change mail settings
Merge branch 'new-design'