More mail settings changes