Index: mail/mail-component.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-component.c,v
retrieving revision 1.132
diff -u -r1.132 mail/mail-component.c
--- mail/mail-component.c	8 Feb 2006 11:51:32 -0000	1.132
+++ mail/mail-component.c	20 Apr 2006 21:13:55 -0000
@@ -731,9 +731,12 @@
 	mail_config_prune_proxies ();
 	switch (mc->priv->quit_state) {
 	case MC_QUIT_START: {
+		extern int camel_application_is_exiting;
 		int now = time(NULL)/60/60/24, days;
 		GConfClient *gconf = mail_config_get_gconf_client();
-
+		
+		camel_application_is_exiting = TRUE;
+		
 		mail_vfolder_shutdown();
 
 		mc->priv->quit_expunge = gconf_client_get_bool(gconf, "/apps/evolution/mail/trash/empty_on_exit", NULL)