Mailer fix