Fix to mailer