diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index dd1f3b5b0949..0255434aeba8 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -92,8 +92,8 @@
 #
 
 PORTNAME=	mutt-devel
-PORTVERSION=	1.5.8
-PORTREVISION=	1
+PORTVERSION=	1.5.9
+PORTREVISION=	0
 CATEGORIES+=	mail ipv6
 .if defined(WITH_MUTT_NNTP)
 CATEGORIES+=	news
@@ -282,10 +282,11 @@ pre-configure::
 
 .if defined(WITH_MUTT_EDIT_THREADS)
 pre-configure::
-	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-edit-threads
+	@${PATCH} ${PATCH_ARGS} -p1 < ${PATCHDIR}/extra-patch-edit-threads
 .endif
 
 .if defined(WITH_MUTT_SIDEBAR_PATCH)
+.error The WITH_MUTT_SIDEBAR_PATCH is not available at the moment
 pre-configure::
 	@${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-sidebar
 .endif
@@ -323,11 +324,11 @@ CONFIGURE_ARGS+=	--without-idn
 PATCH_DIST_STRIP=	-p1
 
 .if ! defined (WITHOUT_MUTT_COMPRESSED_FOLDERS)
-DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.1.gz:rr
+DISTFILES+=	patch-${RR_PATCH_VERSION}.rr.compressed.gz:vvv
 CONFIGURE_ARGS+=	--enable-compressed
 SGML_NEEDED=	yes
 pre-patch::
-	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.1.gz > ${WRKDIR}/patch-compressed
+	@${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/patch-${RR_PATCH_VERSION}.rr.compressed.gz > ${WRKDIR}/patch-compressed
 	@${REINPLACE_CMD} -E '/^diff.*\/doc\/manual.txt$$/,/^diff/d' \
 		 ${WRKDIR}/patch-compressed
 	@${PATCH} ${PATCH_ARGS} -p1 < ${WRKDIR}/patch-compressed
diff --git a/mail/mutt-devel/distinfo b/mail/mutt-devel/distinfo
index e5073a665a15..c60328a617f4 100644
--- a/mail/mutt-devel/distinfo
+++ b/mail/mutt-devel/distinfo
@@ -1,13 +1,13 @@
-MD5 (mutt/mutt-1.5.8i.tar.gz) = 9b9bdef4ef7107332f8782b3a910d00e
-SIZE (mutt/mutt-1.5.8i.tar.gz) = 3010088
-MD5 (mutt/patch-1.5.8.rr.compressed.1.gz) = a45bd30996f98ba725bf479111cc9579
-SIZE (mutt/patch-1.5.8.rr.compressed.1.gz) = 13728
-MD5 (mutt/patch-1.5.8.vvv.nntp.gz) = b439b7cf7b7c83f4d392cc3e0cbe7aa2
-SIZE (mutt/patch-1.5.8.vvv.nntp.gz) = 92282
-MD5 (mutt/patch-1.5.8.vvv.initials.gz) = efcb8e77f504a046324ae5b1b59085f4
-SIZE (mutt/patch-1.5.8.vvv.initials.gz) = 687
-MD5 (mutt/patch-1.5.8.vvv.quote.gz) = 12f33e0520a68aec15e5c3e6993c4bc7
-SIZE (mutt/patch-1.5.8.vvv.quote.gz) = 1613
+MD5 (mutt/mutt-1.5.9i.tar.gz) = c5318eba3404ebd78a15c680fa1b6056
+SIZE (mutt/mutt-1.5.9i.tar.gz) = 3036003
+MD5 (mutt/patch-1.5.9.rr.compressed.gz) = 9d9ef4ec0e970f9fc3de2d5c6219a349
+SIZE (mutt/patch-1.5.9.rr.compressed.gz) = 10260
+MD5 (mutt/patch-1.5.9.vvv.nntp.gz) = f7cf37af82169eefe94c6c42c6f3b9cd
+SIZE (mutt/patch-1.5.9.vvv.nntp.gz) = 91518
+MD5 (mutt/patch-1.5.9.vvv.initials.gz) = 149c52991b23b9ab3d6add27cb27e151
+SIZE (mutt/patch-1.5.9.vvv.initials.gz) = 689
+MD5 (mutt/patch-1.5.9.vvv.quote.gz) = 08329134d8995c05a28dd8258174a668
+SIZE (mutt/patch-1.5.9.vvv.quote.gz) = 1629
 MD5 (mutt/patch-1.5.4.cd.ifdef.1) = a545036cdb55519154d0b35465f52daa
 SIZE (mutt/patch-1.5.4.cd.ifdef.1) = 3545
 MD5 (mutt/p0-patch-1.5.6.dw.mbox-hook.1) = 9e29a6778ab07a4de3442691e4573fea
diff --git a/mail/mutt-devel/files/extra-patch-edit-threads b/mail/mutt-devel/files/extra-patch-edit-threads
index 34f9a78e9c57..b1695240c98d 100644
--- a/mail/mutt-devel/files/extra-patch-edit-threads
+++ b/mail/mutt-devel/files/extra-patch-edit-threads
@@ -1,6 +1,11 @@
-diff -ru work.old/mutt-1.5.6/OPS work/mutt-1.5.6/OPS
---- OPS	Wed Nov  5 10:41:31 2003
-+++ OPS	Tue Feb 10 14:40:41 2004
+diff -Nru a/PATCHES b/PATCHES
+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.7.tg.edit_threads.1
+diff -Nru a/OPS b/OPS
+--- a/OPS	2005-01-29 17:07:15 +01:00
++++ b/OPS	2005-01-29 17:07:15 +01:00
 @@ -96,6 +96,7 @@
  OP_LIST_REPLY "reply to specified mailing list"
  OP_MACRO "execute a macro"
@@ -17,58 +22,21 @@ diff -ru work.old/mutt-1.5.6/OPS work/mutt-1.5.6/OPS
  OP_MAIN_NEXT_NEW "jump to the next new message"
  OP_MAIN_NEXT_NEW_THEN_UNREAD "jump to the next new or unread message"
  OP_MAIN_NEXT_SUBTHREAD "jump to the next subthread"
-diff -ru work.old/mutt-1.5.6/config.h.in work/mutt-1.5.6/config.h.in
---- config.h.in	Sun Feb  1 18:18:21 2004
-+++ config.h.in	Tue Feb 10 14:40:41 2004
-@@ -549,3 +549,7 @@
-  * all return values other than (size_t)(-1) as equivalent. */
- #undef ICONV_NONTRANS
- 
-+/* Do you want to use the rethreading functions with IMAP
-+ * (--enable-imap-edit-threads) */
-+#undef IMAP_EDIT_THREADS
-+
 --- /dev/null	Sun Feb 13 11:16:10 2005
-+++ acconfig.h	Sun Feb 13 11:15:44 2005
++++ b/acconfig.h	Sun Feb 13 11:15:44 2005
 @@ -0,0 +1,4 @@
 +/* Do you want to use the rethreading functions with IMAP
 + * (--enable-imap-edit-threads) */
 +#undef IMAP_EDIT_THREADS
 +
-diff -ru work.old/mutt-1.5.6/configure work/mutt-1.5.6/configure
---- configure	Sun Feb  1 19:22:06 2004
-+++ configure	Tue Feb 10 14:40:41 2004
-@@ -5383,6 +5385,23 @@
- else
-   USE_GSS_TRUE='#'
-   USE_GSS_FALSE=
-+fi
-+
-+
-+# Check whether --enable-imap-edit-threads or --disable-imap-edit-threads was given.
-+if test "${enable_imap_edit_threads+set}" = set; then
-+  enableval="$enable_imap_edit_threads"
-+  
-+  if test "$enableval" = "yes"; then
-+    if test "$need_imap" = "yes"; then
-+      cat >> confdefs.h <<\EOF
-+#define IMAP_EDIT_THREADS 1
-+EOF
-+
-+    else
-+      echo "configure: warning: IMAP support for edit_threads is only useful with IMAP support" 1>&2
-+    fi
-+fi
- fi
- 
- 
-diff -ru work.old/mutt-1.5.6/configure.in work/mutt-1.5.6/configure.in
---- configure.in	Sun Feb  1 19:22:05 2004
-+++ configure.in	Tue Feb 10 14:40:41 2004
-@@ -559,6 +559,16 @@
+diff -Nru a/configure.in b/configure.in
+--- a/configure.in.orig	Mon Mar 14 08:30:21 2005
++++ b/configure.in	Mon Mar 14 08:33:05 2005
+@@ -566,6 +566,16 @@
+ AM_CONDITIONAL(USE_GSS, test x$need_gss = xyes)
  
  dnl -- end imap dependencies --
- 
++ 
 +AC_ARG_ENABLE(imap-edit-threads, [  --enable-imap-edit-threads Enable editing threads support for IMAP],
 +[
 +  if test "$enableval" = "yes"; then
@@ -78,13 +46,12 @@ diff -ru work.old/mutt-1.5.6/configure.in work/mutt-1.5.6/configure.in
 +      AC_MSG_WARN([IMAP support for edit_threads is only useful with IMAP support])
 +    fi
 +fi])
-+
- AC_ARG_WITH(ssl, [  --with-ssl[=PFX]           Compile in SSL support for POP/IMAP],
+ 
+ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl[=PFX]], [Compile in SSL support for POP/IMAP]),
  [       if test "$with_ssl" != "no"
-         then
-diff -ru work.old/mutt-1.5.6/copy.c work/mutt-1.5.6/copy.c
---- copy.c	Wed Nov  5 10:41:31 2003
-+++ copy.c	Tue Feb 10 14:40:41 2004
+diff -Nru a/copy.c b/copy.c
+--- a/copy.c	2005-01-29 17:07:15 +01:00
++++ b/copy.c	2005-01-29 17:07:15 +01:00
 @@ -95,6 +95,12 @@
  	    (ascii_strncasecmp ("Content-Length:", buf, 15) == 0 ||
  	     ascii_strncasecmp ("Lines:", buf, 6) == 0))
@@ -187,9 +154,9 @@ diff -ru work.old/mutt-1.5.6/copy.c work/mutt-1.5.6/copy.c
        if (h->old || h->read)
        {
  	if (fputs ("Status: ", out) == EOF)
-diff -ru work.old/mutt-1.5.6/curs_main.c work/mutt-1.5.6/curs_main.c
---- curs_main.c	Wed Nov  5 10:41:31 2003
-+++ curs_main.c	Tue Feb 10 14:40:41 2004
+diff -Nru a/curs_main.c b/curs_main.c
+--- a/curs_main.c	2005-01-29 17:07:15 +01:00
++++ b/curs_main.c	2005-01-29 17:07:15 +01:00
 @@ -930,6 +930,11 @@
  	else
  	{
@@ -202,7 +169,7 @@ diff -ru work.old/mutt-1.5.6/curs_main.c work/mutt-1.5.6/curs_main.c
  	  menu->redraw = REDRAW_STATUS;
  	  if (option (OPTRESOLVE) && menu->current < Context->vcount - 1)
  	  {
-@@ -1162,6 +1167,89 @@
+@@ -1165,6 +1170,89 @@
  	  }
  	  done = 1;
  	}
@@ -292,10 +259,10 @@ diff -ru work.old/mutt-1.5.6/curs_main.c work/mutt-1.5.6/curs_main.c
  	break;
  
        case OP_EDIT_TYPE:
-diff -ru work.old/mutt-1.5.6/doc/manual.sgml.head work/mutt-1.5.6/doc/manual.sgml.head
---- doc/manual.sgml.head	Sun Feb  1 18:49:53 2004
-+++ doc/manual.sgml.head	Tue Feb 10 14:40:41 2004
-@@ -2197,8 +2197,43 @@
+diff -Nru a/doc/manual.sgml.head b/doc/manual.sgml.head
+--- a/doc/manual.sgml.head	2005-01-29 17:07:15 +01:00
++++ b/doc/manual.sgml.head	2005-01-29 17:07:15 +01:00
+@@ -2322,8 +2322,43 @@
  with large volume mailing lists easier because you can easily delete
  uninteresting threads and quickly find topics of value.
  
@@ -339,9 +306,9 @@ diff -ru work.old/mutt-1.5.6/doc/manual.sgml.head work/mutt-1.5.6/doc/manual.sgm
  RFC1894 defines a set of MIME content types for relaying information
  about the status of electronic mail messages.  These can be thought of as
  ``return receipts.'' Berkeley sendmail 8.8.x currently has some command
-diff -ru work.old/mutt-1.5.6/functions.h work/mutt-1.5.6/functions.h
---- functions.h	Wed Nov  5 10:41:31 2003
-+++ functions.h	Tue Feb 10 14:40:41 2004
+diff -Nru a/functions.h b/functions.h
+--- a/functions.h	2005-01-29 17:07:15 +01:00
++++ b/functions.h	2005-01-29 17:07:15 +01:00
 @@ -69,6 +69,7 @@
  struct binding_t OpMain[] = {
    { "create-alias",		OP_CREATE_ALIAS,		"a" },
@@ -374,10 +341,10 @@ diff -ru work.old/mutt-1.5.6/functions.h work/mutt-1.5.6/functions.h
    { "list-reply",	OP_LIST_REPLY,			"L" },
    { "redraw-screen",	OP_REDRAW,			"\014" },
    { "mail",		OP_MAIL,			"m" },
-diff -ru work.old/mutt-1.5.6/imap/imap.c work/mutt-1.5.6/imap/imap.c
---- imap/imap.c	Sun Feb  1 18:10:58 2004
-+++ imap/imap.c	Tue Feb 10 14:40:41 2004
-@@ -981,9 +981,11 @@
+diff -Nru a/imap/imap.c b/imap/imap.c
+--- a/imap/imap.c	2005-01-29 17:07:15 +01:00
++++ b/imap/imap.c	2005-01-29 17:07:15 +01:00
+@@ -983,9 +983,11 @@
        mutt_buffer_addstr (&cmd, "UID STORE ");
        mutt_buffer_addstr (&cmd, uid);
  
@@ -392,10 +359,10 @@ diff -ru work.old/mutt-1.5.6/imap/imap.c work/mutt-1.5.6/imap/imap.c
        {
  	dprint (3, (debugfile, "imap_sync_mailbox: Attachments to be deleted, falling back to _mutt_save_message\n"));
  	if (!appendctx)
-diff -ru work.old/mutt-1.5.6/main.c work/mutt-1.5.6/main.c
---- main.c	Tue Mar  4 08:49:48 2003
-+++ main.c	Tue Feb 10 14:40:41 2004
-@@ -228,6 +228,12 @@
+diff -Nru a/main.c b/main.c
+--- a/main.c	2005-01-29 17:07:15 +01:00
++++ b/main.c	2005-01-29 17:07:15 +01:00
+@@ -235,6 +235,12 @@
          "-USE_IMAP  "
  #endif
  
@@ -408,10 +375,10 @@ diff -ru work.old/mutt-1.5.6/main.c work/mutt-1.5.6/main.c
  #ifdef USE_GSS
  	"+USE_GSS  "
  #else
-diff -ru work.old/mutt-1.5.6/mh.c work/mutt-1.5.6/mh.c
---- mh.c	Sun Feb  1 18:10:57 2004
-+++ mh.c	Tue Feb 10 14:40:41 2004
-@@ -1220,7 +1220,7 @@
+diff -Nru a/mh.c b/mh.c
+--- a/mh.c	2005-01-29 17:07:15 +01:00
++++ b/mh.c	2005-01-29 17:07:15 +01:00
+@@ -1326,7 +1326,7 @@
  {
    HEADER *h = ctx->hdrs[msgno];
  
@@ -420,7 +387,7 @@ diff -ru work.old/mutt-1.5.6/mh.c work/mutt-1.5.6/mh.c
      if (mh_rewrite_message (ctx, msgno) != 0)
        return -1;
  
-@@ -1231,9 +1231,9 @@
+@@ -1337,9 +1337,9 @@
  {
    HEADER *h = ctx->hdrs[msgno];
  
@@ -432,10 +399,10 @@ diff -ru work.old/mutt-1.5.6/mh.c work/mutt-1.5.6/mh.c
      if (mh_rewrite_message (ctx, msgno) != 0)
        return (-1);
    }
-diff -ru work.old/mutt-1.5.6/mutt.h work/mutt-1.5.6/mutt.h
---- mutt.h	Sun Feb  1 18:15:17 2004
-+++ mutt.h	Tue Feb 10 14:41:33 2004
-@@ -94,6 +94,8 @@
+diff -Nru a/mutt.h b/mutt.h
+--- a/mutt.h	2005-01-29 17:07:15 +01:00
++++ b/mutt.h	2005-01-29 17:07:15 +01:00
+@@ -96,6 +96,8 @@
  #define CH_WEED_DELIVERED (1<<13) /* weed eventual Delivered-To headers */
  #define CH_FORCE_FROM	(1<<14)	/* give CH_FROM precedence over CH_WEED? */
  #define CH_NOQFROM	(1<<15)	/* give CH_FROM precedence over CH_WEED? */
@@ -444,16 +411,15 @@ diff -ru work.old/mutt-1.5.6/mutt.h work/mutt-1.5.6/mutt.h
  
  /* flags for mutt_enter_string() */
  #define  M_ALIAS   1      /* do alias "completion" by calling up the alias-menu */
-@@ -518,6 +520,8 @@
- void mutt_free_rx_list (RX_LIST **);
- int mutt_matches_ignore (const char *, LIST *);
- 
+@@ -542,6 +544,7 @@
+ #define mutt_new_rx_list() safe_calloc (1, sizeof (RX_LIST))
+ #define mutt_new_spam_list() safe_calloc (1, sizeof (SPAM_LIST))
+ void mutt_free_list (LIST **);
 +LIST *mutt_copy_list (LIST *);
-+
- /* add an element to a list */
- LIST *mutt_add_list (LIST *, const char *);
- 
-@@ -657,6 +661,8 @@
+ void mutt_free_rx_list (RX_LIST **);
+ void mutt_free_spam_list (SPAM_LIST **);
+ int mutt_matches_ignore (const char *, LIST *);
+@@ -699,6 +702,8 @@
    unsigned int subject_changed : 1; 	/* used for threading */
    unsigned int threaded : 1;	    	/* used for threading */
    unsigned int display_subject : 1; 	/* used for threading */
@@ -462,7 +428,7 @@ diff -ru work.old/mutt-1.5.6/mutt.h work/mutt-1.5.6/mutt.h
    unsigned int recip_valid : 1;  	/* is_recipient is valid */
    unsigned int active : 1;	    	/* message is not to be removed */
    unsigned int trash : 1;		/* message is marked as trashed on disk.
-@@ -697,6 +703,10 @@
+@@ -739,6 +744,10 @@
    char *tree;           	/* character string to print thread tree */
    struct thread *thread;
  
@@ -473,7 +439,7 @@ diff -ru work.old/mutt-1.5.6/mutt.h work/mutt-1.5.6/mutt.h
  #ifdef MIXMASTER
    LIST *chain;
  #endif
-@@ -761,6 +771,7 @@
+@@ -803,6 +812,7 @@
    char *pattern;                /* limit pattern string */
    pattern_t *limit_pattern;     /* compiled limit pattern */
    HEADER **hdrs;
@@ -481,9 +447,9 @@ diff -ru work.old/mutt-1.5.6/mutt.h work/mutt-1.5.6/mutt.h
    THREAD *tree;			/* top of thread tree */
    HASH *id_hash;		/* hash table by msg id */
    HASH *subj_hash;		/* hash table by subject */
-diff -ru work.old/mutt-1.5.6/mx.c work/mutt-1.5.6/mx.c
---- mx.c	Wed Nov  5 10:41:32 2003
-+++ mx.c	Tue Feb 10 14:40:41 2004
+diff -Nru a/mx.c b/mx.c
+--- a/mx.c	2005-01-29 17:07:15 +01:00
++++ b/mx.c	2005-01-29 17:07:15 +01:00
 @@ -1161,6 +1161,8 @@
          ctx->deleted = 0;
        }
@@ -493,10 +459,10 @@ diff -ru work.old/mutt-1.5.6/mx.c work/mutt-1.5.6/mx.c
    }
  
    /* really only for IMAP - imap_sync_mailbox results in a call to
-diff -ru work.old/mutt-1.5.6/pager.c work/mutt-1.5.6/pager.c
---- pager.c	Sun Feb  1 18:10:57 2004
-+++ pager.c	Tue Feb 10 14:40:41 2004
-@@ -2481,6 +2481,11 @@
+diff -Nru a/pager.c b/pager.c
+--- a/pager.c	2005-01-29 17:07:15 +01:00
++++ b/pager.c	2005-01-29 17:07:15 +01:00
+@@ -2492,6 +2492,11 @@
        case OP_TAG:
  	CHECK_MODE(IsHeader (extra));
  	mutt_set_flag (Context, extra->hdr, M_TAG, !extra->hdr->tagged);
@@ -508,10 +474,10 @@ diff -ru work.old/mutt-1.5.6/pager.c work/mutt-1.5.6/pager.c
  	redraw = REDRAW_STATUS | REDRAW_INDEX;
  	if (option (OPTRESOLVE))
  	{
-diff -ru work.old/mutt-1.5.6/protos.h work/mutt-1.5.6/protos.h
---- protos.h	Sun Feb  1 18:15:17 2004
-+++ protos.h	Tue Feb 10 14:40:41 2004
-@@ -148,6 +148,7 @@
+diff -Nru a/protos.h b/protos.h
+--- a/protos.h	2005-01-29 17:07:15 +01:00
++++ b/protos.h	2005-01-29 17:07:15 +01:00
+@@ -161,6 +161,7 @@
  void mutt_block_signals_system (void);
  void mutt_body_handler (BODY *, STATE *);
  int  mutt_bounce_message (FILE *fp, HEADER *, ADDRESS *);
@@ -519,18 +485,18 @@ diff -ru work.old/mutt-1.5.6/protos.h work/mutt-1.5.6/protos.h
  void mutt_buffy (char *, size_t);
  int  mutt_buffy_list (void);
  void mutt_canonical_charset (char *, size_t, const char *);
-@@ -289,6 +290,7 @@
+@@ -302,6 +303,7 @@
  int mutt_is_subscribed_list (ADDRESS *);
  int mutt_is_text_part (BODY *);
  int mutt_is_valid_mailbox (const char *);
 +int mutt_link_threads (HEADER *, HEADER *, CONTEXT *);
  int mutt_lookup_mime_type (BODY *, const char *);
  int mutt_match_rx_list (const char *, RX_LIST *);
- int mutt_messages_in_thread (CONTEXT *, HEADER *, int);
-diff -ru work.old/mutt-1.5.6/thread.c work/mutt-1.5.6/thread.c
---- thread.c	Sun Feb  1 18:10:58 2004
-+++ thread.c	Tue Feb 10 14:40:41 2004
-@@ -1336,3 +1336,105 @@
+ int mutt_match_spam_list (const char *, SPAM_LIST *, char *, int);
+diff -Nru a/thread.c b/thread.c
+--- a/thread.c	2005-01-29 17:07:15 +01:00
++++ b/thread.c	2005-01-29 17:07:15 +01:00
+@@ -1340,3 +1340,105 @@
  
    return hash;
  }
diff --git a/mail/mutt-devel/files/extra-patch-maildir-header-cache b/mail/mutt-devel/files/extra-patch-maildir-header-cache
index be2b5e998038..d4e6678c23cd 100644
--- a/mail/mutt-devel/files/extra-patch-maildir-header-cache
+++ b/mail/mutt-devel/files/extra-patch-maildir-header-cache
@@ -2,10 +2,10 @@ diff -Nru a/PATCHES b/PATCHES
 --- a/PATCHES
 +++ b/PATCHES
 @@ -0,0 +1 @@
-+mutt-cvs-header-cache.28
++mutt-cvs-header-cache.29
 diff -Nru a/init.h b/init.h
---- a/init.h	2005-01-27 20:54:24 +01:00
-+++ b/init.h	2005-01-28 15:12:41 +01:00
+--- a/init.h	2005-02-12 22:08:19 +01:00
++++ b/init.h	2005-02-13 00:51:10 +01:00
 @@ -1032,6 +1032,13 @@
    ** global header cache for all folders is used. Per default it is unset and so
    ** no header caching will be used.
@@ -21,9 +21,9 @@ diff -Nru a/init.h b/init.h
    /*
    ** .pp
 diff -Nru a/mh.c b/mh.c
---- a/mh.c	2005-01-27 20:45:37 +01:00
-+++ b/mh.c	2005-02-03 09:09:50 +01:00
-@@ -787,6 +787,14 @@
+--- a/mh.c	2005-02-03 19:01:43 +01:00
++++ b/mh.c	2005-02-05 12:25:16 +01:00
+@@ -791,6 +791,14 @@
    return r;
  }
  
@@ -38,7 +38,7 @@ diff -Nru a/mh.c b/mh.c
  #ifdef USE_INODESORT
  /*
   * Merge two maildir lists according to the inode numbers.
-@@ -882,27 +890,67 @@
+@@ -886,27 +894,67 @@
   * This function does the second parsing pass for a maildir-style
   * folder.
   */
@@ -118,7 +118,7 @@ diff -Nru a/mh.c b/mh.c
  
  /* Read a MH/maildir style mailbox.
   *
-@@ -1399,6 +1447,9 @@
+@@ -1403,6 +1451,9 @@
  {
    char path[_POSIX_PATH_MAX], tmp[_POSIX_PATH_MAX];
    int i, j;
@@ -128,7 +128,7 @@ diff -Nru a/mh.c b/mh.c
  
    if (ctx->magic == M_MH)
      i = mh_check_mailbox (ctx, index_hint);
-@@ -1408,6 +1459,11 @@
+@@ -1412,6 +1463,11 @@
    if (i != 0)
      return i;
  
@@ -140,7 +140,7 @@ diff -Nru a/mh.c b/mh.c
    for (i = 0; i < ctx->msgcount; i++)
    {
      if (ctx->hdrs[i]->deleted
-@@ -1416,7 +1472,13 @@
+@@ -1420,7 +1476,13 @@
        snprintf (path, sizeof (path), "%s/%s", ctx->path, ctx->hdrs[i]->path);
        if (ctx->magic == M_MAILDIR
  	  || (option (OPTMHPURGE) && ctx->magic == M_MH))
@@ -154,7 +154,7 @@ diff -Nru a/mh.c b/mh.c
        else if (ctx->magic == M_MH)
        {
  	/* MH just moves files out of the way when you delete them */
-@@ -1438,16 +1500,21 @@
+@@ -1442,16 +1504,21 @@
        if (ctx->magic == M_MAILDIR)
        {
  	if (maildir_sync_message (ctx, i) == -1)
@@ -178,7 +178,7 @@ diff -Nru a/mh.c b/mh.c
    if (ctx->magic == M_MH)
      mh_update_sequences (ctx);
  
-@@ -1468,6 +1535,13 @@
+@@ -1472,6 +1539,13 @@
    }
  
    return 0;
@@ -193,9 +193,9 @@ diff -Nru a/mh.c b/mh.c
  
  static char *maildir_canon_filename (char *dest, const char *src, size_t l)
 diff -Nru a/mutt.h b/mutt.h
---- a/mutt.h	2005-01-27 20:54:24 +01:00
-+++ b/mutt.h	2005-01-28 15:12:54 +01:00
-@@ -353,6 +353,9 @@
+--- a/mutt.h	2005-02-12 21:19:25 +01:00
++++ b/mutt.h	2005-02-13 00:51:10 +01:00
+@@ -351,6 +351,9 @@
    OPTFORCENAME,
    OPTFORWDECODE,
    OPTFORWQUOTE,
diff --git a/mail/mutt-devel/files/patch-02 b/mail/mutt-devel/files/patch-02
index 05f26a83e8e3..5b7160c8d11e 100644
--- a/mail/mutt-devel/files/patch-02
+++ b/mail/mutt-devel/files/patch-02
@@ -1,7 +1,7 @@
---- doc/Makefile.in.orig	Thu Jan 24 22:53:25 2002
-+++ doc/Makefile.in	Fri Aug 30 11:26:16 2002
-@@ -61,13 +61,23 @@
- topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog	\
+--- doc/Makefile.in.orig	Tue Feb 15 20:28:24 2005
++++ doc/Makefile.in	Mon Mar 14 08:08:25 2005
+@@ -63,13 +63,23 @@
+ 	ChangeLog.old					\
  	README NEWS TODO README.SECURITY README.SSL 
  
 -all: muttrc.man try-html try-txt
@@ -27,7 +27,7 @@
  
  install: all instdoc
  	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1
-@@ -87,10 +97,6 @@
+@@ -90,10 +100,6 @@
  		$(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \
  	done
  	$(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true
@@ -38,11 +38,11 @@
  
  uninstall:
  	-rm -f $(DESTDIR)$(mandir)/man1/mutt.1
-@@ -100,17 +106,20 @@
+@@ -103,17 +109,20 @@
  
  check:
  manual.txt: manual.sgml
--	if sgml2txt -c latin manual ; then \
+-	if linuxdoc -B txt --pass='-P -c' manual ; then \
 -		uniq < manual.txt | expand > _manual.txt ; \
 -		rm manual.txt ; \
 +	if sgmlfmt -f ascii manual; then \
@@ -53,14 +53,14 @@
  
  manual.html: manual.sgml
 -	sgml2html manual  || true
-+	sgmlfmt -f html manual  || true
++	sgmlfmt -f html manual || true
 +
 +manual.latin1: manual.sgml
-+	sgmlfmt -f latin1 manual  || true
++	sgmlfmt -f latin1 manual || true
  
  manual.ps: manual.sgml
 -	sgml2latex --output=ps manual || true
-+	sgmlfmt -f ps manual  || true
++	sgmlfmt -f ps manual || true
  
  clean: 
  	rm -f *~ *.html *.orig *.rej  stamp-doc-sgml stamp-doc-man *.ps
diff --git a/mail/mutt-devel/files/patch-smime-find-keys b/mail/mutt-devel/files/patch-smime-find-keys
deleted file mode 100644
index e0dce29cb6be..000000000000
--- a/mail/mutt-devel/files/patch-smime-find-keys
+++ /dev/null
@@ -1,13 +0,0 @@
---- smime.c.orig2	Sat Feb 19 13:49:51 2005
-+++ smime.c	Sun Feb 20 08:58:35 2005
-@@ -464,8 +464,8 @@
-       }
-     }
-     if (hash) {
--      fname = safe_malloc(14); /* Hash + '.' + Suffix + \n + \0 */
--      sprintf(fname, "%.8x.%i\n", Table[cur].hash, Table[cur].suffix);
-+      fname = safe_malloc(13); /* Hash + '.' + Suffix + \0 */
-+      sprintf(fname, "%.8x.%i", Table[cur].hash, Table[cur].suffix);
-     }
-     else fname = NULL;
-   
diff --git a/mail/mutt-devel/scripts/generate-plist b/mail/mutt-devel/scripts/generate-plist
index 9a62e1ed2061..5221342e1b8f 100644
--- a/mail/mutt-devel/scripts/generate-plist
+++ b/mail/mutt-devel/scripts/generate-plist
@@ -133,7 +133,7 @@ EOF
   fi
 
   if [ "$MUTT_HTML" = "yes" ]; then
-    html=382
+    html=383
     if [ "$MUTT_COMPRESSED_FOLDERS" = "yes" ]; then
       html=$(($html + 5))
     fi