diff --git a/directives/bufferline.html b/directives/bufferline.html
index 2a8f82c..2dd3535 100644
--- a/directives/bufferline.html
+++ b/directives/bufferline.html
@@ -6,5 +6,4 @@
 <td class="prefix"><a ng-click="addMention(bufferline.prefix)"></a></td>
 <td class="message">
   <div ng-repeat="metadata in bufferline.metadata" plugin data="metadata"></div>
-  <span ng-repeat="part in bufferline.content" class="text" bo-class="part.classes" bo-html="part.text|irclinky:'_blank'"></span>
 </td>
diff --git a/js/glowingbear.js b/js/glowingbear.js
index 7afa9c2..fad7fe8 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -1246,20 +1246,36 @@ weechat.directive('bufferLine', function() {
         link: {
             pre: function preLink(scope, iElement, iAttrs, controller) {
                 var prefix = "";
-                for (var partNum in scope.bufferline.prefix) {
-                    var part = scope.bufferline.prefix[partNum];
+                var part, partNum, classNum;
+                for (partNum in scope.bufferline.prefix) {
+                    part = scope.bufferline.prefix[partNum];
                     prefix = angular.element("<span>" + part.text + "</span>");
-                    for (var classNum in part.classes) {
+                    for (classNum in part.classes) {
                         prefix.addClass(part.classes[classNum]);
                     }
                     iElement.find('td.prefix a').append(prefix);
                 }
+
+                var content;
+                for (partNum in scope.bufferline.content) {
+                    part = scope.bufferline.content[partNum];
+                    content = scope.irclinky(part.text);
+                    prefix = angular.element('<span class="text">' + content + '</span>');
+                    for (classNum in part.classes) {
+                        prefix.addClass(part.classes[classNum]);
+                    }
+                    iElement.find('td.message').append(prefix);
+                }
             }
         },
 
-        controller: function($rootScope, $scope) {
+        controller: function($rootScope, $scope, $filter) {
             // pass through the nick click action
             $scope.addMention = $rootScope.addMention;
+
+            $scope.irclinky = function(text) {
+                return $filter('irclinky')(text, '_blank');
+            };
         }
 
     };