Merge pull request #115 from joanneci/19621

19621
functional email changes