I fixed some issues around this exact problem in:
Specifically the consistent repro of the issue was to have 2 conversations going and to flick between them.
You are … almost… at that commit, the commit should land middle of this week.
Just confirming though, when you reload the page after all stuff is done are you seeing stuff show up correctly?