Merge pull request #21553 from eileenmcnaughton/email2