diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 768db0831..2cccfec6c 100755
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -38,6 +38,7 @@ Build =
       postID:   data.no
       threadID: data.resto or data.no
       boardID:  boardID
+      isReply:  !!data.resto
       # thread status
       isSticky: !!data.sticky
       isClosed: !!data.closed
@@ -98,7 +99,6 @@ Build =
     ###
     {postID, threadID, boardID, file} = o
     {subject, email, name, tripcode, capcode, uniqueID, flagCode, flag, dateUTC, dateText, commentHTML} = o.info
-    isOP = postID is threadID
     {staticPath, gifIcon} = Build
 
     ### Post Info ###
@@ -134,7 +134,7 @@ Build =
 
     ### Whole Post ###
 
-    postClass = if isOP then 'op' else 'reply'
+    postClass = if o.isReply then 'reply' else 'op'
 
     wholePost = <%= importHTML('Build/Post') %>
 
diff --git a/src/General/html/Build/Post.html b/src/General/html/Build/Post.html
index 4ac9ff192..bc9cf1852 100644
--- a/src/General/html/Build/Post.html
+++ b/src/General/html/Build/Post.html
@@ -1,5 +1,5 @@
-?{!isOP}{<div class="sideArrows" id="sa${postID}">&gt;&gt;</div>}
+?{o.isReply}{<div class="sideArrows" id="sa${postID}">&gt;&gt;</div>}
 <div id="p${postID}" class="post ${postClass}?{o.capcodeHighlight}{ highlightPost}">
-  ?{isOP}{&{fileBlock}&{postInfo}}{&{postInfo}&{fileBlock}}
+  ?{o.isReply}{&{postInfo}&{fileBlock}}{&{fileBlock}&{postInfo}}
   <blockquote class="postMessage" id="m${postID}">&{commentHTML}</blockquote>
 </div>
diff --git a/src/General/html/Build/PostInfo.html b/src/General/html/Build/PostInfo.html
index 6de0b69ff..75f7c383d 100644
--- a/src/General/html/Build/PostInfo.html
+++ b/src/General/html/Build/PostInfo.html
@@ -1,24 +1,24 @@
 <div class="postInfo desktop" id="pi${postID}">
   <input type="checkbox" name="${postID}" value="delete"> 
-  ?{isOP || boardID === "f" || subject}{<span class="subject">${subject || ""}</span> }
+  ?{!o.isReply || boardID === "f" || subject}{<span class="subject">${subject || ""}</span> }
   <span class="nameBlock?{capcode}{ capcode${capcodeUC}}">
     ?{email}{<a href="mailto:${encodeURIComponent(email).replace(/%40/g, "@")}" class="useremail">}
       <span class="name?{capcode}{ capcode}">${name}</span>
       ?{tripcode}{ <span class="postertrip">${tripcode}</span>}
       ?{capcode}{ <strong class="capcode hand id_${capcodeLC}" title="Highlight posts by ${capcodePlural}">## ${capcode}</strong>}
     ?{email}{</a>}
-    ?{boardID === "f" && isOP || capcode}{}{ }
+    ?{boardID === "f" && !o.isReply || capcode}{}{ }
     ?{capcode}{ <img src="${staticPath}${capcodeLC}icon${gifIcon}" alt="${capcodeUC} Icon" title="This user is ${capcodeDescription}." class="identityIcon retina">}
     ?{uniqueID && !capcode}{ <span class="posteruid id_${uniqueID}">(ID: <span class="hand" title="Highlight posts by this ID">${uniqueID}</span>)</span>}
     ?{flagCode}{ <span title="${flag}" class="flag flag-${flagCode.toLowerCase()}"></span>}
   </span> 
   <span class="dateTime" data-utc="${dateUTC}">${dateText}</span> 
-  <span class="postNum?{!(boardID === "f" && isOP)}{ desktop}">
+  <span class="postNum?{!(boardID === "f" && !o.isReply)}{ desktop}">
     <a href="${postLink}" title="Link to this post">No.</a>
     <a href="${quoteLink}" title="Reply to this post">${postID}</a>
     ?{o.isSticky}{ <img src="${staticPath}sticky${gifIcon}" alt="Sticky" title="Sticky" class="stickyIcon retina">}
     ?{o.isClosed && !o.isArchived}{ <img src="${staticPath}closed${gifIcon}" alt="Closed" title="Closed" class="closedIcon retina">}
     ?{o.isArchived}{ <img src="${staticPath}archived${gifIcon}" alt="Archived" title="Archived" class="archivedIcon retina">}
-    ?{isOP && g.VIEW === "index"}{ &nbsp; <span>[<a href="/${boardID}/thread/${threadID}" class="replylink">Reply</a>]</span>}
+    ?{!o.isReply && g.VIEW === "index"}{ &nbsp; <span>[<a href="/${boardID}/thread/${threadID}" class="replylink">Reply</a>]</span>}
   </span>
 </div>
diff --git a/src/General/lib/fetcher.class b/src/General/lib/fetcher.class
index a8cd461c9..890bfaf28 100644
--- a/src/General/lib/fetcher.class
+++ b/src/General/lib/fetcher.class
@@ -129,6 +129,7 @@ class Fetcher
       postID:   @postID
       threadID: @threadID
       boardID:  @boardID
+      isReply:  @postID isnt @threadID
     o.info =
       subject:  data.title
       email:    data.email