diff --git a/resources/qml/Reactions.qml b/resources/qml/Reactions.qml
index cb2bcb2499070fce10bdcbeaa68b6b4271484f77..aaf32647fc6e0532a6c590d22b6741ae50df516c 100644
--- a/resources/qml/Reactions.qml
+++ b/resources/qml/Reactions.qml
@@ -19,8 +19,6 @@ Flow {
     property string eventId
     property alias reactions: repeater.model
 
-    anchors.left: parent.left
-    anchors.right: parent.right
     spacing: 4
 
     Repeater {
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 8b34c1ee74f5f8101ed9010657fc02511c6538f4..97e2bcf0c36001208fb3c0afdf6caab4b4eaae63 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -103,6 +103,7 @@ Item {
                 Layout.row: 0
                 Layout.column: 0
                 Layout.fillWidth: true
+                Layout.maximumWidth: Settings.bubbles? Number.MAX_VALUE : implicitWidth
                 Layout.bottomMargin: visible? 2 : 0
                 Layout.preferredHeight: height
                 id: reply
@@ -247,8 +248,11 @@ Item {
         anchors {
             top: row.bottom
             topMargin: -2
-            left: row.left
+            left: row.bubbleOnRight? undefined : row.left
+            right: row.bubbleOnRight? row.right : undefined
         }
+        width: row.maxWidth
+        layoutDirection: row.bubbleOnRight? Qt.RightToLeft : Qt.LeftToRight
 
         id: reactionRow