Try #3 to get emails working
Merge pull request #295 from CruGlobal/fix_emails

Try #3 to get emails working