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 049bf6cc..150269b7 100644
--- a/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
+++ b/taiga/projects/history/templates/emails/includes/fields_diff-html.jinja
@@ -99,12 +99,12 @@
     {# DESCRIPTIONS #}
         {% elif field_name in ["description_diff"] %}
                 <dd style="background: #eee; padding: 5px 15px; color: #444">
-                    <b>diff:</b> <i>{{ mdrender(object.project, values.1) }}</i>
+                    <b>diff:</b> <i>{{ mdrender(project, values.1) }}</i>
                 </dd>
     {# CONTENT #}
         {% elif field_name in ["content_diff"] %}
                 <dd style="background: #eee; padding: 5px 15px; color: #444">
-                    <b>diff:</b> <i>{{ mdrender(object.project, values.1) }}</i>
+                    <b>diff:</b> <i>{{ mdrender(project, values.1) }}</i>
                 </dd>
     {# ASSIGNED TO #}
         {% elif field_name == "assigned_to" %}
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 11ddedb5..0f517727 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,23 +1,25 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("issue", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Issue #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Issue #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ mdrender(object.project, comment) }}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
-        </td>
+            {% for entry in history_entries%}
+                {% if entry.comment %}
+                    <p>Comment <b>{{ mdrender(project, entry.comment) }}</b></p>
+                {% endif %}
+                {% set changed_fields = entry.values_diff %}
+                {% if changed_fields %}
+                    {% include "emails/includes/fields_diff-html.jinja" %}
+                {% endif %}
+                </td>
+            {% endfor %}
     </tr>
 </table>
 {% 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 a3dd43ba..efcd3214 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,15 +1,17 @@
-{% set final_url = resolve_front_url("issue", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- Issue #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- Issue #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% include "emails/includes/fields_diff-text.jinja" %}
-{% endif %}
+{% 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 }}) **
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 91d2a97f..e6f72cb8 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 @@
-[{{ object.project.name|safe }}] Updated the issue #{{ object.ref|safe }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Updated the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
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 29dc64e5..5f6538b8 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,14 +1,14 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("issue", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Issue #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Issue #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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 257e41cf..f64a3176 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,8 +1,8 @@
-{% set final_url = resolve_front_url("issue", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View issue #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("issue", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View issue #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- US #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- US #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Created by {{ changer.get_full_name() }}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja b/taiga/projects/notifications/templates/emails/issues/issue-create-subject.jinja
index c88820da..93ea5b7d 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 @@
-[{{ object.project.name|safe }}] Created the issue #{{ object.ref|safe }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Created the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
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 d25575a9..d9be80bc 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
@@ -4,8 +4,8 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>{{ object.project.name }}</h1>
-            <h2>Issue #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>{{ project.name }}</h1>
+            <h2>Issue #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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 8bf2b9e9..e71c0580 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,3 +1,3 @@
-- Project: {{ object.project.name }}
-- Issue #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- Issue #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Deleted by {{ changer.get_full_name() }}
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 e958318e..87d1c86a 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 @@
-[{{ object.project.name|safe }}] Deleted the issue #{{ object.ref|safe }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Deleted the issue #{{ snapshot.ref|safe }} "{{ snapshot.subject|safe }}"
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 ea456b34..898c8e78 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,22 +1,24 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("taskboard", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(object.slug) %}
+{% 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: {{ object.project.name }}</h1>
-            <h2>Milestone #{{ object.slug }}: {{ object.name }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ comment|linebreaksbr }}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
+            {% 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>
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 c2f667d5..ff4f4ea2 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,15 +1,17 @@
-{% set final_url = resolve_front_url("taskboard", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(object.slug) %}
+{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
 
-- Project: {{ object.project.name }}
-- Milestone #{{ object.slug }}: {{ object.name }}
+- Project: {{ project.name }}
+- Milestone #{{ snapshot.slug }}: {{ snapshot.name }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% include "emails/includes/fields_diff-text.jinja" %}
-{% endif %}
+{% 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 }}) **
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 e2b864e7..1249eb83 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 @@
-[{{ object.project.name|safe }}] Updated the milestone #{{ object.slug|safe }} "{{ object.name|safe }}"
+[{{ project.name|safe }}] Updated the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
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 1470717f..284e98b0 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,14 +1,14 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("taskboard", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(object.slug) %}
+{% 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: {{ object.project.name }}</h1>
-            <h2>Milestone #{{ object.slug }}: {{ object.name }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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 a12024f9..300c8059 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,8 @@
-{% set final_url = resolve_front_url("taskboard", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View milestone #{0}".format(object.slug) %}
+{% set final_url = resolve_front_url("taskboard", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View milestone #{0}".format(snapshot.slug) %}
 
-- Project: {{ object.project.name }}
-- Milestone #{{ object.slug }}: {{ object.name }}
+- Project: {{ project.name }}
+- Milestone #{{ 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/milestones/milestone-create-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-create-subject.jinja
index 176713df..28704d3e 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 @@
-[{{ object.project.name|safe }}] Created the milestone #{{ object.slug|safe }} "{{ object.name|safe }}"
+[{{ project.name|safe }}] Created the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
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 d22cbdd4..20ac2a5d 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
@@ -4,8 +4,8 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>{{ object.project.name }}</h1>
-            <h2>Milestone #{{ object.slug }}: {{ object.name }}</h2>
+            <h1>{{ project.name }}</h1>
+            <h2>Milestone #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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 9298a196..2916ae80 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,3 @@
-- Project: {{ object.project.name }}
-- Milestone #{{ object.slug }}: {{ object.name }}
+- Project: {{ project.name }}
+- Milestone #{{ snapshot.slug }}: {{ snapshot.name }}
 - Deleted by {{ changer.get_full_name() }}
diff --git a/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja b/taiga/projects/notifications/templates/emails/milestones/milestone-delete-subject.jinja
index 6bf4b9cf..54221a8c 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 @@
-[{{ object.project.name|safe }}] Deleted the milestone #{{ object.slug|safe }} "{{ object.name|safe }}"
+[{{ project.name|safe }}] Deleted the milestone #{{ snapshot.slug|safe }} "{{ snapshot.name|safe }}"
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
index 39fe4f7e..0c65ef64 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-change-body-html.jinja
@@ -1,21 +1,23 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("project-admin", object.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(object.slug) %}
+{% 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 #{{ object.slug }}: {{ object.name }}</h2>
+            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ comment|linebreaksbr }}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
+            {% 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>
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
index dfe93b9c..14fda13f 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-change-body-text.jinja
@@ -1,16 +1,17 @@
-{% set final_url = resolve_front_url("project-admin", object.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(object.slug) %}
+{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
+{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
 
-- Project #{{ object.slug }}: {{ object.name }}
+- Project #{{ snapshot.slug }}: {{ snapshot.name }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% for field_name, values in changed_fields.items() %}
-    * {{ verbose_name(object, field_name) }}</b>: from '{{ values.0 }}' to '{{ values.1 }}'.
-    {% endfor %}
-{% endif %}
+{% 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 %}
+    {% endif %}
+{% 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
index f2845743..25d9943b 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-change-subject.jinja
@@ -1 +1 @@
-[{{ object.name|safe }}] Updated the project #{{ object.slug|safe }}
+[{{ 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
index a45dbab3..a37f59c1 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-create-body-html.jinja
@@ -1,12 +1,12 @@
-{% set final_url = resolve_front_url("project-admin", object.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(object.slug) %}
+{% 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: {{ object.project.name }}</h1>
-            <h2>Project #{{ object.slug }}: {{ object.name }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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
index af278212..c66430fc 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-create-body-text.jinja
@@ -1,7 +1,7 @@
-{% set final_url = resolve_front_url("project-admin", object.slug) %}
-{% set final_url_name = "Taiga - View Project #{0}".format(object.slug) %}
+{% set final_url = resolve_front_url("project-admin", snapshot.slug) %}
+{% set final_url_name = "Taiga - View Project #{0}".format(snapshot.slug) %}
 
-- Project #{{ object.slug }}: {{ object.name }}
+- 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
index 82b06b70..06ed271b 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-create-subject.jinja
@@ -1 +1 @@
-[{{ object.name|safe }}] Created the project #{{ object.slug|safe }}
+[{{ 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
index 09448adc..2b8fa57d 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-delete-body-html.jinja
@@ -4,7 +4,7 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h2>Project #{{ object.slug }}: {{ object.name }}</h2>
+            <h2>Project #{{ snapshot.slug }}: {{ snapshot.name }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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
index 75d8013b..39935515 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-delete-body-text.jinja
@@ -1,2 +1,2 @@
-- Project #{{ object.slug }}: {{ object.name }}
+- 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
index 3caf2ac4..cf0adf31 100644
--- a/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
+++ b/taiga/projects/notifications/templates/emails/projects/project-delete-subject.jinja
@@ -1 +1 @@
-[{{ object.name|safe }}] Deleted the project #{{ object.slug|safe }}
+[{{ 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 1a655513..02bfee38 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,22 +1,24 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("task", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Task #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Task #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ mdrender(object.project, comment) }}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
+            {% for entry in history_entries%}
+                {% if entry.comment %}
+                    <p>Comment <b>{{ mdrender(project, entry.comment) }}</b></p>
+                {% endif %}
+                {% set changed_fields = entry.values_diff %}
+                {% if changed_fields %}
+                    {% include "emails/includes/fields_diff-html.jinja" %}
+                {% endif %}
+            {% endfor %}
         </td>
     </tr>
 </table>
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 771d1d94..925fbacc 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,15 +1,17 @@
-{% set final_url = resolve_front_url("task", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- Task #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- Task #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% include "emails/includes/fields_diff-text.jinja" %}
-{% endif %}
+{% 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 }}) **
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 1074e93b..ddd26e48 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 @@
-[{{ object.project.name|safe }}] Updated the task #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Updated the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 e4122675..6d2a216e 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,14 +1,14 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("task", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Task #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Task #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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 231473be..7ceca7fe 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,8 +1,8 @@
-{% set final_url = resolve_front_url("task", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View task #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("task", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View task #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- Task #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- Task #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Created by {{ changer.get_full_name() }}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja b/taiga/projects/notifications/templates/emails/tasks/task-create-subject.jinja
index 70c37be2..c83009d4 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 @@
-[{{ object.project.name|safe }}] Created the task #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Created the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 008ff424..0186fa98 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
@@ -4,8 +4,8 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>{{ object.project.name }}</h1>
-            <h2>Task #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>{{ project.name }}</h1>
+            <h2>Task #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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 22db8d90..8aa8d6ba 100644
--- a/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
+++ b/taiga/projects/notifications/templates/emails/tasks/task-delete-body-text.jinja
@@ -1,4 +1,4 @@
-- Project: {{ object.project.name }}
-- Task #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- Task #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Deleted by {{ changer.get_full_name() }}
 
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 00b8afc2..5a411013 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 @@
-[{{ object.project.name|safe }}] Deleted the task #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Deleted the task #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 f73ad4e1..770ae1a0 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,22 +1,24 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("userstory", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>US #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ mdrender(object.project, comment)}}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
+            {% for entry in history_entries%}
+                {% if entry.comment %}
+                    <p>Comment <b>{{ mdrender(project, entry.comment) }}</b></p>
+                {% endif %}
+                {% set changed_fields = entry.values_diff %}
+                {% if changed_fields %}
+                    {% include "emails/includes/fields_diff-html.jinja" %}
+                {% endif %}
+            {% endfor %}
         </td>
     </tr>
 </table>
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 e796e9bc..95195b79 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,15 +1,17 @@
-{% set final_url = resolve_front_url("userstory", object.project.slug, object.ref)  %}
-{% set final_url_name = "Taiga - View US #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref)  %}
+{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- US #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- US #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% include "emails/includes/fields_diff-text.jinja" %}
-{% endif %}
+{% 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 }}) **
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 e1fe8bb4..5c66b14f 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 @@
-[{{ object.project.name|safe }}] Updated the US #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Updated the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 8e530f34..922aa86f 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,14 +1,14 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("userstory", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>US #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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 4caa83a4..850d1d3a 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,8 @@
-{% set final_url = resolve_front_url("userstory", object.project.slug, object.ref) %}
-{% set final_url_name = "Taiga - View US #{0}".format(object.ref) %}
+{% set final_url = resolve_front_url("userstory", project.slug, snapshot.ref) %}
+{% set final_url_name = "Taiga - View US #{0}".format(snapshot.ref) %}
 
-- Project: {{ object.project.name }}
-- US #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- US #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Created by {{ changer.get_full_name() }}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja b/taiga/projects/notifications/templates/emails/userstories/userstory-create-subject.jinja
index c17c460f..59f4b8db 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 @@
-[{{ object.project.name|safe }}] Created the US #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Created the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 549d786d..75d3c14d 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
@@ -4,8 +4,8 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>{{ object.project.name }}</h1>
-            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
+            <h1>{{ project.name }}</h1>
+            <h2>US #{{ snapshot.ref }}: {{ snapshot.subject }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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 0dbb68b7..7ea708ce 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,3 +1,3 @@
-- Project: {{ object.project.name }}
-- US #{{ object.ref }}: {{ object.subject }}
+- Project: {{ project.name }}
+- US #{{ snapshot.ref }}: {{ snapshot.subject }}
 - Deleted by {{ changer.get_full_name() }}
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 118117d7..1b315744 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 @@
-[{{ object.project.name|safe }}] Deleted the US #{{ object.ref }} "{{ object.subject|safe }}"
+[{{ project.name|safe }}] Deleted the US #{{ snapshot.ref }} "{{ snapshot.subject|safe }}"
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 3bde4285..c7694c4a 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,22 +1,24 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("wiki", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(object.slug) %}
+{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Wiki Page: {{ object.slug }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Wiki Page: {{ snapshot.slug }}</h2>
             <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
-        {% if comment %}
-            <p>Comment <b>{{ mdrender(object.project, comment) }}</b></p>
-        {% endif %}
-        {% if changed_fields %}
-            <p>Updated fields:</p>
-            {% include "emails/includes/fields_diff-html.jinja" %}
-        {% endif %}
+            {% for entry in history_entries%}
+                {% if entry.comment %}
+                    <p>Comment <b>{{ mdrender(project, entry.comment) }}</b></p>
+                {% endif %}
+                {% set changed_fields = entry.values_diff %}
+                {% if changed_fields %}
+                    {% include "emails/includes/fields_diff-html.jinja" %}
+                {% endif %}
+            {% endfor %}
         </td>
     </tr>
 </table>
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 b358d18f..50bc8d74 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,15 +1,17 @@
-{% set final_url = resolve_front_url("wiki", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(object.slug) %}
+{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
 
-- Project: {{ object.project.name }}
-- Wiki Page: {{ object.slug }}
+- Project: {{ project.name }}
+- Wiki Page: {{ snapshot.slug }}
 - Updated by {{ changer.get_full_name() }}
-{% if comment %}
-Comment: {{ comment|linebreaksbr }}
-{% endif %}
-{% if changed_fields %}
-- Updated fields:
-    {% include "emails/includes/fields_diff-text.jinja" %}
-{% endif %}
+{% 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 }}) **
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 18413c2d..024d566e 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 @@
-[{{ object.project.name|safe }}] Updated the Wiki Page "{{ object.slug }}"
+[{{ project.name|safe }}] Updated the Wiki Page "{{ snapshot.slug }}"
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 5eaf9f83..6112a0c5 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,14 +1,14 @@
 {% extends "emails/base.jinja" %}
 
-{% set final_url = resolve_front_url("wiki", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(object.slug) %}
+{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
 
 {% block body %}
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>Project: {{ object.project.name }}</h1>
-            <h2>Wiki Page: {{ object.slug }}</h2>
+            <h1>Project: {{ project.name }}</h1>
+            <h2>Wiki Page: {{ snapshot.slug }}</h2>
             <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
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 b41f4b8c..70bb34e9 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,8 +1,8 @@
-{% set final_url = resolve_front_url("wiki", object.project.slug, object.slug) %}
-{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(object.slug) %}
+{% set final_url = resolve_front_url("wiki", project.slug, snapshot.slug) %}
+{% set final_url_name = "Taiga - View Wiki Page '{0}'".format(snapshot.slug) %}
 
-- Project: {{ object.project.name }}
-- Wiki Page: {{ object.slug }}
+- Project: {{ project.name }}
+- Wiki Page: {{ snapshot.slug }}
 - Created by {{ changer.get_full_name() }}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
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 a32efed4..af4ca48d 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 @@
-[{{ object.project.name|safe }}] Created the Wiki Page "{{ object.slug }}"
+[{{ project.name|safe }}] Created the Wiki Page "{{ snapshot.slug }}"
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 6f9bc2ba..4e98c508 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
@@ -4,8 +4,8 @@
 <table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
     <tr>
         <td>
-            <h1>{{ object.project.name }}</h1>
-            <h2>Wiki Page: {{ object.slug }}</h2>
+            <h1>{{ project.name }}</h1>
+            <h2>Wiki Page: {{ snapshot.slug }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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 e69b4559..d896f42f 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,3 +1,3 @@
-- Project: {{ object.project.name }}
-- Wiki Page: {{ object.slug }}
+- Project: {{ project.name }}
+- Wiki Page: {{ snapshot.slug }}
 - Deleted by {{ changer.get_full_name() }}
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 7fd60924..a496edc2 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 @@
-[{{ object.project.name|safe }}] Deleted the Wiki Page "{{ object.slug }}"
+[{{ project.name|safe }}] Deleted the Wiki Page "{{ snapshot.slug }}"