diff --git a/imports/NeoChat/Component/Timeline/TimelineContainer.qml b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
index a77bf59b4..cfe2436af 100644
--- a/imports/NeoChat/Component/Timeline/TimelineContainer.qml
+++ b/imports/NeoChat/Component/Timeline/TimelineContainer.qml
@@ -36,7 +36,8 @@ Item {
 
     property alias hovered: controlContainer.hovered
 
-    height: mainColumn.childrenRect.height + (readMarker ? Kirigami.Units.smallSpacing : 0)
+    //height: mainColumn.childrenRect.height + (readMarker ? Kirigami.Units.smallSpacing : 0)
+    height: mainColumn.implicitHeight + (readMarker ? Kirigami.Units.smallSpacing : 0)
 
     property int hoverComponentX: column.width - hoverComponent.childWidth + Kirigami.Units.largeSpacing
     property int hoverComponentY: -Kirigami.Units.largeSpacing - hoverComponent.childHeight * 1.5
@@ -149,7 +150,7 @@ Item {
                 id: controlContainer
                 Layout.maximumWidth: mainColumn.width - Kirigami.Units.gridUnit * 2 - Kirigami.Units.largeSpacing * 2
                 implicitHeight: contentItem.implicitHeight
-                topPadding: 0
+                topPadding: Kirigami.Units.largeSpacing
                 bottomPadding: 0
                 leftPadding: 0
                 rightPadding: 0
@@ -158,9 +159,6 @@ Item {
                 contentItem: ColumnLayout {
                     id: column
                     spacing: 0
-                    Item { // top padding
-                        Layout.topMargin: Kirigami.Units.largeSpacing
-                    }
                     Loader {
                         id: topRow
                         active: model.showAuthor && !isEmote
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index 2e69284b7..7dd2dd9de 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -366,6 +366,7 @@ Kirigami.ScrollablePage {
                         Layout.fillWidth: true
                         Layout.rightMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
+                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
                         TapHandler {
                             acceptedButtons: Qt.RightButton
                             onTapped: openMessageContext(author, display, eventId, toolTip)
@@ -392,6 +393,7 @@ Kirigami.ScrollablePage {
                     innerObject: TextDelegate {
                         Layout.fillWidth: true
                         Layout.rightMargin: Kirigami.Units.largeSpacing
+                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
                         Layout.leftMargin: Kirigami.Units.largeSpacing
                         TapHandler {
                             acceptedButtons: Qt.RightButton
@@ -417,6 +419,7 @@ Kirigami.ScrollablePage {
                         Layout.fillWidth: true
                         Layout.rightMargin: Kirigami.Units.largeSpacing
                         Layout.leftMargin: Kirigami.Units.largeSpacing
+                        Layout.bottomMargin: Kirigami.Units.largeSpacing * 2
                     }
                 }
             }