inline patch no longer destroys whitespaces
made code less bad
don't assume there's an email body
Merge branch 'html_emails'