diff --git a/4chan_x.user.js b/4chan_x.user.js
index 202d8f359..c42d21a9d 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -703,7 +703,11 @@
       return false;
     },
     subject: function(post) {
-      return $('.postInfo .subject', post.el).textContent || false;
+      var subject;
+      if (subject = $('.postInfo .subject', post.el)) {
+        return subject.textContent;
+      }
+      return false;
     },
     comment: function(post) {
       var data, i, nodes, text, _i, _ref;
@@ -3752,6 +3756,7 @@
         emailStart = '';
         emailEnd = '';
       }
+      subject = subject ? "<span class=subject>" + subject + "</span>" : '';
       userID = !capcode && uniqueID ? (" <span class='posteruid id_" + uniqueID + "'>(ID: ") + ("<span class=hand title='Highlight posts by this ID'>" + uniqueID + "</span>)</span> ") : '';
       switch (capcode) {
         case 'admin':
@@ -3818,7 +3823,7 @@
       container = $.el('div', {
         id: "pc" + postID,
         className: "postContainer " + (isOP ? 'op' : 'reply') + "Container",
-        innerHTML: (isOP ? '' : "<div class=sideArrows id=sa" + postID + ">&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + ("<div class='postInfoM mobile' id=pim" + postID + ">") + ("<span class='nameBlock" + capcodeClass + "'>") + ("<span class=name>" + name + "</span>") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("<br><span class=subject>" + subject + "</span>") + ("</span><span class='dateTime postNum' data-utc=" + dateUTC + ">" + date) + '<br><em>' + ("<a href=" + ("/" + board + "/res/" + threadID + "#p" + postID) + ">No.</a>") + ("<a href='" + (g.REPLY && g.THREAD_ID === threadID ? "javascript:quote(" + postID + ")" : "/" + board + "/res/" + threadID + "#q" + postID) + "'>" + postID + "</a>") + '</em></span>' + '</div>' + (isOP ? fileHTML : '') + ("<div class='postInfo desktop' id=pi" + postID + ">") + ("<input type=checkbox name=" + postID + " value=delete> ") + ("<span class=subject>" + (subject || '') + "</span> ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + name + "</span>") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum desktop'>" + ("<a href=" + ("/" + board + "/res/" + threadID + "#p" + postID) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.REPLY && g.THREAD_ID === threadID ? "javascript:quote(" + postID + ")" : "/" + board + "/res/" + threadID + "#q" + postID) + "' title='Quote this post'>" + postID + "</a>") + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage id=m" + postID + ">" + comment + "</blockquote> ") + '</div>'
+        innerHTML: (isOP ? '' : "<div class=sideArrows id=sa" + postID + ">&gt;&gt;</div>") + ("<div id=p" + postID + " class='post " + (isOP ? 'op' : 'reply') + (capcode === 'admin_highlight' ? ' highlightPost' : '') + "'>") + ("<div class='postInfoM mobile' id=pim" + postID + ">") + ("<span class='nameBlock" + capcodeClass + "'>") + ("<span class=name>" + name + "</span>") + tripcode + capcodeStart + capcode + userID + flag + sticky + closed + ("<br>" + subject) + ("</span><span class='dateTime postNum' data-utc=" + dateUTC + ">" + date) + '<br><em>' + ("<a href=" + ("/" + board + "/res/" + threadID + "#p" + postID) + ">No.</a>") + ("<a href='" + (g.REPLY && g.THREAD_ID === threadID ? "javascript:quote(" + postID + ")" : "/" + board + "/res/" + threadID + "#q" + postID) + "'>" + postID + "</a>") + '</em></span>' + '</div>' + (isOP ? fileHTML : '') + ("<div class='postInfo desktop' id=pi" + postID + ">") + ("<input type=checkbox name=" + postID + " value=delete> ") + ("" + subject + " ") + ("<span class='nameBlock" + capcodeClass + "'>") + emailStart + ("<span class=name>" + name + "</span>") + tripcode + capcodeStart + emailEnd + capcode + userID + flag + sticky + closed + ' </span> ' + ("<span class=dateTime data-utc=" + dateUTC + ">" + date + "</span> ") + "<span class='postNum desktop'>" + ("<a href=" + ("/" + board + "/res/" + threadID + "#p" + postID) + " title='Highlight this post'>No.</a>") + ("<a href='" + (g.REPLY && g.THREAD_ID === threadID ? "javascript:quote(" + postID + ")" : "/" + board + "/res/" + threadID + "#q" + postID) + "' title='Quote this post'>" + postID + "</a>") + '</span>' + '</div>' + (isOP ? '' : fileHTML) + ("<blockquote class=postMessage id=m" + postID + ">" + comment + "</blockquote> ") + '</div>'
       });
       _ref = $$('.quotelink', container);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
diff --git a/script.coffee b/script.coffee
index bb4bff7ed..a0f1fd855 100644
--- a/script.coffee
+++ b/script.coffee
@@ -557,7 +557,9 @@ Filter =
       return decodeURIComponent mail.href[7..]
     false
   subject: (post) ->
-    $('.postInfo .subject', post.el).textContent or false
+    if subject = $ '.postInfo .subject', post.el
+      return subject.textContent
+    false
   comment: (post) ->
     text = []
     # XPathResult.ORDERED_NODE_SNAPSHOT_TYPE is 7
@@ -2965,6 +2967,12 @@ Build =
       emailStart = ''
       emailEnd   = ''
 
+    subject =
+      if subject
+        "<span class=subject>#{subject}</span>"
+      else
+        ''
+
     userID =
       if !capcode and uniqueID
         " <span class='posteruid id_#{uniqueID}'>(ID: " +
@@ -3097,7 +3105,7 @@ Build =
           "<span class='nameBlock#{capcodeClass}'>" +
               "<span class=name>#{name}</span>" + tripcode +
             capcodeStart + capcode + userID + flag + sticky + closed +
-            "<br><span class=subject>#{subject}</span>" +
+            "<br>#{subject}" +
           "</span><span class='dateTime postNum' data-utc=#{dateUTC}>#{date}" +
           '<br><em>' +
             "<a href=#{"/#{board}/res/#{threadID}#p#{postID}"}>No.</a>" +
@@ -3114,7 +3122,7 @@ Build =
 
         "<div class='postInfo desktop' id=pi#{postID}>" +
           "<input type=checkbox name=#{postID} value=delete> " +
-          "<span class=subject>#{subject or ''}</span> " +
+          "#{subject} " +
           "<span class='nameBlock#{capcodeClass}'>" +
             emailStart +
               "<span class=name>#{name}</span>" + tripcode +