Merged in mailer.py changes from SendJack.