upgrading the mailer
fixing conflict