diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index 1960428461..d8d7f2f66d 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -50,7 +50,7 @@
     onclick="select_message_by_id({{id}});">
     <td class="message_picture">
     {{#include_sender}}
-        <img class="img-rounded profile_picture"
+        <img class="img-rounded profile_picture user_info_hover"
              src="https://secure.gravatar.com/avatar/{{gravatar_hash}}?d=identicon&s=30"
              onclick="userinfo_popover(event, this, {{id}});"/>
     {{/include_sender}}
@@ -62,9 +62,9 @@
         onmouseover="show_email({{id}});"
         onmouseout="hide_email();">
         {{#include_sender}}
-        <span class="message_sender"
+        <span class="message_sender user_info_hover"
               onclick="userinfo_popover(event, this, {{id}});">
-            <a class="sender_name">{{sender_full_name}}</a>
+            <span class="sender_name">{{sender_full_name}}</span>
             <span class="sender_email invisible">{{sender_email}}</span>
         </span>
     {{/include_sender}}
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 34f86f876d..667a4e1d21 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -16,6 +16,20 @@ function register_onclick(message_row, message_id) {
     });
 }
 
+function register_user_info_mouseover(message_row, message_id) {
+    message_row.find(".user_info_hover").mouseover(function (e) {
+        show_email(message_id);
+        message_row.find(".sender_name").addClass("sender_hovered");
+    });
+}
+
+function register_user_info_mouseout(message_row, message_id) {
+    message_row.find(".user_info_hover").mouseout(function (e) {
+        hide_email();
+        message_row.find(".sender_name").removeClass("sender_hovered");
+    });
+}
+
 function focus_on(field_id) {
     // Call after autocompleting on a field, to advance the focus to
     // the next input field.
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index d4735e340f..5486f4fed6 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -346,6 +346,8 @@ function add_to_table(messages, table_name, filter_function, where) {
     $.each(messages_to_render, function (index, message) {
         var row = rows.get(message.id, table_name);
         register_onclick(row, message.id);
+        register_user_info_mouseover(row, message.id);
+        register_user_info_mouseout(row, message.id);
 
         row.find('.message_content a').each(function (index, link) {
             link = $(link);
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 6cb334e9a0..ba3d68bace 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -168,6 +168,11 @@ td.pointer {
     font-weight: bold;
 }
 
+.sender_hovered {
+    color: #0088CC;
+    text-decoration: underline;
+}
+
 .sender_email {
     font-size: 80%;
     color: gray;