diff --git a/TODO.md b/TODO.md
index f50718e2..34a2bb4b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -13,6 +13,7 @@
   - When qml syntax highlighting supports ES6 string interpolation, use that
 
 - Fixes
+  - Quote links color in room subtitles
   - Pressing backspace in composer sometimes doesn't work
   - Message order isn't preserved when sending a first message in a E2E
     room, then while keys are being shared sending one with another account,
diff --git a/src/qml/Chat/Timeline/EventContent.qml b/src/qml/Chat/Timeline/EventContent.qml
index 4edb5f79..823a7e5e 100644
--- a/src/qml/Chat/Timeline/EventContent.qml
+++ b/src/qml/Chat/Timeline/EventContent.qml
@@ -9,7 +9,6 @@ Row {
 
     readonly property string eventText: Utils.processedEventText(model)
     readonly property string eventTime: Utils.formatTime(model.date, false)
-    readonly property int eventTimeSpaces: 2
 
     readonly property string hoveredLink:
         nameLabel.hoveredLink || contentLabel.hoveredLink
@@ -113,10 +112,9 @@ Row {
                 text: theme.chat.message.styleInclude +
                       eventContent.eventText +
                       // time
-                      " ".repeat(eventTimeSpaces) +
+                      " " +
                       "<font size=" + theme.fontSize.small +
-                      "px color=" + theme.chat.message.date +
-                      ' style="vertical-align: middle">' +
+                      "px color=" + theme.chat.message.date + '>' +
                       eventTime +
                       "</font>" +
                       // local echo icon
@@ -134,7 +132,7 @@ Row {
                     contentLabel.select(
                         0,
                         contentLabel.length -
-                        eventTime.length - eventTimeSpaces,
+                        eventTime.length - 1  // - 1: separating space
                     )
                     contentLabel.updateContainerSelectedTexts()
                 }