diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index b9db224d..6363a87d 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
@@ -396,7 +396,7 @@ Item {
 
             anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
             width: chat.delegateMaxWidth
-            height: section.active ? section.height + timelinerow.height : timelinerow.height
+            height: section.active ? section.height + timelinerow.height: timelinerow.height
 
             hoverEnabled: true