Added more mail settings