From c654520c73fe935603813f8015d990c1a73a9aca Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Mon, 5 Nov 2012 17:30:20 -0500
Subject: [PATCH] Display email on currently moused-over message.

(imported from commit ae27dc6068fefa9df7b5a03992df0253da9ec61a)
---
 zephyr/jstemplates/message.html | 11 ++++++-----
 zephyr/static/js/ui.js          |  6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index 208093bd36..1960428461 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -46,7 +46,7 @@
 {{/if}}
 {{/include_recipient}}
 <tr zid="{{id}}" id="{{dom_id}}"
-    class="message_row{{^is_stream}} personal-message{{/is_stream}}"
+    class="message_row{{^is_stream}} personal-message{{/is_stream}}{{#include_sender}} include-sender{{/include_sender}}"
     onclick="select_message_by_id({{id}});">
     <td class="message_picture">
     {{#include_sender}}
@@ -57,12 +57,13 @@
     </td>
     <td class="pointer"><p></p></td>
     <td class="messagebox{{^include_sender}} prev_is_same_sender{{/include_sender}}{{^is_stream}} personal-message{{/is_stream}}"
-        onmousedown="mousedown();" onmousemove="mousemove();">
+        onmousedown="mousedown();"
+        onmousemove="mousemove();"
+        onmouseover="show_email({{id}});"
+        onmouseout="hide_email();">
         {{#include_sender}}
         <span class="message_sender"
-              onclick="userinfo_popover(event, this, {{id}});"
-              onmouseover="show_email({{id}});"
-              onmouseout="hide_email();">
+              onclick="userinfo_popover(event, this, {{id}});">
             <a class="sender_name">{{sender_full_name}}</a>
             <span class="sender_email invisible">{{sender_email}}</span>
         </span>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 8ee5e24978..34f86f876d 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -36,7 +36,11 @@ function hide_email() {
 
 function show_email(message_id) {
     hide_email();
-    rows.get(message_id).find('.sender_email').removeClass('invisible');
+    var row_with_email = rows.get(message_id);
+    while (!row_with_email.hasClass('include-sender')) {
+        row_with_email = row_with_email.prev();
+    }
+    row_with_email.find('.sender_email').removeClass('invisible');
 }
 
 function report_message(response, status_box, cls) {