[continued from previous message]

*** 218,228 ****
*/
action_message(to_keep,to_store, to_delete);

! if (!cd)
! cd = new_schedule_cancel(check_delay_msec,
! CATGETS(elm_msg_cat, ElmSet,
! ElmCheckingMailbox,
! "Checking mailbox ..."));
rflush = flush_folder(storage->current_folder,&err,cd);
if (rflush) {
r1 = new_mail_on_folder(storage->current_folder,&new_bytes,&newmails,&err,
--- 214,221 ----
*/
action_message(to_keep,to_store, to_delete);

! setup_mbx_cancel_message(&cd,mbx_checking_mailbox);
!
rflush = flush_folder(storage->current_folder,&err,cd);
if (rflush) {
r1 = new_mail_on_folder(storage->current_folder,&new_bytes,&newmails,&err,
***************
*** 445,455 ****
else
sleep(5);

! if (!cd)
! cd = new_schedule_cancel(exit_delay_msec,
! CATGETS(elm_msg_cat, ElmSet,
! ElmLeavingMailbox,
! "Leaving mailbox ..."));
DPRINT(Debug,9, (&Debug,
"real_save: closing folder\n"));

--- 438,445 ----
else
sleep(5);

! setup_mbx_cancel_message(&cd,mbx_leaving_mailbox);
!
DPRINT(Debug,9, (&Debug,
"real_save: closing folder\n"));

***************
*** 502,509 ****


{
- static const int exit_delay_msec = 2000; /* 2000 milliseconds: 2 seconds */
-
int i, sc;

int to_delete = 0, to_store = 0, to_keep = 0, to_unset