Rewrote section on mail settings