IMAP path canonification hack from Brendan Cully.

diff --git a/muttlib.c b/muttlib.c
index 694ff3692021bda5a76fb52560172910763b45a8..28cc0e3c59e76048cbb87a597db66c3d228385ba 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -369,8 +369,10 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
       case '+':    
       {
 #ifdef USE_IMAP
-       /* special case: folder = {host}: don't append slash */
-       if (mx_is_imap (NONULL (Maildir)) && Maildir[strlen (Maildir) - 1] == '}')
+       /* if folder = {host} or imap[s]://host/: don't append slash */
+       if (mx_is_imap (NONULL (Maildir)) &&
+           (Maildir[strlen (Maildir) - 1] == '}' ||
+            Maildir[strlen (Maildir) - 1] == '/'))
          strfcpy (p, NONULL (Maildir), sizeof (p));
        else
 #endif