diff --git a/frontend_tests/node_tests/templates.js b/frontend_tests/node_tests/templates.js
index 2a422d688a..90a3aabbd6 100644
--- a/frontend_tests/node_tests/templates.js
+++ b/frontend_tests/node_tests/templates.js
@@ -657,7 +657,7 @@ function render(template_name, args) {
     global.write_handlebars_output("message_info_popover_content", html);
 
     var a = $(html).find("a.respond_personal_button");
-    assert.equal(a.text().trim(), 'Send Alice Smith a private message');
+    assert.equal(a.text().trim(), 'Send private message');
 }());
 
 
diff --git a/static/templates/message_info_popover_content.handlebars b/static/templates/message_info_popover_content.handlebars
index 0946a0d6e8..073f493124 100644
--- a/static/templates/message_info_popover_content.handlebars
+++ b/static/templates/message_info_popover_content.handlebars
@@ -1,7 +1,7 @@
 {{! Contents of the "message info" popup }}
 <ul class="nav nav-list actions_popover sender_info_popover" data-user-id="{{message.sender_id}}">
     <div class="popover_info">
-        <li>{{#tr this}}Sent by <b>__message.sender_full_name__</b>{{/tr}}</li>
+        <li>{{#tr this}}<b>__message.sender_full_name__</b>{{/tr}}</li>
         <li class='my_email'>{{sender_email}}</li>
 
         {{#if message.historical}}
@@ -11,22 +11,22 @@
     <hr />
     <li>
         <a href="#" class="respond_personal_button">
-            <i class="icon-vector-edit"></i> {{#tr this}}Send __message.sender_full_name__ a private message{{/tr}}
+            <i class="icon-vector-edit"></i> {{#tr this}}Send private message{{/tr}}
         </a>
     </li>
     <li>
         <a href="{{ pm_with_uri }}" class="narrow_to_private_messages">
-            <i class="icon-vector-user"></i> {{#tr this}}Narrow to private messages with __message.sender_full_name__{{/tr}}
+            <i class="icon-vector-user"></i> {{#tr this}}Private messages with user{{/tr}}
         </a>
     </li>
     <li>
         <a href="{{ sent_by_uri }}" class="narrow_to_messages_sent">
-            <i class="icon-vector-bullhorn"></i> {{#tr this}}Narrow to messages sent by __message.sender_full_name__{{/tr}}
+            <i class="icon-vector-bullhorn"></i> {{#tr this}}Messages sent by user{{/tr}}
         </a>
     </li>
     <li>
         <a class="mention_user">
-            {{#tr this}}@ Compose a reply @-mentioning __message.sender_full_name__{{/tr}}
+            <i>@</i> {{#tr this}}Reply mentioning user{{/tr}}
         </a>
     </li>
 </ul>