Fixes #1606 - Email with subject bug

#1606