Refactor localization of email (To be continued)