Added config data for the mail service.
Merge remote-tracking branch 'upstream/master'