diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 3ad4f9907..fe1e75ffc 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -222,6 +222,7 @@ Build =
 
     root.dataset.fullID = thread.fullID
     $.addClass root, thread.OP.highlights... if thread.OP.highlights
+    $.addClass root, 'noFile' unless thread.OP.file
 
     if thread.isSticky
       $.add $('.catalog-icons', root), $.el 'img',
diff --git a/src/General/Index.coffee b/src/General/Index.coffee
index 35ae4e24d..53e10c8ca 100644
--- a/src/General/Index.coffee
+++ b/src/General/Index.coffee
@@ -716,9 +716,10 @@ Index =
     isCatalog = (Conf['Index Mode'] is 'catalog')
     for thread in threads
       node = if isCatalog then thread.catalogView.nodes.root else thread.OP.nodes.post
-      {info, comment} = thread.OP.nodes
+      {fileRoot, info, comment} = thread.OP.nodes
       unless node.contains comment
         comment.className = if isCatalog then 'comment' else 'postMessage'
+        $.prepend node, fileRoot if fileRoot
         $.add node, [info, comment]
     return
 
diff --git a/src/classes/Post.Clone.coffee b/src/classes/Post.Clone.coffee
index 12773ba58..a6052db4b 100644
--- a/src/classes/Post.Clone.coffee
+++ b/src/classes/Post.Clone.coffee
@@ -14,6 +14,7 @@ Post.Clone = class extends Post
     root = cloneNode nodes.root
     # Handle case where comment has been moved into catalog thread
     if nodes.comment.parentNode isnt nodes.post
+      $.prepend $('.post', root), cloneNode(nodes.fileRoot) if nodes.fileRoot
       $.add $('.post', root), [cloneNode(nodes.info), cloneNode(nodes.comment)]
     Post.Clone.prefix or= 0
     for node in [root, $$('[id]', root)...]
diff --git a/src/css/style.css b/src/css/style.css
index 9a13366a3..27d73050e 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -729,9 +729,12 @@ div.catalog-thread {
   border-right: 1px solid transparent;
 }
 .catalog-thread > :first-child {
-  margin-top: -1px;
+  margin-top: -21px;
   border-top: 1px solid transparent;
 }
+.catalog-thread.noFile > :first-child {
+  padding-top: 20px;
+}
 .catalog-thread > :last-child {
   margin-bottom: -1px;
   border-bottom: 1px solid transparent;
@@ -788,21 +791,30 @@ div.catalog-thread {
 .catalog-stats > [title] {
   cursor: help;
 }
+#delform .catalog-thread:not(:hover) > .file,
+#delform .catalog-thread:not(:hover) > .postInfo,
+#delform .catalog-thread > .file > :not(.fileText),
+#delform .catalog-thread > .file > .fileText > :not(:first-child),
+#delform .catalog-thread > .postInfo > :not(.nameBlock):not(.dateTime),
+#delform .catalog-thread .posteruid {
+  display: none;
+}
+.catalog-thread .fileText {
+  min-height: 16px;
+  font-size: 10px;
+  line-height: 1;
+  padding: 2px;
+}
 #delform .catalog-thread > .postInfo {
   width: auto;
 }
-#delform .catalog-thread > .postInfo > * {
-  display: none;
-}
-#delform .catalog-thread > .postInfo > .subject {
+.catalog-thread .subject {
   display: block;
 }
 .catalog-thread .dateTime {
+  display: inline-block;
   font-style: italic;
 }
-.catalog-thread .posteruid {
-  display: none;
-}
 .catalog-thread:hover {
   overflow: visible;
   z-index: 1;
@@ -811,10 +823,6 @@ div.catalog-thread {
   margin-left: -61px;
   margin-right: -61px;
 }
-#delform .catalog-thread:hover > .postInfo > .nameBlock,
-#delform .catalog-thread:hover > .postInfo > .dateTime {
-  display: inline-block;
-}
 .catalog-thread .prettyprinted {
   max-width: 100%;
   box-sizing: border-box;