Merge pull request #232 from ssieb/master

load the right number of messages from the server