Added mailer support