Bhavesh Code Merge

Email related changes