Fix mailer again