Revert "mailer changes"

This reverts commit 69f216844a53429b89ed9b7afbc2c4c88950a207.