diff --git a/files/templates/submission.html b/files/templates/submission.html
index 5e103dca5d..d372ca0a30 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -9,12 +9,7 @@
{% endif %}
-{% if v %}
{% set title=p.realtitle(v) %}
-{% else %}
-{% set title=p.title %}
-{% endif %}
-
{% set ups=p.upvotes_fuzzed %}
{% set downs=p.downvotes_fuzzed %}
{% set score=ups-downs %}
@@ -31,21 +26,22 @@
{% if comment_info and not comment_info.is_banned and not linked_comment.deleted_utc > 0 %}
+
{{'@'+comment_info.author.username}} comments on "{{p.title}} - {{"SITE_NAME" | app_config}}"
+
-{{'@'+comment_info.author.username}} comments on "{{title}} - {{"SITE_NAME" | app_config}}"
{% if comment_info.edited_utc %}{% endif %}
-
+
-
+
@@ -56,20 +52,22 @@
{% endif %}
{% else %}
-{{p.title}} - {{"SITE_NAME" | app_config}}
+{{p.title | safe}} - {{"SITE_NAME" | app_config}}
+
+
{% if p.edited_utc %}{% endif %}
-
+
-
+
@@ -237,9 +235,9 @@
{% if p.realurl(v) %}
-
+
{% else %}
- {{p.realtitle(v) | safe}}
+ {{title | safe}}
{% endif %}