Update email templates to better handle html