Use controls.

imports/Spectral/Component/Timeline/StateDelegate.qml

@@ -8,34 +8,16 @@ import Spectral.Dialog 2.0
 import Spectral.Effect 2.0
 import Spectral.Setting 0.1
 
-Control {
+RowLayout {
-    id: root
-
-    padding: 8
-
-    contentItem: RowLayout {
     id: row
 
-        Control {
-            Layout.alignment: Qt.AlignTop
-
-            id: authorControl
-
-            padding: 4
-
-            background: Rectangle {
-                radius: height / 2
-                color: author.color
-            }
-
-            contentItem: RowLayout {
     Avatar {
         Layout.preferredWidth: 24
         Layout.preferredHeight: 24
 
         hint: author.displayName
         source: author.avatarMediaId
-                    color: Qt.darker(author.color, 1.1)
+        color: author.color
 
         Component {
             id: userDetailDialog
@@ -57,18 +39,11 @@ Control {
 
         text: author.displayName
         font.pixelSize: 13
-                    font.weight: Font.Medium
+        font.bold: true
-                    color: "white"
-                    rightPadding: 8
-                }
-            }
     }
 
     Label {
-            Layout.fillWidth: true
+        text: model.display
-            Layout.maximumWidth: messageListView.width - authorControl.width - row.spacing - (root.padding * 2)
-
-            text: display + " • " + Qt.formatTime(time)
         color: MPalette.foreground
         font.pixelSize: 13
         font.weight: Font.Medium
@@ -77,4 +52,3 @@ Control {
         onLinkActivated: Qt.openUrlExternally(link)
     }
 }
-}

imports/Spectral/Component/Timeline/TextDelegate.qml

@@ -2,7 +2,6 @@ import QtQuick 2.12
 
 import org.kde.kirigami 2.4 as Kirigami
 
-
 TextEdit {
     text: "<style>pre {white-space: pre-wrap} a{color: " + Kirigami.Theme.linkColor + ";} .user-pill{}</style>" + model.display
 

imports/Spectral/Component/Timeline/TimelineContainer.qml

@@ -10,12 +10,14 @@ Controls.ItemDelegate {
     horizontalPadding: Kirigami.Units.largeSpacing
     verticalPadding: Kirigami.Units.smallSpacing
 
-    contentItem: Column {
+    contentItem: ColumnLayout {
         id: column
 
         SectionDelegate {
-            anchors.horizontalCenter: parent.horizontalCenter
+            //            anchors.horizontalCenter: parent.horizontalCenter
-            width: Math.min(implicitWidth, parent.width)
+            //            width: Math.min(implicitWidth, parent.width)
+            Layout.maximumWidth: parent.width
+            Layout.alignment: Qt.AlignHCenter
 
             visible: showSection
         }

imports/Spectral/Panel/RoomPanel.qml

@@ -104,28 +104,34 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "state"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
-                    StateDelegate {}
+                    innerObject: StateDelegate {
+                        Layout.maximumWidth: parent.width
+                        Layout.alignment: Qt.AlignHCenter
+                    }
                 }
             }
 
             DelegateChoice {
                 roleValue: "emote"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
-                    innerObject: StateDelegate {}
+                    innerObject: StateDelegate {
+                        Layout.maximumWidth: parent.width
+                        Layout.alignment: Qt.AlignHCenter
+                    }
                 }
             }
 
             DelegateChoice {
                 roleValue: "message"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: TextDelegate {
                             Layout.fillWidth: true
@@ -137,10 +143,10 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "notice"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: TextDelegate {
                             Layout.fillWidth: true
@@ -152,10 +158,10 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "image"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: ImageDelegate {
                             Layout.fillWidth: true
@@ -168,10 +174,10 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "audio"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: AudioDelegate {
                             Layout.fillWidth: true
@@ -183,10 +189,10 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "video"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: AudioDelegate {
                             Layout.fillWidth: true
@@ -198,10 +204,10 @@ Kirigami.ScrollablePage {
             DelegateChoice {
                 roleValue: "file"
                 delegate: TimelineContainer {
-                    width: page.width
+                    width: messageListView.width
 
                     innerObject: MessageDelegate {
-                        width: parent.width
+                        Layout.fillWidth: true
 
                         innerObject: FileDelegate {
                             Layout.fillWidth: true

src/messageeventmodel.cpp

@@ -459,7 +459,7 @@ QVariant MessageEventModel::data(const QModelIndex& idx, int role) const {
   }
 
   if (role == ShowAuthorRole) {
-    for (auto r = row + 1; r < 0; ++r) {
+    for (auto r = row + 1; r < rowCount(); ++r) {
       auto i = index(r);
       if (data(i, SpecialMarksRole) != EventStatus::Hidden) {
         return data(i, AuthorRole) != data(idx, AuthorRole) ||