load the correct number of extra messages from the server instead of possibly doubling the count
Merge pull request #232 from ssieb/master

load the right number of messages from the server
changelog updates
Merge branch 'master' into issue362