don't modify virtual folders' paths

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/muttlib.c b/muttlib.c
index 350714f8d775d45b15a4e341e61b17263202d31e..58badfe9163384347871beb580aac5303a0b74a0 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -440,6 +440,11 @@ char *_mutt_expand_path (char *s, size_t slen, int rx)
             Maildir[strlen (Maildir) - 1] == '/'))
          strfcpy (p, NONULL (Maildir), sizeof (p));
        else
+#endif
+#ifdef USE_NOTMUCH
+       if (mx_is_notmuch (NONULL (Maildir)))
+         strfcpy (p, NONULL (Maildir), sizeof (p));
+       else
 #endif
        if (Maildir && *Maildir && Maildir[strlen (Maildir) - 1] == '/')
          strfcpy (p, NONULL (Maildir), sizeof (p));
@@ -887,6 +892,11 @@ void mutt_pretty_mailbox (char *s, size_t buflen)
   }
 #endif
 
+#ifdef USE_NOTMUCH
+  if (scheme == U_NOTMUCH)
+    return;
+#endif
+
   /* if s is an url, only collapse path component */
   if (scheme != U_UNKNOWN)
   {