fixing mailer issues