Merge pull request #3319 from dgmike/issue-3313

Verifying From header before send mail