new email function updates
Merge remote-tracking branch 'remotes/github/newEmailFunctionUpdates'