CRM-13965 : email sending template fixes