Mailer fix again