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