diff --git a/index.html b/index.html
index 6af084c..2f4f6a7 100644
--- a/index.html
+++ b/index.html
@@ -49,7 +49,7 @@
           <a ng-click="setActiveBuffer(key)">{{ content.full_name }}</a>
         </span>
         <div ng-repeat="bufferline in activeBuffer.lines">
-
+          <span class="timestamp color-dark-gray">{{ bufferline.timestamp  | date: 'h:mm:ss'}}</span>
           <span ng-repeat="part in bufferline.content" class="text {{ part.fg }}">
             {{ part.text }}
           </span>
diff --git a/js/websockets.js b/js/websockets.js
index 773e2ff..df62a1a 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -224,7 +224,7 @@ weechat.factory('handlers', ['$rootScope', 'colors', 'pluginManager', function($
 
 
         var buffer = message['objects'][0]['content'][0]['buffer'];
-        var timestamp = message['objects'][0]['content'][0]['date'];        
+        var timestamp = parseInt(message['objects'][0]['content'][0]['date']) * 1e3;
         var text = colors.parse(message['objects'][0]['content'][0]['message']);
         var content = parseLineAddedTextElements(message);
         var additionalContent = pluginManager.contentForMessage(text[0]['text']);