From d06c64a4872be0f65134f479694986b3ae3118c5 Mon Sep 17 00:00:00 2001
From: Yuri Baburov <burchik@gmail.com>
Date: Thu, 25 Jul 2013 17:49:27 +0000
Subject: [PATCH] Added subject decode

---
 django_mailbox/admin.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/django_mailbox/admin.py b/django_mailbox/admin.py
index 896bf6b..84bbba1 100644
--- a/django_mailbox/admin.py
+++ b/django_mailbox/admin.py
@@ -44,16 +44,23 @@ class MessageAttachmentInline(admin.TabularInline):
     model = MessageAttachment
     extra = 0
 
+default_charset = 'ASCII'
+import email.header
+def decode(m):
+    return ''.join([ unicode(t[0], t[1] or default_charset) for t in email.header.decode_header(m) ])
 
 class MessageAdmin(admin.ModelAdmin):
     def attachment_count(self, msg):
         return msg.attachments.count()
 
+    def Subject(self, msg):
+        return decode(msg.subject)
+
     inlines = [
         MessageAttachmentInline,
     ]
     list_display = (
-        'subject',
+        'Subject',
         'processed',
         'read',
         'mailbox',