Update email templates to better handle html
Merge branch 'mailing-list' into staging2