--- ./src/folder.h	Thu Sep 11 16:46:07 2003
+++ ../sylpheed-0.9.6claws/./src/folder.h	Mon Oct 20 14:34:28 2003
@@ -283,13 +283,14 @@
 	MsgCache *cache;
 
 	/* special flags */
-	guint no_sub         : 1; /* no child allowed?    */
-	guint no_select      : 1; /* not selectable?      */
-	guint collapsed      : 1; /* collapsed item       */
-	guint thread_collapsed      : 1; /* collapsed item       */
-	guint threaded       : 1; /* threaded folder view */
-	guint hide_read_msgs : 1; /* hide read messages   */
-	guint ret_rcpt       : 1; /* return receipt       */
+	guint no_sub		: 1; /* no child allowed?    */
+	guint no_select		: 1; /* not selectable?      */
+	guint collapsed		: 1; /* collapsed item       */
+	guint thread_collapsed	: 1; /* collapsed item       */
+	guint threaded		: 1; /* threaded folder view */
+	guint hide_read_msgs	: 1; /* hide read messages   */
+	guint ret_rcpt		: 1; /* return receipt       */
+	guint scan_on_inc	: 1; /* scan folder on incorporation */
 
 	gint op_count;
 	guint opened         : 1; /* opened by summary view */
@@ -323,6 +324,7 @@
 	guint		threaded	: 1;
 	guint		hide_read_msgs	: 1; /* CLAWS */
 	guint		ret_rcpt	: 1; /* CLAWS */
+	guint		scan_on_inc	: 1; /* CLAWS */
 } PersistPrefs;
 
 struct _FolderUpdateData
--- ./src/folder_item_prefs.h	Sun Aug 31 06:39:31 2003
+++ ../sylpheed-0.9.6claws/./src/folder_item_prefs.h	Mon Oct 20 15:59:57 2003
@@ -48,6 +48,7 @@
 	GSList * processing;
 
 	gboolean request_return_receipt;
+	gboolean scan_on_inc;
 	gboolean enable_default_to;
 	gchar *default_to;
 	gboolean enable_default_reply_to;
--- ./src/folderview.h	Sun Jul 20 09:43:22 2003
+++ ../sylpheed-0.9.6claws/./src/folderview.h	Mon Oct 20 15:06:22 2003
@@ -79,7 +79,8 @@
 					 GtkCTreeNode	*row);
 void folderview_rescan_tree		(Folder		*folder);
 void folderview_rescan_all		(void);
-gint folderview_check_new		(Folder		*folder);
+gint folderview_check_new		(Folder		*folder,
+					 gboolean	 scan_folders_on_inc);
 void folderview_check_new_all		(void);
 
 void folderview_new_folder		(FolderView	*folderview);
--- ./src/mh.h	Wed May 14 16:24:58 2003
+++ ../sylpheed-0.9.6claws/./src/mh.h	Tue Oct 21 11:20:58 2003
@@ -26,12 +26,21 @@
 #include "procmsg.h"
 
 typedef struct _MHFolder	MHFolder;
+typedef struct _MHFolderItem	MHFolderItem;
 
 #define MH_FOLDER(obj)		((MHFolder *)obj)
+#define MH_FOLDER_ITEM(obj)	((MHFolderItem *)obj)
 
 struct _MHFolder
 {
 	LocalFolder lfolder;
+};
+
+struct _MHFolderItem
+{
+	FolderItem item;
+
+	time_t last_update_time;
 };
 
 FolderClass *mh_get_class	(void);
--- ./src/prefs_common.h	Mon Sep 29 17:35:07 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_common.h	Mon Oct 20 15:17:19 2003
@@ -65,6 +65,7 @@
 	gboolean use_extinc;
 	gchar *extinc_cmd;
 	gboolean scan_all_after_inc;
+	gboolean scan_flagged_after_inc;
 	gboolean autochk_newmail;
 	gint autochk_itv;
 	gboolean chk_on_startup;
--- ./src/action.c	Sun Sep 28 17:21:34 2003
+++ ../sylpheed-0.9.6claws/./src/action.c	Wed Oct  8 15:47:00 2003
@@ -1124,7 +1124,7 @@
 	dialog = gtk_dialog_new();
 	gtk_container_set_border_width
 		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
-	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Action's input/output"));
 	gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
 	manage_window_set_transient(GTK_WINDOW(dialog));
--- ./src/addrgather.c	Wed Jul 24 03:17:27 2002
+++ ../sylpheed-0.9.6claws/./src/addrgather.c	Wed Oct  8 15:47:00 2003
@@ -473,7 +473,7 @@
 	window = gtk_window_new( GTK_WINDOW_DIALOG );
 	gtk_widget_set_usize( window, 380, -1 );
 	gtk_container_set_border_width(GTK_CONTAINER(window), 0);
-	gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_CENTER );
+	gtk_window_set_position( GTK_WINDOW(window), GTK_WIN_POS_MOUSE );
 	gtk_window_set_modal( GTK_WINDOW(window), TRUE );	
 	gtk_signal_connect( GTK_OBJECT(window), "delete_event",
 		GTK_SIGNAL_FUNC( addrgather_dlg_delete_event ), NULL );
--- ./src/alertpanel.c	Mon Sep 22 16:25:46 2003
+++ ../sylpheed-0.9.6claws/./src/alertpanel.c	Wed Oct  8 15:47:00 2003
@@ -242,7 +242,7 @@
 	gtk_window_set_policy(GTK_WINDOW(dialog), FALSE, FALSE, FALSE);
 	gtk_container_set_border_width
 		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
-	gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
 	gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
 			   GTK_SIGNAL_FUNC(alertpanel_deleted),
 			   (gpointer)G_ALERTOTHER);
--- ./src/compose.c	Wed Sep 24 04:01:50 2003
+++ ../sylpheed-0.9.6claws/./src/compose.c	Wed Oct  8 15:47:00 2003
@@ -5706,7 +5706,7 @@
 	gtk_widget_set_usize(window, 480, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
 	gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(attach_property_delete_event),
--- ./src/crash.c	Sun Aug 17 02:06:05 2003
+++ ../sylpheed-0.9.6claws/./src/crash.c	Wed Oct  8 15:47:00 2003
@@ -184,7 +184,7 @@
 	window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_container_set_border_width(GTK_CONTAINER(window1), 5);
 	gtk_window_set_title(GTK_WINDOW(window1), _("Sylpheed has crashed"));
-	gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window1), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window1), TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(window1), 460, 272);
 
--- ./src/editaddress.c	Sat Jun 21 16:45:48 2003
+++ ../sylpheed-0.9.6claws/./src/editaddress.c	Wed Oct  8 15:47:00 2003
@@ -478,7 +478,7 @@
 	gtk_widget_set_usize(window, EDITPERSON_WIDTH, EDITPERSON_HEIGHT );
 	/* gtk_container_set_border_width(GTK_CONTAINER(window), 0); */
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit Person Data"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_person_delete_event),
--- ./src/editbook.c	Sat Mar 16 17:10:45 2002
+++ ../sylpheed-0.9.6claws/./src/editbook.c	Wed Oct  8 15:47:00 2003
@@ -150,7 +150,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit Addressbook"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_book_delete_event),
--- ./src/editgroup.c	Sat Jun 21 16:45:48 2003
+++ ../sylpheed-0.9.6claws/./src/editgroup.c	Wed Oct  8 15:47:00 2003
@@ -262,7 +262,7 @@
 	gtk_widget_set_usize(window, EDITGROUP_WIDTH, EDITGROUP_HEIGHT );
 	gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit Group Data"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_group_delete_event),
--- ./src/editjpilot.c	Sat Jan 19 17:25:11 2002
+++ ../sylpheed-0.9.6claws/./src/editjpilot.c	Wed Oct  8 15:47:00 2003
@@ -271,7 +271,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit JPilot Entry"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_jpilot_delete_event),
--- ./src/editldap.c	Sat Jun 21 16:45:48 2003
+++ ../sylpheed-0.9.6claws/./src/editldap.c	Wed Oct  8 15:47:00 2003
@@ -311,7 +311,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP Server"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_ldap_delete_event),
--- ./src/editldap_basedn.c	Sat Jun 21 16:45:48 2003
+++ ../sylpheed-0.9.6claws/./src/editldap_basedn.c	Wed Oct  8 15:47:00 2003
@@ -139,7 +139,7 @@
 	gtk_widget_set_usize(window, 300, 270);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 0);
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit LDAP - Select Search Base"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_ldap_bdn_delete_event), NULL );
--- ./src/editvcard.c	Sat Jan 19 17:25:11 2002
+++ ../sylpheed-0.9.6claws/./src/editvcard.c	Wed Oct  8 15:47:00 2003
@@ -186,7 +186,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title(GTK_WINDOW(window), _("Edit vCard Entry"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(edit_vcard_delete_event),
--- ./src/exphtmldlg.c	Tue Aug  5 16:42:02 2003
+++ ../sylpheed-0.9.6claws/./src/exphtmldlg.c	Wed Oct  8 15:47:00 2003
@@ -687,7 +687,7 @@
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window),
 		_("Export Address Book to HTML File") );
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(export_html_delete_event),
--- ./src/expldifdlg.c	Tue Aug  5 14:13:01 2003
+++ ../sylpheed-0.9.6claws/./src/expldifdlg.c	Wed Oct  8 15:47:01 2003
@@ -708,7 +708,7 @@
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window),
 		_("Export Address Book to LDIF File") );
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(export_ldif_delete_event),
--- ./src/export.c	Sun Jun  8 08:03:41 2003
+++ ../sylpheed-0.9.6claws/./src/export.c	Wed Oct  8 15:47:01 2003
@@ -127,7 +127,7 @@
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_window_set_title(GTK_WINDOW(window), _("Export"));
 	gtk_container_set_border_width(GTK_CONTAINER(window), 5);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
--- ./src/folder.c	Fri Sep 26 19:41:23 2003
+++ ../sylpheed-0.9.6claws/./src/folder.c	Mon Oct 20 14:52:24 2003
@@ -201,6 +201,7 @@
 	item->thread_collapsed = FALSE;
 	item->threaded  = TRUE;
 	item->ret_rcpt  = FALSE;
+	item->scan_on_inc = FALSE;
 	item->opened    = FALSE;
 	item->node = NULL;
 	item->parent = NULL;
@@ -1072,7 +1073,8 @@
 
 gint folder_item_open(FolderItem *item)
 {
-	if((item->folder->klass->scan_required != NULL) && (item->folder->klass->scan_required(item->folder, item))) {
+	if((item->folder->klass->scan_required != NULL) &&
+	   (item->folder->klass->scan_required(item->folder, item))) {
 		folder_item_scan_full(item, TRUE);
 	}
 
@@ -1878,6 +1880,7 @@
 	new_item->thread_collapsed = src->thread_collapsed;
 	new_item->threaded  = src->threaded;
 	new_item->ret_rcpt  = src->ret_rcpt;
+	new_item->scan_on_inc = src->scan_on_inc;
 	new_item->hide_read_msgs = src->hide_read_msgs;
 	new_item->sort_key  = src->sort_key;
 	new_item->sort_type = src->sort_type;
@@ -2301,7 +2304,7 @@
 	gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
 		 threaded = TRUE, apply_sub = FALSE;
 	gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE,
-		 thread_collapsed = FALSE; /* CLAWS */
+		 thread_collapsed = FALSE, scan_on_inc = FALSE; /* CLAWS */
 	FolderSortKey sort_key = SORT_BY_NONE;
 	FolderSortType sort_type = SORT_ASCENDING;
 	gint new = 0, unread = 0, total = 0, unreadmarked = 0;
@@ -2362,6 +2365,8 @@
 			hidereadmsgs =  *attr->value == '1' ? TRUE : FALSE;
 		else if (!strcmp(attr->name, "reqretrcpt"))
 			ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
+		else if (!strcmp(attr->name, "scanoninc"))
+			scan_on_inc = *attr->value == '1' ? TRUE : FALSE;
 		else if (!strcmp(attr->name, "sort_key")) {
 			if (!strcmp(attr->value, "none"))
 				sort_key = SORT_BY_NONE;
@@ -2416,6 +2421,7 @@
 	item->threaded  = threaded;
 	item->hide_read_msgs  = hidereadmsgs;
 	item->ret_rcpt  = ret_rcpt;
+	item->scan_on_inc = scan_on_inc;
 	item->sort_key  = sort_key;
 	item->sort_type = sort_type;
 	item->node = node;
@@ -2450,7 +2456,8 @@
 	const gchar *path = NULL;
 	PrefsAccount *account = NULL;
 	gboolean collapsed = FALSE, threaded = TRUE, apply_sub = FALSE;
-	gboolean ret_rcpt = FALSE, thread_collapsed = FALSE; /* CLAWS */
+	gboolean ret_rcpt = FALSE, thread_collapsed = FALSE,
+		scan_on_inc = FALSE; /* CLAWS */
 
 	if (g_node_depth(node) != 2) return FALSE;
 	g_return_val_if_fail(node->data != NULL, FALSE);
@@ -2486,6 +2493,8 @@
 			apply_sub = *attr->value == '1' ? TRUE : FALSE;
 		else if (!strcmp(attr->name, "reqretrcpt"))
 			ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
+		else if (!strcmp(attr->name, "scanoninc"))
+			scan_on_inc = *attr->value == '1' ? TRUE : FALSE;
 	}
 
 	folder = folder_new(class, name, path);
@@ -2505,6 +2514,7 @@
 	item->account   = account;
 	item->apply_sub = apply_sub;
 	item->ret_rcpt  = ret_rcpt;
+	item->scan_on_inc = scan_on_inc;
 
 	g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
 			folder_build_tree, folder);
@@ -2568,6 +2578,8 @@
 			fputs(" apply_sub=\"1\"", fp);
 		if (item->ret_rcpt) 
 			fputs(" reqretrcpt=\"1\"", fp);
+		if (item->scan_on_inc) 
+			fputs(" scanoninc=\"1\"", fp);
 	} else {
 		fprintf(fp, "<folderitem type=\"%s\"",
 			folder_item_stype_str[item->stype]);
@@ -2598,6 +2610,8 @@
 			fputs(" hidereadmsgs=\"0\"", fp);
 		if (item->ret_rcpt)
 			fputs(" reqretrcpt=\"1\"", fp);
+		if (item->scan_on_inc)
+			fputs(" scanoninc=\"1\"", fp);
 
 		if (item->sort_key != SORT_BY_NONE) {
 			fprintf(fp, " sort_key=\"%s\"",
@@ -2806,6 +2820,7 @@
 	item->thread_collapsed = pp->thread_collapsed;
 	item->threaded  = pp->threaded;
 	item->ret_rcpt  = pp->ret_rcpt;
+	item->scan_on_inc  = pp->scan_on_inc;
 	item->hide_read_msgs = pp->hide_read_msgs;
 	item->sort_key  = pp->sort_key;
 	item->sort_type = pp->sort_type;
@@ -2831,6 +2846,7 @@
 		pp->thread_collapsed = item->thread_collapsed;
 		pp->threaded  = item->threaded;
 		pp->ret_rcpt  = item->ret_rcpt;	
+		pp->scan_on_inc = item->scan_on_inc;	
 		pp->hide_read_msgs = item->hide_read_msgs;
 		pp->sort_key  = item->sort_key;
 		pp->sort_type = item->sort_type;
--- ./src/folder_item_prefs.c	Sun Aug 31 06:39:31 2003
+++ ../sylpheed-0.9.6claws/./src/folder_item_prefs.c	Mon Oct 20 16:18:05 2003
@@ -60,6 +60,8 @@
 	/* MIGRATION */	 
 	{"request_return_receipt", "", &tmp_prefs.request_return_receipt, P_BOOL,
 	 NULL, NULL, NULL},
+	{"scan_on_inc", "", &tmp_prefs.scan_on_inc, P_BOOL,
+	 NULL, NULL, NULL},
 	{"enable_default_to", "", &tmp_prefs.enable_default_to, P_BOOL,
 	 NULL, NULL, NULL},
 	{"default_to", "", &tmp_prefs.default_to, P_STRING,
@@ -113,6 +115,7 @@
 	 */
 
 	item->ret_rcpt = tmp_prefs.request_return_receipt ? TRUE : FALSE;
+	item->scan_on_inc = tmp_prefs.scan_on_inc ? TRUE : FALSE;
 
 	/* MIGRATION: 0.7.8main+ has persistent sort order. claws had the sort
 	 *	      order in different members, which is ofcourse a little
@@ -166,6 +169,7 @@
 	prefs->important_score = 9999;
 
 	prefs->request_return_receipt = FALSE;
+	prefs->scan_on_inc = FALSE;
 	prefs->enable_default_to = FALSE;
 	prefs->default_to = NULL;
 	prefs->enable_default_reply_to = FALSE;
@@ -262,6 +266,7 @@
 	tmp_prefs.processing			= tmp_prop_list;
 	
 	tmp_prefs.request_return_receipt	= src->prefs->request_return_receipt;
+	tmp_prefs.scan_on_inc			= src->prefs->scan_on_inc;
 	tmp_prefs.enable_default_to		= src->prefs->enable_default_to;
 	tmp_prefs.default_to			= g_strdup(src->prefs->default_to);
 	tmp_prefs.enable_default_reply_to	= src->prefs->enable_default_reply_to;
--- ./src/foldersel.c	Fri Jun  6 17:38:30 2003
+++ ../sylpheed-0.9.6claws/./src/foldersel.c	Wed Oct  8 15:47:01 2003
@@ -148,7 +148,7 @@
 	gtk_window_set_title(GTK_WINDOW(window), _("Select folder"));
 	gtk_widget_set_usize(window, 300, 400);
 	gtk_container_set_border_width(GTK_CONTAINER(window), BORDER_WIDTH);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, TRUE);
 	gtk_window_set_wmclass
--- ./src/folderview.c	Wed Sep 17 17:45:20 2003
+++ ../sylpheed-0.9.6claws/./src/folderview.c	Mon Oct 20 17:51:33 2003
@@ -798,7 +798,7 @@
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_widget_set_usize(window, 380, 60);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_title(GTK_WINDOW(window), str);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
@@ -840,7 +840,7 @@
  *  \param folder the folder to check for new messages
  *  \return the number of new messages since last check
  */
-gint folderview_check_new(Folder *folder)
+gint folderview_check_new(Folder *folder, gboolean scan_folders_on_inc)
 {
 	GList *list;
 	FolderItem *item;
@@ -866,6 +866,13 @@
 			if (item->no_select) continue;
 			if (folder && folder != item->folder) continue;
 			if (!folder && !FOLDER_IS_LOCAL(item->folder)) continue;
+			if (scan_folders_on_inc) {
+				if (!item->scan_on_inc) continue;
+				if (item->folder->klass->scan_required != NULL &&
+				    item->folder->klass->scan_required(item->folder, item) == FALSE) {
+					continue;
+				}
+			}
 
 			folderview_scan_tree_func(item->folder, item, NULL);
 			former_new = item->new_msgs;
@@ -910,7 +917,7 @@
 	for (; list != NULL; list = list->next) {
 		Folder *folder = list->data;
 
-		folderview_check_new(folder);
+		folderview_check_new(folder, FALSE);
 	}
 
 	folder_write_list();
@@ -1806,7 +1813,7 @@
 	g_return_if_fail(item->folder != NULL);
 
 	if (action == 0)
-		folderview_check_new(item->folder);
+		folderview_check_new(item->folder, FALSE);
 	else
 		folderview_rescan_tree(item->folder);
 }
--- ./src/grouplistdialog.c	Wed Sep 17 17:29:18 2003
+++ ../sylpheed-0.9.6claws/./src/grouplistdialog.c	Wed Oct  8 15:47:01 2003
@@ -172,7 +172,7 @@
 			     GROUPLIST_DIALOG_WIDTH, GROUPLIST_DIALOG_HEIGHT);
 	gtk_container_set_border_width
 		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
-	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_title(GTK_WINDOW(dialog), _("Newsgroup subscription"));
 	gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
 			   GTK_SIGNAL_FUNC(window_deleted), NULL);
--- ./src/html.c	Tue Apr 22 22:03:17 2003
+++ ../sylpheed-0.9.6claws/./src/html.c	Wed Oct  8 15:47:01 2003
@@ -552,7 +552,7 @@
 		while (isspace(*tmpp)) tmpp++;
 		attr_name = tmpp;
 		if ((p = strchr(attr_name, '=')) == NULL) {
-			g_warning("html_get_tag(): syntax error in tag: '%s'\n", str);
+			/* g_warning("html_get_tag(): syntax error in tag: '%s'\n", str); */
 			return tag;
 		}
 		tmpp = p;
@@ -560,7 +560,7 @@
 		while (isspace(*tmpp)) tmpp++;
 
 		if (*tmpp == '\0') {
-			g_warning("html_get_tag(): syntax error in tag: '%s'\n", str);
+			/* g_warning("html_get_tag(): syntax error in tag: '%s'\n", str); */
 			return tag;
 		} else if (*tmpp == '"' || *tmpp == '\'') {
 			/* name="value" */
--- ./src/import.c	Wed Jan  8 08:49:26 2003
+++ ../sylpheed-0.9.6claws/./src/import.c	Wed Oct  8 15:47:01 2003
@@ -129,7 +129,7 @@
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_window_set_title(GTK_WINDOW(window), _("Import"));
 	gtk_container_set_border_width(GTK_CONTAINER(window), 5);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
--- ./src/importldif.c	Tue Aug  5 16:42:03 2003
+++ ../sylpheed-0.9.6claws/./src/importldif.c	Wed Oct  8 15:47:01 2003
@@ -997,7 +997,7 @@
 	gtk_widget_set_usize(window, IMPORTLDIF_WIDTH, IMPORTLDIF_HEIGHT );
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Import LDIF file into Address Book") );
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(imp_ldif_delete_event),
--- ./src/importmutt.c	Sat Mar 16 17:10:45 2002
+++ ../sylpheed-0.9.6claws/./src/importmutt.c	Wed Oct  8 15:47:01 2003
@@ -237,7 +237,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Import MUTT file into Address Book") );
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(imp_mutt_delete_event),
--- ./src/importpine.c	Tue Apr  2 16:57:31 2002
+++ ../sylpheed-0.9.6claws/./src/importpine.c	Wed Oct  8 15:47:01 2003
@@ -237,7 +237,7 @@
 	gtk_widget_set_usize(window, 450, -1);
 	gtk_container_set_border_width( GTK_CONTAINER(window), 0 );
 	gtk_window_set_title( GTK_WINDOW(window), _("Import Pine file into Address Book") );
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);	
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(imp_pine_delete_event),
--- ./src/inc.c	Tue Sep 30 00:55:25 2003
+++ ../sylpheed-0.9.6claws/./src/inc.c	Mon Oct 20 15:05:30 2003
@@ -143,7 +143,9 @@
 	FolderItem *item;
 
 	if (prefs_common.scan_all_after_inc)
-		folderview_check_new(NULL);
+		folderview_check_new(NULL, FALSE);
+	else if (prefs_common.scan_flagged_after_inc)
+		folderview_check_new(NULL, TRUE);
 
 	if (!new_messages && !prefs_common.scan_all_after_inc) return;
 
@@ -216,7 +218,7 @@
 		 * TODO: do it when bug [19] is fixed (IMAP folder sets 
 		 * an incorrect new message count)
 		 */
-		folderview_check_new(FOLDER(account->folder));
+		folderview_check_new(FOLDER(account->folder), FALSE);
 		return 0;
 	case A_POP3:
 	case A_APOP:
@@ -283,7 +285,7 @@
 		PrefsAccount *account = list->data;
 		if ((account->protocol == A_IMAP4 ||
 		     account->protocol == A_NNTP) && account->recv_at_getall) {
-			new_msgs += folderview_check_new(FOLDER(account->folder));
+			new_msgs += folderview_check_new(FOLDER(account->folder), FALSE);
 		}
 	}
 
--- ./src/inputdialog.c	Fri Jun  6 17:36:27 2003
+++ ../sylpheed-0.9.6claws/./src/inputdialog.c	Wed Oct  8 15:47:01 2003
@@ -169,7 +169,7 @@
 	gtk_widget_set_usize(dialog, INPUT_DIALOG_WIDTH, -1);
 	gtk_container_set_border_width
 		(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
-	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_MOUSE);
 	gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
 			   GTK_SIGNAL_FUNC(delete_event), NULL);
 	gtk_signal_connect(GTK_OBJECT(dialog), "key_press_event",
--- ./src/main.c	Tue Sep 30 00:55:25 2003
+++ ../sylpheed-0.9.6claws/./src/main.c	Mon Oct 20 15:06:48 2003
@@ -323,7 +323,7 @@
 	/* if Sylpheed crashed, rebuild caches */
 	if (!cmd.crash && is_file_exist(get_crashfile_name())) {
 		debug_print("Sylpheed crashed, checking for new messages in local folders\n");
-		folderview_check_new(NULL);
+		folderview_check_new(NULL, FALSE);
 	}
 	/* make the crash-indicator file */
 	str_write_to_file("foo", get_crashfile_name());
--- ./src/messageview.c	Sat Sep  6 07:31:57 2003
+++ ../sylpheed-0.9.6claws/./src/messageview.c	Wed Oct  8 15:47:01 2003
@@ -414,7 +414,7 @@
 	headerview_init(messageview->headerview);
 	textview_init(messageview->textview);
 	mimeview_init(messageview->mimeview);
-	/*messageview_set_font(messageview);*/
+	messageview_set_font(messageview);
 
 	noticeview_hide(messageview->noticeview);
 }
@@ -792,10 +792,10 @@
 		GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 		MsgInfo *msginfo = gtk_ctree_node_get_row_data(ctree, 
 						      summaryview->selected);
-		g_return_if_fail(msginfo != NULL);
 
-		messageview_show(msgview, msginfo, 
-				 msgview->all_headers);
+		if (msginfo != NULL)
+			messageview_show(msgview, msginfo, 
+					 msgview->all_headers);
 	} 
 }
 
--- ./src/mh.c	Thu Sep 11 16:53:36 2003
+++ ../sylpheed-0.9.6claws/./src/mh.c	Tue Oct 21 11:29:39 2003
@@ -48,6 +48,8 @@
 
 static Folder *mh_folder_new(const gchar * name, const gchar * path);
 static void mh_folder_destroy(Folder * folder);
+static FolderItem *mh_folder_item_new(Folder *folder);
+static void mh_folder_item_destroy(Folder *folder, FolderItem *_item);
 static gchar *mh_fetch_msg(Folder * folder, FolderItem * item, gint num);
 static MsgInfo *mh_get_msginfo(Folder * folder,
 			       FolderItem * item, gint num);
@@ -81,6 +83,7 @@
 static MsgInfo *mh_parse_msg(const gchar * file, FolderItem * item);
 static void	mh_remove_missing_folder_items	(Folder		*folder);
 static void mh_scan_tree_recursive(FolderItem * item);
+static gboolean mh_scan_required(Folder *folder, FolderItem *item);
 
 static gboolean mh_rename_folder_func(GNode * node, gpointer data);
 static gchar *mh_item_get_path(Folder *folder, FolderItem *item);
@@ -98,8 +101,8 @@
 	mh_create_tree,
 
 	/* FolderItem functions */
-	NULL,
-	NULL,
+	mh_folder_item_new,
+	mh_folder_item_destroy,
 	mh_item_get_path,
 	mh_create_folder,
 	mh_rename_folder,
@@ -109,7 +112,7 @@
 	NULL,
 	NULL,
 	NULL,
-	NULL,
+	mh_scan_required,
 	
 	/* Message functions */
 	mh_get_msginfo,
@@ -149,7 +152,28 @@
 static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
 {
 	folder_local_folder_init(folder, name, path);
+}
+
+static FolderItem *mh_folder_item_new(Folder *folder)
+{
+	MHFolderItem *item;
+	
+	item = g_new0(MHFolderItem, 1);
+	item->last_update_time = 0;
+
+	debug_print("mh_folder_item_new: %d\n",
+		    item->last_update_time);
+
+	return (FolderItem *)item;
+}
+
+static void mh_folder_item_destroy(Folder *folder, FolderItem *_item)
+{
+	MHFolderItem *item = (MHFolderItem *)_item;
+
+	g_return_if_fail(item != NULL);
 
+	g_free(_item);
 }
 
 void mh_get_last_num(Folder *folder, FolderItem *item)
@@ -203,7 +227,7 @@
 
 	g_return_val_if_fail(item != NULL, -1);
 
-	debug_print("mh_get_last_num(): Scanning %s ...\n", item->path);
+	debug_print("mh_get_num_list(): Scanning %s ...\n", item->path);
 
 	*old_uids_valid = TRUE;
 
@@ -230,6 +254,11 @@
 	}
 	closedir(dp);
 
+	MH_FOLDER_ITEM(item)->last_update_time = time(0);
+	debug_print("mh_get_num_list: %s, %d\n",
+		    path,
+		    MH_FOLDER_ITEM(item)->last_update_time);
+
 	return nummsgs;
 }
 
@@ -252,6 +281,37 @@
 	return file;
 }
 
+gboolean mh_scan_required(Folder *folder, FolderItem *item)
+{
+	gchar *path;
+	struct stat s;
+
+	path = folder_item_get_path(item);
+	g_return_val_if_fail(path != NULL, FALSE);
+
+	if (stat(path, &s) < 0) {
+		FILE_OP_ERROR(path, "stat");
+		g_free(path);
+		return FALSE;
+	}
+
+	if (s.st_mtime > MH_FOLDER_ITEM(item)->last_update_time) {
+		debug_print("MH scan required, folder updated: %s (%d > %d)\n",
+			    path,
+			    s.st_mtime,
+			    MH_FOLDER_ITEM(item)->last_update_time);
+		g_free(path);
+		return TRUE;
+	}
+
+	debug_print("MH scan not required: %s (%d <= %d)\n",
+		    path,
+		    s.st_mtime,
+		    MH_FOLDER_ITEM(item)->last_update_time);
+	g_free(path);
+	return FALSE;
+}
+
 MsgInfo *mh_get_msginfo(Folder *folder, FolderItem *item, gint num)
 {
 	MsgInfo *msginfo;
@@ -436,6 +496,7 @@
 	}
 
 	g_free(file);
+
 	return 0;
 }
 
@@ -869,6 +930,11 @@
 	}
 
 	closedir(dp);
+
+	MH_FOLDER_ITEM(item)->last_update_time = time(0);
+	debug_print("mh_scan_tree_recursive: %s, %d\n",
+		    item->path,
+		    MH_FOLDER_ITEM(item)->last_update_time);
 
 /*
 	if (item->path) {
--- ./src/passphrase.c	Wed May 14 16:24:58 2003
+++ ../sylpheed-0.9.6claws/./src/passphrase.c	Wed Oct  8 15:47:01 2003
@@ -85,7 +85,7 @@
     gtk_window_set_title(GTK_WINDOW(window), _("Passphrase"));
     gtk_widget_set_usize(window, 450, -1);
     gtk_container_set_border_width(GTK_CONTAINER(window), 4);
-    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+    gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
     gtk_window_set_modal(GTK_WINDOW(window), TRUE);
     gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
     gtk_signal_connect(GTK_OBJECT(window), "delete_event",
@@ -147,7 +147,7 @@
 
     if (grab_all)
         gtk_object_set (GTK_OBJECT(window), "type", GTK_WINDOW_POPUP, NULL);
-    gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+    gtk_window_set_position (GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
     if (grab_all)   
         gtk_window_set_policy (GTK_WINDOW(window), FALSE, FALSE, TRUE);
     
--- ./src/prefs_actions.c	Sun Sep 14 20:56:19 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_actions.c	Wed Oct  8 15:47:01 2003
@@ -149,7 +149,7 @@
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 
 	gtk_container_set_border_width(GTK_CONTAINER (window), 8);
-	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_window_set_default_size(GTK_WINDOW(window), 400, -1);
--- ./src/prefs_common.c	Tue Sep 30 00:55:25 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_common.c	Mon Oct 20 15:19:42 2003
@@ -72,8 +72,8 @@
 
 	GtkWidget *checkbtn_chkonstartup;
 	GtkWidget *checkbtn_scan_after_inc;
+	GtkWidget *checkbtn_scan_flagged_after_inc;
 
-
 	GtkWidget *checkbtn_newmail_auto;
 	GtkWidget *checkbtn_newmail_manu;
 	GtkWidget *entry_newmail_notify_cmd;
@@ -270,6 +270,9 @@
 	{"scan_all_after_inc", "FALSE", &prefs_common.scan_all_after_inc,
 	 P_BOOL, &receive.checkbtn_scan_after_inc,
 	 prefs_set_data_from_toggle, prefs_set_toggle},
+	{"scan_flagged_after_inc", "FALSE", &prefs_common.scan_flagged_after_inc,
+	 P_BOOL, &receive.checkbtn_scan_flagged_after_inc,
+	 prefs_set_data_from_toggle, prefs_set_toggle},
 	{"newmail_notify_manu", "FALSE", &prefs_common.newmail_notify_manu,
 	 P_BOOL, &receive.checkbtn_newmail_manu,
  	 prefs_set_data_from_toggle, prefs_set_toggle},
@@ -1012,6 +1015,7 @@
 	GtkWidget *label_autochk2;
 	GtkWidget *checkbtn_chkonstartup;
 	GtkWidget *checkbtn_scan_after_inc;
+	GtkWidget *checkbtn_scan_flagged_after_inc;
 
 
 	GtkWidget *frame_newmail;
@@ -1100,6 +1104,8 @@
 			   _("Check new mail on startup"));
 	PACK_CHECK_BUTTON (vbox2, checkbtn_scan_after_inc,
 			   _("Update all local folders after incorporation"));
+	PACK_CHECK_BUTTON (vbox2, checkbtn_scan_flagged_after_inc,
+			   _("Update flagged local folders after incorporation"));
 
 
 	/* receive dialog */
@@ -1184,7 +1190,7 @@
 
 	receive.checkbtn_chkonstartup = checkbtn_chkonstartup;
 	receive.checkbtn_scan_after_inc = checkbtn_scan_after_inc;
-
+	receive.checkbtn_scan_flagged_after_inc = checkbtn_scan_flagged_after_inc;
 
 	receive.checkbtn_newmail_auto  = checkbtn_newmail_auto;
 	receive.checkbtn_newmail_manu  = checkbtn_newmail_manu;
@@ -2698,7 +2704,7 @@
 	datefmt_win = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width(GTK_CONTAINER(datefmt_win), 8);
 	gtk_window_set_title(GTK_WINDOW(datefmt_win), _("Date format"));
-	gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_MOUSE);
 	gtk_widget_set_usize(datefmt_win, 440, 280);
 
 	vbox1 = gtk_vbox_new(FALSE, 10);
@@ -2798,7 +2804,7 @@
 			   GTK_SIGNAL_FUNC(date_format_select_row),
 			   datefmt_win);
 
-	gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(datefmt_win), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(datefmt_win), TRUE);
 
 	gtk_widget_show(datefmt_win);
@@ -2842,7 +2848,7 @@
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 2);
 	gtk_window_set_title(GTK_WINDOW(window), _("Set message colors"));
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
 
@@ -3023,7 +3029,7 @@
 	}
 
 	color_dialog = gtk_color_selection_dialog_new(title);
-	gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
 	manage_window_set_transient(GTK_WINDOW(color_dialog));
@@ -3151,7 +3157,7 @@
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 	gtk_window_set_title (GTK_WINDOW (window), _("Key bindings"));
-	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, FALSE, FALSE);
 	manage_window_set_transient (GTK_WINDOW (window));
--- ./src/prefs_customheader.c	Fri Jan 10 20:53:37 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_customheader.c	Wed Oct  8 15:47:01 2003
@@ -146,7 +146,7 @@
 
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_display_header.c	Tue Dec 31 11:11:11 2002
+++ ../sylpheed-0.9.6claws/./src/prefs_display_header.c	Wed Oct  8 15:47:01 2003
@@ -179,7 +179,7 @@
 
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_filtering.c	Mon Sep 15 03:20:21 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_filtering.c	Wed Oct  8 15:47:01 2003
@@ -201,7 +201,7 @@
 
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_filtering_action.c	Mon Sep 15 03:20:21 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_filtering_action.c	Wed Oct  8 15:47:01 2003
@@ -256,7 +256,7 @@
 
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_folder_item.c	Sun Aug 31 06:39:32 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_folder_item.c	Mon Oct 20 16:14:26 2003
@@ -66,6 +66,7 @@
 	GtkWidget *checkbtn_folder_chmod;
 	GtkWidget *entry_folder_chmod;
 	GtkWidget *folder_color_btn;
+	GtkWidget *checkbtn_scan_on_inc;
 
 	gint	   folder_color;
 };
@@ -117,6 +118,7 @@
 	GtkWidget *entry_folder_chmod;
 	GtkWidget *folder_color;
 	GtkWidget *folder_color_btn;
+	GtkWidget *checkbtn_scan_on_inc;
 
 	page->item	   = item;
 
@@ -194,6 +196,18 @@
 
 	rowcount++;
 
+	/* Scan on incorporation */
+	checkbtn_scan_on_inc = gtk_check_button_new_with_label
+		(_("Scan on incorporation"));
+	gtk_widget_show(checkbtn_scan_on_inc);
+	gtk_table_attach(GTK_TABLE(table), checkbtn_scan_on_inc, 
+			 0, 2, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, 
+			 GTK_FILL, 0, 0);
+	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbtn_scan_on_inc),
+				     item->scan_on_inc ? TRUE : FALSE);
+
+	rowcount++;
+
 	page->table = table;
 	page->checkbtn_simplify_subject = checkbtn_simplify_subject;
 	page->entry_simplify_subject = entry_simplify_subject;
@@ -200,6 +214,7 @@
 	page->checkbtn_folder_chmod = checkbtn_folder_chmod;
 	page->entry_folder_chmod = entry_folder_chmod;
 	page->folder_color_btn = folder_color_btn;
+	page->checkbtn_scan_on_inc = checkbtn_scan_on_inc;
 
 	page->page.widget = table;
 }
@@ -244,6 +259,10 @@
 	/* update folder view */
 	if (prefs->color > 0)
 		folder_item_update(page->item, F_ITEM_UPDATE_MSGCNT);
+
+	prefs->scan_on_inc = 
+	    gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(page->checkbtn_scan_on_inc));
+	page->item->scan_on_inc = prefs->scan_on_inc;
 
 	folder_item_prefs_save_config(page->item);
 }
--- ./src/prefs_fonts.c	Thu Oct  2 00:46:12 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_fonts.c	Wed Oct  8 15:47:01 2003
@@ -74,7 +74,7 @@
 		font_sel_win = gtk_font_selection_dialog_new
 			(_("Font selection"));
 		gtk_window_position(GTK_WINDOW(font_sel_win),
-				    GTK_WIN_POS_CENTER);
+				    GTK_WIN_POS_MOUSE);
 		gtk_signal_connect(GTK_OBJECT(font_sel_win), "delete_event",
 				   GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete),
 				   NULL);
--- ./src/prefs_gtk.c	Sun Jul 20 18:01:48 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_gtk.c	Wed Oct  8 15:47:01 2003
@@ -428,7 +428,7 @@
 
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW(window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_matcher.c	Wed Sep 17 19:18:19 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_matcher.c	Wed Oct  8 15:47:01 2003
@@ -359,7 +359,7 @@
 
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_scoring.c	Sun Jul 20 18:01:48 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_scoring.c	Wed Oct  8 15:47:01 2003
@@ -185,7 +185,7 @@
 
 	window = gtk_window_new (GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 
--- ./src/prefs_summary_column.c	Sun Jan 26 23:56:55 2003
+++ ../sylpheed-0.9.6claws/./src/prefs_summary_column.c	Wed Oct  8 15:47:01 2003
@@ -171,7 +171,7 @@
 
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, FALSE, FALSE);
 	gtk_window_set_title(GTK_WINDOW(window),
--- ./src/prefs_template.c	Thu Nov 28 04:41:38 2002
+++ ../sylpheed-0.9.6claws/./src/prefs_template.c	Wed Oct  8 15:47:01 2003
@@ -135,7 +135,7 @@
 
 	/* main window */
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
-	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 	gtk_window_set_default_size(GTK_WINDOW(window), 400, -1);
--- ./src/procheader.c	Tue Jul 29 20:05:05 2003
+++ ../sylpheed-0.9.6claws/./src/procheader.c	Wed Oct  8 15:47:01 2003
@@ -909,9 +909,11 @@
 {
 	gchar *file;
 	FILE *fp;
-	HeaderEntry hentry[]={ { header, NULL, TRUE  },
-                               { NULL,   NULL, FALSE } };
+	HeaderEntry hentry[]={ { NULL, NULL, TRUE  },
+                               { NULL, NULL, FALSE } };
 	gint val;
+
+	hentry[0].name = header;
        
 	g_return_val_if_fail(msginfo != NULL, -1);
 	file = procmsg_get_message_file_path(msginfo);
--- ./src/progressdialog.c	Thu Aug 29 19:09:18 2002
+++ ../sylpheed-0.9.6claws/./src/progressdialog.c	Wed Oct  8 15:47:01 2003
@@ -58,7 +58,7 @@
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_widget_set_usize(window, 460, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
 	gtk_widget_realize(window);
 
--- ./src/sigstatus.c	Sat Nov 30 01:52:24 2002
+++ ../sylpheed-0.9.6claws/./src/sigstatus.c	Wed Oct  8 15:47:01 2003
@@ -111,7 +111,7 @@
 	hd->mainwindow = window;
 	gtk_widget_set_usize(window, 400, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, FALSE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(delete_event), hd);
--- ./src/ssl_manager.c	Mon Dec  9 00:52:09 2002
+++ ../sylpheed-0.9.6claws/./src/ssl_manager.c	Wed Oct  8 15:47:01 2003
@@ -81,7 +81,7 @@
 	gtk_window_set_title (GTK_WINDOW(window),
 			      _("Saved SSL Certificates"));
 	gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, FALSE);
 	gtk_signal_connect (GTK_OBJECT(window), "delete_event",
 			    GTK_SIGNAL_FUNC(ssl_manager_ok_cb), NULL);
--- ./src/gtk/about.c	Mon Mar 17 22:13:53 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/about.c	Wed Oct  8 15:47:01 2003
@@ -89,7 +89,7 @@
 	gtk_window_set_title(GTK_WINDOW(window), _("About"));
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
 	gtk_widget_set_usize(window, 518, 358);
-	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
 			   GTK_SIGNAL_FUNC(gtk_widget_hide_on_delete), NULL);
 	gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
--- ./src/gtk/colorsel.c	Sat Aug  9 11:11:53 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/colorsel.c	Wed Oct  8 15:47:01 2003
@@ -49,7 +49,7 @@
 	gint result;
 
 	color_dialog = GTK_COLOR_SELECTION_DIALOG(gtk_color_selection_dialog_new(title));
-	gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(color_dialog), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(color_dialog), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(color_dialog), FALSE, FALSE, FALSE);
 	manage_window_set_transient(GTK_WINDOW(color_dialog));
--- ./src/gtk/description_window.c	Mon Jan 27 00:31:26 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/description_window.c	Wed Oct  8 15:47:01 2003
@@ -64,7 +64,7 @@
 	gtk_window_set_title(GTK_WINDOW(dwindow->window),
 			     gettext(dwindow->title));
 	gtk_container_set_border_width(GTK_CONTAINER(dwindow->window), 8);
-	gtk_window_set_position(GTK_WINDOW(dwindow->window), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(dwindow->window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(dwindow->window), TRUE);
 	gtk_window_set_policy(GTK_WINDOW(dwindow->window), FALSE, TRUE, FALSE);
 
--- ./src/gtk/filesel.c	Wed Sep  3 15:53:18 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/filesel.c	Wed Oct  8 15:47:01 2003
@@ -177,7 +177,7 @@
 static void filesel_create(const gchar *title, gboolean multiple_files)
 {
 	filesel = gtk_file_selection_new(title);
-	gtk_window_set_position(GTK_WINDOW(filesel), GTK_WIN_POS_CENTER);
+	gtk_window_set_position(GTK_WINDOW(filesel), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(filesel), TRUE);
 	gtk_window_set_wmclass
 		(GTK_WINDOW(filesel), "file_selection", "Sylpheed");
--- ./src/gtk/pluginwindow.c	Sun Jun  8 08:03:41 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/pluginwindow.c	Wed Oct  8 15:47:01 2003
@@ -149,7 +149,7 @@
 	gtk_window_set_default_size(GTK_WINDOW(window), 480, 300);
 	gtk_window_set_title(GTK_WINDOW(window), _("Plugins"));
 	gtk_window_set_position(GTK_WINDOW(window),
-				GTK_WIN_POS_CENTER);
+				GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 
 	vbox1 = gtk_vbox_new(FALSE, 4);
--- ./src/gtk/prefswindow.c	Sun Aug 10 06:33:46 2003
+++ ../sylpheed-0.9.6claws/./src/gtk/prefswindow.c	Wed Oct  8 15:47:01 2003
@@ -222,7 +222,7 @@
 	prefswindow->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_title(GTK_WINDOW(prefswindow->window), title);
 	gtk_window_set_default_size(GTK_WINDOW(prefswindow->window), 600, 340);
-	gtk_window_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_CENTER);
+	gtk_window_position (GTK_WINDOW(prefswindow->window), GTK_WIN_POS_MOUSE);
 	gtk_window_set_modal (GTK_WINDOW (prefswindow->window), TRUE);
 	gtk_window_set_policy (GTK_WINDOW(prefswindow->window), FALSE, TRUE, FALSE);
 	gtk_container_set_border_width(GTK_CONTAINER(prefswindow->window), 4);
--- ./tools/OOo2sylpheed.pl	Wed Jan  8 20:54:07 2003
+++ ../sylpheed-0.9.6claws/./tools/OOo2sylpheed.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright 2002 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/calypso_convert.pl	Sat Jul 20 01:49:28 2002
+++ ../sylpheed-0.9.6claws/./tools/calypso_convert.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 # calypso_import.pl
 # Author: Thorsten Maerz <info@netztorte.de>
 # License: GPL
--- ./tools/convert_mbox.pl	Tue May 20 20:05:07 2003
+++ ../sylpheed-0.9.6claws/./tools/convert_mbox.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 # convert_mbox.pl
 # perl script to convert mbox file to files in a new MH directory
 # aka another mbox -> MH conversion tool
--- ./tools/filter_conv.pl	Wed Dec  4 01:06:00 2002
+++ ../sylpheed-0.9.6claws/./tools/filter_conv.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/freeware/bin/perl -w
 use strict;
 
 #  * Copyright 2002 Paul Mangan <claws@thewildbeast.co.uk>
--- ./tools/freshmeat_search.pl	Sun Feb 23 21:10:05 2003
+++ ../sylpheed-0.9.6claws/./tools/freshmeat_search.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2003 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/gif2xface.pl	Sat Jul 28 17:33:55 2001
+++ ../sylpheed-0.9.6claws/./tools/gif2xface.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 #
 # gif2xface -- converts a 48x48 GIF file to an X-Face mail header
 #
--- ./tools/google_msgid.pl	Wed Dec 18 08:25:49 2002
+++ ../sylpheed-0.9.6claws/./tools/google_msgid.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 my $browser   = 'mozilla';
 my $google_id = 'http://groups.google.com/groups?as_umsgid';
 $_ = <>;
--- ./tools/google_search.pl	Sun Feb 23 21:10:04 2003
+++ ../sylpheed-0.9.6claws/./tools/google_search.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2003 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/kmail2sylpheed.pl	Sat May 25 20:10:05 2002
+++ ../sylpheed-0.9.6claws/./tools/kmail2sylpheed.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2002 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/kmail2sylpheed_v2.pl	Sat Nov  9 02:33:03 2002
+++ ../sylpheed-0.9.6claws/./tools/kmail2sylpheed_v2.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2002 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/maildir2sylpheed.pl	Wed Oct  1 19:12:12 2003
+++ ../sylpheed-0.9.6claws/./tools/maildir2sylpheed.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * This file is free software; you can redistribute it and/or modify it
 #  * under the terms of the GNU General Public License as published by
--- ./tools/multiwebsearch.pl	Sat Jul 26 19:59:54 2003
+++ ../sylpheed-0.9.6claws/./tools/multiwebsearch.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2003 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/newscache_clean.pl	Wed Dec 12 02:07:15 2001
+++ ../sylpheed-0.9.6claws/./tools/newscache_clean.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright 2001 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/outlook2sylpheed.pl	Sun Apr 20 18:10:51 2003
+++ ../sylpheed-0.9.6claws/./tools/outlook2sylpheed.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/freeware/bin/perl -w
 
 #  * Copyright 2002-2003 Ricardo Mones Lastra <mones@aic.uniovi.es>
 #  *
--- ./tools/sylpheed-switcher	Fri Dec  7 23:25:01 2001
+++ ../sylpheed-0.9.6claws/./tools/sylpheed-switcher	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 #  * Copyright © 2001 Paul Mangan <claws@thewildbeast.co.uk>
 #  *
--- ./tools/sylprint.pl	Wed Jan  9 06:34:37 2002
+++ ../sylpheed-0.9.6claws/./tools/sylprint.pl	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/freeware/bin/perl -w
 #
 # sylprint.pl - process a Sylpheed mail and print it using enscript or lpr
 # 
--- ./tools/tb2sylpheed	Fri Jan  3 05:03:25 2003
+++ ../sylpheed-0.9.6claws/./tools/tb2sylpheed	Wed Oct  8 15:47:01 2003
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/freeware/bin/perl
 
 # Script name : tb2sylpheed
 # Script version: 1.0.1
--- ./config/ltmain.sh	Fri Oct  3 00:39:28 2003
+++ ../sylpheed-0.9.6claws/./config/ltmain.sh	Wed Oct  8 15:47:01 2003
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"