1 files changed, 12 insertions, 26 deletions
diff --git a/forum/skins/default/templates/instant_notification.html b/forum/skins/default/templates/instant_notification.html
index a8218c12..1bab99cf 100644
--- a/forum/skins/default/templates/instant_notification.html
+++ b/forum/skins/default/templates/instant_notification.html
@@ -16,31 +16,17 @@ has_mention - Boolean
 {% blocktrans with receiving_user.get_best_name as user_name %}Dear {{user_name}},{% endblocktrans %}
 
 {% if has_mention %}
-{% if update_type == 'question_comment' or update_type == 'answer_comment' %}
-{% blocktrans with post_author.get_profile_link as author_link and related_origin_post.get_absolute_url as origin_post_url and related_origin_post.title as origin_post_title %}
-{{author_link}} has left you a <a href="{{update_url|safe}}">comment</a>
-related to question <a href="{{origin_post_url|safe}}">{{origin_post_title}}</a>
-{% endblocktrans %}
-{% endif %}
+    {% if update_type == 'question_comment' or update_type == 'answer_comment' %}
+    {% blocktrans with post_author.get_profile_link as author_link and related_origin_post.get_absolute_url as origin_post_url and related_origin_post.title as origin_post_title %}
+    {{author_link}} has left you a <a href="{{update_url}}">comment</a>
+    related to question <a href="{{origin_post_url}}">{{origin_post_title}}</a>
+    {% endblocktrans %}
+    {% endif %}
 {% else %}{# updated post has no mention of user #}
-{% if update_type == 'question_comment' or update_type == 'answer_comment' %}
-{% blocktrans with post_author.get_profile_link as author_link and related_origin_post.get_absolute_url as origin_post_url and related_origin_post.title as origin_post_title %}
-{{author_link}} has left a new <a href="{{update_url|safe}}">comment</a>
-related to question <a href="{{origin_post_url|safe}}">{{origin_post_title}}</a>
-{% endblocktrans %}
-{% if update
-{% endif %}
-{% if update_type == 'question_comment' or update_type == 'answer_comment' %}
-{% if has_mention %}
-{% blocktrans %}
-
-{% endblocktrans %}
+    {% if update_type == 'question_comment' or update_type == 'answer_comment' %}
+    {% blocktrans with post_author.get_profile_link as author_link and related_origin_post.get_absolute_url as origin_post_url and related_origin_post.title as origin_post_title %}
+    {{author_link}} has left a new <a href="{{update_url}}">comment</a>
+    related to question <a href="{{origin_post_url}}">{{origin_post_title}}</a>
+    {% endblocktrans %}
+    {% endif %}
 {% endif %}
-{% endwith %}
-{% endif %}
-{% if update_type == 'answer_update' %}
-{% endif %}
-{% if update_type == 'question_update' %}
-{% endif %}
-
-{% include "email_footer.txt" %}