More email template changes