diff --git a/files/templates/comments.html b/files/templates/comments.html
index 1eb4d081d..beae0733a 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -848,7 +848,7 @@
{% if v %}
-
+
{% endif %}
@@ -859,7 +859,7 @@
{% include "expanded_image_modal.html" %}
-
+
-
{% if PUSHER_ID != 'blahblahblah' and v %}
{{request.host}}{{v.id}}
{{PUSHER_ID}}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index b95d084e3..714ee83dd 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -1059,10 +1059,6 @@
{% endif %}
-{% if v %}
-
-{% endif %}
-
{% if not v or v.highlightcomments %}
{% endif %}
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index f64390caf..b1e1d01b4 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -212,7 +212,7 @@
- {% if p.body %}
+ {% if p.realbody(v) %}
{% endif %}
-
@@ -244,7 +244,7 @@
- {% if p.body and request.path != "/changelog"%}
+ {% if p.realbody(v) and request.path != "/changelog"%}
{% endif %}
@@ -443,5 +443,5 @@
{% include "expanded_image_modal.html" %}
-
+
\ No newline at end of file