=== modified file 'mail/mail-component.c' --- mail/mail-component.c 2007-12-18 20:23:31 +0000 +++ mail/mail-component.c 2007-12-18 20:42:30 +0000 @@ -826,11 +826,14 @@ 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; gboolean empty_junk; 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)