"I think we should render messages in the thread separately (even if they are from the same user) and add a possibility for the user to merge them together (just like threads).
Right now it is unclear when the user posted the message.
The count in the channel and what you see on the right in the thread is also very confusing." - @Emil Ajdyna