diff --git a/src/eventhandler.cpp b/src/eventhandler.cpp
index b4782f79f..4423a38a0 100644
--- a/src/eventhandler.cpp
+++ b/src/eventhandler.cpp
@@ -321,8 +321,7 @@ QString EventHandler::getBody(const Quotient::RoomEvent *event, Qt::TextFormat f
             }
 
             if (prettyPrint) {
-                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a>")
-                                  .arg(e.userId(), Utils::getUserColor(m_room->user(e.userId())->hueF()).name(), subjectName);
+                subjectName = QStringLiteral("<a href=\"https://matrix.to/#/%1\">%2</a>").arg(e.userId(), subjectName);
             }
 
             // The below code assumes senderName output in AuthorRole
diff --git a/src/models/messagefiltermodel.cpp b/src/models/messagefiltermodel.cpp
index 9d84235ee..20abe8853 100644
--- a/src/models/messagefiltermodel.cpp
+++ b/src/models/messagefiltermodel.cpp
@@ -127,9 +127,8 @@ QString MessageFilterModel::aggregateEventToString(int sourceRow) const
         chunks.removeDuplicates();
         // The author text is either "n users" if > 1 user or the matrix.to link to a single user.
         QString userText = uniqueAuthors.length() > 1 ? i18ncp("n users", " %1 user ", " %1 users ", uniqueAuthors.length())
-                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\" style=\"color: %2\">%3</a> ")
+                                                      : QStringLiteral("<a href=\"https://matrix.to/#/%1\">%3</a> ")
                                                             .arg(uniqueAuthors[0].toMap()[QStringLiteral("id")].toString(),
-                                                                 uniqueAuthors[0].toMap()[QStringLiteral("color")].toString(),
                                                                  uniqueAuthors[0].toMap()[QStringLiteral("displayName")].toString().toHtmlEscaped());
 
         QString chunksText;
diff --git a/src/qml/StateComponent.qml b/src/qml/StateComponent.qml
index acd62e17b..ccc433b7c 100644
--- a/src/qml/StateComponent.qml
+++ b/src/qml/StateComponent.qml
@@ -70,9 +70,12 @@ RowLayout {
         id: label
         Layout.alignment: Qt.AlignVCenter
         Layout.fillWidth: true
-        text: `<style>a {text-decoration: none;}</style><a href="https://matrix.to/#/${root.author.id}" style="color: ${root.author.color}">${root.authorDisplayName}</a> ${root.text}`
+        text: `<style>a {text-decoration: none; color: ${Kirigami.Theme.textColor};}</style><a href="https://matrix.to/#/${root.author.id}">${root.authorDisplayName}</a> ${root.text}`
         wrapMode: Text.WordWrap
         textFormat: Text.RichText
         onLinkActivated: link => RoomManager.resolveResource(link)
+        HoverHandler {
+            cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+        }
     }
 }
diff --git a/src/qml/StateDelegate.qml b/src/qml/StateDelegate.qml
index 2ff957824..c9683b236 100644
--- a/src/qml/StateDelegate.qml
+++ b/src/qml/StateDelegate.qml
@@ -153,11 +153,14 @@ TimelineDelegate {
                 Layout.fillWidth: true
                 visible: root.folded
 
-                text: root.aggregateDisplay
+                text: `<style>a {color: ${Kirigami.Theme.textColor}}</style>` + root.aggregateDisplay
                 elide: Qt.ElideRight
                 textFormat: Text.RichText
                 wrapMode: Text.WordWrap
                 onLinkActivated: RoomManager.resolveResource(link)
+                HoverHandler {
+                    cursorShape: parent.hoveredLink ? Qt.PointingHandCursor : Qt.IBeamCursor
+                }
             }
             Item {
                 Layout.fillWidth: true