fixed some mailer issues