jfru

Fix unsuccessful for issue 2200 (improve consistency when retrieving message after push notification)

2

## What did you do? We are still seeing messages fail to appear sporadically in the channel when a user enters from a notification. This is a huge problem for...