Mattermost has both! Messages always appear in sequence. Replies in a thread are visually identified as reply including the thread it is part of. This way you can do both grouping of discussions and follow the discussions from higher over.