More debugging on mail
Merge branch 'master' into RC_1.15.93.100