I just ran into this bug when trying to merge a post and its replies to another topic.

In threaded mode, the thread structure looks fine but in flat mode, the order is out of whack.

blaaskaak, do you have a manual fix for this?