Fix some issues with not showing right count of messages