diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index f32d68a0d8a4dacff0075139a0dca1574295d2a5..b65b9692bd0aee39f653312335ad699f9f4b1bc9 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -250,7 +250,7 @@ ScrollView {
 
             Column {
                 topPadding: userName_.visible? 4: 0
-                bottomPadding: Settings.bubbles? 2 : 3
+                bottomPadding: Settings.bubbles? (isSender? 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 c7508a1c99a1e77050235186c0db047ba9616d1f..b74fb5c1a34d86a2723aa3e1cd23301ab3764101 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -80,7 +80,7 @@ Item {
         anchors.left: bubbleOnRight? undefined : parent.left
         anchors.right: bubbleOnRight? parent.right : undefined
         property int maxWidth: parent.width-anchors.leftMargin-anchors.rightMargin
-        width: Settings.bubbles? Math.min(maxWidth,implicitWidth+metadata.width) : maxWidth
+        width: Settings.bubbles? Math.min(maxWidth,implicitWidth+4) : maxWidth
         leftPadding: 4
         rightPadding: (Settings.bubbles && !isStateEvent)? 4: 2
         topPadding: (Settings.bubbles && !isStateEvent)? 4: 2