Email issues resolved
Merge pull request #83 from niravpatel2008/developer

Email issues resolved