More email improvements.
More email improvements
Merge branch 'master' of https://github.com/pmnguye3/JAMSGitHub.git