diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 4dc7183501..f86ac1b92a 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -808,6 +808,16 @@ $(function () {
         show_actions_popover(this, rows.id(row));
     });
 
+    $("#main_div").on("contextmenu", ".message_row, .recipient_row", function (e) {
+        // Let the browser handle right-click on links in messages;
+        // otherwise we take over
+        if ($(e.target).is('a'))
+            return;
+        e.preventDefault();
+
+        show_actions_popover(this, rows.id($(this)));
+    });
+
     $("#home").on("click", ".narrows_by_recipient", function (e) {
         var row = $(this).closest(".recipient_row");
         narrow.target(rows.id(row));