diff --git a/VERSION b/VERSION
index c94e6ae9..de9b9614 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.5.1-stable+timestamp.2013.06.23.08.45.09
+Version 2.5.1-stable+timestamp.2013.06.23.08.47.09
diff --git a/gluon/dal.py b/gluon/dal.py
index 122807ee..f625e09c 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -6071,6 +6071,8 @@ class IMAPAdapter(NoSQLAdapter):
     def header_represent(f, r):
         from email.header import decode_header
         text, encoding = decode_header(f)[0]
+        if encoding:
+            text = text.decode(encoding).encode('utf-8')
         return text
 
     def encode_text(self, text, charset, errors="replace"):