improve formatting of mail logging
Fix formatting.
Merge branch '4.2'