Mailer implementation addition #245