Fixed more email settings
Merge branch 'master' into kingman