diff --git a/4chan_x.user.js b/4chan_x.user.js
index c8317e099..289ccd731 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -1711,10 +1711,14 @@
       return g.callbacks.push(quoteBacklink.node);
     },
     node: function(root) {
-      var el, id, link, qid, quote, quotes, tid, _i, _len, _ref, _results;
+      var container, el, id, link, qid, quote, quotes, tid, _i, _len, _ref, _results;
       if (root.className) {
         return;
       }
+      container = $.el('span', {
+        className: 'container'
+      });
+      $.before($('br, blockquote', root), container);
       id = root.id || $('td[id]', root).id;
       quotes = {};
       tid = g.THREAD_ID || root.parentNode.firstChild.id;
@@ -1749,7 +1753,7 @@
         if ($.config('Quote Inline')) {
           $.bind(link, 'click', quoteInline.toggle);
         }
-        _results.push($.before($('td > br, blockquote', el), link));
+        _results.push($.append($('.container', el), link));
       }
       return _results;
     }
diff --git a/script.coffee b/script.coffee
index b0dc57063..287712c82 100644
--- a/script.coffee
+++ b/script.coffee
@@ -1381,7 +1381,9 @@ quoteBacklink =
     g.callbacks.push quoteBacklink.node
   node: (root) ->
     return if root.className
-    #better coffee-script way of doing this?
+    container = $.el 'span',
+      className: 'container'
+    $.before $('br, blockquote', root), container
     id = root.id or $('td[id]', root).id
     quotes = {}
     tid = g.THREAD_ID or root.parentNode.firstChild.id
@@ -1404,7 +1406,7 @@ quoteBacklink =
         $.bind link, 'mouseout',  quotePreview.mouseout
       if $.config 'Quote Inline'
         $.bind link, 'click', quoteInline.toggle
-      $.before $('td > br, blockquote', el), link
+      $.append $('.container', el), link
 
 quoteInline =
   init: ->