XXX is this correct?

--- curs_main.c.orig	2006-06-14 01:27:25.000000000 +0200
+++ curs_main.c	2006-06-14 01:29:00.000000000 +0200
@@ -1253,10 +1253,17 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE);
 	    cp = _("Open newsgroup");
 	  nntp_buffy (buf);
 	}
-	else
+	else {
 #endif
+	if (option (OPTCHANGEFOLDERNEXT) && Context && Context->path)
+	{
+	  strfcpy (buf, Context->path, sizeof (buf));
+	  mutt_pretty_mailbox (buf);
+	}
 	mutt_buffy (buf, sizeof (buf));
-
+#ifdef USE_NNTP
+	}
+#endif
 	if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1)
 	  break;
 	if (!buf[0])