diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 077171c9..17dc2cd7 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -11,15 +11,23 @@ Item {
     anchors.right: parent.right
     height: row.height
 
+    Rectangle {
+        color: (Settings.messageHoverHighlight && hoverHandler.containsMouse) ? colors.alternateBase : "transparent"
+        anchors.fill: row
+    }
+
     MouseArea {
+        id: hoverHandler
         anchors.fill: parent
         propagateComposedEvents: true
-        preventStealing: true
+        preventStealing: false
         hoverEnabled: true
         acceptedButtons: Qt.AllButtons
         onClicked: {
             if (mouse.button === Qt.RightButton)
-                messageContextMenu.show(model.id, model.type, model.isEncrypted, row);
+            messageContextMenu.show(model.id, model.type, model.isEncrypted, row);
+            else
+            event.accepted = false
 
         }
         onPressAndHold: {
@@ -27,11 +35,6 @@ Item {
         }
     }
 
-    Rectangle {
-        color: (Settings.messageHoverHighlight && parent.containsMouse) ? colors.base : "transparent"
-        anchors.fill: row
-    }
-
     RowLayout {
         id: row
 
diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml
index fe2fe23f..ff1fa657 100644
--- a/resources/qml/delegates/Reply.qml
+++ b/resources/qml/delegates/Reply.qml
@@ -15,7 +15,7 @@ Item {
 
     MouseArea {
         anchors.fill: parent
-        preventStealing: true
+        preventStealing: false
         onClicked: chat.positionViewAtIndex(chat.model.idToIndex(modelData.id), ListView.Contain)
         cursorShape: Qt.PointingHandCursor
     }