Email i18n improvements

- Separate email keys from UI keys to fix unit tests
- Updated tests to work with latest files
Nah, it doesn't. :(