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 eb526fbf..48148614 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,13 +1,21 @@
 {% extends "emails/base.jinja" %}
 
+{% set final_url = resolve_front_url("userstory", object.project.id, object.id) %}
+{% set final_url_name = "Greenmine - View US #{0}".format(object.ref) %}
+
 {% 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>
+            <h1>Project: {{ object.project.name }}</h1>
+            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
+            <p>Created by <b>{{ changer.get_full_name() }}</b>.</p>
         </td>
     </tr>
 </table>
 {% endblock %}
+{% block footer %}
+<p style="padding: 10px; border-top: 1px solid #eee;">
+    More info at: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a>
+</p>
+{% 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
new file mode 100644
index 00000000..7a4340f5
--- /dev/null
+++ b/greenmine/projects/userstories/templates/emails/create_userstory_notification-body-text.jinja
@@ -0,0 +1,8 @@
+{% set final_url = resolve_front_url("userstory", object.project.id, object.id) %}
+{% set final_url_name = "Greenmine - View US #{0}".format(object.ref) %}
+
+- Project: {{ object.project.name }}
+- US #{{ object.ref }}: {{ object.subject }}
+- Created by {{ changer.get_full_name() }}
+
+** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/userstories/templates/emails/create_userstory_notification-subject.jinja b/greenmine/projects/userstories/templates/emails/create_userstory_notification-subject.jinja
index 4c42b36f..c1a0cf06 100644
--- a/greenmine/projects/userstories/templates/emails/create_userstory_notification-subject.jinja
+++ b/greenmine/projects/userstories/templates/emails/create_userstory_notification-subject.jinja
@@ -1 +1 @@
-Create the new task "{{ object }}"
+[{{ object.project.name }}] Created the US #{{ object.ref }} "{{ object.subject }}"
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 1b0c3f39..549d786d 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
@@ -5,7 +5,7 @@
     <tr>
         <td>
             <h1>{{ object.project.name }}</h1>
-            <h2>User story: {{ object.subject }}</h2>
+            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
             <p>Deleted by <b>{{ changer.get_full_name() }}</b></p>
         </td>
     </tr>
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
new file mode 100644
index 00000000..0dbb68b7
--- /dev/null
+++ b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-body-text.jinja
@@ -0,0 +1,3 @@
+- Project: {{ object.project.name }}
+- US #{{ object.ref }}: {{ object.subject }}
+- Deleted by {{ changer.get_full_name() }}
diff --git a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja
index 8aff3908..e50851a3 100644
--- a/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja
+++ b/greenmine/projects/userstories/templates/emails/destroy_userstory_notification-subject.jinja
@@ -1,2 +1 @@
-Deleted the user story "{{ object }}"
-
+[{{ object.project.name }}] Deleted the US #{{ object.ref }} "{{ object.subject }}"
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 6cdd6d26..58266ecb 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,16 +1,40 @@
 {% extends "emails/base.jinja" %}
 
 {% set final_url = resolve_front_url("userstory", object.project.id, object.id) %}
+{% set final_url_name = "Greenmine - View US #{0}".format(object.ref) %}
 
 {% 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>
+            <h1>Project: {{ object.project.name }}</h1>
+            <h2>US #{{ object.ref }}: {{ object.subject }}</h2>
+            <p>Updated by <b>{{ changer.get_full_name() }}</b>.</p>
+            <p>Updated fields:
+            {% for field in changed_fields_dict.values() %}
+                <b>{{ field.verbose_name }}</b>{% if not loop.last %},{% endif %}
+            {% endfor %}
+            </p>
+
+        {# TODO: Improvemments in some methods to use that:  #}
+        {#         - WatchedMixin._get_changed_field_old_value() #}
+        {#         - WatchedMixin._get_changed_field_new_value() #}
+        {#
+            <ul>
+            {% for field in changed_fields_dict.values() %}
+                <li>
+                    <b>{{ field.verbose_name}}</b>: from <i>{{ field.old_value}}</i>
+                                                      to <i>{{ field.new_value}}</i>.
+                </li>
+            {% endfor %}
+            </ul>
+        #}
         </td>
     </tr>
 </table>
 {% endblock %}
-
+{% block footer %}
+<p style="padding: 10px; border-top: 1px solid #eee;">
+    More info at: <a href="{{ final_url }}" style="color: #666;">{{ final_url_name }}</a>
+</p>
+{% 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
new file mode 100644
index 00000000..3ed0b918
--- /dev/null
+++ b/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
@@ -0,0 +1,21 @@
+{% set final_url = resolve_front_url("userstory", object.project.id, object.id)  %}
+{% set final_url_name = "Greenmine - View US #{0}".format(object.ref) %}
+
+- Project: {{ object.project.name }}
+- US #{{ object.ref }}: {{ object.subject }}
+- Updated by {{ changer.get_full_name() }}
+- Updated fields:
+{% for field in changed_fields_dict.values() %}
+    {{ field.verbose_name }}{% if not loop.last %}, {% endif %}
+{% endfor %}
+
+{# TODO: Improvemments in some methods to use that:  #}
+{#         - WatchedMixin._get_changed_field_old_value() #}
+{#         - WatchedMixin._get_changed_field_new_value() #}
+{#
+{% for field in changed_fields_dict.values() %}
+    * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
+{% endfor %}
+#}
+
+** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/userstories/templates/emails/update_userstory_notification-subject.jinja b/greenmine/projects/userstories/templates/emails/update_userstory_notification-subject.jinja
index 5e7ae2aa..dac9afab 100644
--- a/greenmine/projects/userstories/templates/emails/update_userstory_notification-subject.jinja
+++ b/greenmine/projects/userstories/templates/emails/update_userstory_notification-subject.jinja
@@ -1 +1 @@
-Updated the user story "{{ object }}"
+[{{ object.project.name }}] Updated the US #{{ object.ref }} "{{ object.subject }}"