fix mailer issues