# changelog commit

diff --git a/ChangeLog b/ChangeLog
index d14fbde780c28a3925a9ab00a8d72aa15db20bc8..7c386187d4dcfe7971d1417f62d98c4973463192 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-24 18:28:36  Brendan Cully  <brendan@kublai.com>  (brendan)
+
+       * imap/message.c, muttlib.c, protos.h: Merge full envelope from
+       message fetch into original sparse envelope, instead of replacing
+       it. This should be gentler on the various threading hashes and may
+       (knock on wood) fix the threading segfault. Threading behaviour is
+       observably better.
+
 2005-07-24 18:18:29  brendan  (brendan)
 
        * imap/util.c: Revert Glanzmann's imap_parse_mailbox patch.