Add option to set a mail config
Merge remote-tracking branch 'origin/mail_config'