Bug 1093371 - [email] Small cleanup from bug 1005446 refactoring
Merge pull request #25788 from jrburke/bug1093371-email-refactor-cleanup

Bug 1093371 - [email] Small cleanup from bug 1005446 refactoring r=asuth