Basic mailer support added