diff --git a/templates/zephyr/home.html b/templates/zephyr/home.html
index 1580585b1d..044a52bbac 100644
--- a/templates/zephyr/home.html
+++ b/templates/zephyr/home.html
@@ -74,7 +74,7 @@
             <tr id="personal-message">
               <td colspan="2" class="message_header message_header_huddle left_part"></td>
               <td class="message_header message_header_huddle right_part">
-                <input type="text" class="recipient_box" name="recipient" id="huddle_recipient" onblur="focus_on('new_message_content')" value="" placeholder="Huddle with one or more people..." autocomplete="off"/>
+                You and <input type="text" class="recipient_box" name="recipient" id="huddle_recipient" onblur="focus_on('new_message_content')" value="" placeholder="one or more people..." autocomplete="off"/>
               </td>
             </tr>
             <tr>
diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index c459a1cedb..9374b4ea37 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -41,7 +41,7 @@
     </td>
     <td class="message_label_clickable message_header message_header_huddle right_part"
         onclick="narrow.target({{id}}); narrow.by_recipient();"
-        title="Huddle with {{display_reply_to}}">{{display_reply_to}}</td>
+        title="Huddle with you and {{display_reply_to}}">You and {{display_reply_to}}</td>
 </tr>
 {{/if}}
 {{/include_recipient}}
diff --git a/zephyr/static/js/narrow.js b/zephyr/static/js/narrow.js
index 621bfbb38e..eb438dc97a 100644
--- a/zephyr/static/js/narrow.js
+++ b/zephyr/static/js/narrow.js
@@ -61,7 +61,7 @@ exports.target = function (id) {
 };
 
 exports.all_personals = function () {
-    do_narrow("All huddles with you", function (other) {
+    do_narrow("<i class='icon-user'></i> You and anyone else", function (other) {
         return other.type === "personal" || other.type === "huddle";
     });
 };
@@ -85,7 +85,7 @@ exports.by_recipient = function () {
     switch (message.type) {
     case 'personal':
         // Narrow to personals with a specific user
-        do_narrow("<i class='icon-user'></i> " + message.display_reply_to, function (other) {
+        do_narrow("<i class='icon-user'></i> You and " + message.display_reply_to, function (other) {
             return (other.type === 'personal') &&
                 (((other.display_recipient.email === message.display_recipient.email)
                     && (other.sender_email === message.sender_email)) ||
@@ -95,7 +95,7 @@ exports.by_recipient = function () {
         break;
 
     case 'huddle':
-        do_narrow("<i class='icon-user'></i> " + message.display_reply_to, function (other) {
+        do_narrow("<i class='icon-user'></i> You and " + message.display_reply_to, function (other) {
             return (other.type === "personal" || other.type === "huddle")
                 && other.reply_to === message.reply_to;
         });