Merge pull request #17406 from eileenmcnaughton/email2