mailer changes
Merge pull request #9 from kishore-mohan/mansoor

mailer changes
bug
Merge pull request #10 from kishore-mohan/mansoor

bug
resolving conflicts