working on fixing the mailer