Cleaned up email message markup

Closes #389