diff --git a/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja b/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja
index 0eda2fcb..eb526fbf 100644
--- a/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja
+++ b/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-html.jinja
@@ -1,2 +1,13 @@
-# TODO: {{ changer }} {{ object }}
+{% extends "emails/base.jinja" %}
 
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h1>{{ object.project.name }}</h1>
+            <h2>User story: {{ object.subject }}</h2>
+            <p>Created by <b>{{ changer.get_full_name() }}</b></p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
diff --git a/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja b/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja
deleted file mode 100644
index 0eda2fcb..00000000
--- a/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: {{ changer }} {{ object }}
-
diff --git a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja
index 0eda2fcb..1b0c3f39 100644
--- a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja
+++ b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-html.jinja
@@ -1,2 +1,13 @@
-# TODO: {{ changer }} {{ object }}
+{% extends "emails/base.jinja" %}
 
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h1>{{ object.project.name }}</h1>
+            <h2>User story: {{ object.subject }}</h2>
+            <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
diff --git a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja
deleted file mode 100644
index 0eda2fcb..00000000
--- a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja
+++ /dev/null
@@ -1,2 +0,0 @@
-# TODO: {{ changer }} {{ object }}
-
diff --git a/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja b/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja
index e5708f8b..6cdd6d26 100644
--- a/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja
+++ b/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-html.jinja
@@ -1,8 +1,16 @@
-<p>Updated fields by {{ changer }}:</p>
-<ul>
-{% for field in changed_fields_dict.values() %}
-    <li><b>{{ field.verbose_name}}</b>: from "{{ field.old_value}}" to "{{ field.new_value}}".</li>
-{% endfor %}
-</ul>
-{# TODO Print the "object" details #}
+{% extends "emails/base.jinja" %}
+
+{% set final_url = resolve_front_url("userstory", object.project.id, object.id) %}
+
+{% block body %}
+<table border="0" width="100%" cellpadding="0" cellspacing="0" class="table-body">
+    <tr>
+        <td>
+            <h1>{{ object.project.name }}</h1>
+            <h2>User story: {{ object.subject }}</h2>
+            <p>Updated by <b>{{ changer.get_full_name() }}</b></p>
+        </td>
+    </tr>
+</table>
+{% endblock %}
 
diff --git a/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja b/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
deleted file mode 100644
index 3192319b..00000000
--- a/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
+++ /dev/null
@@ -1,8 +0,0 @@
-Updated fields by {{ changer }}:
-
-{% for field in changed_fields_dict.values() %}
-    ** {{ field.verbose_name}}: from "{{ field.old_value}}" to "{{ field.new_value}}".
-{% endfor %}
-
-{# TODO Print the "object" details #}
-