Update mail settings to be slightly more generic