diff --git a/4chan_x.user.js b/4chan_x.user.js
index 69ee1ea26..8abbc11ca 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3099,35 +3099,30 @@
       }
     },
     parseArchivedPost: function(req, board, postID, root, cb) {
-      var bq, br, capcode, data, email, file, filesize, isOP, nameBlock, p, pc, pi, piM, span;
+      var bq, br, capcode, data, email, file, filesize, isOP, name, nameBlock, pc, pi, piM, span, subject, threadID, trip;
       data = JSON.parse(req.response);
+      $.addClass(root, 'archivedPost');
       if (data.error) {
         root.textContent = data.error;
         return;
       }
-      isOP = postID === data.thread_num;
-      pc = $.el('div', {
-        id: "pc" + postID,
-        className: isOP ? 'postContainer opContainer' : 'postContainer replyContainer'
-      });
-      p = $.el('div', {
-        id: "p" + postID,
-        className: isOP ? 'post op' : 'post reply'
-      });
-      $.add(pc, p);
+      threadID = data.thread_num;
+      isOP = postID === threadID;
+      name = data.name, trip = data.trip;
+      subject = data.title;
       piM = $.el('div', {
         id: "pim" + postID,
         className: 'postInfoM mobile',
-        innerHTML: "<span class=nameBlock><span class=name></span><br><span class=subject></span></span><span class='dateTime postNum' data-utc=" + timestamp + ">" + data.fourchan_date + "<br><em></em><a href='/" + board + "/res/" + data.thread_num + "#p" + postID + "' title='Highlight this post'>No.</a><a href='/" + board + "/res/" + data.thread_num + "#q" + postID + "' title='Quote this post'>" + postID + "</a></span>"
+        innerHTML: "<span class=nameBlock><span class=name></span><br><span class=subject></span></span><span class='dateTime postNum' data-utc=" + timestamp + ">" + data.fourchan_date + "<br><em></em><a href='/" + board + "/res/" + threadID + "#p" + postID + "' title='Highlight this post'>No.</a><a href='/" + board + "/res/" + threadID + "#q" + postID + "' title='Quote this post'>" + postID + "</a></span>"
       });
-      $('.name', piM).textContent = data.name;
-      $('.subject', piM).textContent = data.title;
+      $('.name', piM).textContent = name;
+      $('.subject', piM).textContent = subject;
       br = $('br', piM);
-      if (data.trip) {
+      if (trip) {
         $.before(br, [
           $.tn(' '), $.el('span', {
             className: 'postertrip',
-            textContent: data.trip
+            textContent: trip
           })
         ]);
       }
@@ -3149,9 +3144,9 @@
       pi = $.el('div', {
         id: "pi" + postID,
         className: 'postInfo desktop',
-        innerHTML: "<input type=checkbox name=" + postID + " value=delete> <span class=userInfo><span class=subject></span> <span class=nameBlock></span></span> <span class=dateTime data-utc=" + data.timestamp + ">data.fourchan_date</span> <span class='postNum desktop'><a href='/" + board + "/res/" + data.thread_num + "#p" + postID + "' title='Highlight this post'>No.</a><a href='/" + board + "/res/" + data.thread_num + "#q" + postID + "' title='Quote this post'>" + postID + "</a>" + (isOP ? ' &nbsp; ' : '') + "</span> "
+        innerHTML: "<input type=checkbox name=" + postID + " value=delete> <span class=userInfo><span class=subject></span> <span class=nameBlock></span></span> <span class=dateTime data-utc=" + data.timestamp + ">data.fourchan_date</span> <span class='postNum desktop'><a href='/" + board + "/res/" + threadID + "#p" + postID + "' title='Highlight this post'>No.</a><a href='/" + board + "/res/" + threadID + "#q" + postID + "' title='Quote this post'>" + postID + "</a>" + (isOP ? ' &nbsp; ' : '') + "</span> "
       });
-      $('.subject', pi).textContent = data.title;
+      $('.subject', pi).textContent = subject;
       nameBlock = $('.nameBlock', pi);
       if (data.email) {
         email = $.el('a', {
@@ -3165,11 +3160,11 @@
         className: 'name',
         textContent: data.name
       }));
-      if (data.trip) {
+      if (trip) {
         $.add(nameBlock, [
           $.tn(' '), $.el('span', {
             className: 'postertrip',
-            textContent: data.trip
+            textContent: trip
           })
         ]);
       }
@@ -3223,7 +3218,12 @@
         }
       });
       bq.innerHTML = bq.innerHTML.replace(/(^|>)(&gt;[^<$]+)(<|$)/g, '$1<span class=quote>$2</span>$3');
-      $.add(p, [piM, pi, bq]);
+      pc = $.el('div', {
+        id: "pc" + postID,
+        className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
+        innerHTML: "<div id=p" + postID + " class='postContainer " + (isOP ? 'op' : 'reply') + "'></div>"
+      });
+      $.add(pc.firstChild, [piM, pi, bq]);
       if (data.media_filename) {
         file = $.el('div', {
           id: "f" + postID,
@@ -3245,7 +3245,6 @@
         }));
         $.after((isOP ? piM : pi), file);
       }
-      $.addClass(root, 'archivedPost');
       $.replace(root.firstChild, pc);
       if (cb) {
         return cb();
diff --git a/script.coffee b/script.coffee
index 0434c96fe..4c408581c 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2378,35 +2378,28 @@ Get =
     cb() if cb
   parseArchivedPost: (req, board, postID, root, cb) ->
     data = JSON.parse req.response
-
+    $.addClass root, 'archivedPost'
     if data.error
       root.textContent = data.error
       return
 
-    isOP = postID is data.thread_num
-
-    # post containers
-    pc = $.el 'div',
-      id: "pc#{postID}"
-      className: if isOP then 'postContainer opContainer' else 'postContainer replyContainer'
-    p  = $.el 'div',
-      id: "p#{postID}"
-      className: if isOP then 'post op' else 'post reply'
-    $.add pc, p
-
+    threadID = data.thread_num
+    isOP = postID is threadID
+    {name, trip} = data
+    subject = data.title
 
     # post info (mobile)
     piM = $.el 'div',
       id: "pim#{postID}"
       className: 'postInfoM mobile'
-      innerHTML: "<span class=nameBlock><span class=name></span><br><span class=subject></span></span><span class='dateTime postNum' data-utc=#{timestamp}>#{data.fourchan_date}<br><em></em><a href='/#{board}/res/#{data.thread_num}#p#{postID}' title='Highlight this post'>No.</a><a href='/#{board}/res/#{data.thread_num}#q#{postID}' title='Quote this post'>#{postID}</a></span>"
-    $('.name',    piM).textContent = data.name
-    $('.subject', piM).textContent = data.title
+      innerHTML: "<span class=nameBlock><span class=name></span><br><span class=subject></span></span><span class='dateTime postNum' data-utc=#{timestamp}>#{data.fourchan_date}<br><em></em><a href='/#{board}/res/#{threadID}#p#{postID}' title='Highlight this post'>No.</a><a href='/#{board}/res/#{threadID}#q#{postID}' title='Quote this post'>#{postID}</a></span>"
+    $('.name',    piM).textContent = name
+    $('.subject', piM).textContent = subject
     br = $ 'br', piM
-    if data.trip
+    if trip
       $.before br, [$.tn(' '), $.el 'span',
         className: 'postertrip'
-        textContent: data.trip
+        textContent: trip
       ]
     {capcode} = data
     if capcode isnt 'N' # 'A'dmin or 'M'od
@@ -2427,15 +2420,13 @@ Get =
         )
       ]
 
-
     # post info
     pi = $.el 'div',
       id: "pi#{postID}"
       className: 'postInfo desktop'
-      innerHTML: "<input type=checkbox name=#{postID} value=delete> <span class=userInfo><span class=subject></span> <span class=nameBlock></span></span> <span class=dateTime data-utc=#{data.timestamp}>data.fourchan_date</span> <span class='postNum desktop'><a href='/#{board}/res/#{data.thread_num}#p#{postID}' title='Highlight this post'>No.</a><a href='/#{board}/res/#{data.thread_num}#q#{postID}' title='Quote this post'>#{postID}</a>#{if isOP then ' &nbsp; ' else ''}</span> "
+      innerHTML: "<input type=checkbox name=#{postID} value=delete> <span class=userInfo><span class=subject></span> <span class=nameBlock></span></span> <span class=dateTime data-utc=#{data.timestamp}>data.fourchan_date</span> <span class='postNum desktop'><a href='/#{board}/res/#{threadID}#p#{postID}' title='Highlight this post'>No.</a><a href='/#{board}/res/#{threadID}#q#{postID}' title='Quote this post'>#{postID}</a>#{if isOP then ' &nbsp; ' else ''}</span> "
     # subject
-    $('.subject', pi).textContent = data.title
-
+    $('.subject', pi).textContent = subject
     nameBlock = $ '.nameBlock', pi
     if data.email
       email = $.el 'a',
@@ -2446,8 +2437,8 @@ Get =
     $.add nameBlock, $.el 'span',
       className: 'name'
       textContent: data.name
-    if data.trip
-      $.add nameBlock, [$.tn(' '), $.el('span', className: 'postertrip', textContent: data.trip)]
+    if trip
+      $.add nameBlock, [$.tn(' '), $.el('span', className: 'postertrip', textContent: trip)]
     if capcode isnt 'N' # 'A'dmin or 'M'od
       $.add nameBlock, [
         $.tn(' '),
@@ -2468,7 +2459,6 @@ Get =
         )
       ]
 
-
     # comment
     bq = $.el 'blockquote',
       id: "m#{postID}"
@@ -2507,11 +2497,15 @@ Get =
             '<b style="color: red;">'
           when '[/banned]'
             '</b>'
+    # greentext
     bq.innerHTML = bq.innerHTML.replace /(^|>)(&gt;[^<$]+)(<|$)/g, '$1<span class=quote>$2</span>$3'
 
-
-    $.add p, [piM, pi, bq]
-
+    # post container
+    pc = $.el 'div',
+      id: "pc#{postID}"
+      className: "postContainer #{if isOP then 'op' else 'reply'}Container"
+      innerHTML: "<div id=p#{postID} class='postContainer #{if isOP then 'op' else 'reply'}'></div>"
+    $.add pc.firstChild, [piM, pi, bq]
 
     # file
     if data.media_filename
@@ -2536,7 +2530,6 @@ Get =
         innerHTML: "<img src=#{data.thumb_link} alt='#{if data.spoiler is '1' then 'Spoiler Image, ' else ''}#{filesize}' data-md5=#{data.media_hash} style='height: #{data.preview_h}px; width: #{data.preview_w}px;'>"
       $.after (if isOP then piM else pi), file
 
-    $.addClass root, 'archivedPost'
     $.replace root.firstChild, pc
     cb() if cb
   cleanPost: (root) ->