mail for emails by messages and configuration
Merge origin/master