Fix up email templates