Added pagination to messages
Merge pull request #428 from AndreiRO/master

Added pagination to messages, thanks to @AndreiRO