fixes message-fetch limit problems