Merge commit 'upstream/1.5.20'

[software/mutt-debian.git] / imap / browse.c

diff --git a/imap/browse.c b/imap/browse.c
index 0262e2fca3275486dec7f0ccda1871e8befe6dd8..8b60bc782aafbffbe914cb51f0d31721f7fc8a57 100644 (file)
--- a/imap/browse.c
+++ b/imap/browse.c
@@ -72,11 +72,13 @@ int imap_browse (char* path, struct browser_state* state)
   if (mx.mbox && mx.mbox[0] != '\0')
   {
     int rc;
+    char *ptr;
     imap_fix_path (idata, mx.mbox, mbox, sizeof (mbox));
-    imap_munge_mbox_name (buf, sizeof (buf), mbox);
-    imap_unquote_string(buf); /* As kludgy as it gets */
+    ptr = safe_strdup (mbox);
+    imap_utf7_encode (&ptr);
     mbox[sizeof (mbox) - 1] = '\0';
-    strncpy (mbox, buf, sizeof (mbox) - 1);
+    strncpy (mbox, ptr, sizeof (mbox) - 1);
+    FREE (&ptr);
     n = mutt_strlen (mbox);
 
     dprint (3, (debugfile, "imap_browse: mbox: %s\n", mbox));