Work in process - mailer
test fix