diff --git a/js/websockets.js b/js/websockets.js
index 182c6e8..d47a900 100644
--- a/js/websockets.js
+++ b/js/websockets.js
@@ -168,8 +168,11 @@ weechat.factory('connection', ['$rootScope', 'colors', function($scope, colors)
 
 
         var handleBufferLineAdded = function(message) {
-            var buffer_line = colors.parse(message['objects'][0]['content'][0]['message']);
 
+
+            var prefix = colors.parse(message['objects'][0]['content'][0]['prefix']);
+            var message = colors.parse(message['objects'][0]['content'][0]['message']);
+            var buffer_line = _.union(prefix, message);
             $scope.buffer.push(buffer_line);
         }
 
diff --git a/websockets.html b/websockets.html
index 7319135..aa1c94c 100644
--- a/websockets.html
+++ b/websockets.html
@@ -40,9 +40,9 @@
       <div ng-show="connected">
         <div ng-repeat="bufferline in buffer">
           <p>
-            <div ng-repeat="part in bufferline">
-              <span class="text">{{ part.text }}</span>
-            </div>
+            <span ng-repeat="part in bufferline" class="text">
+              {{ part.text }}
+            </span>
           </p>
         </div>
               <form ng-submit="sendMessage()">