Added mailer
mailer added
merge mailer branch