Improved the Mailer plug-in