Add mail settings
Merge branch 'feature/jwako'