diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
index c9a697643..4bee50b82 100644
--- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
@@ -37,7 +37,7 @@ Image {
         maskSource: Rectangle {
             width: img.width
             height: img.height
-            radius: 18
+            radius: 2
         }
     }
 
@@ -65,7 +65,7 @@ Image {
         }
 
         background: Rectangle {
-            radius: height / 2
+            radius: 2
             color: "black"
             opacity: 0.3
         }
diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 23ea24ff5..3ce8cc1b2 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -33,9 +33,10 @@ RowLayout {
 
     id: root
 
-    spacing: Kirigami.Units.largeSpacing
-    Layout.leftMargin: Kirigami.Units.smallSpacing
+    spacing: Kirigami.Units.smallSpacing
+    Layout.leftMargin: Kirigami.Units.largeSpacing
     Layout.rightMargin: Kirigami.Units.smallSpacing
+    Layout.topMargin: showAuthor ? Kirigami.Units.smallSpacing : 0
 
     Kirigami.Avatar {
         Layout.minimumWidth: Kirigami.Units.iconSizes.medium
@@ -65,7 +66,6 @@ RowLayout {
     Item {
         Layout.minimumWidth: Kirigami.Units.iconSizes.medium
         Layout.preferredHeight: 1
-
         visible: !showAuthor
     }
 
@@ -73,12 +73,14 @@ RowLayout {
     QQC2.Control {
         id: controlContainer
         Layout.fillWidth: true
+        topPadding: 0
         contentItem: ColumnLayout {
             id: column
             spacing: Kirigami.Units.smallSpacing
 
             QQC2.Label {
                 Layout.fillWidth: true
+                topInset: 0
 
                 visible: showAuthor
 
@@ -121,12 +123,9 @@ RowLayout {
                         wrapMode: Text.Wrap
                     }
 
-                    Text {
+                    QQC2.Label {
                         Layout.fillWidth: true
-
                         text: replyVisible ? reply.display : ""
-
-                        color: Kirigami.Theme.textColor
                         wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                         textFormat: Text.RichText
                     }