diff --git a/greenmine/base/notifications/api.py b/greenmine/base/notifications/api.py
index ecda5939..8b14dedf 100644
--- a/greenmine/base/notifications/api.py
+++ b/greenmine/base/notifications/api.py
@@ -18,7 +18,8 @@ class NotificationSenderMixin(object):
         super().post_save(obj, created)
 
         users = obj.get_watchers_to_notify(self.request.user)
-        context = {'changer': self.request.user, 'object': obj}
+        comment = self.request.DATA.get("comment", None)
+        context = {'changer': self.request.user, "comment": comment, 'object': obj}
 
         if created:
             self._send_notification_email(self.create_notification_template,
diff --git a/greenmine/projects/issues/templates/emails/update_issue_notification-body-html.jinja b/greenmine/projects/issues/templates/emails/update_issue_notification-body-html.jinja
index 86fb2433..ea9b6f82 100644
--- a/greenmine/projects/issues/templates/emails/update_issue_notification-body-html.jinja
+++ b/greenmine/projects/issues/templates/emails/update_issue_notification-body-html.jinja
@@ -10,6 +10,10 @@
             <h1>Project: {{ object.project.name }}</h1>
             <h2>Issue #{{ object.ref }}: {{ object.subject }}</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:
             <dl>
             {% for field in changed_fields %}
@@ -28,6 +32,7 @@
                 {% endif %}
             {% endfor %}
             </dl>
+        {% endif %}
         </td>
     </tr>
 </table>
diff --git a/greenmine/projects/issues/templates/emails/update_issue_notification-body-text.jinja b/greenmine/projects/issues/templates/emails/update_issue_notification-body-text.jinja
index 5c1781bb..51757984 100644
--- a/greenmine/projects/issues/templates/emails/update_issue_notification-body-text.jinja
+++ b/greenmine/projects/issues/templates/emails/update_issue_notification-body-text.jinja
@@ -4,9 +4,14 @@
 - Project: {{ object.project.name }}
 - Issue #{{ object.ref }}: {{ object.subject }}
 - Updated by {{ changer.get_full_name() }}
+{% if comment %}
+Comment: {{ comment|linebreaksbr }}
+{% endif %}
+{% if changed_fields %}
 - Updated fields:
-{% for field in changed_fields %}
+    {% for field in changed_fields %}
     * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
-{% endfor %}
+    {% endfor %}
+{% endif %}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja b/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja
index f781b122..617d5127 100644
--- a/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja
+++ b/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-html.jinja
@@ -10,6 +10,10 @@
             <h1>Project: {{ object.project.name }}</h1>
             <h2>Milestone #{{ object.slug }}: {{ object.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:
             <dl>
             {% for field in changed_fields %}
@@ -28,6 +32,7 @@
                 {% endif %}
             {% endfor %}
             </dl>
+        {% endif %}
         </td>
     </tr>
 </table>
diff --git a/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja b/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja
index 4c437d3b..d3e8331a 100644
--- a/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja
+++ b/greenmine/projects/milestones/templates/emails/update_milestone_notification-body-text.jinja
@@ -4,9 +4,14 @@
 - Project: {{ object.project.name }}
 - Milestone #{{ object.slug }}: {{ object.name }}
 - Updated by {{ changer.get_full_name() }}
+{% if comment %}
+Comment: {{ comment|linebreaksbr }}
+{% endif %}
+{% if changed_fields %}
 - Updated fields:
-{% for field in changed_fields %}
+    {% for field in changed_fields %}
     * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
-{% endfor %}
+    {% endfor %}
+{% endif %}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja b/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja
index 53cb9849..e1460cb7 100644
--- a/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja
+++ b/greenmine/projects/tasks/templates/emails/update_task_notification-body-html.jinja
@@ -10,6 +10,10 @@
             <h1>Project: {{ object.project.name }}</h1>
             <h2>Task #{{ object.ref }}: {{ object.subject }}</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:
             <dl>
             {% for field in changed_fields %}
@@ -28,6 +32,7 @@
                 {% endif %}
             {% endfor %}
             </dl>
+        {% endif %}
         </td>
     </tr>
 </table>
diff --git a/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja b/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja
index 158612b2..fd4dc589 100644
--- a/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja
+++ b/greenmine/projects/tasks/templates/emails/update_task_notification-body-text.jinja
@@ -4,9 +4,14 @@
 - Project: {{ object.project.name }}
 - Task #{{ object.ref }}: {{ object.subject }}
 - Updated by {{ changer.get_full_name() }}
+{% if comment %}
+Comment: {{ comment|linebreaksbr }}
+{% endif %}
+{% if changed_fields %}
 - Updated fields:
-{% for field in changed_fields %}
+    {% for field in changed_fields %}
     * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
-{% endfor %}
+    {% endfor %}
+{% endif %}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
diff --git a/greenmine/projects/templates/emails/update_project_notification-body-html.jinja b/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
index c0ced8cd..78244c89 100644
--- a/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
+++ b/greenmine/projects/templates/emails/update_project_notification-body-html.jinja
@@ -9,6 +9,10 @@
         <td>
             <h2>Project #{{ object.slug }}: {{ object.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:
             <dl>
             {% for field in changed_fields %}
@@ -27,6 +31,7 @@
                 {% endif %}
             {% endfor %}
             </dl>
+        {% endif %}
         </td>
     </tr>
 </table>
diff --git a/greenmine/projects/templates/emails/update_project_notification-body-text.jinja b/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
index 5e88c59b..a201e7ec 100644
--- a/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
+++ b/greenmine/projects/templates/emails/update_project_notification-body-text.jinja
@@ -3,9 +3,14 @@
 
 - Project #{{ object.slug }}: {{ object.name }}
 - Updated by {{ changer.get_full_name() }}
+{% if comment %}
+Comment: {{ comment|linebreaksbr }}
+{% endif %}
+{% if changed_fields %}
 - Updated fields:
-{% for field in changed_fields %}
+    {% for field in changed_fields %}
     * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
-{% endfor %}
+    {% endfor %}
+{% endif %}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **
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 ed0ab8f9..770b8d52 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
@@ -10,6 +10,10 @@
             <h1>Project: {{ object.project.name }}</h1>
             <h2>US #{{ object.ref }}: {{ object.subject }}</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:
             <dl>
             {% for field in changed_fields %}
@@ -28,6 +32,7 @@
                 {% endif %}
             {% endfor %}
             </dl>
+        {% endif %}
         </td>
     </tr>
 </table>
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
index 3a444cc5..3c7b46bf 100644
--- a/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
+++ b/greenmine/projects/userstories/templates/emails/update_userstory_notification-body-text.jinja
@@ -4,9 +4,14 @@
 - Project: {{ object.project.name }}
 - US #{{ object.ref }}: {{ object.subject }}
 - Updated by {{ changer.get_full_name() }}
+{% if comment %}
+Comment: {{ comment|linebreaksbr }}
+{% endif %}
+{% if changed_fields %}
 - Updated fields:
-{% for field in changed_fields %}
+    {% for field in changed_fields %}
     * {{ field.verbose_name}}</b>: from '{{ field.old_value}}' to '{{ field.new_value }}'.
-{% endfor %}
+    {% endfor %}
+{% endif %}
 
 ** More info at {{ final_url_name }} ({{ final_url }}) **