diff --git a/4chan_x.user.js b/4chan_x.user.js
index 0cf4a9690..dec2ce93d 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3016,7 +3016,8 @@
         }
       }
       qp.innerHTML = html;
-      return Time.node(qp);
+      if (conf['Image Auto-Gif']) imgGif.node(qp);
+      if (conf['Time Formatting']) return Time.node(qp);
     }
   };
 
diff --git a/script.coffee b/script.coffee
index f842c95e2..b2669e27c 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2370,7 +2370,10 @@ quotePreview =
           html = reply.innerHTML
           break
     qp.innerHTML = html
-    Time.node qp
+    if conf['Image Auto-Gif']
+      imgGif.node qp
+    if conf['Time Formatting']
+      Time.node   qp
 
 quoteOP =
   init: ->