Improved mail settings support