Fixes #1606 - Email with subject bug
Merge pull request #1607 from ATofighi/fix-1606

Fixes #1606 - Email with subject bug