Fixed mailer issues