diff --git a/modoboa/extensions/webmail/lib.py b/modoboa/extensions/webmail/lib.py
index 74e2941b5..0bc18ef39 100644
--- a/modoboa/extensions/webmail/lib.py
+++ b/modoboa/extensions/webmail/lib.py
@@ -53,14 +53,19 @@ class IMAPheader(object):
     def to_unicode(value):
         if value is None or type(value) is unicode:
             return value
+        try:
+            value = value.decode('utf-8')
+        except UnicodeDecodeError:
+            pass
+        else:
+            return value
         try:
             res = chardet.detect(value)
         except UnicodeDecodeError:
             return value
         if res["encoding"] == "ascii":
             return value
-        return value
-        #return value.decode(res["encoding"])
+        return value.decode(res["encoding"])
 
     @staticmethod
     def parse_address(value, **kwargs):