From ab42be4205e1451f12020af7228d641e8b3942bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Tue, 29 Mar 2016 15:31:46 +0200
Subject: [PATCH] Fix issue #3995: remove safe filter in emails to escape the
 content of emails

---
 .../export_import/templates/emails/dump_project-body-html.jinja | 2 +-
 .../export_import/templates/emails/dump_project-body-text.jinja | 2 +-
 taiga/export_import/templates/emails/dump_project-subject.jinja | 2 +-
 .../export_import/templates/emails/export_error-body-html.jinja | 2 +-
 .../export_import/templates/emails/export_error-body-text.jinja | 2 +-
 taiga/export_import/templates/emails/export_error-subject.jinja | 2 +-
 .../export_import/templates/emails/import_error-body-html.jinja | 2 +-
 .../export_import/templates/emails/import_error-body-text.jinja | 2 +-
 taiga/export_import/templates/emails/load_dump-body-html.jinja  | 2 +-
 taiga/export_import/templates/emails/load_dump-body-text.jinja  | 2 +-
 taiga/export_import/templates/emails/load_dump-subject.jinja    | 2 +-
 .../templates/emails/feedback_notification-body-html.jinja      | 2 +-
 .../templates/emails/feedback_notification-body-text.jinja      | 2 +-
 .../templates/emails/feedback_notification-subject.jinja        | 2 +-
 .../templates/emails/issues/issue-change-body-html.jinja        | 2 +-
 .../templates/emails/issues/issue-change-body-text.jinja        | 2 +-
 .../templates/emails/issues/issue-change-subject.jinja          | 2 +-
 .../templates/emails/issues/issue-create-body-html.jinja        | 2 +-
 .../templates/emails/issues/issue-create-body-text.jinja        | 2 +-
 .../templates/emails/issues/issue-create-subject.jinja          | 2 +-
 .../templates/emails/issues/issue-delete-body-html.jinja        | 2 +-
 .../templates/emails/issues/issue-delete-body-text.jinja        | 2 +-
 .../templates/emails/issues/issue-delete-subject.jinja          | 2 +-
 .../emails/milestones/milestone-change-body-html.jinja          | 2 +-
 .../emails/milestones/milestone-change-body-text.jinja          | 2 +-
 .../templates/emails/milestones/milestone-change-subject.jinja  | 2 +-
 .../emails/milestones/milestone-create-body-html.jinja          | 2 +-
 .../emails/milestones/milestone-create-body-text.jinja          | 2 +-
 .../templates/emails/milestones/milestone-create-subject.jinja  | 2 +-
 .../emails/milestones/milestone-delete-body-html.jinja          | 2 +-
 .../emails/milestones/milestone-delete-body-text.jinja          | 2 +-
 .../templates/emails/milestones/milestone-delete-subject.jinja  | 2 +-
 .../templates/emails/tasks/task-change-body-html.jinja          | 2 +-
 .../templates/emails/tasks/task-change-body-text.jinja          | 2 +-
 .../templates/emails/tasks/task-change-subject.jinja            | 2 +-
 .../templates/emails/tasks/task-create-body-html.jinja          | 2 +-
 .../templates/emails/tasks/task-create-body-text.jinja          | 2 +-
 .../templates/emails/tasks/task-create-subject.jinja            | 2 +-
 .../templates/emails/tasks/task-delete-body-html.jinja          | 2 +-
 .../templates/emails/tasks/task-delete-body-text.jinja          | 2 +-
 .../templates/emails/tasks/task-delete-subject.jinja            | 2 +-
 .../emails/userstories/userstory-change-body-html.jinja         | 2 +-
 .../emails/userstories/userstory-change-body-text.jinja         | 2 +-
 .../templates/emails/userstories/userstory-change-subject.jinja | 2 +-
 .../emails/userstories/userstory-create-body-html.jinja         | 2 +-
 .../emails/userstories/userstory-create-body-text.jinja         | 2 +-
 .../templates/emails/userstories/userstory-create-subject.jinja | 2 +-
 .../emails/userstories/userstory-delete-body-html.jinja         | 2 +-
 .../emails/userstories/userstory-delete-body-text.jinja         | 2 +-
 .../templates/emails/userstories/userstory-delete-subject.jinja | 2 +-
 .../templates/emails/wiki/wikipage-change-body-html.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-change-body-text.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-change-subject.jinja         | 2 +-
 .../templates/emails/wiki/wikipage-create-body-html.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-create-body-text.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-create-subject.jinja         | 2 +-
 .../templates/emails/wiki/wikipage-delete-body-html.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-delete-body-text.jinja       | 2 +-
 .../templates/emails/wiki/wikipage-delete-subject.jinja         | 2 +-
 .../templates/emails/membership_invitation-subject.jinja        | 2 +-
 .../templates/emails/membership_notification-subject.jinja      | 2 +-
 61 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/taiga/export_import/templates/emails/dump_project-body-html.jinja b/taiga/export_import/templates/emails/dump_project-body-html.jinja
index 86906ded..18b234c0 100644
--- a/taiga/export_import/templates/emails/dump_project-body-html.jinja
+++ b/taiga/export_import/templates/emails/dump_project-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, project=project.name|safe, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %}
+    {% trans user=user.get_full_name(), project=project.name, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %}
     <h1>Project dump generated</h1>
     <p>Hello {{ user }},</p>
     <h3>Your dump from project {{ project }} has been correctly generated.</h3>
diff --git a/taiga/export_import/templates/emails/dump_project-body-text.jinja b/taiga/export_import/templates/emails/dump_project-body-text.jinja
index 810d373d..6e12008b 100644
--- a/taiga/export_import/templates/emails/dump_project-body-text.jinja
+++ b/taiga/export_import/templates/emails/dump_project-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, project=project.name|safe, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %}
+{% trans user=user.get_full_name(), project=project.name, url=url, deletion_date=deletion_date|date("SHORT_DATETIME_FORMAT") + deletion_date|date(" T") %}
 Hello {{ user }},
 
 Your dump from project {{ project }} has been correctly generated. You can download it here:
diff --git a/taiga/export_import/templates/emails/dump_project-subject.jinja b/taiga/export_import/templates/emails/dump_project-subject.jinja
index 7ad0ef61..f723a922 100644
--- a/taiga/export_import/templates/emails/dump_project-subject.jinja
+++ b/taiga/export_import/templates/emails/dump_project-subject.jinja
@@ -1 +1 @@
-{% trans project=project.name|safe %}[{{ project }}] Your project dump has been generated{% endtrans %}
+{% trans project=project.name %}[{{ project }}] Your project dump has been generated{% endtrans %}
diff --git a/taiga/export_import/templates/emails/export_error-body-html.jinja b/taiga/export_import/templates/emails/export_error-body-html.jinja
index 12ab5b10..0ae593e9 100644
--- a/taiga/export_import/templates/emails/export_error-body-html.jinja
+++ b/taiga/export_import/templates/emails/export_error-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email"), project=project.name|safe %}
+    {% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email"), project=project.name %}
     <h1>{{ error_message }}</h1>
     <p>Hello {{ user }},</p>
     <p>Your project {{ project }} has not been exported correctly.</p>
diff --git a/taiga/export_import/templates/emails/export_error-body-text.jinja b/taiga/export_import/templates/emails/export_error-body-text.jinja
index e9efcb16..2eab60a5 100644
--- a/taiga/export_import/templates/emails/export_error-body-text.jinja
+++ b/taiga/export_import/templates/emails/export_error-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email"), project=project.name|safe %}
+{% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email"), project=project.name %}
 Hello {{ user }},
 
 {{ error_message }}
diff --git a/taiga/export_import/templates/emails/export_error-subject.jinja b/taiga/export_import/templates/emails/export_error-subject.jinja
index fed22ace..e5d020cf 100644
--- a/taiga/export_import/templates/emails/export_error-subject.jinja
+++ b/taiga/export_import/templates/emails/export_error-subject.jinja
@@ -1 +1 @@
-{% trans error_subject=error_subject, project=project.name|safe %}[{{ project }}] {{ error_subject }}{% endtrans %}
+{% trans error_subject=error_subject, project=project.name %}[{{ project }}] {{ error_subject }}{% endtrans %}
diff --git a/taiga/export_import/templates/emails/import_error-body-html.jinja b/taiga/export_import/templates/emails/import_error-body-html.jinja
index b1a27a72..52afe388 100644
--- a/taiga/export_import/templates/emails/import_error-body-html.jinja
+++ b/taiga/export_import/templates/emails/import_error-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email") %}
+    {% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email") %}
     <h1>{{ error_message }}</h1>
     <p>Hello {{ user }},</p>
     <p>Your project has not been importer correctly.</p>
diff --git a/taiga/export_import/templates/emails/import_error-body-text.jinja b/taiga/export_import/templates/emails/import_error-body-text.jinja
index 50f1ccb4..7a9d782e 100644
--- a/taiga/export_import/templates/emails/import_error-body-text.jinja
+++ b/taiga/export_import/templates/emails/import_error-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, error_message=error_message, support_email=sr("support.email") %}
+{% trans user=user.get_full_name(), error_message=error_message, support_email=sr("support.email") %}
 Hello {{ user }},
 
 {{ error_message }}
diff --git a/taiga/export_import/templates/emails/load_dump-body-html.jinja b/taiga/export_import/templates/emails/load_dump-body-html.jinja
index 52d7fd7f..564ccff3 100644
--- a/taiga/export_import/templates/emails/load_dump-body-html.jinja
+++ b/taiga/export_import/templates/emails/load_dump-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, url=resolve_front_url("project", project.slug), project=project.name|safe %}
+    {% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %}
     <h1>Project dump imported</h1>
     <p>Hello {{ user }},</p>
     <h3>Your project dump has been correctly imported.</h3>
diff --git a/taiga/export_import/templates/emails/load_dump-body-text.jinja b/taiga/export_import/templates/emails/load_dump-body-text.jinja
index e5f0aa24..3cb40ad2 100644
--- a/taiga/export_import/templates/emails/load_dump-body-text.jinja
+++ b/taiga/export_import/templates/emails/load_dump-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, url=resolve_front_url("project", project.slug), project=project.name|safe %}
+{% trans user=user.get_full_name(), url=resolve_front_url("project", project.slug), project=project.name %}
 Hello {{ user }},
 
 Your project dump has been correctly imported.
diff --git a/taiga/export_import/templates/emails/load_dump-subject.jinja b/taiga/export_import/templates/emails/load_dump-subject.jinja
index a258d42e..6ef621c4 100644
--- a/taiga/export_import/templates/emails/load_dump-subject.jinja
+++ b/taiga/export_import/templates/emails/load_dump-subject.jinja
@@ -1 +1 @@
-{% trans project=project.name|safe %}[{{ project }}] Your project dump has been imported{% endtrans %}
+{% trans project=project.name %}[{{ project }}] Your project dump has been imported{% endtrans %}
diff --git a/taiga/feedback/templates/emails/feedback_notification-body-html.jinja b/taiga/feedback/templates/emails/feedback_notification-body-html.jinja
index b2c38449..3417e7c2 100644
--- a/taiga/feedback/templates/emails/feedback_notification-body-html.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email %}
+    {% trans full_name=feedback_entry.full_name, email=feedback_entry.email %}
     <h1>Feedback</h1>
     <p>Taiga has received feedback from {{ full_name }} <{{ email }}></p>
     {% endtrans %}
diff --git a/taiga/feedback/templates/emails/feedback_notification-body-text.jinja b/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
index 414501ae..ec2faa8b 100644
--- a/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email, comment=feedback_entry.comment %}---------
+{% trans full_name=feedback_entry.full_name, email=feedback_entry.email, comment=feedback_entry.comment %}---------
 - From: {{ full_name }} <{{ email }}>
 ---------
 - Comment:
diff --git a/taiga/feedback/templates/emails/feedback_notification-subject.jinja b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
index e93fdbd1..a5fe9c3f 100644
--- a/taiga/feedback/templates/emails/feedback_notification-subject.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
@@ -1,3 +1,3 @@
-{% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email %}
+{% trans full_name=feedback_entry.full_name, email=feedback_entry.email %}
 [Taiga] Feedback from {{ full_name }} <{{ email }}>
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja
index c07b9a92..47ce994d 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-change-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
     <h1>Issue updated</h1>
     <p>Hello {{ user }}, <br> {{ changer }} has updated an issue on {{ project }}</p>
     <p>Issue #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja
index adda2149..0f5fd94e 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-change-body-text.jinja
@@ -1,6 +1,6 @@
 {% extends "emails/updates-body-text.jinja" %}
 {% block head %}
-{% trans user=user.get_full_name(), changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
 Issue updated
 Hello {{ user }}, {{ changer }} has updated an issue on {{ project }}
 See issue #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
index 707e2703..5cee74b7 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Updated the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja
index 8147f59c..5560899a 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-create-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
     <h1>New issue created</h1>
     <p>Hello {{ user }},<br />{{ changer }} has created a new issue on {{ project }}</p>
     <p>Issue #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja
index 5b7ff367..3a69643c 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-create-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("issue", project.slug, snapshot.ref) %}
 New issue created
 Hello {{ user }}, {{ changer }} has created a new issue on {{ project }}
 See issue #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
index 7e4cf6bd..cde770ce 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Created the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja
index 7b184627..1b20a020 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
     <h1>Issue deleted</h1>
     <p>Hello {{ user }},<br />{{ changer }} has deleted an issue on {{ project }}</p>
     <p>Issue #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja
index 7c39fc31..40c386f9 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 Issue deleted
 Hello {{ user }}, {{ changer }} has deleted an issue on {{ project }}
 Issue #{{ ref }} {{ subject }}
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
index bf297fa4..c5773908 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Deleted the issue #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja
index f756b38c..3e350766 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, name=snapshot.name, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
     <h1>Sprint updated</h1>
     <p>Hello {{ user }}, <br> {{ changer }} has updated an sprint on {{ project }}</p>
     <p>Sprint {{ name }}</p>
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja
index f98e35cb..dbb65b00 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-body-text.jinja
@@ -1,6 +1,6 @@
 {% extends "emails/updates-body-text.jinja" %}
 {% block head %}
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("task", project.slug, snapshot.slug) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, name=snapshot.name, url=resolve_front_url("task", project.slug, snapshot.slug) %}
 Sprint updated
 Hello {{ user }}, {{ changer }} has updated a sprint on {{ project }}
 See sprint {{ name }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
index 400bf944..1891a893 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, milestone=snapshot.name|safe %}
+{% trans project=project.name, milestone=snapshot.name %}
 [{{ project }}] Updated the sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja
index 8390b282..39de7a4a 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, name=snapshot.name, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
     <h1>New sprint created</h1>
     <p>Hello {{ user }},<br />{{ changer }} has created a new sprint on {{ project }}</p>
     <p>Sprint {{ name }}</p>
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja
index 0433cf7f..8cbd531b 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, name=snapshot.name, url=resolve_front_url("taskboard", project.slug, snapshot.slug) %}
 New sprint created
 Hello {{ user }}, {{ changer }} has created a new sprint on {{ project }}
 See sprint {{ name }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
index 10656b83..700faac0 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, milestone=snapshot.name|safe %}
+{% trans project=project.name, milestone=snapshot.name %}
 [{{ project }}] Created the sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja
index fcd2cb2d..4604ba41 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, name=snapshot.name|safe %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, name=snapshot.name %}
     <h1>Sprint deleted</h1>
     <p>Hello {{ user }},<br />{{ changer }} has deleted an sprint on {{ project }}</p>
     <p>Sprint {{ name }}</p>
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja
index 2bb8bbe1..4c19f2cb 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, name=snapshot.name|safe %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, name=snapshot.name %}
 Sprint deleted
 Hello {{ user }}, {{ changer }} has deleted an sprint on {{ project }}
 Sprint {{ name }}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
index 11404786..242f1326 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, milestone=snapshot.name|safe %}
+{% trans project=project.name, milestone=snapshot.name %}
 [{{ project }}] Deleted the Sprint "{{ milestone }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja
index 024a41f2..83093f1f 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-change-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("task", project.slug, snapshot.ref) %}
     <h1>Task updated</h1>
     <p>Hello {{ user }}, <br> {{ changer }} has updated a task on {{ project }}</p>
     <p>Task #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja
index f34a7d96..45c3015b 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-change-body-text.jinja
@@ -1,6 +1,6 @@
 {% extends "emails/updates-body-text.jinja" %}
 {% block head %}
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("task", project.slug, snapshot.ref) %}
 Task updated
 Hello {{ user }}, {{ changer }} has updated a task on {{ project }}
 See task #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
index 1e4d7c16..6275e839 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Updated the task #{{ ref }} "{{ subject  }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja
index bd0e796e..496c77af 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-create-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("task", project.slug, snapshot.ref) %}
     <h1>New task created</h1>
     <p>Hello {{ user }},<br />{{ changer }} has created a new task on {{ project }}</p>
     <p>Task #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja
index 34deae44..befa385c 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-create-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("task", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("task", project.slug, snapshot.ref) %}
 New task created
 Hello {{ user }}, {{ changer }} has created a new task on {{ project }}
 See task #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
index d107e855..27dabde4 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Created the task #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja
index d10551cd..0eb1af1e 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
     <h1>Task deleted</h1>
     <p>Hello {{ user }},<br />{{ changer }} has deleted a task on {{ project }}</p>
     <p>Task #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
index d2c11cdf..9234770b 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 Task deleted
 Hello {{ user }}, {{ changer }} has deleted a task on {{ project }}
 Task #{{ ref }} {{ subject }}
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
index e80e164f..8522f00c 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Deleted the task #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja
index 8cecace4..0ca026c2 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
     <h1>User Story updated</h1>
     <p>Hello {{ user }}, <br> {{ changer }} has updated a user story on {{ project }}</p>
     <p>User Story #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja
index 68719440..d9fc6d71 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-body-text.jinja
@@ -1,6 +1,6 @@
 {% extends "emails/updates-body-text.jinja" %}
 {% block head %}
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe,ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name,ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
 User story updated
 Hello {{ user }}, {{ changer }} has updated a user story on {{ project }}
 See user story #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
index e116e403..3ed70685 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Updated the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja
index dc35ed3d..a1e4a8a1 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
     <h1>New user story created</h1>
     <p>Hello {{ user }},<br />{{ changer }} has created a new user story on {{ project }}</p>
     <p>User Story #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja
index 8bcd625c..842fc0d2 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject, url=resolve_front_url("userstory", project.slug, snapshot.ref) %}
 New user story created
 Hello {{ user }}, {{ changer }} has created a new user story on {{ project }}
 See user story #{{ ref }} {{ subject }} at {{ url }}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
index 124e3060..1e166e57 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Created the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja
index 8decb3ef..1877b3b7 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
     <h1>User Story deleted</h1>
     <p>Hello {{ user }},<br />{{ changer }} has deleted a user story on {{ project }}</p>
     <p>User Story #{{ ref }} {{ subject }}</p>
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja
index 0158a1b8..b03e4879 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 User Story deleted
 Hello {{ user }}, {{ changer }} has deleted a user story on {{ project }}
 User Story #{{ ref }} {{ subject }}
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
index f7843217..3a48058e 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, ref=snapshot.ref, subject=snapshot.subject|safe %}
+{% trans project=project.name, ref=snapshot.ref, subject=snapshot.subject %}
 [{{ project }}] Deleted the US #{{ ref }} "{{ subject }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja
index 550c7ebe..f056254c 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
     <h1>Wiki Page updated</h1>
     <p>Hello {{ user }}, <br> {{ changer }} has updated a wiki page on {{ project }}</p>
     <p>Wiki page {{ page }}</p>
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja
index 31f5884a..c20da951 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-body-text.jinja
@@ -1,6 +1,6 @@
 {% extends "emails/updates-body-text.jinja" %}
 {% block head %}
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
 Wiki Page updated
 
 Hello {{ user }}, {{ changer }} has updated a wiki page on {{ project }}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
index 251a5adb..73912cb6 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, page=snapshot.slug %}
+{% trans project=project.name, page=snapshot.slug %}
 [{{ project }}] Updated the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja
index 7627ef2b..28b1a0b5 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
     <h1>New wiki page created</h1>
     <p>Hello {{ user }},<br />{{ changer }} has created a new wiki page on {{ project }}</p>
     <p>Wiki page {{ page }}</p>
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja
index 29d5e375..1a1e45af 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug, url=resolve_front_url("wiki", project.slug, snapshot.slug) %}
 New wiki page created
 
 Hello {{ user }}, {{ changer }} has created a new wiki page on {{ project }}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
index ac5a6ddf..6b7d1adf 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, page=snapshot.slug %}
+{% trans project=project.name, page=snapshot.slug %}
 [{{ project }}] Created the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja
index 212441cf..291c1cb6 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-html.jinja
@@ -1,7 +1,7 @@
 {% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    {% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug %}
+    {% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug %}
     <h1>Wiki page deleted</h1>
     <p>Hello {{ user }},<br />{{ changer }} has deleted a wiki page on {{ project }}</p>
     <p>Wiki page {{ page }}</p>
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja
index a53b87a5..64745aed 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-body-text.jinja
@@ -1,4 +1,4 @@
-{% trans user=user.get_full_name()|safe, changer=changer.get_full_name()|safe, project=project.name|safe, page=snapshot.slug %}
+{% trans user=user.get_full_name(), changer=changer.get_full_name(), project=project.name, page=snapshot.slug %}
 Wiki page deleted
 
 Hello {{ user }}, {{ changer }} has deleted a wiki page on {{ project }}
diff --git a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
index d73de78f..a807f6f3 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=project.name|safe, page=snapshot.slug %}
+{% trans project=project.name, page=snapshot.slug %}
 [{{ project }}] Deleted the Wiki Page "{{ page }}"
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_invitation-subject.jinja b/taiga/projects/templates/emails/membership_invitation-subject.jinja
index 0b5206ef..8e620317 100644
--- a/taiga/projects/templates/emails/membership_invitation-subject.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=membership.project|safe %}
+{% trans project=membership.project %}
 [Taiga] Invitation to join to the project '{{ project }}'
 {% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_notification-subject.jinja b/taiga/projects/templates/emails/membership_notification-subject.jinja
index 57d60ac6..c6bdd588 100644
--- a/taiga/projects/templates/emails/membership_notification-subject.jinja
+++ b/taiga/projects/templates/emails/membership_notification-subject.jinja
@@ -1,3 +1,3 @@
-{% trans project=membership.project|safe %}
+{% trans project=membership.project %}
 [Taiga] Added to the project '{{ project }}'
 {% endtrans %}