Minor Fixes the the Mail helper
Whoops
Merge pull request #1720 from Mnkras/hotfix/mail-fixes

Minor Fixes the the Mail helper