added support for mailer