Merge remote-tracking branch 'upstream/master' into webrtc-video

1 files changed, 1 insertions, 1 deletions

diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml

index 38597673..57fded90 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -48,7 +48,7 @@ Item {
             Reply {
                 visible: model.replyTo
                 modelData: chat.model.getDump(model.replyTo, model.id)
-                userColor: TimelineManager.userColor(modelData.userId, colors.window)
+                userColor: TimelineManager.userColor(modelData.userId, colors.base)
             }
 
             // actual message content