Revert "Revert "Tester""

This reverts commit 5cace716827a878484c3b7a0d163decb699be7d8.
Fixes to mailer