Try to get emails sending correctly
Merge pull request #314 from CruGlobal/Fix_Email_issue

Try to get emails sending correctly