1 files changed, 12 insertions, 9 deletions

diff --git a/Mailman/Utils.py b/Mailman/Utils.py
index 52ea90471..7b2729c4e 100644
--- a/Mailman/Utils.py
+++ b/Mailman/Utils.py
@@ -777,12 +777,15 @@ def uncanonstr(s, lang=None):
             return s
     except UnicodeError:
         # Nope, it contains funny characters, so html-ref it
-        a = []
-        for c in s:
-            o = ord(c)
-            if o > 127:
-                a.append('&#%3d;' % o)
-            else:
-                a.append(c)
-        # Join characters together and coerce to byte string
-        return str(EMPTYSTRING.join(a))
+        return uquote(s)
+
+def uquote(s):
+    a = []
+    for c in s:
+        o = ord(c)
+        if o > 127:
+            a.append('&#%3d;' % o)
+        else:
+            a.append(c)
+    # Join characters together and coerce to byte string
+    return str(EMPTYSTRING.join(a))