diff --git a/4chan_x.user.js b/4chan_x.user.js
index 708a679a7..62eaed735 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -750,9 +750,8 @@
         }
         quote.href = "res/" + href;
       }
-      Main.prettify(node);
       post = {
-        el: node,
+        blockquote: node,
         threadId: threadID,
         quotes: quotes,
         backlinks: []
@@ -772,7 +771,8 @@
       if (Conf['Indicate Cross-thread Quotes']) {
         QuoteCT.node(post);
       }
-      return $.replace(a.parentNode.parentNode, node);
+      $.replace(a.parentNode.parentNode, node);
+      return Main.prettify(node);
     }
   };
 
diff --git a/script.coffee b/script.coffee
index 551306bf5..91f5436d4 100644
--- a/script.coffee
+++ b/script.coffee
@@ -577,12 +577,11 @@ ExpandComment =
       href = quote.getAttribute 'href'
       continue if href[0] is '/' # Cross-board quote
       quote.href = "res/#{href}" # Fix pathnames
-    Main.prettify node
     post =
-      el:        node
-      threadId:  threadID
-      quotes:    quotes
-      backlinks: []
+      blockquote: node
+      threadId:   threadID
+      quotes:     quotes
+      backlinks:  []
     if Conf['Resurrect Quotes']
       Quotify.node      post
     if Conf['Quote Preview']
@@ -594,6 +593,7 @@ ExpandComment =
     if Conf['Indicate Cross-thread Quotes']
       QuoteCT.node      post
     $.replace a.parentNode.parentNode, node
+    Main.prettify node
 
 ExpandThread =
   init: ->