Merged mine and Peter's entries.

2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>

	* NEWS (Mail): Merged mine and Peter's entries.

svn path=/trunk/; revision=11097

4 files changed, 48 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index abe8b677bf..aab1753397 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* NEWS (Mail): Merged mine and Peter's entries.
+
 2001-07-12  JP Rosevear  <jpr@ximian.com>
 
 	* NEWS: Start new entry
diff --git a/NEWS b/NEWS
index a8c1192273..c1e0e3f91f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,23 +3,51 @@ Version 0.11.0 "No code name yet", 2001-07-12
 
 Shell:
 
-Mail: 
+Mail:
 
-  - Added more folder information and cleaned up this code. You can 
-    now see the number of hidden messages and total number of messages
-    in the upper righthand corner of the screen. (Peter)
+  - Added ability to specify a charset in the composer and for the Preview Pane.  (Jeff, Danw)
 
-  - Standalone message view now has full menus. (Peter)
+  - Auto-save messages during composition and composer crash-recovery.  (Larry)
 
-  - Implemented "Select Thread". (Peter)
+  - Better signature file handling.  (Radek)
 
-  - Fixed saving of html signature preferences. (Peter)
+  - File->Insert menu.  (Larry)
 
-  - Cleaned up exiting by having remote stores sync folders (Peter)
+  - Address-completion in the composer.  (Trow)
+
+  - Much improved PGP/GPG.  (Jeff)
+
+  - Cut/Copy/Paste and Drag & Drop.  (Jeff)
+
+  - Disconnected IMAP, IMAP filtering, and other IMAP improvements. (Danw)
+
+  - Empty Trash On Exit.  (Jeff)
+
+  - More informative Folder message counts (new/hidden/total).  (Peter)
+
+  - Implemented "Select Thread".  (Peter)
+
+  - Movemail fixes and improvements.  (Michael)
 
-  - Bugzilla bugs fixed: 4245, 4137, 4281, 4422
+  - Improved/Configurable Forward/Reply functionality.  (Jeff, Trow, Danw)
 
-  - Send Later no longer segfaults (Peter)
+  - Improved Message browser window.  (Jeff, Peter)
+
+  - Load HTML images Sometimes/Always/Never.  (Danw)
+
+  - rfc2184 conformance.  (Jeff)
+
+  - Online/Offline modes.  (Ettore, Danw, Jeff)
+
+  - HTML indexing.  (Michael)
+
+  - Spool providers.  (Michael)
+
+  - Many i18n fixes. (Jeff, Trow, Larry, Michael)
+
+  - Fixed saving of html signature preferences. (Peter)
+
+  - Cleaned up exiting by having remote stores sync folders (Peter)
 
   - Attached binhex files do not cause infintie loops (Peter)
 
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 1037c39b7e..58a21f8d2e 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,11 +1,11 @@
 2001-07-13  Peter Williams  <peterw@ximian.com>
 
-	* mail-callbacks.c (expunge_folder): Segfault prevention here if no uid is
-	currently loaded.
+	* mail-callbacks.c (expunge_folder): Segfault prevention here if
+	no uid is currently loaded.
 
-	* mail-vfolder.c (unlist_vfolder): New function. If a vfolder in our list
-	gets finalized, NULL out info->folder (Is it wrong if this happens?) Also,
-	locking issues?
+	* mail-vfolder.c (unlist_vfolder): New function. If a vfolder in
+	our list gets finalized, NULL out info->folder (Is it wrong if
+	this happens?) Also, locking issues?
 	(vfolder_uri_to_folder): Hook up to the finalize event here.
 
 2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
diff --git a/mail/mail-callbacks.c b/mail/mail-callbacks.c
index 2f0269caf7..b982fc1c97 100644
--- a/mail/mail-callbacks.c
+++ b/mail/mail-callbacks.c
@@ -1655,7 +1655,7 @@ expunge_folder (BonoboUIComponent *uih, void *user_data, const char *path)
                    viewed is one of those to be expunged */
 		if (fb->loaded_uid) {
 			info = camel_folder_get_message_info (fb->folder, fb->loaded_uid);
-
+			
 			if (info && info->flags & CAMEL_MESSAGE_DELETED)
 				mail_display_set_message (fb->mail_display, NULL);
 		}