new email settings
Merge branch 'dev' into test
email