- Use CMSMS is_email function instead of our own.
- Minor improvements.