config: Email setup info stored in system config files
Merge remote-tracking branch 'origin/master'