diff --git a/imports/NeoChat/Component/Timeline/MessageDelegate.qml b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
index 16a92b6e9..d52462e24 100644
--- a/imports/NeoChat/Component/Timeline/MessageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/MessageDelegate.qml
@@ -50,7 +50,7 @@ RowLayout {
 
         Layout.alignment: Qt.AlignTop
 
-        visible: showAuthor
+        visible: showAuthor && Config.showAvatarInTimeline
         name: author.displayName
         source: author.avatarMediaId ? "image://mxc/" + author.avatarMediaId : ""
         color: author.color
@@ -70,7 +70,7 @@ RowLayout {
     Item {
         Layout.minimumWidth: Kirigami.Units.gridUnit * 2
         Layout.preferredHeight: 1
-        visible: !showAuthor
+        visible: !showAuthor && Config.showAvatarInTimeline
     }
 
 
diff --git a/imports/NeoChat/Component/Timeline/ReplyComponent.qml b/imports/NeoChat/Component/Timeline/ReplyComponent.qml
index 6c1136c14..e43148f7e 100644
--- a/imports/NeoChat/Component/Timeline/ReplyComponent.qml
+++ b/imports/NeoChat/Component/Timeline/ReplyComponent.qml
@@ -28,7 +28,7 @@ QQC2.AbstractButton {
             Layout.preferredWidth: Kirigami.Units.gridUnit
             Layout.preferredHeight: Kirigami.Units.gridUnit
             Layout.alignment: Qt.AlignTop
-
+            visible: Config.showAvatarInTimeline
             source: replyVisible && reply.author.avatarMediaId ? "image://mxc/" + reply.author.avatarMediaId : ""
             name: replyVisible ? reply.author.displayName : "H"
             color: replyVisible ? reply.author.color : Kirigami.Theme.highlightColor
diff --git a/imports/NeoChat/Page/SettingsPage.qml b/imports/NeoChat/Page/SettingsPage.qml
index b3a65eb0b..ecc6ce638 100644
--- a/imports/NeoChat/Page/SettingsPage.qml
+++ b/imports/NeoChat/Page/SettingsPage.qml
@@ -40,5 +40,11 @@ Kirigami.ScrollablePage {
             checked: Config.mergeRoomList
             onToggled: Config.mergeRoomList = true
         }
+        QQC2.CheckBox {
+            Kirigami.FormData.label: i18n("Timeline:")
+            text: i18n("Show User Avatar")
+            checked: Config.showAvatarInTimeline
+            onToggled: Config.showAvatarInTimeline = checked
+        }
     }
 }
diff --git a/src/neochatconfig.kcfg b/src/neochatconfig.kcfg
index 6640b6e06..c9ceca3a8 100644
--- a/src/neochatconfig.kcfg
+++ b/src/neochatconfig.kcfg
@@ -24,5 +24,11 @@
       <default>true</default>
     </entry>
   </group>
+  <group name="Timeline">
+    <entry name="ShowAvatarInTimeline" type="bool">
+      <label>Show avatar in the timeline</label>
+      <default>true</default>
+    </entry>
+  </group>
 </kcfg>