Email changes to handle Office 365
Merged mail changes made for Office 365