improved config
Merge pull request #2389 from Ragazzo/basic_app_mail_config

improved config