Revert "working on messages' sorting"

This reverts commit 4d8645cb7d6a740787d216b3b5d938ec6daaceea.