diff --git a/welco/sources/mail/models.py b/welco/sources/mail/models.py
index 66d7164..0c7d731 100644
--- a/welco/sources/mail/models.py
+++ b/welco/sources/mail/models.py
@@ -14,6 +14,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see .
+import re
import subprocess
from django.contrib.contenttypes import generic
@@ -82,6 +83,9 @@ class Mail(models.Model):
user_details = get_wcs_data('api/users/%s/' % self.contact_id)
return user_details.get('user_display_name')
+ def html_note(self):
+ return re.sub(r'[\r?\n]+', '
', self.note, re.DOTALL)
+
@receiver(post_save, sender=Mail)
def create_thumbnail(sender, instance, created, **kwargs):
diff --git a/welco/sources/mail/templates/welco/mail_summary.html b/welco/sources/mail/templates/welco/mail_summary.html
index 5c7f5e8..0d008f1 100644
--- a/welco/sources/mail/templates/welco/mail_summary.html
+++ b/welco/sources/mail/templates/welco/mail_summary.html
@@ -5,6 +5,21 @@
+{% if object.note %}
+
+{{object.html_note|safe}}
+
+
+{% endif %}
+
{% if object.associations.all|length > 1 %}
{% trans 'Mail with multiple formdata:' %}
diff --git a/welco/sources/mail/views.py b/welco/sources/mail/views.py
index c4cb14f..1c1cff5 100644
--- a/welco/sources/mail/views.py
+++ b/welco/sources/mail/views.py
@@ -15,7 +15,6 @@
# along with this program. If not, see .
import json
-import re
from django import template
from django.contrib.auth.decorators import login_required
@@ -111,9 +110,9 @@ edit_note = login_required(csrf_exempt(EditNote.as_view()))
@login_required
def note(request, *args, **kwargs):
mail = Mail.objects.get(id=kwargs['pk'])
- note = mail.note or '+'
- note = re.sub(r'[\r?\n]+', '
', note, re.DOTALL)
- return HttpResponse(note)
+ if not mail.note:
+ mail.note = '+'
+ return HttpResponse(mail.html_note())
@login_required