Improved Message.shouldRefreshStream mechanism