diff -ruNd mail/mutt/patches/patch-03 mail/mutt/patches/patch-03
--- mail/mutt/patches/patch-03	Sun Dec 13 04:31:06 1998
+++ mail/mutt/patches/patch-03	Tue May  2 04:45:11 2000
@@ -1,5 +1,5 @@
---- doc/manual.sgml.in.orig	Tue Dec  8 13:20:07 1998
-+++ doc/manual.sgml.in	Sat Dec 12 09:03:23 1998
+--- doc/manual.sgml.in.orig	Thu Sep 30 23:39:23 1999
++++ doc/manual.sgml.in	Tue May  2 04:44:07 2000
 @@ -1,4 +1,7 @@
 -<!doctype linuxdoc system>
 +<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [
@@ -9,3 +9,75 @@
  
  <article>
  
+@@ -575,12 +578,12 @@
+ system administrator), unless the ``-n'' <ref id="commandline"
+ name="command line"> option is specified.  This file is typically
+ <tt>@sharedir@/Muttrc</tt> or <tt>@sysconfdir@/Muttrc</tt>. Mutt
+-will next look for a file named <tt>.muttrc</tt> in your home
++will next look for a file named <tt>.desk/muttrc</tt> in your home
+ directory.  If this file does not exist and your home directory has
+ a subdirectory named <tt/.mutt/, mutt try to load a file named
+ <tt>.mutt/muttrc</tt>. 
+ 
+-<tt>.muttrc</tt> is the file where you will usually place your <ref
++<tt>.desk/muttrc</tt> is the file where you will usually place your <ref
+  id="commands" name="commands"> to configure Mutt.
+ 
+ In addition, mutt supports version specific configuration files that are
+@@ -588,9 +591,9 @@
+ your system has a <tt/Muttrc-0.88/ file in the system configuration
+ directory, and you are running version 0.88 of mutt, this file will be
+ sourced instead of the <tt/Muttrc/ file.  The same is true of the user
+-configuration file, if you have a file <tt/.muttrc-0.88.6/ in your home
++configuration file, if you have a file <tt/.desk/muttrc-0.88.6/ in your home
+ directory, when you run mutt version 0.88.6, it will source this file
+-instead of the default <tt/.muttrc/ file.  The version number is the
++instead of the default <tt/.desk/muttrc/ file.  The version number is the
+ same which is visible using the ``-v'' <ref id="commandline"
+ name="command line"> switch or using the <tt/show-version/ key (default:
+ V) from the index menu.
+@@ -688,7 +691,7 @@
+ On the other hand, the <ref id="create-alias" name="create-alias">
+ function can use only one file, the one pointed to by the <ref
+ id="alias_file" name="&dollar;alias&lowbar;file"> variable (which is
+-<tt>&tilde;/.muttrc</tt> by default). This file is not special either,
++<tt>&tilde;/.desk/muttrc</tt> by default). This file is not special either,
+ in the sense that Mutt will happily append aliases to any file, but in
+ order for the new aliases to take effect you need to explicitly <ref
+ id="source" name="source"> this file too.
+@@ -1039,7 +1042,7 @@
+ my_hdr Organization: A Really Big Company, Anytown, USA
+ </quote>
+ 
+-in your <tt/.muttrc/.
++in your <tt/.desk/muttrc/.
+ 
+ <bf/Note:/  space characters are <em/not/ allowed between the keyword and
+ the colon (``:'').  The standard for electronic mail (RFC822) says that
+@@ -1248,7 +1251,7 @@
+ This command allows the inclusion of initialization commands
+ from other files.  For example, I place all of my aliases in
+ <tt>&tilde;/.mail&lowbar;aliases</tt> so that I can make my
+-<tt>&tilde;/.muttrc</tt> readable and keep my aliases private.
++<tt>&tilde;/.desk/muttrc</tt> readable and keep my aliases private.
+ 
+ If the filename begins with a tilde (``&tilde;''), it will be expanded to the
+ path of your home directory.
+@@ -2450,7 +2453,7 @@
+ <sect2>alias&lowbar;file<label id="alias_file">
+ <p>
+ Type: string<newline>
+-Default: &tilde;/.muttrc
++Default: &tilde;/.desk/muttrc
+ 
+ The default file in which to save aliases created by the
+ <ref id="create-alias" name="create-alias"> function.
+@@ -4037,7 +4040,7 @@
+ <itemize>
+ <item>address (sort alphabetically by email address)
+ <item>alias (sort alphabetically by alias name)
+-<item>unsorted (leave in order specified in .muttrc)
++<item>unsorted (leave in order specified in .desk/muttrc)
+ </itemize>
+ 
+ <sect2>sort&lowbar;aux<label id="sort_aux">
diff -ruNd mail/mutt/patches/patch-08 mail/mutt/patches/patch-08
--- mail/mutt/patches/patch-08	Thu Jul 23 11:19:32 1998
+++ mail/mutt/patches/patch-08	Tue May  2 04:35:45 2000
@@ -1,6 +1,15 @@
---- Muttrc.in.original	Wed Jul 22 10:47:49 1998
-+++ Muttrc.in	Wed Jul 22 10:48:02 1998
-@@ -60,7 +60,7 @@
+--- Muttrc.in.orig	Thu Sep 30 23:52:21 1999
++++ Muttrc.in	Tue May  2 04:34:52 2000
+@@ -38,7 +38,7 @@
+ 
+ # set abort_nosubject=ask-yes
+ # set abort_unmodified=yes
+-# set alias_file="~/.muttrc"
++# set alias_file="~/.desk/muttrc"
+ # set alias_format=""%2n %t %-10a   %r"
+ # set allow_8bit
+ # set alternates=""
+@@ -72,7 +72,7 @@
  # unset fcc_attach
  # set folder="~/Mail"
  # set folder_format="%N %F %2l %-8.8u %-8.8g %8s %d %f"
@@ -8,4 +17,4 @@
 +unset followup_to
  # unset force_name
  # set forward_decode
- # set forward_format="[%a: %s]"
+ # unset forward_decrypt
diff -ruNd mail/mutt/patches/patch-ba mail/mutt/patches/patch-ba
--- mail/mutt/patches/patch-ba	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-ba	Tue May  2 04:49:36 2000
@@ -0,0 +1,25 @@
+--- doc/mutt.man.in.orig	Wed Jul 28 23:09:02 1999
++++ doc/mutt.man.in	Tue May  2 04:48:42 2000
+@@ -54,7 +54,7 @@
+ .IP "-f \fImailbox\fP"
+ Specify which mailbox to load.
+ .IP "-F \fImuttrc\fP"
+-Specify an initialization file to read instead of ~/.muttrc
++Specify an initialization file to read instead of ~/.desk/muttrc
+ .IP "-h"
+ Display help.
+ .IP "-H \fIdraft\fP"
+@@ -107,11 +107,11 @@
+ Editor to invoke when the ~v command is given in the builtin editor.
+ .SH FILES
+ .PP
+-.IP "~/.muttrc"
++.IP "~/.desk/muttrc"
+ User configuration file.
+ .IP "@sysconfdir@/Muttrc"
+ System-wide configuration file.
+-.IP "/tmp/muttXXXXXX"
++.IP "$TMPDIR/muttXXXXXX"
+ Temporary files created by Mutt.
+ .IP "~/.mailcap"
+ User definition for handling non-text MIME types.
diff -ruNd mail/mutt/patches/patch-bb mail/mutt/patches/patch-bb
--- mail/mutt/patches/patch-bb	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-bb	Tue May  2 04:53:06 2000
@@ -0,0 +1,11 @@
+--- init.h.orig	Thu Jan  6 14:55:07 2000
++++ init.h	Tue May  2 04:52:36 2000
+@@ -69,7 +69,7 @@
+ struct option_t MuttVars[] = {
+   { "abort_nosubject",	DT_QUAD, R_NONE, OPT_SUBJECT, M_ASKYES },
+   { "abort_unmodified",	DT_QUAD, R_NONE, OPT_ABORT, M_YES },
+-  { "alias_file",	DT_PATH, R_NONE, UL &AliasFile, UL "~/.muttrc" },
++  { "alias_file",	DT_PATH, R_NONE, UL &AliasFile, UL "~/.desk/muttrc" },
+   { "alias_format",	DT_STR,  R_NONE, UL &AliasFmt, UL "%2n %t %-10a   %r" },
+   { "allow_8bit",	DT_BOOL, R_NONE, OPTALLOW8BIT, 1 },
+   { "alternates",	DT_RX,	 R_BOTH, UL &Alternates, 0 },
diff -ruNd mail/mutt/patches/patch-bc mail/mutt/patches/patch-bc
--- mail/mutt/patches/patch-bc	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-bc	Tue May  2 04:53:14 2000
@@ -0,0 +1,14 @@
+--- init.c.orig	Thu Jan  6 14:55:07 2000
++++ init.c	Tue May  2 04:51:39 2000
+@@ -1739,9 +1739,9 @@
+ 
+   if (!Muttrc)
+   {
+-    snprintf (buffer, sizeof(buffer), "%s/.muttrc-%s", NONULL(Homedir), MUTT_VERSION);
++    snprintf (buffer, sizeof(buffer), "%s/.desk/muttrc-%s", NONULL(Homedir), MUTT_VERSION);
+     if (access(buffer, F_OK) == -1)
+-      snprintf (buffer, sizeof(buffer), "%s/.muttrc", NONULL(Homedir));
++      snprintf (buffer, sizeof(buffer), "%s/.desk/muttrc", NONULL(Homedir));
+     if (access(buffer, F_OK) == -1)
+       snprintf (buffer, sizeof (buffer), "%s/.mutt/muttrc-%s", NONULL(Homedir), MUTT_VERSION);
+     if (access(buffer, F_OK) == -1)
diff -ruNd mail/mutt/patches/patch-bd mail/mutt/patches/patch-bd
--- mail/mutt/patches/patch-bd	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-bd	Tue May  2 04:57:18 2000
@@ -0,0 +1,11 @@
+--- main.c.orig	Thu Jan  6 14:58:02 2000
++++ main.c	Tue May  2 04:54:33 2000
+@@ -423,7 +423,7 @@
+ 	break;
+ 
+       case 'm':
+-	/* should take precedence over .muttrc setting, so save it for later */
++	/* should take precedence over .desk/muttrc setting, so save it for later */
+ 	newMagic = optarg; 
+ 	break;
+ 
diff -ruNd mail/mutt/patches/patch-be mail/mutt/patches/patch-be
--- mail/mutt/patches/patch-be	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-be	Tue May  2 04:57:42 2000
@@ -0,0 +1,11 @@
+--- mx.c.orig	Thu Jan  6 14:55:11 2000
++++ mx.c	Tue May  2 04:55:12 2000
+@@ -608,7 +608,7 @@
+     return (NULL);
+   }
+   
+-  /* if the user has a `push' command in their .muttrc, or in a folder-hook,
++  /* if the user has a `push' command in their .desk/muttrc, or in a folder-hook,
+    * it will cause the progress messages not to be displayed because
+    * mutt_refresh() will think we are in the middle of a macro.  so set a
+    * flag to indicate that we should really refresh the screen.
diff -ruNd mail/mutt/patches/patch-bf mail/mutt/patches/patch-bf
--- mail/mutt/patches/patch-bf	Thu Jan  1 03:00:00 1970
+++ mail/mutt/patches/patch-bf	Tue May  2 04:58:13 2000
@@ -0,0 +1,11 @@
+--- rfc1524.c.orig	Thu Jan  6 14:55:17 2000
++++ rfc1524.c	Tue May  2 04:56:40 2000
+@@ -401,7 +401,7 @@
+    * joy.  They say 
+    * $HOME/.mailcap:/etc/mailcap:/usr/etc/mailcap:/usr/local/etc/mailcap, etc
+    * and overriden by the MAILCAPS environment variable, and, just to be nice, 
+-   * we'll make it specifiable in .muttrc
++   * we'll make it specifiable in .desk/muttrc
+    */
+   if (!curr || !*curr)
+   {