X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=muttlib.c;h=0b0530a9b88da7a8340be0968d2baa60c4490c8d;hp=27b73f287857188ef8d692493ab9abf35c76c98d;hb=820b351118c174e9a5413a42ffbe778d837aecb5;hpb=105e395f06e15f2c3878d856bc278dd2cf971794

diff --git a/muttlib.c b/muttlib.c
index 27b73f2..0b0530a 100644
--- a/muttlib.c
+++ b/muttlib.c
@@ -362,10 +362,9 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
     case '+':
       {
 #ifdef USE_IMAP
-        /* if folder = {host} or imap[s]://host/: don't append slash */
-        if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP &&
-            (Maildir[safe_strlen (Maildir) - 1] == '}' ||
-             Maildir[safe_strlen (Maildir) - 1] == '/'))
+        /* if folder = imap[s]://host/: don't append slash */
+        if (imap_is_magic (NONULL (Maildir), NULL) == M_IMAP && 
+            Maildir[safe_strlen (Maildir) - 1] == '/')
           strfcpy (p, NONULL (Maildir), sizeof (p));
         else
 #endif
@@ -457,13 +456,6 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
   }
   while (recurse);
 
-#ifdef USE_IMAP
-  /* Rewrite IMAP path in canonical form - aids in string comparisons of
-   * folders. May possibly fail, in which case s should be the same. */
-  if (imap_is_magic (s, NULL) == M_IMAP)
-    imap_expand_path (s, slen);
-#endif
-
   return (s);
 }