From e2f3f7a6922d8ca0365e93e03ab170d1ab1d575e Mon Sep 17 00:00:00 2001
From: Folker Bernitt <fbernitt@thoughtworks.com>
Date: Thu, 12 Mar 2015 17:02:50 +0100
Subject: Fixed problem with multi line content type header field.

- Bugfix
- Issues #313, #322
---
 service/pixelated/adapter/model/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'service/pixelated/adapter/model')

diff --git a/service/pixelated/adapter/model/mail.py b/service/pixelated/adapter/model/mail.py
index 8521babf..c11b2aa3 100644
--- a/service/pixelated/adapter/model/mail.py
+++ b/service/pixelated/adapter/model/mail.py
@@ -82,7 +82,7 @@ class Mail(object):
 
     def _parse_charset_header(self, charset_header, default_charset='utf-8'):
         try:
-            return re.compile('.*charset=([a-zA-Z0-9-]+)').match(charset_header).group(1)
+            return re.compile('.*charset=([a-zA-Z0-9-]+)', re.MULTILINE | re.DOTALL).match(charset_header).group(1)
         except:
             return default_charset
 
-- 
cgit v1.2.3