Fixed inconsistencies found in the email message implementation.