diff --git a/clientapp/templates.js b/clientapp/templates.js
index 8fb8aaa..f6d9ff9 100644
--- a/clientapp/templates.js
+++ b/clientapp/templates.js
@@ -311,6 +311,7 @@ exports.includes.mucRosterItem = function anonymous(locals) {
 exports.includes.mucWrappedMessage = function anonymous(locals) {
     var buf = [];
     with (locals || {}) {
+        var messageDate = Date.create(message.timestamp);
         buf.push('<li><div class="sender"><a href="#" class="messageAvatar"><img' + jade.attrs({
             src: "https://gravatar.com/avatar",
             alt: message.from.resource,
@@ -319,7 +320,12 @@ exports.includes.mucWrappedMessage = function anonymous(locals) {
             src: true,
             alt: true,
             "data-placement": true
-        }) + '/></a></div><div class="messageWrapper"><div class="message_header"><div class="name">' + jade.escape((jade.interp = message.from.resource) == null ? "" : jade.interp) + '</div><div class="date">' + jade.escape((jade.interp = Date.create(message.timestamp).format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
+        }) + '/></a></div><div class="messageWrapper"><div class="message_header"><div class="name">' + jade.escape((jade.interp = message.from.resource) == null ? "" : jade.interp) + "</div><div" + jade.attrs({
+            title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
+            "class": "date"
+        }, {
+            title: true
+        }) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
             id: "chat" + message.cid,
             "class": "message" + " " + message.classList
         }, {
@@ -383,6 +389,7 @@ exports.includes.mucWrappedMessage = function anonymous(locals) {
 exports.includes.wrappedMessage = function anonymous(locals) {
     var buf = [];
     with (locals || {}) {
+        var messageDate = Date.create(message.timestamp);
         buf.push('<li><div class="sender"><a href="#" class="messageAvatar"><img' + jade.attrs({
             src: message.sender.avatar,
             alt: message.sender.displayName,
@@ -391,7 +398,12 @@ exports.includes.wrappedMessage = function anonymous(locals) {
             src: true,
             alt: true,
             "data-placement": true
-        }) + '/></a></div><div class="messageWrapper"><div class="message_header"><div class="name">' + jade.escape((jade.interp = message.sender.displayName) == null ? "" : jade.interp) + '</div><div class="date">' + jade.escape((jade.interp = Date.create(message.timestamp).format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
+        }) + '/></a></div><div class="messageWrapper"><div class="message_header"><div class="name">' + jade.escape((jade.interp = message.sender.displayName) == null ? "" : jade.interp) + "</div><div" + jade.attrs({
+            title: messageDate.format("{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}"),
+            "class": "date"
+        }, {
+            title: true
+        }) + ">" + jade.escape((jade.interp = messageDate.format("{h}:{mm} {tt}")) == null ? "" : jade.interp) + "</div></div><div" + jade.attrs({
             id: "chat" + message.cid,
             "class": "message" + " " + message.classList
         }, {
diff --git a/clientapp/templates/includes/mucWrappedMessage.jade b/clientapp/templates/includes/mucWrappedMessage.jade
index d8caa22..e348b9e 100644
--- a/clientapp/templates/includes/mucWrappedMessage.jade
+++ b/clientapp/templates/includes/mucWrappedMessage.jade
@@ -1,3 +1,4 @@
+- var messageDate = Date.create(message.timestamp)
 li
   .sender
     a.messageAvatar(href='#')
@@ -5,5 +6,5 @@ li
   .messageWrapper
     .message_header
       .name #{message.from.resource}
-      .date #{Date.create(message.timestamp).format('{h}:{mm} {tt}')}
+      .date(title=messageDate.format('{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}')) #{messageDate.format('{h}:{mm} {tt}')}
     include mucBareMessage
diff --git a/clientapp/templates/includes/wrappedMessage.jade b/clientapp/templates/includes/wrappedMessage.jade
index f221b7f..15a7e42 100644
--- a/clientapp/templates/includes/wrappedMessage.jade
+++ b/clientapp/templates/includes/wrappedMessage.jade
@@ -1,3 +1,4 @@
+- var messageDate = Date.create(message.timestamp)
 li
   .sender
     a.messageAvatar(href='#')
@@ -5,5 +6,5 @@ li
   .messageWrapper
     .message_header
       .name #{message.sender.displayName}
-      .date #{Date.create(message.timestamp).format('{h}:{mm} {tt}')}
+      .date(title=messageDate.format('{Dow}, {MM}/{dd}/{yyyy} - {h}:{mm} {Tt}')) #{messageDate.format('{h}:{mm} {tt}')}
     include bareMessage