Remove the 'Mailer' string
Update email templates