Mail settings tweaked