Mailer fixes

Mailer fixes