diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 34771b4c57..c36ca14dba 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -30,9 +30,6 @@
 <script id="template_actions_popover_content" type="text/x-handlebars-template">
 {% rawjstemplate "actions_popover_content" %}
 </script>
-<script id="template_timeinfo_popover_content" type="text/x-handlebars-template">
-{% rawjstemplate "timeinfo_popover_content" %}
-</script>
 
 {% compressed_css 'app' %}
 <link rel="stylesheet" href="/static/third/spectrum/spectrum.css" />
diff --git a/zephyr/jstemplates/actions_popover_content.html b/zephyr/jstemplates/actions_popover_content.html
index 1b1f28b206..3dd5e1d777 100644
--- a/zephyr/jstemplates/actions_popover_content.html
+++ b/zephyr/jstemplates/actions_popover_content.html
@@ -1,14 +1,28 @@
 {{! Contents of the "message actions" popup }}
 <ul class="nav nav-list actions_popover">
+  <div class="popover_info">
+    <li>{{message.full_date_str}}</li>
+    <li>{{message.full_time_str}}</li>
+    <hr />
+  </div>
+
+  {{#if narrowed}}
   <li>
-    <a onclick="respond_to_message();">
-      <i class="icon-share-alt"></i> Reply to this {{#if is_stream}}stream{{else}}private message{{/if}}
+    <a onclick="ui.hide_actions_popover(); narrow.target({{message.id}}); narrow.activate([]);">
+      <i class="icon-time"></i> Narrow to messages around this time
     </a>
   </li>
-  {{#unless is_private}}
+  {{/if}}
+  <li>
+    <a onclick="respond_to_message();">
+      <i class="icon-share-alt"></i>
+      Reply to this {{#if message.is_stream}}stream{{else}}private message{{/if}}
+    </a>
+  </li>
+  {{#unless message.is_private}}
   <li>
     <a onclick="respond_to_message('personal');">
-      <i class="icon-user"></i> Reply to {{sender_full_name}} only
+      <i class="icon-user"></i> Reply to {{message.sender_full_name}} only
     </a>
   </li>
   {{/unless}}
diff --git a/zephyr/jstemplates/actions_popover_title.html b/zephyr/jstemplates/actions_popover_title.html
index c01d6d2c40..9ccdd3517f 100644
--- a/zephyr/jstemplates/actions_popover_title.html
+++ b/zephyr/jstemplates/actions_popover_title.html
@@ -1,3 +1,8 @@
 {{! Title of the "message actions" popup }}
-<span title="{{sender_full_name}}"><b>{{sender_full_name}}</b></span><br />
-<span class='my_email' title="{{sender_email}}">{{sender_email}}</span>
+<span title="{{message.sender_full_name}}">
+  <b>{{message.sender_full_name}}</b>
+</span><br />
+
+<span class='my_email' title="{{message.sender_email}}">
+  {{message.sender_email}}
+</span>
diff --git a/zephyr/jstemplates/message.html b/zephyr/jstemplates/message.html
index 004a0afb7a..a8e2c2bc1d 100644
--- a/zephyr/jstemplates/message.html
+++ b/zephyr/jstemplates/message.html
@@ -60,8 +60,7 @@
             <span class="sender_email invisible">{{sender_email}}</span>
         </span>
     {{/include_sender}}
-        <span class="message_time actions_hover"
-              title="{{full_date_str}}">{{{timestr}}}</span>
+        <span class="message_time actions_hover">{{{timestr}}}</span>
         <div class="message_content">{{{content}}}</div>
     </td>
 </tr>
diff --git a/zephyr/jstemplates/timeinfo_popover_content.html b/zephyr/jstemplates/timeinfo_popover_content.html
deleted file mode 100644
index d4dc714639..0000000000
--- a/zephyr/jstemplates/timeinfo_popover_content.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{{! Client-side Mustache template for the contents of the little "timeinfo" popup that shows up when you click on a time }}
-<ul class="nav nav-list actions_popover">
-  <li>
-    <a onclick="ui.hide_actions_popover(); narrow.target({{id}}); narrow.activate([]);">
-      <i class="icon-time"></i> Narrow to messages around this time
-    </a>
-  </li>
-</ul>
diff --git a/zephyr/static/js/setup.js b/zephyr/static/js/setup.js
index 925a833d32..dbac5b5b68 100644
--- a/zephyr/static/js/setup.js
+++ b/zephyr/static/js/setup.js
@@ -13,7 +13,7 @@ $(function () {
     // Compile Handlebars templates.
     $.each(['message', 'subscription',
             'actions_popover_title', 'actions_popover_content',
-            'timeinfo_popover_content', 'invite_subscription', 'new_stream_users'],
+            'invite_subscription', 'new_stream_users'],
         function (index, name) {
             templates[name] = Handlebars.compile($('#template_'+name).html());
         }
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 9c1261362e..9d946b6fb2 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -387,24 +387,16 @@ function show_actions_popover(element, id) {
     select_message_by_id(id);
     var elt = $(element);
     if (elt.data('popover') === undefined) {
-        var content, message = message_dict[id];
-        if (elt.hasClass("message_sender") || elt.hasClass("profile_picture")) {
-            elt.popover({placement: "bottom",
-                         title: templates.actions_popover_title(message),
-                         content: templates.actions_popover_content(message),
-                         trigger: "manual"
-                        });
-        } else if (elt.hasClass("message_time")) {
-            if (!narrow.active()) {
-                // Only show the time-travel popover when narrowed
-                return;
-            }
-            // Bootstrap takes the title from the 'title' attribute of elt
-            elt.popover({placement: "bottom",
-                         content: templates.timeinfo_popover_content(message),
-                         trigger: "manual"
-                        });
-        }
+        var args = {
+            message:  message_dict[id],
+            narrowed: narrow.active()
+        };
+        elt.popover({
+            placement: "bottom",
+            title:     templates.actions_popover_title(args),
+            content:   templates.actions_popover_content(args),
+            trigger:   "manual"
+        });
         elt.popover("show");
         current_actions_popover_elem = elt;
     }
diff --git a/zephyr/static/js/zephyr.js b/zephyr/static/js/zephyr.js
index b597685ad0..805f2eed37 100644
--- a/zephyr/static/js/zephyr.js
+++ b/zephyr/static/js/zephyr.js
@@ -272,9 +272,15 @@ function add_display_time(message, prev) {
     } else {
         message.timestr = time.toString("HH:mm");
     }
-    // Rather than using time.toLocaleString(), which varies by
-    // browser, just do our own hardcoded formatting.
-    message.full_date_str = time.toDateString() + " " + time.toTimeString();
+
+    // Convert to number of hours ahead/behind UTC.
+    // The sign of getTimezoneOffset() is reversed wrt
+    // the conventional meaning of UTC+n / UTC-n
+    var tz_offset = -time.getTimezoneOffset() / 60;
+
+    message.full_date_str = time.toLocaleDateString();
+    message.full_time_str = time.toLocaleTimeString() +
+        ' (UTC' + ((tz_offset < 0) ? '' : '+') + tz_offset + ')';
 }
 
 function add_to_table(messages, table_name, filter_function, where, allow_collapse) {
diff --git a/zephyr/static/styles/zephyr.css b/zephyr/static/styles/zephyr.css
index 0b0f1c82b9..f18c549fa9 100644
--- a/zephyr/static/styles/zephyr.css
+++ b/zephyr/static/styles/zephyr.css
@@ -648,6 +648,15 @@ table.floating_recipient {
     text-overflow: ellipsis;
 }
 
+.popover_info {
+    text-align: center;
+}
+
+.popover hr {
+    margin-top:    5px;
+    margin-bottom: 5px;
+}
+
 .hotkeys_table {
     float: left;
     width: 250px;