written by Nicolas Rachinsky <nr-0@rachinsky.de>
http://www.rachinsky.de

This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
by the Free Software Foundation;  version 2 of the License.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
General Public License for more details.

--- mutt-1.3.27-ori/buffy.c	Sat Feb 23 17:30:51 2002
+++ buffy.c	Sat Feb 23 17:36:57 2002
@@ -162,7 +162,7 @@
 
 int mutt_parse_mailboxes (BUFFER *path, BUFFER *s, unsigned long data, BUFFER *err)
 {
-  BUFFY **tmp;
+  BUFFY **tmp,*tmp1;
   char buf[_POSIX_PATH_MAX];
 #ifdef BUFFY_SIZE
   struct stat sb;
@@ -172,6 +172,19 @@
   {
     mutt_extract_token (path, s, 0);
     strfcpy (buf, path->data, sizeof (buf));
+
+    if(data == M_UNMAILBOXES && mutt_strcmp(buf,"*") == 0)
+    {
+      for (tmp = &Incoming; *tmp;)
+      {
+        safe_free((void **)&((*tmp)->path));
+        tmp1=(*tmp)->next;
+        safe_free((void **)tmp);
+        *tmp=tmp1;
+      }
+      return 0;
+    }
+
     mutt_expand_path (buf, sizeof (buf));
 
     /* Skip empty tokens. */
@@ -182,6 +195,18 @@
     {
       if (mutt_strcmp (buf, (*tmp)->path) == 0)
 	break;
+    }
+
+    if(data == M_UNMAILBOXES)
+    {
+      if(*tmp)
+      {
+        safe_free((void **)&((*tmp)->path));
+        tmp1=(*tmp)->next;
+        safe_free((void **)tmp);
+        *tmp=tmp1;
+      }
+      continue;
     }
 
     if (!*tmp)
--- mutt-1.3.27-ori/buffy.h	Sat Feb 23 17:30:53 2002
+++ buffy.h	Sat Feb 23 17:31:06 2002
@@ -16,6 +16,10 @@
  *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  */
 
+/*parameter to mutt_parse_mailboxes*/
+#define M_MAILBOXES   1
+#define M_UNMAILBOXES 2 
+
 typedef struct buffy_t
 {
   char *path;
--- mutt-1.3.27-ori/doc/manual.sgml.head	Sat Feb 23 17:30:46 2002
+++ doc/manual.sgml.head	Sat Feb 23 17:31:06 2002
@@ -1206,7 +1206,7 @@
 
 <sect1>Defining mailboxes which receive mail<label id="mailboxes">
 <p>
-Usage: <tt/mailboxes/ &lsqb;!&rsqb;<em/filename/ &lsqb; <em/filename/ ... &rsqb;
+Usage: <tt/&lsqb;un&rsqb;mailboxes/ &lsqb;!&rsqb;<em/filename/ &lsqb; <em/filename/ ... &rsqb;
 
 This command specifies folders which can receive mail and
 which will be checked for new messages.  By default, the
@@ -1220,6 +1220,11 @@
 specified by the <tt/mailboxes/ command, and indicate which contain new
 messages.  Mutt will automatically enter this mode when invoked from the
 command line with the <tt/-y/ option.
+
+The ``unmailboxes'' command is used to remove a token from the list
+of folders which receive mail. Use ``unmailboxes *'' to remove all
+tokens.
+
 <p>
 <bf/Note:/ new mail is detected by comparing the last modification time to
 the last access time.  Utilities like <tt/biff/ or <tt/frm/ or any other
--- mutt-1.3.27-ori/init.h	Sat Feb 23 17:30:53 2002
+++ init.h	Sat Feb 23 17:31:06 2002
@@ -2457,7 +2457,8 @@
   { "ignore",		parse_ignore,		0 },
   { "lists",		parse_list,		UL &MailLists },
   { "macro",		mutt_parse_macro,	0 },
-  { "mailboxes",	mutt_parse_mailboxes,	0 },
+  { "mailboxes",	mutt_parse_mailboxes,	M_MAILBOXES },
+  { "unmailboxes",	mutt_parse_mailboxes,	M_UNMAILBOXES },
   { "message-hook",	mutt_parse_hook,	M_MESSAGEHOOK },
   { "mbox-hook",	mutt_parse_hook,	M_MBOXHOOK },
   { "mono",		mutt_parse_mono,	0 },
--- PATCHES~    Tue Nov  6 19:59:33 2001
+++ PATCHES     Tue Nov  6 19:59:42 2001
@@ -1,0 +1 @@
+1.3.28.nr.unmailboxes.1