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
Bug 1093128 - Fix checking for the viewer to open when the user clicks a link to protected content