default mail config set to "mail"
Merge branch 'master' into Refactoring-files