Minor changes in mail log/messages.
Adding PSE.
Merge branch 'origin/refactor'