Issue #38: change order of settings in the email settings screen