--- mutt-1.5.8/PATCHES~	never
+++ mutt-1.5.8/PATCHES	Tue Mar  8 13:43:07 CST 2005
@@ -1,0 +1 @@
+patch-1.5.8.dgc.uncollapsenew.1
diff -Pur mutt-1.5.8-base/curs_main.c mutt-1.5.8/curs_main.c
--- mutt-1.5.8-base/curs_main.c	Sat Feb 12 13:22:15 2005
+++ mutt-1.5.8/curs_main.c	Tue Mar  8 12:50:47 2005
@@ -317,7 +317,7 @@
   mutt_sort_headers (Context, (check == M_REOPENED));
 
   /* uncollapse threads with new mail */
-  if ((Sort & SORT_MASK) == SORT_THREADS)
+  if (option(OPTUNCOLLAPSENEW) && ((Sort & SORT_MASK) == SORT_THREADS))
   {
     if (check == M_REOPENED)
     {
diff -Pur mutt-1.5.8-base/init.h mutt-1.5.8/init.h
--- mutt-1.5.8-base/init.h	Sat Feb 12 14:01:10 2005
+++ mutt-1.5.8/init.h	Tue Mar  8 12:54:20 2005
@@ -306,6 +306,14 @@
   ** When \fIset\fP, Mutt will jump to the next unread message, if any,
   ** when the current thread is \fIun\fPcollapsed.
   */
+  { "uncollapse_new", 	DT_BOOL, R_NONE, OPTUNCOLLAPSENEW, 1 },
+  /*
+  ** .pp
+  ** When \fIset\fP, Mutt will automatically uncollapse any collapsed thread
+  ** that receives a new message. When \fIunset\fP, collapsed threads will
+  ** remain collapsed. the presence of the new message will still affect
+  ** index sorting, though.
+  */
   { "compose_format",	DT_STR,	 R_BOTH, UL &ComposeFormat, UL "-- Mutt: Compose  [Approx. msg size: %l   Atts: %a]%>-" },
   /*
   ** .pp
diff -Pur mutt-1.5.8-base/mutt.h mutt-1.5.8/mutt.h
--- mutt-1.5.8-base/mutt.h	Sat Feb 12 14:01:20 2005
+++ mutt-1.5.8/mutt.h	Tue Mar  8 12:51:30 2005
@@ -426,6 +426,7 @@
   OPTTHREADRECEIVED,
   OPTTILDE,
   OPTUNCOLLAPSEJUMP,
+  OPTUNCOLLAPSENEW,
   OPTUSE8BITMIME,
   OPTUSEDOMAIN,
   OPTUSEFROM,