update mailer and test suite