Fixed a couple things in the general mailer.