diff --git a/zephyr/jstemplates/actions_popover_content.html b/zephyr/jstemplates/actions_popover_content.html
index 6a768af01c..2812d2a082 100644
--- a/zephyr/jstemplates/actions_popover_content.html
+++ b/zephyr/jstemplates/actions_popover_content.html
@@ -17,11 +17,28 @@
     </a>
   </li>
   {{/if}}
+
+  {{#if message.is_stream}}
+    <li>
+      <a onclick="narrow.from_popover({{message.id}}); narrow.by_subject();">
+        <i class="icon-bullhorn"></i>
+        Narrow to this subject on stream <b>{{message.display_recipient}}</b>
+      </a>
+    </li>
+  {{else}}
+    <li>
+      <a onclick="narrow.from_popover({{message.id}}); narrow.by_recipient();">
+        <i class="icon-user"></i>
+        Narrow to this private message conversation
+      </a>
+    </li>
+  {{/if}}
+
   <li>
     <a onclick="respond_to_message();">
       <i class="icon-share-alt"></i>
       {{#if message.is_stream}}
-      Reply to stream <b>{{message.display_recipient}}</b> on this subject
+      Reply to this subject on stream <b>{{message.display_recipient}}</b>
       {{else}}
       Reply to this private message
       {{/if}}