email template fixes