diff --git a/files/templates/submission.html b/files/templates/submission.html
index 1fb37df69a..5e103dca5d 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -31,9 +31,8 @@
{% if comment_info and not comment_info.is_banned and not linked_comment.deleted_utc > 0 %}
+
{{'@'+comment_info.author.username}} comments on "{{title}} - {{"SITE_NAME" | app_config}}"
-
-
{% if comment_info.edited_utc %}{% endif %}
@@ -57,9 +56,7 @@
{% endif %}
{% else %}
-{{title | safe}} - {{"SITE_NAME" | app_config}}
-
-
+{{p.title}} - {{"SITE_NAME" | app_config}}
{% if p.edited_utc %}{% endif %}