From 0d591dcadc7db41a127100d28c3556e539469692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?=
 <david.barragan@kaleidos.net>
Date: Wed, 14 Jan 2015 21:45:15 +0100
Subject: [PATCH] Translate and fix all emails

---
 requirements.txt                              |   2 +-
 settings/common.py                            |   4 +
 settings/sr.py                                |  29 ++
 taiga/base/management/commands/test_emails.py |  70 ++-
 .../{updates.jinja => base-body-html.jinja}   |  51 +-
 .../{hero.jinja => hero-body-html.jinja}      |  34 +-
 .../{base.jinja => updates-body-html.jinja}   |  70 ++-
 .../templates/emails/updates-body-text.jinja  |  15 +
 taiga/export_import/tasks.py                  |  20 +-
 .../emails/dump_project-body-html.jinja       |  38 +-
 .../emails/dump_project-body-text.jinja       |  12 +-
 .../emails/dump_project-subject.jinja         |   2 +-
 .../emails/export_error-body-html.jinja       |  14 +
 .../emails/export_error-body-text.jinja       |  13 +
 .../emails/export_error-subject.jinja         |   1 +
 .../export_import_error-body-html.jinja       |  14 -
 .../export_import_error-body-text.jinja       |   7 -
 .../emails/export_import_error-subject.jinja  |   1 -
 .../emails/import_error-body-html.jinja       |  13 +
 .../emails/import_error-body-text.jinja       |  12 +
 .../emails/import_error-subject.jinja         |   1 +
 .../emails/load_dump-body-html.jinja          |  36 +-
 .../emails/load_dump-body-text.jinja          |  13 +-
 .../templates/emails/load_dump-subject.jinja  |   2 +-
 .../feedback_notification-body-html.jinja     | 452 +-----------------
 .../feedback_notification-body-text.jinja     |  11 +-
 .../feedback_notification-subject.jinja       |   4 +-
 .../emails/includes/fields_diff-html.jinja    |  42 +-
 .../emails/includes/fields_diff-text.jinja    |  16 +-
 .../issues/issue-change-body-html.jinja       |  51 +-
 .../issues/issue-change-body-text.jinja       |  29 +-
 .../emails/issues/issue-change-subject.jinja  |   6 +-
 .../issues/issue-create-body-html.jinja       |  30 +-
 .../issues/issue-create-body-text.jinja       |  16 +-
 .../emails/issues/issue-create-subject.jinja  |   6 +-
 .../issues/issue-delete-body-html.jinja       |  24 +-
 .../issues/issue-delete-body-text.jinja       |  12 +-
 .../emails/issues/issue-delete-subject.jinja  |   6 +-
 .../milestone-change-body-html.jinja          |  47 +-
 .../milestone-change-body-text.jinja          |  29 +-
 .../milestones/milestone-change-subject.jinja |   5 +-
 .../milestone-create-body-html.jinja          |  37 +-
 .../milestone-create-body-text.jinja          |  18 +-
 .../milestones/milestone-create-subject.jinja |   5 +-
 .../milestone-delete-body-html.jinja          |  33 +-
 .../milestone-delete-body-text.jinja          |  14 +-
 .../milestones/milestone-delete-subject.jinja |   5 +-
 .../projects/project-change-body-html.jinja   |  36 --
 .../projects/project-change-body-text.jinja   |  17 -
 .../projects/project-change-subject.jinja     |   1 -
 .../projects/project-create-body-html.jinja   |  27 --
 .../projects/project-create-body-text.jinja   |   7 -
 .../projects/project-create-subject.jinja     |   1 -
 .../projects/project-delete-body-html.jinja   |  24 -
 .../projects/project-delete-body-text.jinja   |   2 -
 .../projects/project-delete-subject.jinja     |   1 -
 .../emails/tasks/task-change-body-html.jinja  |  51 +-
 .../emails/tasks/task-change-body-text.jinja  |  30 +-
 .../emails/tasks/task-change-subject.jinja    |   6 +-
 .../emails/tasks/task-create-body-html.jinja  |  31 +-
 .../emails/tasks/task-create-body-text.jinja  |  16 +-
 .../emails/tasks/task-create-subject.jinja    |   6 +-
 .../emails/tasks/task-delete-body-html.jinja  |  24 +-
 .../emails/tasks/task-delete-body-text.jinja  |  13 +-
 .../emails/tasks/task-delete-subject.jinja    |   6 +-
 .../userstory-change-body-html.jinja          |  51 +-
 .../userstory-change-body-text.jinja          |  29 +-
 .../userstory-change-subject.jinja            |   6 +-
 .../userstory-create-body-html.jinja          |  30 +-
 .../userstory-create-body-text.jinja          |  17 +-
 .../userstory-create-subject.jinja            |   6 +-
 .../userstory-delete-body-html.jinja          |  25 +-
 .../userstory-delete-body-text.jinja          |  14 +-
 .../userstory-delete-subject.jinja            |   6 +-
 .../wiki/wikipage-change-body-html.jinja      |  51 +-
 .../wiki/wikipage-change-body-text.jinja      |  26 +-
 .../emails/wiki/wikipage-change-subject.jinja |   4 +-
 .../wiki/wikipage-create-body-html.jinja      |  29 +-
 .../wiki/wikipage-create-body-text.jinja      |  17 +-
 .../emails/wiki/wikipage-create-subject.jinja |   4 +-
 .../wiki/wikipage-delete-body-html.jinja      |  11 +-
 .../wiki/wikipage-delete-body-text.jinja      |  13 +-
 .../emails/wiki/wikipage-delete-subject.jinja |   4 +-
 .../membership_invitation-body-html.jinja     |  40 +-
 .../membership_invitation-body-text.jinja     |  29 +-
 .../membership_invitation-subject.jinja       |   4 +-
 .../membership_notification-body-html.jinja   |  25 +-
 .../membership_notification-body-text.jinja   |  10 +-
 .../membership_notification-subject.jinja     |   4 +-
 .../emails/change_email-body-html.jinja       |  23 +-
 .../emails/change_email-body-text.jinja       |   7 +-
 .../emails/change_email-subject.jinja         |   2 +-
 .../emails/password_recovery-body-html.jinja  |  24 +-
 .../emails/password_recovery-body-text.jinja  |   7 +-
 .../emails/password_recovery-subject.jinja    |   2 +-
 .../emails/registered_user-body-html.jinja    |  24 +-
 .../emails/registered_user-body-text.jinja    |  13 +-
 .../emails/registered_user-subject.jinja      |   2 +-
 98 files changed, 863 insertions(+), 1367 deletions(-)
 create mode 100644 settings/sr.py
 rename taiga/base/templates/emails/{updates.jinja => base-body-html.jinja} (87%)
 rename taiga/base/templates/emails/{hero.jinja => hero-body-html.jinja} (85%)
 rename taiga/base/templates/emails/{base.jinja => updates-body-html.jinja} (74%)
 create mode 100644 taiga/base/templates/emails/updates-body-text.jinja
 create mode 100644 taiga/export_import/templates/emails/export_error-body-html.jinja
 create mode 100644 taiga/export_import/templates/emails/export_error-body-text.jinja
 create mode 100644 taiga/export_import/templates/emails/export_error-subject.jinja
 delete mode 100644 taiga/export_import/templates/emails/export_import_error-body-html.jinja
 delete mode 100644 taiga/export_import/templates/emails/export_import_error-body-text.jinja
 delete mode 100644 taiga/export_import/templates/emails/export_import_error-subject.jinja
 create mode 100644 taiga/export_import/templates/emails/import_error-body-html.jinja
 create mode 100644 taiga/export_import/templates/emails/import_error-body-text.jinja
 create mode 100644 taiga/export_import/templates/emails/import_error-subject.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
 delete mode 100644 taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja

diff --git a/requirements.txt b/requirements.txt
index 3b91231c..71fb578a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ Markdown==2.4.1
 fn==0.2.13
 diff-match-patch==20121119
 requests==2.4.1
-
+django-sr==0.0.4
 easy-thumbnails==2.1
 celery==3.1.17
 redis==2.10.3
diff --git a/settings/common.py b/settings/common.py
index 76c6b14b..f6ec3a8a 100644
--- a/settings/common.py
+++ b/settings/common.py
@@ -203,6 +203,7 @@ INSTALLED_APPS = [
     "djmail",
     "django_jinja",
     "django_jinja.contrib._humanize",
+    "sr",
     "easy_thumbnails",
     "raven.contrib.django.raven_compat",
     "django_transactional_cleanup",
@@ -370,6 +371,9 @@ EXPORTS_TTL = 60 * 60 * 24  # 24 hours
 CELERY_ENABLED = False
 WEBHOOKS_ENABLED = False
 
+from .sr import *
+
+
 # NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE
 TEST_RUNNER="django.test.runner.DiscoverRunner"
 
diff --git a/settings/sr.py b/settings/sr.py
new file mode 100644
index 00000000..cd1bc113
--- /dev/null
+++ b/settings/sr.py
@@ -0,0 +1,29 @@
+# Copyright (C) 2015 Andrey Antukh <niwi@niwi.be>
+# Copyright (C) 2015 Jesús Espino <jespinog@gmail.com>
+# Copyright (C) 2015 David Barragán <bameda@dbarragan.com>
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+SR = {
+    "taigaio_url": "https://taiga.io",
+    "social": {
+        "twitter_url": "https://twitter.com/taigaio",
+        "github_url": "https://github.com/taigaio",
+    },
+    "support": {
+        "url": "https://taiga.io/support",
+        "email": "support@taiga.io",
+        "mailing_list": "https://groups.google.com/forum/#!forum/taigaio",
+    }
+}
diff --git a/taiga/base/management/commands/test_emails.py b/taiga/base/management/commands/test_emails.py
index d8e021cd..fbe7a7dd 100644
--- a/taiga/base/management/commands/test_emails.py
+++ b/taiga/base/management/commands/test_emails.py
@@ -16,6 +16,7 @@
 
 import datetime
 
+from django.db.models.loading import get_model
 from django.core.management.base import BaseCommand, CommandError
 from django.utils import timezone
 
@@ -23,6 +24,7 @@ from djmail.template_mail import MagicMailBuilder, InlineCSSTemplateMail
 
 from taiga.projects.models import Project, Membership
 from taiga.projects.history.models import HistoryEntry
+from taiga.projects.history.services import get_history_queryset_by_model_instance
 from taiga.users.models import User
 
 
@@ -45,7 +47,11 @@ class Command(BaseCommand):
         email.send()
 
         # Membership invitation
-        context = {"membership": Membership.objects.order_by("?").filter(user__isnull=True).first()}
+        membership = Membership.objects.order_by("?").filter(user__isnull=True).first()
+        membership.invited_by = User.objects.all().order_by("?").first()
+        membership.invitation_extra_text = "Text example, Text example,\nText example,\n\nText example"
+
+        context = {"membership": membership}
         email = mbuilder.membership_invitation(test_email, context)
         email.send()
 
@@ -82,10 +88,13 @@ class Command(BaseCommand):
         # Export/Import emails
         context = {
             "user": User.objects.all().order_by("?").first(),
+            "project": Project.objects.all().order_by("?").first(),
             "error_subject": "Error generating project dump",
             "error_message": "Error generating project dump",
         }
-        email = mbuilder.export_import_error(test_email, context)
+        email = mbuilder.export_error(test_email, context)
+        email.send()
+        email = mbuilder.import_error(test_email, context)
         email.send()
 
         deletion_date = timezone.now() + datetime.timedelta(seconds=60*60*24)
@@ -107,28 +116,24 @@ class Command(BaseCommand):
 
         # Notification emails
         notification_emails = [
-            "issues/issue-change",
-            "issues/issue-create",
-            "issues/issue-delete",
-            "milestones/milestone-change",
-            "milestones/milestone-create",
-            "milestones/milestone-delete",
-            "projects/project-change",
-            "projects/project-create",
-            "projects/project-delete",
-            "tasks/task-change",
-            "tasks/task-create",
-            "tasks/task-delete",
-            "userstories/userstory-change",
-            "userstories/userstory-create",
-            "userstories/userstory-delete",
-            "wiki/wikipage-change",
-            "wiki/wikipage-create",
-            "wiki/wikipage-delete",
+            ("issues.Issue", "issues/issue-change"),
+            ("issues.Issue", "issues/issue-create"),
+            ("issues.Issue", "issues/issue-delete"),
+            ("tasks.Task", "tasks/task-change"),
+            ("tasks.Task", "tasks/task-create"),
+            ("tasks.Task", "tasks/task-delete"),
+            ("userstories.UserStory", "userstories/userstory-change"),
+            ("userstories.UserStory", "userstories/userstory-create"),
+            ("userstories.UserStory", "userstories/userstory-delete"),
+            ("milestones.Milestone", "milestones/milestone-change"),
+            ("milestones.Milestone", "milestones/milestone-create"),
+            ("milestones.Milestone", "milestones/milestone-delete"),
+            ("wiki.WikiPage", "wiki/wikipage-change"),
+            ("wiki.WikiPage", "wiki/wikipage-create"),
+            ("wiki.WikiPage", "wiki/wikipage-delete"),
         ]
 
         context = {
-           "snapshot": HistoryEntry.objects.filter(is_snapshot=True).order_by("?")[0].snapshot,
            "project": Project.objects.all().order_by("?").first(),
            "changer": User.objects.all().order_by("?").first(),
            "history_entries": HistoryEntry.objects.all().order_by("?")[0:5],
@@ -136,6 +141,27 @@ class Command(BaseCommand):
         }
 
         for notification_email in notification_emails:
-            cls = type("InlineCSSTemplateMail", (InlineCSSTemplateMail,), {"name": notification_email})
+            model = get_model(*notification_email[0].split("."))
+            snapshot = {
+                "subject": "Tests subject",
+                "ref": 123123,
+                "name": "Tests name",
+                "slug": "test-slug"
+            }
+            queryset = model.objects.all().order_by("?")
+            for obj in queryset:
+                end = False
+                entries = get_history_queryset_by_model_instance(obj).filter(is_snapshot=True).order_by("?")
+
+                for entry in entries:
+                    if entry.snapshot:
+                        snapshot = entry.snapshot
+                        end = True
+                        break
+                if end:
+                    break
+            context["snapshot"] = snapshot
+
+            cls = type("InlineCSSTemplateMail", (InlineCSSTemplateMail,), {"name": notification_email[1]})
             email = cls()
             email.send(test_email, context)
diff --git a/taiga/base/templates/emails/updates.jinja b/taiga/base/templates/emails/base-body-html.jinja
similarity index 87%
rename from taiga/base/templates/emails/updates.jinja
rename to taiga/base/templates/emails/base-body-html.jinja
index 65a16fa2..1f6c23a1 100644
--- a/taiga/base/templates/emails/updates.jinja
+++ b/taiga/base/templates/emails/base-body-html.jinja
@@ -1,11 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-{% set home_url = resolve_front_url("home") %}
-{% set home_url_name = "Taiga" %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>[Taiga] Jesús Espino updated the US #1680 "Rediseño de emails"</title>
+        <title>{{ _("Taiga") }}</title>
         <style type="text/css">
             /* /\/\/\/\/\/\/\/\/ CLIENT-SPECIFIC STYLES /\/\/\/\/\/\/\/\/ */
             #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" message */
@@ -395,39 +393,24 @@
                                         <tr>
                                             <td valign="top" class="headerContent">
                                                 <img src="{{ static("emails/top-bg-update.png") }}" />
-                                                <a href="{{ home_url }}"
-                                                   title="{{ home_url_name }}">
+                                                <a href="{{ resolve_front_url("home") }}" title="Taiga">
                                                     <img src="{{ static("emails/logo-color.png") }}" id="headerImage" alt="Taiga logo" />
                                                 </a>
-                                                {% block head %}
+                                                {% block body %}
                                                 {% endblock %}
                                             </td>
                                         </tr>
-                                    </table>
-                                    <!-- // END HEADER -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align="center" valign="top">
-                                    <!-- BEGIN BODY // -->
-                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateBody">
-                                        <tr>
-                                            <td valign="top" class="bodyContent">
-                                                <table class="update-row" border="0" cellpadding="0" cellspacing="0" width="100%">
-                                                    {% block body %}
-                                                    {% endblock %}
-                                                </table>
-                                            </td>
-                                        </tr>
+                                        {% block social %}
                                         <tr>
                                             <td valign="top" class="social-links">
-                                                <a href="https://twitter.com/taigaio" title="Follow us on Twitter">Twitter</a>
-                                                <a href="https://github.com/taigaio" title="Get the code on Github">Github</a>
-                                                <a href="https://taiga.io/" title="Visit our website">Taiga.io</a>
+                                                <a href="{{ sr("social.twitter_url") }}" title="{{ _("Follow us on Twitter") }}" style="color: #9dce0a">{{ _("Twitter") }}</a>
+                                                <a href="{{ sr("social.github_url") }}" title="{{ _("Get the code on GitHub") }}" style="color: #9dce0a">{{ _("GitHub") }}</a>
+                                                <a href="{{ sr("taigaio_url") }}" title="{{ _("Visit our website") }}" style="color: #9dce0a">{{ _("Taiga.io") }}</a>
                                             </td>
                                         </tr>
+                                        {% endblock %}
                                     </table>
-                                    <!-- // END BODY -->
+                                    <!-- // END HEADER -->
                                 </td>
                             </tr>
                             <tr>
@@ -437,6 +420,22 @@
                                         <tr>
                                             <td valign="top" class="footerContent">
                                                 {% block footer %}
+                                                    {% trans support_url=sr("support.url"),
+                                                             support_email=sr("support.email"),
+                                                             mailing_list_url=sr("support.mailing_list") %}
+                                                    <strong>Taiga Support:</strong>
+                                                    <a href="{{ support_url }}" title="Support page" style="color: #9dce0a">{{ support_url}}</a>
+                                                    <br>
+                                                    <strong>Contact us:</strong>
+                                                     <a href="mailto:{{ support_email }}" title="Supporti email" style="color: #9dce0a">
+                                                        {{ support_email }}
+                                                    </a>
+                                                    <br>
+                                                    <strong>Mailing list:</strong>
+                                                    <a href="{{ mailing_list_url }}" title="Mailing list" style="color: #9dce0a">
+                                                        {{ mailing_list_url }}
+                                                    </a>
+                                                    {% endtrans %}
                                                 {% endblock %}
                                             </td>
                                         </tr>
diff --git a/taiga/base/templates/emails/hero.jinja b/taiga/base/templates/emails/hero-body-html.jinja
similarity index 85%
rename from taiga/base/templates/emails/hero.jinja
rename to taiga/base/templates/emails/hero-body-html.jinja
index cf952bcb..4738a3e4 100644
--- a/taiga/base/templates/emails/hero.jinja
+++ b/taiga/base/templates/emails/hero-body-html.jinja
@@ -1,11 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{% set home_url = resolve_front_url("home") %}
-{% set home_url_name = "Taiga" %}
 
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>You have been Taigatized</title>
+        <title>{{ _("You have been Taigatized") }}</title>
         <style type="text/css">
             /* /\/\/\/\/\/\/\/\/ CLIENT-SPECIFIC STYLES /\/\/\/\/\/\/\/\/ */
             #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" message */
@@ -355,11 +353,13 @@
                                     <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateHeader">
                                         <tr>
                                             <td valign="top" class="headerContent" background="{{ static("emails/top-bg-hero.png") }}" style="background-position: center center">
-                                                <a href="{{ home_url }}" title="{{ home_url_name }}">
-                                                    <img src="{{ static("emails/logo.png") }}" alt="Taiga" id="headerImage" />
+                                                <a href="{{ resolve_front_url("home") }}" title="Taiga">
+                                                    <img src="{{ static("emails/logo.png") }}" alt="Taiga logo" id="headerImage" />
                                                 </a>
+                                                {% trans %}
                                                 <h1>You have been Taigatized!</h1>
                                                 <p>Welcome to Taiga, an Open Source, Agile Project Management Tool</p>
+                                                {% endtrans %}
                                             </td>
                                         </tr>
                                     </table>
@@ -374,13 +374,15 @@
                                                 {% block body %}{% endblock %}
                                             </td>
                                         </tr>
+                                        {% block social %}
                                         <tr>
                                             <td valign="top" class="social-links">
-                                                <a href="https://twitter.com/taigaio" title="Follow us on Twitter">Twitter</a>
-                                                <a href="https://github.com/taigaio" title="Get the code on Github">Github</a>
-                                                <a href="https://taiga.io/" title="Visit our website">Taiga.io</a>
+                                                <a href="{{ sr("social.twitter_url") }}" title="{{ _("Follow us on Twitter") }}" style="color: #9dce0a">{{ _("Twitter") }}</a>
+                                                <a href="{{ sr("social.github_url") }}" title="{{ _("Get the code on GitHub") }}" style="color: #9dce0a">{{ _("GitHub") }}</a>
+                                                <a href="{{ sr("taigaio_url") }}" title="{{ _("Visit our website") }}" style="color: #9dce0a">{{ _("Taiga.io") }}</a>
                                             </td>
                                         </tr>
+                                        {% endblock %}
                                     </table>
                                 </td>
                             </tr>
@@ -392,6 +394,22 @@
                                         <tr>
                                             <td valign="top" class="footerContent">
                                                 {% block footer %}
+                                                    {% trans support_url=sr("support.url"),
+                                                             support_email=sr("support.email"),
+                                                             mailing_list_url=sr("support.mailing_list") %}
+                                                    <strong>Taiga Support:</strong>
+                                                    <a href="{{ support_url }}" title="Support page" style="color: #9dce0a">{{ support_url}}</a>
+                                                    <br>
+                                                    <strong>Contact us:</strong>
+                                                     <a href="mailto:{{ support_email }}" title="Supporti email" style="color: #9dce0a">
+                                                        {{ support_email }}
+                                                    </a>
+                                                    <br>
+                                                    <strong>Mailing list:</strong>
+                                                    <a href="{{ mailing_list_url }}" title="Mailing list" style="color: #9dce0a">
+                                                        {{ mailing_list_url }}
+                                                    </a>
+                                                    {% endtrans %}
                                                 {% endblock %}
                                             </td>
                                         </tr>
diff --git a/taiga/base/templates/emails/base.jinja b/taiga/base/templates/emails/updates-body-html.jinja
similarity index 74%
rename from taiga/base/templates/emails/base.jinja
rename to taiga/base/templates/emails/updates-body-html.jinja
index ac8439df..ebac0678 100644
--- a/taiga/base/templates/emails/base.jinja
+++ b/taiga/base/templates/emails/updates-body-html.jinja
@@ -1,11 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
-{% set home_url = resolve_front_url("home") %}
-{% set home_url_name = "Taiga" %}
 <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>Taiga</title>
+        <title>{{ _("[Taiga] Updates") }}</title>
         <style type="text/css">
             /* /\/\/\/\/\/\/\/\/ CLIENT-SPECIFIC STYLES /\/\/\/\/\/\/\/\/ */
             #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" message */
@@ -395,11 +393,11 @@
                                         <tr>
                                             <td valign="top" class="headerContent">
                                                 <img src="{{ static("emails/top-bg-update.png") }}" />
-                                                <a href="{{ home_url }}"
-                                                   title="{{ home_url_name }}">
+                                                <a href="{{ resolve_front_url("home") }}"
+                                                   title="Taiga">
                                                     <img src="{{ static("emails/logo-color.png") }}" id="headerImage" alt="Taiga logo" />
                                                 </a>
-                                                {% block body %}
+                                                {% block head %}
                                                 {% endblock %}
                                             </td>
                                         </tr>
@@ -407,6 +405,50 @@
                                     <!-- // END HEADER -->
                                 </td>
                             </tr>
+                            <tr>
+                                <td align="center" valign="top">
+                                    <!-- BEGIN BODY // -->
+                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateBody">
+                                        <tr>
+                                            <td valign="top" class="bodyContent">
+                                                <table class="update-row" border="0" cellpadding="0" cellspacing="0" width="100%">
+                                                    {% block body %}
+                                                        <tr>
+                                                            <th colspan="2"><h2>{{ _("Updates") }}</h2></th>
+                                                        </tr>
+                                                        {% for entry in history_entries%}
+                                                            {% if entry.comment %}
+                                                        <tr>
+                                                            <td colspan="2">
+                                                                {% trans comment=mdrender(project, entry.comment) %}
+                                                                <h3>comment:</h3>
+                                                                <p>{{ comment }}</p>
+                                                                {% endtrans %}
+                                                            </td>
+                                                        </tr>
+                                                            {% endif %}
+                                                            {% set changed_fields = entry.values_diff %}
+                                                            {% if changed_fields %}
+                                                            {% include "emails/includes/fields_diff-html.jinja" %}
+                                                            {% endif %}
+                                                        {% endfor %}
+                                                    {% endblock %}
+                                                </table>
+                                            </td>
+                                        </tr>
+                                        {% block social %}
+                                        <tr>
+                                            <td valign="top" class="social-links">
+                                                <a href="{{ sr("social.twitter_url") }}" title="{{ _("Follow us on Twitter") }}" style="color: #9dce0a">{{ _("Twitter") }}</a>
+                                                <a href="{{ sr("social.github_url") }}" title="{{ _("Get the code on GitHub") }}" style="color: #9dce0a">{{ _("GitHub") }}</a>
+                                                <a href="{{ sr("taigaio_url") }}" title="{{ _("Visit our website") }}" style="color: #9dce0a">{{ _("Taiga.io") }}</a>
+                                            </td>
+                                        </tr>
+                                        {% endblock %}
+                                    </table>
+                                    <!-- // END BODY -->
+                                </td>
+                            </tr>
                             <tr>
                                 <td align="center" valign="top">
                                     <!-- BEGIN FOOTER // -->
@@ -414,6 +456,22 @@
                                         <tr>
                                             <td valign="top" class="footerContent">
                                                 {% block footer %}
+                                                    {% trans support_url=sr("support.url"),
+                                                             support_email=sr("support.email"),
+                                                             mailing_list_url=sr("support.mailing_list") %}
+                                                    <strong>Taiga Support:</strong>
+                                                    <a href="{{ support_url }}" title="Support page" style="color: #9dce0a">{{ support_url}}</a>
+                                                    <br>
+                                                    <strong>Contact us:</strong>
+                                                     <a href="mailto:{{ support_email }}" title="Supporti email" style="color: #9dce0a">
+                                                        {{ support_email }}
+                                                    </a>
+                                                    <br>
+                                                    <strong>Mailing list:</strong>
+                                                    <a href="{{ mailing_list_url }}" title="Mailing list" style="color: #9dce0a">
+                                                        {{ mailing_list_url }}
+                                                    </a>
+                                                    {% endtrans %}
                                                 {% endblock %}
                                             </td>
                                         </tr>
diff --git a/taiga/base/templates/emails/updates-body-text.jinja b/taiga/base/templates/emails/updates-body-text.jinja
new file mode 100644
index 00000000..470382c1
--- /dev/null
+++ b/taiga/base/templates/emails/updates-body-text.jinja
@@ -0,0 +1,15 @@
+{% block head %}{% endblock %}
+
+{% block body %}
+{% for entry in history_entries %}
+    {% if entry.comment %}
+        {% trans comment=entry.comment %}
+    Comment: {{ comment }}
+        {% endtrans %}
+    {% endif %}
+    {% set changed_fields = entry.values_diff %}
+    {% if changed_fields %}
+        {% include "emails/includes/fields_diff-text.jinja" %}
+    {% endif %}
+{% endfor %}
+{% endblock %}
diff --git a/taiga/export_import/tasks.py b/taiga/export_import/tasks.py
index 2110a7b0..eb0bcf86 100644
--- a/taiga/export_import/tasks.py
+++ b/taiga/export_import/tasks.py
@@ -47,8 +47,9 @@ def dump_project(self, user, project):
             "user": user,
             "error_subject": "Error generating project dump",
             "error_message": "Error generating project dump",
+            "project": project
         }
-        email = mbuilder.export_import_error(user.email, ctx)
+        email = mbuilder.export_error(user.email, ctx)
         email.send()
         return
 
@@ -76,16 +77,15 @@ def load_project_dump(user, dump):
     try:
         project = dict_to_project(dump, user.email)
     except Exception:
-        email = mbuilder.export_import_error(
-            user.email,
-            {
-                "user": user,
-                "error_subject": "Error loading project dump",
-                "error_message": "Error loading project dump",
-            }
-        )
+        ctx = {
+            "user": user,
+            "error_subject": "Error loading project dump",
+            "error_message": "Error loading project dump",
+        }
+        email = mbuilder.import_error(user.email, ctx)
         email.send()
         return
 
-    email = mbuilder.load_dump(user.email, {"user": user, "project": project})
+    ctx = {"user": user, "project": project}
+    email = mbuilder.load_dump(user.email, ctx)
     email.send()
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 f1109ccb..3c6ba602 100644
--- a/taiga/export_import/templates/emails/dump_project-body-html.jinja
+++ b/taiga/export_import/templates/emails/dump_project-body-html.jinja
@@ -1,28 +1,16 @@
-{% extends "emails/base.jinja" %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>Project dump generated</h1>
-            <p>Hello {{ user.get_full_name() }},</p>
-            <h3>Your project dump has been correctly generated.</h3>
-            <p>You can download it from here: <a style="color: #669900;" href="{{ url }}">{{ url }}</a></p>
-            <p>This file will be deleted on {{ deletion_date|date("r") }}.</p>
-            <p>The Taiga Team</p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% trans user=user.get_full_name()|safe,
+             project=project.name|safe,
+             url=url,
+             deletion_date=deletion_date|date("d/M/Y H:i") %}
+    <h1>Project dump generated</h1>
+    <p>Hello {{ user }},</p>
+    <h3>Your dump from project {{ project }} has been correctly generated.</h3>
+    <p>You can download it here:</p>
+    <a class="button" href="{{ url }}" title="Download the dump file">Download the dump file</a>
+    <p>This file will be deleted on {{ deletion_date }}.</p>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
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 4874d4b5..3770092d 100644
--- a/taiga/export_import/templates/emails/dump_project-body-text.jinja
+++ b/taiga/export_import/templates/emails/dump_project-body-text.jinja
@@ -1,9 +1,15 @@
-Hello {{ user.get_full_name() }},
+{% trans user=user.get_full_name()|safe,
+         project=project.name|safe,
+         url=url,
+         deletion_date=deletion_date|date("d/M/Y H:i") %}
+Hello {{ user }},
 
-Your project dump has been correctly generated. You can download it from here:
+Your dump from project {{ project }} has been correctly generated. You can download it here:
 
 {{ url }}
 
-This file will be deleted on {{ deletion_date|date("r") }}.
+This file will be deleted on {{ deletion_date }}.
 
+---
 The Taiga Team
+{% endtrans %}
diff --git a/taiga/export_import/templates/emails/dump_project-subject.jinja b/taiga/export_import/templates/emails/dump_project-subject.jinja
index cdd31e44..7ad0ef61 100644
--- a/taiga/export_import/templates/emails/dump_project-subject.jinja
+++ b/taiga/export_import/templates/emails/dump_project-subject.jinja
@@ -1 +1 @@
-[Taiga] Your project dump has been generated
+{% trans project=project.name|safe %}[{{ 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
new file mode 100644
index 00000000..47eac827
--- /dev/null
+++ b/taiga/export_import/templates/emails/export_error-body-html.jinja
@@ -0,0 +1,14 @@
+{% 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 %}
+    <h1>{{ error_message }}</h1>
+    <p>Hello {{ user }},</p>
+    <p>Please, try it again or contact with the support team at
+       <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
+{% endblock %}
diff --git a/taiga/export_import/templates/emails/export_error-body-text.jinja b/taiga/export_import/templates/emails/export_error-body-text.jinja
new file mode 100644
index 00000000..bf84a194
--- /dev/null
+++ b/taiga/export_import/templates/emails/export_error-body-text.jinja
@@ -0,0 +1,13 @@
+    {% trans user=user.get_full_name()|safe,
+             error_message=error_message,
+             support_email=sr("support.email"),
+             project=project.name|safe %}
+Hello {{ user }},
+
+{{ error_message }}
+
+Please, try it again or contact with the support team at {{ support_email }}
+
+---
+The Taiga Team
+{% endtrans %}
diff --git a/taiga/export_import/templates/emails/export_error-subject.jinja b/taiga/export_import/templates/emails/export_error-subject.jinja
new file mode 100644
index 00000000..fed22ace
--- /dev/null
+++ b/taiga/export_import/templates/emails/export_error-subject.jinja
@@ -0,0 +1 @@
+{% trans error_subject=error_subject, project=project.name|safe %}[{{ project }}] {{ error_subject }}{% endtrans %}
diff --git a/taiga/export_import/templates/emails/export_import_error-body-html.jinja b/taiga/export_import/templates/emails/export_import_error-body-html.jinja
deleted file mode 100644
index c3fb40ae..00000000
--- a/taiga/export_import/templates/emails/export_import_error-body-html.jinja
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "emails/base.jinja" %}
-
-{% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>{{ error_message }}</h1>
-            <p>Hello {{ user.get_full_name() }},</p>
-            <p>Please, contact with the support team at <a style="color: #669900;" href="mailto:support@taiga.io">support@taiga.io</a></p>
-            <p>The Taiga Team</p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
diff --git a/taiga/export_import/templates/emails/export_import_error-body-text.jinja b/taiga/export_import/templates/emails/export_import_error-body-text.jinja
deleted file mode 100644
index 6ef22223..00000000
--- a/taiga/export_import/templates/emails/export_import_error-body-text.jinja
+++ /dev/null
@@ -1,7 +0,0 @@
-Hello {{ user.get_full_name() }},
-
-{{ error_message }}
-
-Please, contact with the support team at support@taiga.io
-
-The Taiga Team
diff --git a/taiga/export_import/templates/emails/export_import_error-subject.jinja b/taiga/export_import/templates/emails/export_import_error-subject.jinja
deleted file mode 100644
index 67eaf97f..00000000
--- a/taiga/export_import/templates/emails/export_import_error-subject.jinja
+++ /dev/null
@@ -1 +0,0 @@
-[Taiga] {{ error_subject }}
diff --git a/taiga/export_import/templates/emails/import_error-body-html.jinja b/taiga/export_import/templates/emails/import_error-body-html.jinja
new file mode 100644
index 00000000..00275f86
--- /dev/null
+++ b/taiga/export_import/templates/emails/import_error-body-html.jinja
@@ -0,0 +1,13 @@
+{% extends "emails/base-body-html.jinja" %}
+
+{% block body %}
+    {% trans user=user.get_full_name()|safe,
+             error_message=error_message,
+             support_email=sr("support.email") %}
+    <h1>{{ error_message }}</h1>
+    <p>Hello {{ user }},</p>
+    <p>Please, try it again or contact with the support team at
+       <a href="mailto:{{ support_email }}" title="Support email" style="color: #699b05">{{ support_email }}</a></p>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
+{% endblock %}
diff --git a/taiga/export_import/templates/emails/import_error-body-text.jinja b/taiga/export_import/templates/emails/import_error-body-text.jinja
new file mode 100644
index 00000000..bdaab4e2
--- /dev/null
+++ b/taiga/export_import/templates/emails/import_error-body-text.jinja
@@ -0,0 +1,12 @@
+    {% trans user=user.get_full_name()|safe,
+             error_message=error_message,
+             support_email=sr("support.email") %}
+Hello {{ user }},
+
+{{ error_message }}
+
+Please, try it again or contact with the support team at {{ support_email }}
+
+---
+The Taiga Team
+{% endtrans %}
diff --git a/taiga/export_import/templates/emails/import_error-subject.jinja b/taiga/export_import/templates/emails/import_error-subject.jinja
new file mode 100644
index 00000000..44506406
--- /dev/null
+++ b/taiga/export_import/templates/emails/import_error-subject.jinja
@@ -0,0 +1 @@
+{% trans error_subject=error_subject %}[Taiga] {{ error_subject }}{% endtrans %}
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 a253fe00..b3c64b4a 100644
--- a/taiga/export_import/templates/emails/load_dump-body-html.jinja
+++ b/taiga/export_import/templates/emails/load_dump-body-html.jinja
@@ -1,29 +1,13 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("project", project.slug) %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>Project dump imported</h1>
-            <p>Hello {{ user.get_full_name() }},</p>
-            <h3>Your project dump has been correctly imported.</h3>
-            <p>You can see the project here: <a style="color: #669900;" href="{{ final_url }}">{{ final_url }}</a></p>
-            <p>The Taiga Team</p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% trans user=user.get_full_name()|safe,
+             url=resolve_front_url("project", project.slug),
+             project=project.name|safe %}
+    <h1>Project dump imported</h1>
+    <p>Hello {{ user }},</p>
+    <h3>Your project dump has been correctly imported.</h3>
+    <a class="button" href="{{ url }}" title="Go to the project {{ project }}">Go to {{ project }}</a>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
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 30064644..e38c99a6 100644
--- a/taiga/export_import/templates/emails/load_dump-body-text.jinja
+++ b/taiga/export_import/templates/emails/load_dump-body-text.jinja
@@ -1,7 +1,14 @@
-Hello {{ user.get_full_name() }},
+{% trans user=user.get_full_name()|safe,
+         url=resolve_front_url("project", project.slug),
+         project=project.name|safe %}
+Hello {{ user }},
 
-Your project dump has been correctly imported. You can see the project here:
+Your project dump has been correctly imported.
 
-{{ resolve_front_url('project', project.slug) }}
+You can see the project {{ project }} here:
 
+{{ url }}
+
+---
 The Taiga Team
+{% endtrans %}
diff --git a/taiga/export_import/templates/emails/load_dump-subject.jinja b/taiga/export_import/templates/emails/load_dump-subject.jinja
index d18f37c4..a258d42e 100644
--- a/taiga/export_import/templates/emails/load_dump-subject.jinja
+++ b/taiga/export_import/templates/emails/load_dump-subject.jinja
@@ -1 +1 @@
-[Taiga] Your project dump has been imported
+{% trans project=project.name|safe %}[{{ 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 9687ed51..b2c38449 100644
--- a/taiga/feedback/templates/emails/feedback_notification-body-html.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-body-html.jinja
@@ -1,414 +1,21 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-        <title>Taiga</title>
-        <style type="text/css">
-            /* /\/\/\/\/\/\/\/\/ CLIENT-SPECIFIC STYLES /\/\/\/\/\/\/\/\/ */
-            #outlook a{padding:0;} /* Force Outlook to provide a "view in browser" message */
-            .ReadMsgBody{width:100%;} .ExternalClass{width:100%;} /* Force Hotmail to display emails at full width */
-            .ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing */
-            body, table, td, p, a, li, blockquote{-webkit-text-size-adjust:100%; -ms-text-size-adjust:100%;} /* Prevent WebKit and Windows mobile changing default text sizes */
-            table, td{mso-table-lspace:0pt; mso-table-rspace:0pt;} /* Remove spacing between tables in Outlook 2007 and up */
-            img{-ms-interpolation-mode:bicubic;} /* Allow smoother rendering of resized image in Internet Explorer */
-
-            /* /\/\/\/\/\/\/\/\/ RESET STYLES /\/\/\/\/\/\/\/\/ */
-            body{margin:0; padding:0;}
-            img{border:0; height:auto; line-height:100%; outline:none; text-decoration:none;}
-            table{border-collapse:collapse !important;}
-            body, #bodyTable, #bodyCell{height:100% !important; margin:0; padding:0; width:100% !important;}
-
-            /* /\/\/\/\/\/\/\/\/ TEMPLATE STYLES /\/\/\/\/\/\/\/\/ */
-
-            #bodyCell{padding:20px;}
-            #templateContainer{width:600px;}
-
-            /* ========== Page Styles ========== */
-
-            body, #bodyTable{
-                background-color:#f5f5f5;
-            }
-
-            /**
-            * @section email border
-            */
-            #templateContainer{
-                background-color:#FFF;
-                border:1px solid #CDCDCD;
-            }
-
-            /**
-            * @section heading 1
-            */
-            h1{
-                color: #6e6e6e !important;
-                display:block;
-                font-family: 'Open Sans', Arial;
-                font-size:25px;
-                font-style:normal;
-                font-weight:bold;
-                line-height:100%;
-                letter-spacing:normal;
-                margin-top:0;
-                margin-right:0;
-                margin-bottom:16px;
-                margin-left:0;
-                text-align:center;
-            }
-
-            /**
-            * @style heading 2
-            */
-            h2{
-                color: #6e6e6e !important;
-                display:block;
-                font-family: 'Open Sans', Arial;
-                font-size:20px;
-                font-style:normal;
-                font-weight:bold;
-                line-height:100%;
-                letter-spacing:normal;
-                margin-top:0;
-                margin-right:0;
-                margin-bottom:16px;
-                margin-left:0;
-                text-align:center;
-            }
-
-            /**
-            * @tab Page
-            * @section heading 3
-            */
-            h3{
-                color:#6e6e6e !important;
-                display:block;
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:16px;
-                font-weight:normal;
-                line-height:100%;
-                font-weight:bold;
-                letter-spacing:normal;
-                margin-top:0;
-                margin-right:0;
-                margin-bottom:16px;
-                margin-left:0;
-                text-align:center;
-            }
-
-            /**
-            * @tab Page
-            * @section heading 4
-            */
-            h4{
-                color:#808080 !important;
-                display:block;
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:14px;
-                font-weight:bold;
-                line-height:100%;
-                letter-spacing:normal;
-                margin-top:0;
-                margin-right:0;
-                margin-bottom:16px;
-                margin-left:0;
-                text-align:left;
-            }
-
-
-
-            /* ========== Header Styles ========== */
-
-            .headerContent {
-                text-align: center;
-                color:#b8b8b8 !important;
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:14px;
-                margin-bottom:16px;
-                text-align:center;
-            }
-
-            #headerImage{
-                height:auto;
-                width:80px;
-                margin: 20px auto;
-            }
-
-            /* ========== Body Styles ========== */
-
-            /**
-            * @tab Body
-            * @section body style
-            * @tip Set the background color and borders for your email's body area.
-            */
-            #templateBody{
-                background-color:#FFF;
-            }
-
-            /**
-            * @section body text
-            */
-            .bodyContent{
-                color:#505050;
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:16px;
-                line-height:150%;
-                padding-right:20px;
-                padding-bottom:20px;
-                padding-left:20px;
-                padding-top:20px;
-                text-align:center;
-            }
-
-            /**
-            * @section body link
-            */
-            .bodyContent a:link, .bodyContent a:visited, /* Yahoo! Mail Override */ .bodyContent a .yshortcuts /* Yahoo! Mail Override */{
-                color:#699b05;
-                font-weight:normal;
-                text-decoration:underline;
-            }
-
-            /**
-            * @section body link button class
-            */
-            a.button {
-                background: #699b05;
-                color: #fff;
-                display: block;
-                width: 50%;
-                text-decoration: none;
-                text-align: center;
-                margin: 0 auto 16px;
-                text-transform: uppercase;
-                padding: .8rem 3rem;
-            }
-
-            a.button:hover {
-                background: #aad400;
-            }
-
-            .bodyContent img{
-                display:inline;
-                height:auto;
-                max-width:560px;
-            }
-
-            .update-row h1,
-            .update-row h2,
-            .update-row h3 {
-                text-align: left;
-            }
-
-            .update-row tr {
-                border-bottom: 1px solid #cdcdcd;
-                padding: 10px;
-            }
-
-            .update-row tr:first-child,
-            .update-row tr:last-child {
-                border-bottom: 3px solid #cdcdcd;
-            }
-
-            .update-row td {
-                padding: 15px;
-                text-align: left;
-            }
-
-            .update-row td.update-row-name {
-                width: 40%;
-                text-align: center;
-            }
-
-            .update-row td.update-row-from {
-                border-bottom: 1px solid #f5f5f5;
-            }
-
-            .social-links {
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:13px;
-                padding-right:20px;
-                padding-bottom:20px;
-                padding-left:20px;
-                text-align:center;
-            }
-
-            .social-links a:link, .social-links a:visited{
-                color:#699b05;
-                font-weight:normal;
-                text-decoration:underline;
-                text-align: center;
-                margin: 0 5px;
-            }
-
-            /* ========== Footer Styles ========== */
-
-            /**
-            * @section footer style
-            */
-            #templateFooter{
-                background-color:#555555;
-            }
-
-            /**
-            * @section footer text
-            */
-            .footerContent{
-                color:#f5f5f5;
-                font-family: 'Open Sans', Arial, Helvetica;
-                font-size:10px;
-                line-height:150%;
-                padding-top:20px;
-                padding-right:20px;
-                padding-bottom:20px;
-                padding-left:20px;
-                text-align:left;
-            }
-
-            /**
-            * @tab Footer
-            * @section footer link
-            * @tip Set the styling for your email's footer links. Choose a color that helps them stand out from your text.
-            */
-            .footerContent a:link, .footerContent a:visited, /* Yahoo! Mail Override */ .footerContent a .yshortcuts, .footerContent a span /* Yahoo! Mail Override */{
-                /*@editable*/ color:#699b05;
-                /*@editable*/ font-weight:normal;
-                /*@editable*/ text-decoration:underline;
-            }
-
-            /* /\/\/\/\/\/\/\/\/ MOBILE STYLES /\/\/\/\/\/\/\/\/ */
-
-            @media only screen and (max-width: 480px){
-                /* /\/\/\/\/\/\/ CLIENT-SPECIFIC MOBILE STYLES /\/\/\/\/\/\/ */
-                body, table, td, p, a, li, blockquote{-webkit-text-size-adjust:none !important;} /* Prevent Webkit platforms from changing default text sizes */
-                body{width:100% !important; min-width:100% !important;} /* Prevent iOS Mail from adding padding to the body */
-
-                /* /\/\/\/\/\/\/ MOBILE RESET STYLES /\/\/\/\/\/\/ */
-                #bodyCell{padding:10px !important;}
-
-                /* /\/\/\/\/\/\/ MOBILE TEMPLATE STYLES /\/\/\/\/\/\/ */
-
-                /* ======== Page Styles ======== */
-
-                /**
-                * @section template width
-                */
-                #templateContainer{
-                    max-width:600px !important;
-                    width:100% !important;
-                }
-
-                /**
-                * @section heading 1
-                */
-                h1{
-                    font-size:18px !important;
-                    line-height:100% !important;
-                }
-
-                /**
-                * @section heading 2
-                */
-                h2{
-                    font-size:16px !important;
-                    line-height:100% !important;
-                }
-
-                /**
-                * @section heading 3
-                */
-                h3{
-                    font-size:14px !important;
-                    line-height:100% !important;
-                }
-
-
-                /* ======== Header Styles ======== */
-
-                #templatePreheader{display:none !important;} /* Hide the template preheader to save space */
-
-                /**
-                * @section header image
-                */
-                #headerImage{
-                    height:auto !important;
-                    max-width:600px !important;
-                    width:20% !important;
-                }
-
-                /* ======== Body Styles ======== */
-
-                /**
-                * @tab Mobile Styles
-                * @section body image
-                * @tip Make the main body image fluid for portrait or landscape view adaptability, and set the image's original width as the max-width. If a fluid setting doesn't work, set the image width to half its original size instead.
-                */
-                #bodyImage{
-                    height:auto !important;
-                    max-width:560px !important;
-                    width:100% !important;
-                }
-
-                /**
-                * @section body text
-                */
-                .bodyContent{
-                    font-size:16px !important;
-                    line-height:125% !important;
-                }
-
-                /**
-                * @section body link button class
-                */
-                .bodyContent a.button {
-                    font-size:14px !important;
-                    width: auto;
-                }
-
-                /* ======== Footer Styles ======== */
-
-                /**
-                * @section footer text
-                */
-                .footerContent{
-                    font-size:14px !important;
-                    line-height:115% !important;
-                }
-
-                .footerContent a{display:block !important;} /* Place footer social and utility links on their own lines, for easier access */
-            }
-        </style>
-    </head>
-    <body leftmargin="0" marginwidth="0" topmargin="0" marginheight="0" offset="0">
-        <center>
-            <table align="center" border="0" cellpadding="0" cellspacing="0" height="100%" width="100%" id="bodyTable">
-                <tr>
-                    <td align="center" valign="top" id="bodyCell">
-                        <!-- BEGIN TEMPLATE // -->
-                        <table border="0" cellpadding="0" cellspacing="0" id="templateContainer">
-                            <tr>
-                                <td align="center" valign="top">
-                                    <!-- BEGIN HEADER // -->
-                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateHeader">
-                                        <tr>
-                                            <td valign="top" class="headerContent">
-                                                <img src="{{ static("emails/top-bg-update.png") }}" />
-                                                <a href="{{ home_url }}" title="{{ home_url_name }}">
-                                                    <img src="{{ static("emails/logo-color.png") }}" id="headerImage" alt="Taiga logo" />
-                                                </a>
+{% extends "emails/base-body-html.jinja" %}
 
+{% block body %}
+    {% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email %}
     <h1>Feedback</h1>
-    <p>Taiga has received feedback from {{ feedback_entry.full_name }} <{{ feedback_entry.email }}></p>
+    <p>Taiga has received feedback from {{ full_name }} <{{ email }}></p>
+    {% endtrans %}
+
+    {% trans comment=feedback_entry.comment|linebreaksbr %}
+    <h3>Comment</h3>
+    <p>{{ comment }}</p>
+    {% endtrans %}
+
+    {% if extra %}
     <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateBody">
-        <tr>
-            <td colspan="2" valign="top" class="bodyContent">
-                <h3>Comment</h3>
-                <p>{{ feedback_entry.comment }}</p>
-            </td>
-        </tr>
-
-        {% if extra %}
         <tr>
             <td valign="top" valign="top" class="bodyContent">
-                <h3>Extra:</h3>
+                <h3>{{ _("Extra info") }}</h3>
                 <dl>
                     {% for k, v in extra.items() %}
                         <dt>{{ k }}</dt>
@@ -417,35 +24,6 @@
                 </dl>
             </td>
         </tr>
-        {% endif %}
     </table>
-
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END HEADER -->
-                                </td>
-                            </tr>
-                            <tr>
-                                <td align="center" valign="top">
-                                    <!-- BEGIN FOOTER // -->
-                                    <table border="0" cellpadding="0" cellspacing="0" width="100%" id="templateFooter">
-                                        <tr>
-                                            <td valign="top" class="footerContent">
-
-
-
-                                            </td>
-                                        </tr>
-                                    </table>
-                                    <!-- // END FOOTER -->
-                                </td>
-                            </tr>
-                        </table>
-                        <!-- // END TEMPLATE -->
-                    </td>
-                </tr>
-            </table>
-        </center>
-    </body>
-</html>
+    {% endif %}
+{% endblock %}
diff --git a/taiga/feedback/templates/emails/feedback_notification-body-text.jinja b/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
index fd23785b..414501ae 100644
--- a/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-body-text.jinja
@@ -1,10 +1,11 @@
----------
-- From: {{ feedback_entry.full_name }} [{{ feedback_entry.email }}]
+{% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email, comment=feedback_entry.comment %}---------
+- From: {{ full_name }} <{{ email }}>
 ---------
 - Comment:
-{{ feedback_entry.comment }}
----------{% if extra %}
-- Extra:
+{{ comment }}
+---------{% endtrans %}
+{% if extra %}
+{{ _("- Extra info:") }}
 {% for k, v in extra.items() %}
     - {{ k }}: {{ v }}
 {% endfor %}
diff --git a/taiga/feedback/templates/emails/feedback_notification-subject.jinja b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
index 8f0f4b9c..e93fdbd1 100644
--- a/taiga/feedback/templates/emails/feedback_notification-subject.jinja
+++ b/taiga/feedback/templates/emails/feedback_notification-subject.jinja
@@ -1 +1,3 @@
-[Taiga] Feedback from {{ feedback_entry.full_name }} <{{ feedback_entry.email }}>
+{% trans full_name=feedback_entry.full_name|safe, email=feedback_entry.email %}
+[Taiga] Feedback from {{ full_name }} <{{ email }}>
+{% endtrans %}
diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
index 91484315..6d3728e4 100644
--- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
+++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
@@ -16,16 +16,16 @@
             {% for role, points in values.items() %}
             <tr>
                 <td valign="middle" rowspan="2" class="update-row-name">
-                    <h3>{{ role }} role points</h3>
+                    <h3>{% trans role=role %}{{ role }} role points{% endtrans %}</h3>
                 </td>
                 <td valign="top" class="update-row-from">
-                    <span>from</span><br>
+                    <span>{{ _("from") }}</span><br>
                     <strong>{{ points.1 }}</strong>
                 </td>
             </tr>
             <tr>
                 <td valign="top">
-                    <span>to</span><br>
+                    <span>{{ _("to") }}</span><br>
                     <strong>{{ points.0 }}</strong>
                 </td>
             </tr>
@@ -40,11 +40,11 @@
                         <h3>{{ _("Added new attachment") }}</h3>
                         <p>
                             <a href="{{ att.url }}" target="_blank">
-                                {{ att.filename|linebreaksbr }}
+                                {{ att.filename }}
                             </a>
                         </p>
                         {% if att.description %}
-                        <p>{{ att.description|linebreaksbr }}</p>
+                        <p>{{ att.description }}</p>
                         {% endif %}
                     </td>
                 </tr>
@@ -61,9 +61,9 @@
                                 {{ att.filename|linebreaksbr }}
                                 {% if att.changes.is_deprecated %}
                                     {% if att.changes.is_deprecated.1 %}
-                                        [<i>deprecated</i>]
+                                        [<i>{{ _("deprecated") }}</i>]
                                     {% else %}
-                                        [<i>not deprecated</i>]
+                                        [<i>{{ _("not deprecated") }}</i>]
                                     {% endif %}
                                 {% endif %}
                             </a>
@@ -94,21 +94,21 @@
                     <h3>{{ field_name }}</h3>
                 </td>
                 <td valign="top" class="update-row-from">
-                    <span>from</span><br>
-                    <strong>{{ ', '.join(values.0)|linebreaksbr }}</strong>
+                    <span>{{ _("from") }}</span><br>
+                    <strong>{{ ', '.join(values.0) }}</strong>
                 </td>
             </tr>
             <tr>
                 <td valign="top">
-                    <span>to</span><br>
-                    <strong>{{ ', '.join(values.1)|linebreaksbr }}</strong>
+                    <span>{{ _("to") }}</span><br>
+                    <strong>{{ ', '.join(values.1) }}</strong>
                 </td>
             </tr>
     {# DESCRIPTIONS #}
         {% elif field_name in ["description_diff"] %}
             <tr>
                 <td colspan="2">
-                    <h3>Description diff</h3>
+                    <h3>{{ _("Description diff") }}</h3>
                     <p>{{ mdrender(project, values.1) }}</p>
                 </td>
             </tr>
@@ -116,7 +116,7 @@
         {% elif field_name in ["content_diff"] %}
             <tr>
                 <td colspan="2">
-                    <h3>Content diff</h3>
+                    <h3>{{ _("Content diff") }}</h3>
                     <p>{{ mdrender(project, values.1) }}</p>
                 </td>
             </tr>
@@ -128,10 +128,10 @@
                 </td>
                 <td valign="top" class="update-row-from">
                     {% if values.0 != None and values.0 != "" %}
-                        <span>from</span><br>
-                        <strong>{{ values.0|linebreaksbr }}</strong>
+                        <span>{{ _("from") }}</span><br>
+                        <strong>{{ values.0 }}</strong>
                     {% else %}
-                        <span>from</span><br>
+                        <span>{{ _("from") }}</span><br>
                         <strong>{{ _("Unassigned") }}</strong>
                     {% endif %}
                 </td>
@@ -139,10 +139,10 @@
             <tr>
                 <td valign="top">
                     {% if values.1 != None and values.1 != "" %}
-                        <span>to</span><br>
-                        <strong>{{ values.1|linebreaksbr }}</strong>
+                        <span>{{ _("to") }}</span><br>
+                        <strong>{{ values.1 }}</strong>
                     {% else %}
-                        <span>to</span><br>
+                        <span>{{ _("to") }}</span><br>
                         <strong>{{ _("Unassigned") }}</strong>
                     {% endif %}
                 </td>
@@ -155,13 +155,13 @@
                     <h3>{{ field_name }}</h3>
                 </td>
                 <td valign="top" class="update-row-from">
-                    <span>from</span><br>
+                    <span>{{ _("from") }}</span><br>
                     <strong>{{ values.1|linebreaksbr }}</strong>
                 </td>
             </tr>
             <tr>
                 <td valign="top">
-                    <span>to</span><br>
+                    <span>{{ _("to") }}</span><br>
                     <strong>{{ values.0|linebreaksbr }}</strong>
                 </td>
             </tr>
diff --git a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
index 88d80fbc..d53a205b 100644
--- a/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
+++ b/taiga/projects/history/templates/emails/includes/fields_diff-text.jinja
@@ -14,43 +14,43 @@
     {# POINTS #}
         {% if field_name == "points" %}
             {% for role, points in values.items() %}
-        * {{ role }} to: {{ points.1|linebreaksbr }} from: {{ points.0|linebreaksbr }}
+       * {{ role }} {{ _("to:") }} {{ points.1 }} {{ _("from:") }} {{ points.0 }}
             {% endfor %}
     {# ATTACHMENTS #}
         {% elif field_name == "attachments" %}
             {% if values.new %}
         * {{ _("Added") }}:
                 {% for att in values['new']%}
-            - {{ att.filename|linebreaksbr }}
+            - {{ att.filename }}
                 {% endfor %}
             {% endif %}
 
             {% if values.changed %}
         * {{ _("Changed") }}
                 {% for att in values['changed'] %}
-            - {{ att.filename|linebreaksbr }}
+            - {{ att.filename }}
                 {% endfor %}
             {% endif %}
 
             {% if values.deleted %}
         * {{ _("Deleted") }}
                 {% for att in values['deleted']%}
-            - {{ att.filename|linebreaksbr }}
+            - {{ att.filename }}
                 {% endfor %}
             {% endif %}
     {# TAGS AND WATCHERS #}
         {% elif field_name in ["tags", "watchers"] %}
-    * to: {{ ', '.join(values.1)|linebreaksbr }}
+    * {{ _("to:") }} {{ ', '.join(values.1) }}
             {% if values.0 %}
-    * from: {{ ', '.join(values.0)|linebreaksbr }}
+    * {{ _("from:") }} {{ ', '.join(values.0) }}
             {% endif %}
     {# * #}
         {% else %}
             {% if values.1 != None and values.1 != "" %}
-    * to: {{ values.1|linebreaksbr }}
+    * {{ _("to:") }} {{ values.1|linebreaksbr }}
             {% endif %}
             {% if values.0 != None and values.0 != "" %}
-    * from: {{ values.0|linebreaksbr }}
+    * {{ _("from:") }} {{ values.0|linebreaksbr }}
             {% endif %}
         {% endif %}
     {% endif %}
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 15d72016..12c1178d 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,42 +1,15 @@
-{% extends "emails/updates.jinja" %}
-
-{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
+{% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    <h1>Issue #{{ snapshot.ref }} {{ snapshot.subject }} updated</h1>
-    <p>Hello {{ user.get_full_name() }}, <br> {{ changer.get_full_name() }} has updated an issue on {{ project.name }}</p>
-    <a class="button" href="{{ final_url }}" title="See Issue #{{ snapshot.ref }}: {{ snapshot.subject }} in Taiga">See Issue</a>
-{% endblock %}
-
-{% block body %}
-<tr>
-    <th colspan="2"><h2>Updates</h2></th>
-</tr>
-    {% for entry in history_entries%}
-        {% if entry.comment %}
-            <tr>
-                <td colspan="2">
-                    <h3>Comment</h3>
-                    <p>{{ mdrender(project, entry.comment) }}</p>
-                </td>
-            </tr>
-        {% endif %}
-        {% set changed_fields = entry.values_diff %}
-        {% if changed_fields %}
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% 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) %}
+    <h1>Issue updated</h1>
+    <p>Hello {{ user }}, <br> {{ changer }} has updated an issue on {{ project }}</p>
+    <p>Issue #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See Issue #{{ ref }}: {{ subject }} in Taiga">See issue</a>
+    {% endtrans %}
 {% endblock %}
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 8c2ddbff..98935cea 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,16 +1,13 @@
-{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
-
-Issue #{{ snapshot.ref }} {{ snapshot.subject }} updated
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has updated an issue on {{ project.name }}
-See issue in Taiga {{ final_url_name }} ({{ final_url }})
-
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-    {% set changed_fields = entry.values_diff %}
-    {% if changed_fields %}
-        {% include "emails/includes/fields_diff-text.jinja" %}
-    {% endif %}
-{% endfor %}
+{% 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) %}
+Issue updated
+Hello {{ user }}, {{ changer }} has updated an issue on {{ project }}
+See issue #{{ ref }} {{ subject }} at {{ url }}
+{% endtrans %}
+{% endblock %}
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 e6f72cb8..ec535a22 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-change-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Updated the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 182d31de..63ae6018 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,24 +1,16 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
+{% 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) %}
     <h1>New issue created</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has created a new issue on {{ project.name }}</p>
-    <p>Issue #{{ snapshot.ref }} {{ snapshot.subject }}</p>
-    <a class="button" href="{{ final_url }}" title="See #{{ snapshot.ref }} {{ snapshot.subject }}">See issue</a>
+    <p>Hello {{ user }},<br />{{ changer }} has created a new issue on {{ project }}</p>
+    <p>Issue #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See Issue #{{ ref }} {{ subject }}">See issue</a>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
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 1f67040e..0a64b921 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,7 +1,13 @@
-{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
-
+{% 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) %}
 New issue created
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has created a new issue on {{ project.name }}
-See issue #{{ snapshot.ref }} {{ snapshot.subject }} at {{ final_url_name }} ({{ final_url }})
+Hello {{ user }}, {{ changer }} has created a new issue on {{ project }}
+See issue #{{ ref }} {{ subject }} at {{ url }}
+
+---
 The Taiga Team
+{% endtrans %}
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 93ea5b7d..315ecf1f 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Created the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 d50874be..1c832091 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,20 +1,14 @@
-{% extends "emails/base.jinja" %}
+{% 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 %}
     <h1>Issue deleted</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has deleted an issue on {{ project.name }}</p>
-    <p>Issue #{{ snapshot.ref }} {{ snapshot.subject }}</p>
+    <p>Hello {{ user }},<br />{{ changer }} has deleted an issue on {{ project }}</p>
+    <p>Issue #{{ ref }} {{ subject }}</p>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
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 26dd8ef8..dd4d6cda 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,12 @@
+{% trans user=user.get_full_name()|safe,
+         changer=changer.get_full_name()|safe,
+         project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
 Issue deleted
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has deleted an issue on {{ project.name }}
-Issue #{{ snapshot.ref }} {{ snapshot.subject }}
+Hello {{ user }}, {{ changer }} has deleted an issue on {{ project }}
+Issue #{{ ref }} {{ subject }}
+
+---
 The Taiga Team
+{% endtrans %}
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 87d1c86a..b736414e 100644
--- a/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/issues/issue-delete-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Deleted the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 f0e3f152..2d96fa61 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,37 +1,14 @@
-{% extends "emails/updates.jinja" %}
+{% extends "emails/updates-body-html.jinja" %}
 
-{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
-
-{% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>Project: {{ project.name }}</h1>
-            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-            {% for entry in history_entries%}
-                {% if entry.comment %}
-                    <p>Comment <b>{{ entry.comment|linebreaksbr }}</b></p>
-                {% endif %}
-                {% set changed_fields = entry.values_diff %}
-                {% if changed_fields %}
-                    {% include "emails/includes/fields_diff-html.jinja" %}
-                {% endif %}
-            {% endfor %}
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+{% 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) %}
+    <h1>Sprint updated</h1>
+    <p>Hello {{ user }}, <br> {{ changer }} has updated an sprint on {{ project }}</p>
+    <p>Sprint {{ name }}</p>
+    <a class="button" href="{{ url }}" title="See Sprint: {{ name }} in Taiga">See sprint</a>
+    {% endtrans %}
 {% endblock %}
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 ff4f4ea2..26dc3849 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,17 +1,12 @@
-{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
-
-- Project: {{ project.name }}
-- Milestone #{{ snapshot.slug }}: {{ snapshot.name }}
-- Updated by {{ changer.get_full_name() }}
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-    {% set changed_fields = entry.values_diff %}
-    {% if changed_fields %}
-        {% include "emails/includes/fields_diff-text.jinja" %}
-    {% endif %}
-{% endfor %}
-
-** More info at {{ final_url_name }} ({{ final_url }}) **
+{% 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) %}
+Sprint updated
+Hello {{ user }}, {{ changer }} has updated a sprint on {{ project }}
+See sprint {{ subject }} at {{ url }}
+{% endtrans %}
+{% endblock %}
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 1249eb83..6a2d85e8 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-change-subject.jinja
@@ -1 +1,4 @@
-[{{ project.name|safe }}] Updated the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
+{% trans project=project.name|safe,
+         milestone=snapshot.name|safe %}
+[{{ 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 fc9accae..4f9b81b8 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,28 +1,15 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>Project: {{ project.name }}</h1>
-            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% 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) %}
+    <h1>New sprint created</h1>
+    <p>Hello {{ user }},<br />{{ changer }} has created a new sprint on {{ project }}</p>
+    <p>Sprint {{ name }}</p>
+    <a class="button" href="{{ url }}" title="See Sprint {{ name }}">See sprint</a>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
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 300c8059..98cb5d73 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,8 +1,12 @@
-{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
+{% 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) %}
+New sprint created
+Hello {{ user }}, {{ changer }} has created a new sprint on {{ project }}
+See sprint {{ subject }} at {{ url }}
 
-- Project: {{ project.name }}
-- Milestone #{{ snapshot.slug }}: {{ snapshot.name }}
-- Created by {{ changer.get_full_name() }}
-
-** More info at {{ final_url_name }} ({{ final_url }}) **
+---
+The Taiga Team
+{% endtrans %}
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 28704d3e..33c1aac2 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
@@ -1 +1,4 @@
-[{{ project.name|safe }}] Created the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
+{% trans project=project.name|safe,
+         milestone=snapshot.name|safe %}
+[{{ 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 dae36cfa..10dbfacc 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,25 +1,14 @@
-{% extends "emails/base.jinja" %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>{{ project.name }}</h1>
-            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% trans user=user.get_full_name()|safe,
+             changer=changer.get_full_name()|safe,
+             project=project.name|safe,
+             ref=snapshot.ref,
+             name=snapshot.name|safe %}
+    <h1>Sprint deleted</h1>
+    <p>Hello {{ user }},<br />{{ changer }} has deleted an sprint on {{ project }}</p>
+    <p>Sprint {{ name }}</p>
+    <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
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 2916ae80..41c3b22b 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,3 +1,11 @@
-- Project: {{ project.name }}
-- Milestone #{{ snapshot.slug }}: {{ snapshot.name }}
-- Deleted by {{ changer.get_full_name() }}
+{% trans user=user.get_full_name()|safe,
+         changer=changer.get_full_name()|safe,
+         project=project.name|safe,
+         name=snapshot.name|safe %}
+Sprint deleted
+Hello {{ user }}, {{ changer }} has deleted an sprint on {{ project }}
+Sprint {{ name }}
+
+---
+The Taiga Team
+{% endtrans %}
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 54221a8c..496f517a 100644
--- a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
@@ -1 +1,4 @@
-[{{ project.name|safe }}] Deleted the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
+{% trans project=project.name|safe,
+         milestone=snapshot.name|safe %}
+[{{ project }}] Deleted the Sprint "{{ milestone }}"
+{% endtrans %}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
deleted file mode 100644
index 41ae8ea0..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
+++ /dev/null
@@ -1,36 +0,0 @@
-{% extends "emails/updates.jinja" %}
-
-{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
-
-{% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-            {% for entry in history_entries%}
-                {% if entry.comment %}
-                    <p>Comment <b>{{ entry.comment|linebreaksbr }}</b></p>
-                {% endif %}
-                {% set changed_fields = entry.values_diff %}
-                {% if changed_fields %}
-                    {% include "emails/includes/fields_diff-html.jinja" %}
-                {% endif %}
-            {% endfor %}
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-{% endblock %}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
deleted file mode 100644
index 0d14754d..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
+++ /dev/null
@@ -1,17 +0,0 @@
-{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
-
-- Project #{{ snapshot.slug }}: {{ snapshot.name }}
-- Updated by {{ changer.get_full_name() }}
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-
-    {% set changed_fields = entry.values_diff %}
-    {% for field_name, values in changed_fields.items() %}
-    * {{ verbose_name(object, field_name) }}</b>: from '{{ values.0 }}' to '{{ values.1 }}'.
-    {% endfor %}
-{% endfor %}
-
-** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
deleted file mode 100644
index 25d9943b..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
+++ /dev/null
@@ -1 +0,0 @@
-[{{ snapshot.name|safe }}] Updated the project #{{ snapshot.slug|safe }}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
deleted file mode 100644
index 4207a4cb..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends "emails/hero.jinja" %}
-
-{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
-
-{% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h1>Project: {{ project.name }}</h1>
-            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-{% endblock %}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
deleted file mode 100644
index c66430fc..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
+++ /dev/null
@@ -1,7 +0,0 @@
-{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
-
-- Project #{{ snapshot.slug }}: {{ snapshot.name }}
-- Created by {{ changer.get_full_name() }}
-
-** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
deleted file mode 100644
index 06ed271b..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
+++ /dev/null
@@ -1 +0,0 @@
-[{{ snapshot.name|safe }}] Created the project #{{ snapshot.slug|safe }}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
deleted file mode 100644
index 53dfc6e8..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "emails/base.jinja" %}
-
-{% block body %}
-<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
-    <tr>
-        <td>
-            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
-            <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
-        </td>
-    </tr>
-</table>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-{% endblock %}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
deleted file mode 100644
index 39935515..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
+++ /dev/null
@@ -1,2 +0,0 @@
-- Project #{{ snapshot.slug }}: {{ snapshot.name }}
-- Deleted by {{ changer.get_full_name() }}
diff --git a/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja b/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
deleted file mode 100644
index cf0adf31..00000000
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
+++ /dev/null
@@ -1 +0,0 @@
-[{{ snapshot.name|safe }}] Deleted the project #{{ snapshot.slug|safe }}
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 ada43d22..790cd752 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,42 +1,15 @@
-{% extends "emails/updates.jinja" %}
-
-{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
+{% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    <h1>Task #{{ snapshot.ref }} {{ snapshot.subject }} updated</h1>
-    <p>Hello {{ user.get_full_name() }}, <br> {{ changer.get_full_name() }} has updated a task on {{ project.name }}</p>
-    <a class="button" href="{{ final_url }}" title="See task in Taiga">See task</a>
-{% endblock %}
-
-{% block body %}
-<tr>
-    <th colspan="2"><h2>Updates</h2></th>
-</tr>
-    {% for entry in history_entries%}
-        {% if entry.comment %}
-            <tr>
-                <td colspan="2">
-                    <h3>Comment</h3>
-                    <p>{{ mdrender(project, entry.comment) }}</p>
-                </td>
-            </tr>
-        {% endif %}
-        {% set changed_fields = entry.values_diff %}
-        {% if changed_fields %}
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% 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) %}
+    <h1>Task updated</h1>
+    <p>Hello {{ user }}, <br> {{ changer }} has updated a task on {{ project }}</p>
+    <p>Task #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See Task #{{ ref }}: {{ subject }} in Taiga">See task</a>
+    {% endtrans %}
 {% endblock %}
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 90e38aa6..52d7d258 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,17 +1,13 @@
-{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
-
-Task #{{ snapshot.ref }} {{ snapshot.subject }} updated
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has updated a task on {{ project.name }}
-
-See task at {{ final_url_name }} ({{ final_url }})
-
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-    {% set changed_fields = entry.values_diff %}
-    {% if changed_fields %}
-        {% include "emails/includes/fields_diff-text.jinja" %}
-    {% endif %}
-{% endfor %}
+{% 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) %}
+Task updated
+Hello {{ user }}, {{ changer }} has updated a task on {{ project }}
+See task #{{ ref }} {{ subject }} at {{ url }}
+{% endtrans %}
+{% endblock %}
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 ddd26e48..ced8c417 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-change-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Updated the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 d153199a..969ee9e0 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,25 +1,16 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
+{% 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) %}
     <h1>New task created</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has created a new task on {{ project.name }}</p>
-    <p>Task #{{ snapshot.ref }} {{ snapshot.subject }}</p>
-    <a class="button" href="{{ final_url }}" title="See #{{ snapshot.ref }} {{ snapshot.subject }}">See task</a>
+    <p>Hello {{ user }},<br />{{ changer }} has created a new task on {{ project }}</p>
+    <p>Task #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See Task #{{ ref }} {{ subject }}">See task</a>
     <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-{% endblock %}
-
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 abe81ecc..88ed278f 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,7 +1,13 @@
-{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
+{% 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) %}
+New created
+Hello {{ user }}, {{ changer }} has created a new task on {{ project }}
+See task #{{ ref }} {{ subject }} at {{ url }}
 
-New task created
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has created a new task on {{ project.name }}
-See task #{{ snapshot.ref }} {{ snapshot.subject }} at {{ final_url_name }} ({{ final_url }})
+---
 The Taiga Team
+{% endtrans %}
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 c83009d4..6931764f 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Created the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 ba2804bc..05d1f493 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,21 +1,15 @@
-{% extends "emails/base.jinja" %}
+{% 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 %}
     <h1>Task deleted</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has deleted a task on {{ project.name }}</p>
-    <p>Task #{{ snapshot.ref }} {{ snapshot.subject }}</p>
+    <p>Hello {{ user }},<br />{{ changer }} has deleted a task on {{ project }}</p>
+    <p>Task #{{ ref }} {{ subject }}</p>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
 
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 22e8c043..acf9bfc3 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,3 +1,12 @@
+{% trans user=user.get_full_name()|safe,
+         changer=changer.get_full_name()|safe,
+         project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
 Task deleted
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has deleted a task on {{ project.name }}
-Task #{{ snapshot.ref }} {{ snapshot.subject }}
+Hello {{ user }}, {{ changer }} has deleted a task on {{ project }}
+Task #{{ ref }} {{ subject }}
+
+---
+The Taiga Team
+{% endtrans %}
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 5a411013..1807e6a5 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Deleted the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 37777be0..756a8260 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,42 +1,15 @@
-{% extends "emails/updates.jinja" %}
-
-{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
+{% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    <h1>User story #{{ snapshot.ref }} {{ snapshot.subject }} updated</h1>
-    <p>Hello {{ user.get_full_name() }}, <br> {{ changer.get_full_name() }} has updated a user story on {{ project.name }}</p>
-    <a class="button" href="{{ final_url }}" title="See Issue #{{ snapshot.ref }}: {{ snapshot.subject }} in Taiga">See Issue</a>
-{% endblock %}
-
-{% block body %}
-<tr>
-    <th colspan="2"><h2>Updates</h2></th>
-</tr>
-    {% for entry in history_entries%}
-        {% if entry.comment %}
-            <tr>
-                <td colspan="2">
-                    <h3>Comment</h3>
-                    <p>{{ mdrender(project, entry.comment) }}</p>
-                </td>
-            </tr>
-        {% endif %}
-        {% set changed_fields = entry.values_diff %}
-        {% if changed_fields %}
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% 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) %}
+    <h1>User Story updated</h1>
+    <p>Hello {{ user }}, <br> {{ changer }} has updated a user story on {{ project }}</p>
+    <p>User Story #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See User Story #{{ ref }}: {{ subject }} in Taiga">See user story</a>
+    {% endtrans %}
 {% endblock %}
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 c6138a12..79eaa5fa 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,16 +1,13 @@
-{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref)  %}
-{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
-
-User story #{{ snapshot.ref }} {{ snapshot.subject }} updated
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has updated a user story on {{ project.name }}
-See user story in Taiga {{ final_url_name }} ({{ final_url }})
-
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-    {% set changed_fields = entry.values_diff %}
-    {% if changed_fields %}
-        {% include "emails/includes/fields_diff-text.jinja" %}
-    {% endif %}
-{% endfor %}
+{% 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) %}
+User story updated
+Hello {{ user }}, {{ changer }} has updated a user story on {{ project }}
+See user story #{{ ref }} {{ subject }} at {{ url }}
+{% endtrans %}
+{% endblock %}
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 5c66b14f..a362b076 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-change-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Updated the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 bd95b4ca..1735950e 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,24 +1,16 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
+{% 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) %}
     <h1>New user story created</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has created a new user story on {{ project.name }}</p>
-    <p>User story #{{ snapshot.ref }} {{ snapshot.subject }}</p>
-    <a class="button" href="{{ final_url }}" title="See #{{ snapshot.ref }} {{ snapshot.subject }}">See user story</a>
+    <p>Hello {{ user }},<br />{{ changer }} has created a new user story on {{ project }}</p>
+    <p>User Story #{{ ref }} {{ subject }}</p>
+    <a class="button" href="{{ url }}" title="See User Story #{{ ref }} {{ subject }}">See user story</a>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
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 9d161906..3d5aa92f 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,8 +1,13 @@
-{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
-
+{% 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) %}
 New user story created
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has created a new user story on {{ project.name }}
-User story #{{ snapshot.ref }} {{ snapshot.subject }}
-More info at {{ final_url_name }} ({{ final_url }})
+Hello {{ user }}, {{ changer }} has created a new user story on {{ project }}
+See user story #{{ ref }} {{ subject }} at {{ url }}
+
+---
 The Taiga Team
+{% endtrans %}
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 59f4b8db..549a6129 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Created the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 2e98392f..24aadddc 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,20 +1,15 @@
-{% extends "emails/base.jinja" %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
-    <h1>User story deleted</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has deleted a user story on {{ project.name }}</p>
-    <p>User story #{{ snapshot.ref }} {{ snapshot.subject }}</p>
+    {% trans user=user.get_full_name()|safe,
+             changer=changer.get_full_name()|safe,
+             project=project.name|safe,
+             ref=snapshot.ref,
+             subject=snapshot.subject|safe %}
+    <h1>User Story deleted</h1>
+    <p>Hello {{ user }},<br />{{ changer }} has deleted a user story on {{ project }}</p>
+    <p>User Story #{{ ref }} {{ subject }}</p>
     <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
 
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-{% endblock %}
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 d4af94d3..22a67c97 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,12 @@
-User story deleted
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} hasdeleted a user story on {{ project.name }}
-User story #{{ snapshot.ref }} {{ snapshot.subject }}
+{% trans user=user.get_full_name()|safe,
+         changer=changer.get_full_name()|safe,
+         project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+User Story deleted
+Hello {{ user }}, {{ changer }} has deleted a user story on {{ project }}
+User Story #{{ ref }} {{ subject }}
+
+---
 The Taiga Team
+{% endtrans %}
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 1b315744..3c2d6ed9 100644
--- a/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/userstories/userstory-delete-subject.jinja
@@ -1 +1,5 @@
-[{{ project.name|safe }}] Deleted the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
+{% trans project=project.name|safe,
+         ref=snapshot.ref,
+         subject=snapshot.subject|safe %}
+[{{ 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 4d4bd4b7..65f4aa1c 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,43 +1,14 @@
-{% extends "emails/updates.jinja" %}
-
-{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
+{% extends "emails/updates-body-html.jinja" %}
 
 {% block head %}
-    <h1>Wiki Page {{ snapshot.slug }} updated</h1>
-    <p>Hello {{ user.get_full_name() }}, <br> {{ changer.get_full_name() }} has updated a wiki page on {{ project.name }}</p>
-    <a class="button" href="{{ final_url }}" title="See wiki page in Taiga">See Wiki</a>
-{% endblock %}
-
-
-{% block body %}
-<tr>
-    <th colspan="2"><h2>Updates</h2></th>
-</tr>
-    {% for entry in history_entries%}
-        {% if entry.comment %}
-            <tr>
-                <td colspan="2">
-                    <h3>Comment</h3>
-                    <p>{{ mdrender(project, entry.comment) }}</p>
-                </td>
-            </tr>
-        {% endif %}
-        {% set changed_fields = entry.values_diff %}
-        {% if changed_fields %}
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
-    {% endfor %}
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% 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) %}
+    <h1>Wiki Page updated</h1>
+    <p>Hello {{ user }}, <br> {{ changer }} has updated a wiki page on {{ project }}</p>
+    <p>Wiki page {{ page }}</p>
+    <a class="button" href="{{ url }}" title="See wiki page in Taiga">See Wiki Page</a>
+    {% endtrans %}
 {% endblock %}
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 b9eb44f2..9d284cc8 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,16 +1,14 @@
-{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
+{% 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) %}
+Wiki Page updated
 
-Wiki Page {{ snapshot.slug }} updated
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has updated a wiki page on {{ project.name }}
-See wiki page in Taiga {{ final_url_name }} ({{ final_url }})
+Hello {{ user }}, {{ changer }} has updated a wiki page on {{ project }}
 
-{% for entry in history_entries%}
-    {% if entry.comment %}
-    Comment: {{ entry.comment|linebreaksbr }}
-    {% endif %}
-    {% set changed_fields = entry.values_diff %}
-    {% if changed_fields %}
-        {% include "emails/includes/fields_diff-text.jinja" %}
-    {% endif %}
-{% endfor %}
+See wiki page {{ page }} at {{ url }}
+{% endtrans %}
+{% endblock %}
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 024d566e..251a5adb 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-change-subject.jinja
@@ -1 +1,3 @@
-[{{ project.name|safe }}] Updated the Wiki Page "{{ snapshot.slug }}"
+{% trans project=project.name|safe, 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 cba2b5b0..f9642cb9 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,24 +1,15 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
+{% 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) %}
     <h1>New wiki page created</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has created a new wiki page on {{ project.name }}</p>
-    <p>Wiki page {{ snapshot.slug }}</p>
-    <a class="button" href="{{ final_url }}" title="Wiki page {{ snapshot.slug }}">See wiki page</a>
+    <p>Hello {{ user }},<br />{{ changer }} has created a new wiki page on {{ project }}</p>
+    <p>Wiki page {{ page }}</p>
+    <a class="button" href="{{ url }}" title="Wiki page {{ page }}">See wiki page</a>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
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 8f6f4020..89177038 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,7 +1,14 @@
-{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
-
+{% 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) %}
 New wiki page created
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has created a new wiki page on {{ project.name }}
-See wiki page {{ snapshot.slug }} at {{ final_url_name }} ({{ final_url }})
+
+Hello {{ user }}, {{ changer }} has created a new wiki page on {{ project }}
+
+See wiki page {{ page }} at {{ url }}
+
+---
 The Taiga Team
+{% endtrans %}
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 af4ca48d..ac5a6ddf 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-create-subject.jinja
@@ -1 +1,3 @@
-[{{ project.name|safe }}] Created the Wiki Page "{{ snapshot.slug }}"
+{% trans project=project.name|safe, 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 46bdc60c..b8f07630 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,8 +1,13 @@
-{% extends "emails/base.jinja" %}
+{% 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 %}
     <h1>Wiki page deleted</h1>
-    <p>Hello {{ user.get_full_name() }},<br />{{ changer.get_full_name() }} has deleted a wiki page on {{ project.name }}</p>
-    <p>Wiki page {{ snapshot.slug }}</p>
+    <p>Hello {{ user }},<br />{{ changer }} has deleted a wiki page on {{ project }}</p>
+    <p>Wiki page {{ page }}</p>
     <p><small>The Taiga Team</small></p>
+    {% endtrans %}
 {% endblock %}
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 caecd953..46f5fb2e 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,13 @@
+{% trans user=user.get_full_name()|safe,
+         changer=changer.get_full_name()|safe,
+         project=project.name|safe,
+         page=snapshot.slug %}
 Wiki page deleted
-Hello {{ user.get_full_name() }}, {{ changer.get_full_name() }} has deleted a wiki page on {{ project.name }}
-Wiki page {{ snapshot.slug }}
+
+Hello {{ user }}, {{ changer }} has deleted a wiki page on {{ project }}
+
+Wiki page {{ page }}
+
+---
 The Taiga Team
+{% endtrans %}
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 a496edc2..d73de78f 100644
--- a/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/wiki/wikipage-delete-subject.jinja
@@ -1 +1,3 @@
-[{{ project.name|safe }}] Deleted the Wiki Page "{{ snapshot.slug }}"
+{% trans project=project.name|safe, page=snapshot.slug %}
+[{{ project }}] Deleted the Wiki Page "{{ page }}"
+{% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_invitation-body-html.jinja b/taiga/projects/templates/emails/membership_invitation-body-html.jinja
index 3b426178..ad8c019e 100644
--- a/taiga/projects/templates/emails/membership_invitation-body-html.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-body-html.jinja
@@ -1,28 +1,20 @@
-{% extends "emails/hero.jinja" %}
-
-{% set final_url = resolve_front_url("invitation", membership.token) %}
-{% set final_url_name = "Taiga - Invitation to join on {0} project.".format(membership.project) %}
+{% extends "emails/hero-body-html.jinja" %}
 
 {% block body %}
-<h2>You, or someone you know, has invited you to Taiga</h2>
-<p>The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to </br> {{ membership.email}} </br> and delights in the pleasure of welcoming you to join <b>{{ membership.invited_by.full_name }}</b> and others in the team as a new and right honorable member in good standing of the project titled: <b>'{{ membership.project }}'</b>.</p>
-<small>You may indicate your humble desire to accept this invitation by gently clicking here</small>
-<a class="button" href="{{ final_url }}" title="Accept your invitation to Taiga">Accept your invitation</a>
-{% if membership.invitation_extra_text %}
-<h3>And now some words from the jolly good fellow or sistren who thought so kindly as to invite you:</h3>
-<p>{{ membership.invitation_extra_text }}</p>
-{% endif %}
-<p><small>Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie.</small></p>
-{% endblock %}
+    {% trans full_name=membership.invited_by.get_full_name(),
+             project=membership.project %}
+    <h2>You, or someone you know, has invited you to Taiga</h2>
+    <p>Hi! {{ full_name }} has sent you an invitation to join a project called {{ project }}  which is being managed on Taiga, a Free, open Source Agile Project Management Tool.</p>
+    {% endtrans %}
 
-{% block footer %}
-<em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-<br>
-<strong>Contact us:</strong>
-<br>
-<strong>Support:</strong>
-<a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-<br>
-<strong>Our mailing address is:</strong>
-<a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% if membership.invitation_extra_text %}
+        {% trans extra=membership.invitation_extra_text|linebreaksbr %}
+    <p>And now a few words from the jolly good fellow or sistren who thought so kindly as to invite you:</p>
+    <h3>{{ extra }}</h3>
+        {% endtrans %}
+    {% endif %}
+
+    <a class="button" href="{{ resolve_front_url("invitation", membership.token) }}"
+       title="{{ _("Accept your invitation to Taiga") }}">{{ _("Accept your invitation") }}</a>
+    <p><small>{{ _("The Taiga Team") }}</small></p>
 {% endblock %}
diff --git a/taiga/projects/templates/emails/membership_invitation-body-text.jinja b/taiga/projects/templates/emails/membership_invitation-body-text.jinja
index b96f4025..d2763684 100644
--- a/taiga/projects/templates/emails/membership_invitation-body-text.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-body-text.jinja
@@ -1,18 +1,19 @@
-{% set final_url = resolve_front_url("invitation", membership.token) %}
-{% set final_url_name = "Taiga - Invitation to join on {0} project.".format(membership.project) %}
-
-The Taiga.io Deputy System Admin is commanded by His Highness The Chief Lord Oompa Loompa to extend a membership invitation to {{ membership.email}} and delights in the pleasure of welcoming you to join {{ membership.invited_by.full_name }} and others in the team as a new and right honorable member in good standing of the project titled: '{{ membership.project }}'.
-
-You may indicate your humble desire to accept this invitation by gently clicking here: {{ final_url }}
+{% trans full_name=membership.invited_by.get_full_name(),
+         project=membership.project %}
+You, or someone you know, has invited you to Taiga
 
+Hi! {{ full_name }} has sent you an invitation to join a project called {{ project }}  which is being managed on Taiga, a Free, open Source Agile Project Management Tool.
+{% endtrans %}
 {% if membership.invitation_extra_text %}
+    {% trans extra=membership.invitation_extra_text %}
+And now a few words from the jolly good fellow or sistren who thought so kindly as to invite you:
 
-And now some words from the jolly good fellow or sistren who thought so kindly as to invite you:
-
-{{ membership.invitation_extra_text }}
-
+{{ extra }}
+    {% endtrans %}
 {% endif %}
-
-Dress: Morning Suit, Uniform, Lounge Suit, Birthday Suit or hoodie.
-
-Further details: ({{ final_url }})
+{{ _("Accept your invitation to Taiga following whis link:") }}
+{{ resolve_front_url("invitation", membership.token) }}
+{% trans %}
+---
+The Taiga Team
+{% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_invitation-subject.jinja b/taiga/projects/templates/emails/membership_invitation-subject.jinja
index 9eebc2a9..0b5206ef 100644
--- a/taiga/projects/templates/emails/membership_invitation-subject.jinja
+++ b/taiga/projects/templates/emails/membership_invitation-subject.jinja
@@ -1 +1,3 @@
-[Taiga] Invitation to join to the project '{{ membership.project|safe }}'
+{% trans project=membership.project|safe %}
+[Taiga] Invitation to join to the project '{{ project }}'
+{% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_notification-body-html.jinja b/taiga/projects/templates/emails/membership_notification-body-html.jinja
index fe5e0630..db777193 100644
--- a/taiga/projects/templates/emails/membership_notification-body-html.jinja
+++ b/taiga/projects/templates/emails/membership_notification-body-html.jinja
@@ -1,23 +1,12 @@
-{% extends "emails/hero.jinja" %}
-
-{% set final_url = resolve_front_url("project", membership.project.slug) %}
-{% set final_url_name = "Taiga - Project '{0}'.".format(membership.project) %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
+    {% trans url=resolve_front_url("project", membership.project.slug),
+             full_name=membership.user.get_full_name(),
+             project=membership.project %}
     <h1>You have been added to a project</h1>
-    <p>Hello {{ membership.user.get_full_name() }},<br />you have been added to the project {{ membership.project }}</p>
-    <a class="button" href="{{ final_url }}" title="{{ membership.project }}">Go to project</a>
+    <p>Hello {{ full_name }},<br />you have been added to the project {{ project }}</p>
+    <a class="button" href="{{ url }}" title="Go to{{ project }}">Go to project</a>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
diff --git a/taiga/projects/templates/emails/membership_notification-body-text.jinja b/taiga/projects/templates/emails/membership_notification-body-text.jinja
index b54a23d2..c9d94d67 100644
--- a/taiga/projects/templates/emails/membership_notification-body-text.jinja
+++ b/taiga/projects/templates/emails/membership_notification-body-text.jinja
@@ -1,6 +1,8 @@
-{% set final_url = resolve_front_url("project", membership.project.slug) %}
-
+{% trans url=resolve_front_url("project", membership.project.slug),
+         full_name=membership.user.get_full_name(),
+         project=membership.project %}
 You have been added to a project
-Hello {{ membership.user.get_full_name() }},you have been added to the project {{ membership.project }}
+Hello {{ full_name }},you have been added to the project {{ project }}
 
-See project at ({{ final_url }})
+See project at {{ url }}
+{% endtrans %}
diff --git a/taiga/projects/templates/emails/membership_notification-subject.jinja b/taiga/projects/templates/emails/membership_notification-subject.jinja
index 1e45591b..57d60ac6 100644
--- a/taiga/projects/templates/emails/membership_notification-subject.jinja
+++ b/taiga/projects/templates/emails/membership_notification-subject.jinja
@@ -1 +1,3 @@
-[Taiga] Added to the project '{{ membership.project|safe }}'
+{% trans project=membership.project|safe %}
+[Taiga] Added to the project '{{ project }}'
+{% endtrans %}
diff --git a/taiga/users/templates/emails/change_email-body-html.jinja b/taiga/users/templates/emails/change_email-body-html.jinja
index 6eadbdf0..c1cfd438 100644
--- a/taiga/users/templates/emails/change_email-body-html.jinja
+++ b/taiga/users/templates/emails/change_email-body-html.jinja
@@ -1,24 +1,11 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("change-email", user.email_token) %}
-{% set final_url_name = "Taiga - Change email" %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
+    {% trans full_name=user.get_full_name(), url=resolve_front_url("change-email", user.email_token) %}
     <h1>Change your email</h1>
-    <p>Hello {{ user.get_full_name() }},<br />please confirm your email</p>
-    <a class="button" href="{{ final_url }}" title="Confirm email">Confirm email</a>
+    <p>Hello {{ full_name }},<br />please confirm your email</p>
+    <a class="button" href="{{ url }}" title="Confirm email">Confirm email</a>
     <p>You can ignore this message if you did not request.</p>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
diff --git a/taiga/users/templates/emails/change_email-body-text.jinja b/taiga/users/templates/emails/change_email-body-text.jinja
index ffb6e9d9..46aba26a 100644
--- a/taiga/users/templates/emails/change_email-body-text.jinja
+++ b/taiga/users/templates/emails/change_email-body-text.jinja
@@ -1,5 +1,10 @@
-Hello {{ user.get_full_name() }}, please confirm your email {{ resolve_front_url('change-email', user.email_token) }}
+{% trans full_name=user.get_full_name(), url=resolve_front_url('change-email', user.email_token) %}
+Hello {{ full_name }}, please confirm your email
+
+{{ url }}
 
 You can ignore this message if you did not request.
 
+---
 The Taiga Team
+{% endtrans %}
diff --git a/taiga/users/templates/emails/change_email-subject.jinja b/taiga/users/templates/emails/change_email-subject.jinja
index e00ea7a5..52199560 100644
--- a/taiga/users/templates/emails/change_email-subject.jinja
+++ b/taiga/users/templates/emails/change_email-subject.jinja
@@ -1 +1 @@
-[Taiga] Change email
+{{ _("[Taiga] Change email") }}
diff --git a/taiga/users/templates/emails/password_recovery-body-html.jinja b/taiga/users/templates/emails/password_recovery-body-html.jinja
index f74ebedb..46450731 100644
--- a/taiga/users/templates/emails/password_recovery-body-html.jinja
+++ b/taiga/users/templates/emails/password_recovery-body-html.jinja
@@ -1,24 +1,12 @@
-{% extends "emails/base.jinja" %}
-
-{% set final_url = resolve_front_url("change-password", user.token) %}
-{% set final_url_name = "Taiga - Change password" %}
+{% extends "emails/base-body-html.jinja" %}
 
 {% block body %}
+    {% trans full_name=user.get_full_name(),
+             url=resolve_front_url("change-password", user.token) %}
     <h1>Recover your password</h1>
-    <p>Hello {{ user.get_full_name() }}, <br /> you asked to recover your password</p>
-    <a class="button" href="{{ final_url }}" title="Recover your password">Recover your password</a>
+    <p>Hello {{ full_name }}, <br /> you asked to recover your password</p>
+    <a class="button" href="{{ url }}" title="Recover your password">Recover your password</a>
     <p>You can ignore this message if you did not request.</p>
     <p><small>The Taiga Team</small></p>
-{% endblock %}
-
-{% block footer %}
-    <em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-    <br>
-    <strong>Contact us:</strong>
-    <br>
-    <strong>Support:</strong>
-    <a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-    <br>
-    <strong>Our mailing address is:</strong>
-    <a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
+    {% endtrans %}
 {% endblock %}
diff --git a/taiga/users/templates/emails/password_recovery-body-text.jinja b/taiga/users/templates/emails/password_recovery-body-text.jinja
index d5e25baf..75bd1b95 100644
--- a/taiga/users/templates/emails/password_recovery-body-text.jinja
+++ b/taiga/users/templates/emails/password_recovery-body-text.jinja
@@ -1,7 +1,10 @@
-Hello {{ user.get_full_name() }}, you asked to recover your password
+{% trans full_name=user.get_full_name(), url=resolve_front_url('change-password', user.token) %}
+Hello {{ full_name }}, you asked to recover your password
 
-{{ resolve_front_url('change-password', user.token) }}
+{{ url }}
 
 You can ignore this message if you did not request.
 
+---
 The Taiga Team
+{% endtrans %}
diff --git a/taiga/users/templates/emails/password_recovery-subject.jinja b/taiga/users/templates/emails/password_recovery-subject.jinja
index 86957e55..6193320d 100644
--- a/taiga/users/templates/emails/password_recovery-subject.jinja
+++ b/taiga/users/templates/emails/password_recovery-subject.jinja
@@ -1 +1 @@
-[Taiga] Password recovery
+{{ _("[Taiga] Password recovery") }}
diff --git a/taiga/users/templates/emails/registered_user-body-html.jinja b/taiga/users/templates/emails/registered_user-body-html.jinja
index d939b1b1..efe77ace 100644
--- a/taiga/users/templates/emails/registered_user-body-html.jinja
+++ b/taiga/users/templates/emails/registered_user-body-html.jinja
@@ -1,30 +1,26 @@
-{% extends "emails/hero.jinja" %}
+{% extends "emails/hero-body-html.jinja" %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
+        {% trans %}
         <td>
             <h2>Thank you for registering in Taiga</h2>
             <h3>We hope you enjoy it</h3>
             <p>We built Taiga because we wanted the project management tool that sits open on our computers all day long, to serve as a continued reminder of why we love to collaborate, code and design.</p>
             <p>We built it to be beautiful, elegant, simple to use and fun - without forsaking flexibility and power.</p>
             <small>The taiga Team</small>
-        </td>
+        </td
+        {% endtrans %}>
     </tr>
 </table>
 {% endblock %}
 
 {% block footer %}
-<em>Copyright © 2014 Taiga Agile, LLC, All rights reserved.</em>
-<br>
-<strong>Contact us:</strong>
-<br>
-<strong>Support:</strong>
-<a href="mailto:support@taiga.io" title="Taiga Support">support@taiga.io</a>
-<br>
-<strong>Our mailing list is:</strong>
-<a href="https://groups.google.com/forum/#!forum/taigaio" title="Taiga mailing list">https://groups.google.com/forum/#!forum/taigaio</a>
-<br />
-<br />
-<strong>You may remove your account from this service</strong> <a href="{{ resolve_front_url('cancel-account', cancel_token) }}" title="Remove your account">clicking here</a>
+    {{ super() }}
+    <br />
+    <br />
+    {% trans url=resolve_front_url('cancel-account', cancel_token) %}
+    <strong>You may remove your account from this service</strong> <a href="{{ url }}" title="Remove your account" style="color: #9dce0a">clicking here</a>
+    {% endtrans %}
 {% endblock %}
diff --git a/taiga/users/templates/emails/registered_user-body-text.jinja b/taiga/users/templates/emails/registered_user-body-text.jinja
index d01e0ceb..9ef756ce 100644
--- a/taiga/users/templates/emails/registered_user-body-text.jinja
+++ b/taiga/users/templates/emails/registered_user-body-text.jinja
@@ -1,3 +1,4 @@
+{% trans %}
 Thank you for registering in Taiga
 
 We hope you enjoy it
@@ -8,11 +9,7 @@ We built it to be beautiful, elegant, simple to use and fun - without forsaking
 
 --
 The taiga Team
-
-Copyright © 2014 Taiga Agile, LLC, All rights reserved.
-
-Contact us:
-
-Support: mailto:support@taiga.io
-Our mailing list is: https://groups.google.com/forum/#!forum/taigaio
-You may remove your account from this service: {{ resolve_front_url('cancel-account', cancel_token) }}
+{% endtrans %}
+{% trans url=resolve_front_url('cancel-account', cancel_token) %}
+You may remove your account from this service: {{ url }}
+{% endtrans %}
diff --git a/taiga/users/templates/emails/registered_user-subject.jinja b/taiga/users/templates/emails/registered_user-subject.jinja
index 527a27a8..45fe8698 100644
--- a/taiga/users/templates/emails/registered_user-subject.jinja
+++ b/taiga/users/templates/emails/registered_user-subject.jinja
@@ -1 +1 @@
-You've been Taigatized!
+{{ _("You've been Taigatized!") }}