add 2 files for mail connection
Merge origin/master