fix and improve messages
remove unused flags and comented code
fix user list layout on messages modal
Merge branch 'messages-issue-3459'