Improve Mailer with more options