Email settings tweaks