[continued from previous message]

! if (ison(ret,FOLDER_MBOX)) { DPRINT(Debug,11,(&Debug," FOLDER_MBOX")); }
! if (ison(ret,FOLDER_RDONLY)) { DPRINT(Debug,11,(&Debug," FOLDER_RDONLY")); }
! if (ison(ret,FOLDER_FILE)) { DPRINT(Debug,11,(&Debug," FOLDER_FILE")); }
! if (ison(ret,FOLDER_DISCONNECTED)) { DPRINT(Debug,11,(&Debug," FOLDER_DISCONNECTED")); }
! DPRINT(Debug,11,(&Debug,"\n"));
!
! return ret;
}

+ S_(mbx_give_folder_server mbx_give_pop_server)
const struct remote_server * mbx_give_pop_server
P_((struct folder_info *folder));
const struct remote_server * mbx_give_pop_server(folder)
***************
*** 3188,3193 ****
--- 3796,3998 ----
return ret;
}

+ S_(mbx_comp_prev_hdr_folder mbx_comp_prev_hdr_pop)
+ static enum comp_prev_hdr_result mbx_comp_prev_hdr_pop
+ P_((struct folder_info * folder,
+ struct header_rec * entry,
+ struct header_rec * prev_entry,
+ RECONNECT_MODE reconnect_ptr));
+ enum comp_prev_hdr_result mbx_comp_prev_hdr_pop(folder,entry,prev_entry,
+ reconnect_ptr)
+ struct folder_info * folder;
+ struct header_rec * entry;
+ struct header_rec * prev_entry;
+ RECONNECT_MODE reconnect_ptr;
+ {
+ enum comp_prev_hdr_result ret = comp_prev_hdr_pass;
+
+ if (PRIVATE_DATA_magic != folder->p->magic)
+ panic("MBX PANIC",__FILE__,__LINE__,"mbx_comp_prev_hdr_pop",
+ "Bad magic number (private_data)",0);
+
+ if (entry->mbx_info &&
+ &pop_mbx_info == entry->mbx_info->type_code &&
+ prev_entry->mbx_info &&
+ &pop_mbx_info == prev_entry->mbx_info->type_code
+ ) {
+
+ if (entry->mbx_info->a.pop_mbx.uidl &&
+ pr