Mail and localization tweaks