gchar imap_get_path_separator_for_item (FolderItem *item);
void imap_disconnect_all(void);
gint imap_scan_tree_real(Folder *folder, gboolean subs_only);
-gint imap_subscribe(Folder *folder, FolderItem *item, gboolean sub);
-gint imap_scan_subtree(Folder *folder, FolderItem *item, gboolean subs_only);
+gint imap_subscribe(Folder *folder, FolderItem *item, gchar *rpath, gboolean sub);
+GList *imap_scan_subtree(Folder *folder, FolderItem *item, gboolean unsubs_only, gboolean recursive);
+void imap_cache_msg(FolderItem *item, gint msgnum);
+
+void imap_cancel_all(void);
+gboolean imap_cancel_all_enabled(void);
#endif /* __IMAP_H__ */