more email template fixes