From 8b270f3db88ec3ebad63d945869e841b0826f4fb Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 5 Nov 2014 13:57:50 +0100
Subject: [PATCH] Force headers to string objects.

---
 modoboa/extensions/amavis/views.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/modoboa/extensions/amavis/views.py b/modoboa/extensions/amavis/views.py
index e50f55d94..0b22a2d0e 100644
--- a/modoboa/extensions/amavis/views.py
+++ b/modoboa/extensions/amavis/views.py
@@ -133,12 +133,16 @@ def viewmail(request, mail_id):
 
 @login_required
 def viewheaders(request, mail_id):
+    """Display message headers."""
     content = ""
     for qm in get_connector().get_mail_content(mail_id):
         content += qm.mail_text
     msg = email.message_from_string(content)
+    headers = [
+        (name, value.encode("utf-8")) for name, value in msg.items()
+    ]
     return render(request, 'amavis/viewheader.html', {
-        "headers": msg.items()
+        "headers": headers
     })