Issue #96 mailer fixes