Fix mailer, finally