From 3e58a18de00fc0c754ceaba6598a1b7a81f9aa4a Mon Sep 17 00:00:00 2001
From: Louis-Dominique Dubeau <ldd@lddubeau.com>
Date: Sat, 9 Nov 2013 15:27:58 -0500
Subject: [PATCH] Unicode conversion would fail if the data was a string
 encoded with utf-8.

---
 modoboa/lib/tables.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modoboa/lib/tables.py b/modoboa/lib/tables.py
index 6ee1eb9ae..3a0950652 100644
--- a/modoboa/lib/tables.py
+++ b/modoboa/lib/tables.py
@@ -43,7 +43,7 @@ class Column(object):
             limit = getattr(self, "limit")
             if limit:
                 # The value is not necessarily a string, so...
-                col["value"] = unicode(col["value"])
+                col["value"] = unicode(col["value"], "utf-8") if isinstance(col["value"], str) else unicode(col["value"])
                 if len(col["value"]) > limit:
                     col["value"] = col["value"][0:limit] + "..."
         except AttributeError: