diff --git a/src/timeline/MessageDelegate.qml b/src/timeline/MessageDelegate.qml
index 1d5d1a320..3b2190d35 100644
--- a/src/timeline/MessageDelegate.qml
+++ b/src/timeline/MessageDelegate.qml
@@ -289,7 +289,7 @@ TimelineDelegate {
                         AnchorChanges {
                             target: bubble
                             anchors.left: avatar.right
-                            anchors.right: undefined
+                            anchors.right: root.isThreaded ? parent.right : undefined
                         }
                     }
                 ]