Committing send mail functionality
Merged changes update to PM-3