Fix invalid email headers

Issue report in http://issues.thebuggenie.com/thebuggenie/issues/2389