diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index b9db224d..a9a142b9 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -256,7 +256,7 @@ Item {
 
             Column {
                 topPadding: userName_.visible? 4: 0
-                bottomPadding: Settings.bubbles? (isSender? 0 : 2) : 3
+                bottomPadding: Settings.bubbles? (isSender && previousMessageDay == day? 0 : 2) : 3
                 spacing: 8
                 visible: (previousMessageUserId !== userId || previousMessageDay !== day || isStateEvent !== previousMessageIsStateEvent)
                 width: parentWidth
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 97e2bcf0..a3040412 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -78,7 +78,7 @@ Item {
         anchors.right: isStateEvent? undefined: (bubbleOnRight? parent.right : undefined)
         anchors.horizontalCenter: isStateEvent? parent.horizontalCenter : undefined
         property int maxWidth: parent.width-anchors.leftMargin-anchors.rightMargin
-        width: Settings.bubbles? Math.min(maxWidth,implicitWidth+metadata.width+12) : maxWidth
+        width: Settings.bubbles? Math.min(maxWidth,Math.max(reply.implicitWidth+8,contentItem.implicitWidth+metadata.width+20)) : maxWidth
         leftPadding: 4
         rightPadding: (Settings.bubbles && !isStateEvent)? 4: 2
         topPadding: (Settings.bubbles && !isStateEvent)? 4: 2
@@ -142,7 +142,6 @@ Item {
                 Layout.column: 0
                 Layout.fillWidth: true
                 Layout.preferredHeight: height
-                Layout.minimumWidth: 80
                 id: contentItem
 
                 blurhash: r.blurhash