Email i18n improvements

Use new location for email i18n keys