* src/folder.[ch]
[claws.git] / src / folder.c
index 1391dd12e2094f10506522f2ab9dc453b697e189..953b1625240bb86ce7de2ddd812d34f2fd4a1379 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <stdlib.h>
 
 #include "intl.h"
 #include "folder.h"
+#include "folderview.h"
 #include "session.h"
 #include "imap.h"
 #include "news.h"
 #include "xml.h"
 #include "codeconv.h"
 #include "prefs.h"
+#include "prefs_common.h"
 #include "account.h"
 #include "prefs_account.h"
-#include "mbox_folder.h"
+#include "filtering.h"
+#include "scoring.h"
+#include "prefs_folder_item.h"
+#include "procheader.h"
 
 static GList *folder_list = NULL;
 
 static void folder_init                (Folder         *folder,
-                                FolderType      type,
                                 const gchar    *name);
 
-static void local_folder_destroy       (LocalFolder    *lfolder);
-static void remote_folder_destroy      (RemoteFolder   *rfolder);
-static void mh_folder_destroy          (MHFolder       *folder);
-static void mbox_folder_destroy                (MboxFolder     *folder);
-static void imap_folder_destroy                (IMAPFolder     *folder);
-static void news_folder_destroy                (NewsFolder     *folder);
-
 static gboolean folder_read_folder_func        (GNode          *node,
                                         gpointer        data);
 static gchar *folder_get_list_path     (void);
 static void folder_write_list_recursive        (GNode          *node,
                                         gpointer        data);
+static void folder_update_op_count_rec (GNode          *node);
 
 
+static void folder_get_persist_prefs_recursive
+                                       (GNode *node, GHashTable *pptable);
+static gboolean persist_prefs_free     (gpointer key, gpointer val, gpointer data);
+void folder_item_read_cache            (FolderItem *item);
+void folder_item_free_cache            (FolderItem *item);
+
 Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
 {
        Folder *folder = NULL;
+       FolderItem *item;
 
        name = name ? name : path;
        switch (type) {
@@ -84,78 +93,130 @@ Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
                return NULL;
        }
 
+       /* Create root folder item */
+       item = folder_item_new(folder, name, NULL);
+       item->folder = folder;
+       folder->node = g_node_new(item);
+       folder->data = NULL;
+
        return folder;
 }
 
-Folder *mh_folder_new(const gchar *name, const gchar *path)
+static void folder_init(Folder *folder, const gchar *name)
 {
-       Folder *folder;
+       g_return_if_fail(folder != NULL);
 
-       folder = (Folder *)g_new0(MHFolder, 1);
-       folder_init(folder, F_MH, name);
-       LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
+       folder_set_name(folder, name);
 
-       return folder;
+       /* Init folder data */
+       folder->account = NULL;
+       folder->inbox = NULL;
+       folder->outbox = NULL;
+       folder->draft = NULL;
+       folder->queue = NULL;
+       folder->trash = NULL;
+
+       /* Init Folder functions */
+       folder->item_new = NULL;
+       folder->item_destroy = NULL;
+       folder->fetch_msg = NULL;
+       folder->fetch_msginfo = NULL;
+       folder->fetch_msginfos = NULL;
+       folder->get_num_list = NULL;
+       folder->ui_func = NULL;
+       folder->ui_func_data = NULL;
+       folder->check_msgnum_validity = NULL;
 }
 
-Folder *mbox_folder_new(const gchar *name, const gchar *path)
+void folder_local_folder_init(Folder *folder, const gchar *name,
+                             const gchar *path)
 {
-       /* implementing */
-       Folder *folder;
-
-       folder = (Folder *)g_new0(MboxFolder, 1);
-       folder_init(folder, F_MBOX, name);
+       folder_init(folder, name);
        LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
-
-       return folder;
 }
 
-Folder *maildir_folder_new(const gchar *name, const gchar *path)
+void folder_remote_folder_init(Folder *folder, const gchar *name,
+                              const gchar *path)
 {
-       /* not yet implemented */
-       return NULL;
+       folder_init(folder, name);
+       REMOTE_FOLDER(folder)->session = NULL;
 }
 
-Folder *imap_folder_new(const gchar *name, const gchar *path)
+void folder_destroy(Folder *folder)
 {
-       Folder *folder;
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->destroy != NULL);
 
-       folder = (Folder *)g_new0(IMAPFolder, 1);
-       folder_init(folder, F_IMAP, name);
+       folder->destroy(folder);
 
-       return folder;
+       folder_list = g_list_remove(folder_list, folder);
+
+       folder_tree_destroy(folder);
+       g_free(folder->name);
+       g_free(folder);
 }
 
-Folder *news_folder_new(const gchar *name, const gchar *path)
+void folder_local_folder_destroy(LocalFolder *lfolder)
 {
-       Folder *folder;
+       g_return_if_fail(lfolder != NULL);
 
-       folder = (Folder *)g_new0(NewsFolder, 1);
-       folder_init(folder, F_NEWS, name);
+       g_free(lfolder->rootpath);
+}
 
-       return folder;
+void folder_remote_folder_destroy(RemoteFolder *rfolder)
+{
+       g_return_if_fail(rfolder != NULL);
+
+       if (rfolder->session)
+               session_destroy(rfolder->session);
 }
 
-FolderItem *folder_item_new(const gchar *name, const gchar *path)
+#if 0
+Folder *mbox_folder_new(const gchar *name, const gchar *path)
 {
-       FolderItem *item;
+       /* not yet implemented */
+       return NULL;
+}
+
+Folder *maildir_folder_new(const gchar *name, const gchar *path)
+{
+       /* not yet implemented */
+       return NULL;
+}
+#endif
+
+FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path)
+{
+       FolderItem *item = NULL;
+
+       if (folder->item_new) {
+               item = folder->item_new(folder);
+       } else {
+               item = g_new0(FolderItem, 1);
+       }
 
-       item = g_new0(FolderItem, 1);
+       g_return_val_if_fail(item != NULL, NULL);
 
        item->stype = F_NORMAL;
        item->name = g_strdup(name);
        item->path = g_strdup(path);
-       item->account = NULL;
        item->mtime = 0;
        item->new = 0;
        item->unread = 0;
        item->total = 0;
        item->last_num = -1;
+       item->cache = NULL;
        item->no_sub = FALSE;
        item->no_select = FALSE;
        item->collapsed = FALSE;
+       item->threaded  = TRUE;
+       item->ret_rcpt  = FALSE;
+       item->opened    = FALSE;
        item->parent = NULL;
        item->folder = NULL;
+       item->account = NULL;
+       item->apply_sub = FALSE;
+       item->mark_queue = NULL;
        item->data = NULL;
 
        item->prefs = prefs_folder_item_new();
@@ -201,9 +262,20 @@ void folder_item_destroy(FolderItem *item)
 {
        g_return_if_fail(item != NULL);
 
+       debug_print("Destroying folder item %s\n", item->path);
+
+       if (item->cache)
+               folder_item_free_cache(item);
        g_free(item->name);
        g_free(item->path);
-       g_free(item);
+
+       if (item->folder != NULL) {
+               if(item->folder->item_destroy) {
+                       item->folder->item_destroy(item->folder, item);
+               } else {
+                       g_free(item);
+               }
+       }
 }
 
 void folder_set_ui_func(Folder *folder, FolderUIFunc func, gpointer data)
@@ -228,38 +300,24 @@ void folder_set_name(Folder *folder, const gchar *name)
        }
 }
 
-void folder_destroy(Folder *folder)
-{
-       g_return_if_fail(folder != NULL);
-
-       folder_list = g_list_remove(folder_list, folder);
-
-       switch (folder->type) {
-       case F_MH:
-               mh_folder_destroy(MH_FOLDER(folder));
-               break;
-       case F_MBOX:
-               mbox_folder_destroy(MBOX_FOLDER(folder));
-               break;
-       case F_IMAP:
-               imap_folder_destroy(IMAP_FOLDER(folder));
-               break;
-       case F_NEWS:
-               news_folder_destroy(NEWS_FOLDER(folder));
-               break;
-       default:
-               break;
-       }
+gboolean folder_tree_destroy_func(GNode *node, gpointer data) {
+       FolderItem *item = (FolderItem *) node->data;
 
-       folder_tree_destroy(folder);
-       g_free(folder->name);
-       g_free(folder);
+       folder_item_destroy(item);
+       return FALSE;
 }
 
 void folder_tree_destroy(Folder *folder)
 {
-       /* TODO: destroy all FolderItem before */
-       g_node_destroy(folder->node);
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->node != NULL);
+       
+       prefs_scoring_clear();
+       prefs_filtering_clear();
+
+       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_tree_destroy_func, NULL);
+       if (folder->node)
+               g_node_destroy(folder->node);
 
        folder->inbox = NULL;
        folder->outbox = NULL;
@@ -308,8 +366,11 @@ gint folder_read_list(void)
 {
        GNode *node;
        XMLNode *xmlnode;
+       gchar *path;
 
-       node = xml_parse_file(folder_get_list_path());
+       path = folder_get_list_path();
+       if (!is_file_exist(path)) return -1;
+       node = xml_parse_file(path);
        if (!node) return -1;
 
        xmlnode = node->data;
@@ -354,6 +415,115 @@ void folder_write_list(void)
                g_warning("failed to write folder list.\n");
 }
 
+gboolean folder_scan_tree_func(GNode *node, gpointer data)
+{
+       GHashTable *pptable = (GHashTable *)data;
+       FolderItem *item = (FolderItem *)node->data;
+       
+       folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
+}
+
+void folder_scan_tree(Folder *folder)
+{
+       GHashTable *pptable;
+       
+       if (!folder->scan_tree)
+               return;
+       
+       pptable = folder_persist_prefs_new(folder);
+       folder_tree_destroy(folder);
+
+       folder->scan_tree(folder);
+
+       g_node_traverse(folder->node, G_POST_ORDER, G_TRAVERSE_ALL, -1, folder_scan_tree_func, pptable);
+       folder_persist_prefs_free(pptable);
+
+       prefs_matcher_read_config();
+}
+
+FolderItem *folder_create_folder(FolderItem *parent, const gchar *name)
+{
+       FolderItem *new_item;
+
+       new_item = parent->folder->create_folder(parent->folder, parent, name);
+       new_item->cache = msgcache_new();
+
+       return new_item;
+}
+
+struct TotalMsgCount
+{
+       guint new;
+       guint unread;
+       guint total;
+};
+
+struct FuncToAllFoldersData
+{
+       FolderItemFunc  function;
+       gpointer        data;
+};
+
+static gboolean folder_func_to_all_folders_func(GNode *node, gpointer data)
+{
+       FolderItem *item;
+       struct FuncToAllFoldersData *function_data = (struct FuncToAllFoldersData *) data;
+
+       g_return_val_if_fail(node->data != NULL, FALSE);
+
+       item = FOLDER_ITEM(node->data);
+       g_return_val_if_fail(item != NULL, FALSE);
+
+       function_data->function(item, function_data->data);
+
+       return FALSE;
+}
+
+void folder_func_to_all_folders(FolderItemFunc function, gpointer data)
+{
+       GList *list;
+       Folder *folder;
+       struct FuncToAllFoldersData function_data;
+       
+       function_data.function = function;
+       function_data.data = data;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = FOLDER(list->data);
+               if (folder->node)
+                       g_node_traverse(folder->node, G_PRE_ORDER,
+                                       G_TRAVERSE_ALL, -1,
+                                       folder_func_to_all_folders_func,
+                                       &function_data);
+       }
+}
+
+static void folder_count_total_msgs_func(FolderItem *item, gpointer data)
+{
+       struct TotalMsgCount *count = (struct TotalMsgCount *)data;
+
+       count->new += item->new;
+       count->unread += item->unread;
+       count->total += item->total;
+}
+
+void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+{
+       struct TotalMsgCount count;
+
+       count.new = count.unread = count.total = 0;
+
+       debug_print("Counting total number of messages...\n");
+
+       folder_func_to_all_folders(folder_count_total_msgs_func, &count);
+
+       *new = count.new;
+       *unread = count.unread;
+       *total = count.total;
+}
+
 Folder *folder_find_from_path(const gchar *path)
 {
        GList *list;
@@ -369,6 +539,20 @@ Folder *folder_find_from_path(const gchar *path)
        return NULL;
 }
 
+Folder *folder_find_from_name(const gchar *name, FolderType type)
+{
+       GList *list;
+       Folder *folder;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->type == type && strcmp2(name, folder->name) == 0)
+                       return folder;
+       }
+
+       return NULL;
+}
+
 static gboolean folder_item_find_func(GNode *node, gpointer data)
 {
        FolderItem *item = node->data;
@@ -398,15 +582,124 @@ FolderItem *folder_find_item_from_path(const gchar *path)
        return d[1];
 }
 
+static const struct {
+       gchar *str;
+       FolderType type;
+} type_str_table[] = {
+       {"#mh"     , F_MH},
+       {"#mbox"   , F_MBOX},
+       {"#maildir", F_MAILDIR},
+       {"#imap"   , F_IMAP},
+       {"#news"   , F_NEWS}
+};
+
+static gchar *folder_get_type_string(FolderType type)
+{
+       gint i;
+
+       for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
+            i++) {
+               if (type_str_table[i].type == type)
+                       return type_str_table[i].str;
+       }
+
+       return NULL;
+}
+
+static FolderType folder_get_type_from_string(const gchar *str)
+{
+       gint i;
+
+       for (i = 0; i < sizeof(type_str_table) / sizeof(type_str_table[0]);
+            i++) {
+               if (g_strcasecmp(type_str_table[i].str, str) == 0)
+                       return type_str_table[i].type;
+       }
+
+       return F_UNKNOWN;
+}
+
+gchar *folder_get_identifier(Folder *folder)
+{
+       gchar *type_str;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+
+       type_str = folder_get_type_string(folder->type);
+       return g_strconcat(type_str, "/", folder->name, NULL);
+}
+
+gchar *folder_item_get_identifier(FolderItem *item)
+{
+       gchar *id;
+       gchar *folder_id;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->path != NULL, NULL);
+
+       folder_id = folder_get_identifier(item->folder);
+       id = g_strconcat(folder_id, "/", item->path, NULL);
+       g_free(folder_id);
+
+       return id;
+}
+
+FolderItem *folder_find_item_from_identifier(const gchar *identifier)
+{
+       Folder *folder;
+       gpointer d[2];
+       gchar *str;
+       gchar *p;
+       gchar *name;
+       gchar *path;
+       FolderType type;
+
+       g_return_val_if_fail(identifier != NULL, NULL);
+
+       if (*identifier != '#')
+               return folder_find_item_from_path(identifier);
+
+       Xstrdup_a(str, identifier, return NULL);
+
+       p = strchr(str, '/');
+       if (!p)
+               return folder_find_item_from_path(identifier);
+       *p = '\0';
+       p++;
+       type = folder_get_type_from_string(str);
+       if (type == F_UNKNOWN)
+               return folder_find_item_from_path(identifier);
+
+       name = p;
+       p = strchr(p, '/');
+       if (!p)
+               return folder_find_item_from_path(identifier);
+       *p = '\0';
+       p++;
+
+       folder = folder_find_from_name(name, type);
+       if (!folder)
+               return folder_find_item_from_path(identifier);
+
+       path = p;
+
+       d[0] = (gpointer)path;
+       d[1] = NULL;
+       g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                       folder_item_find_func, d);
+       return d[1];
+}
+
 Folder *folder_get_default_folder(void)
 {
-       return FOLDER(folder_list->data);
+       return folder_list ? FOLDER(folder_list->data) : NULL;
 }
 
 FolderItem *folder_get_default_inbox(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->inbox;
@@ -416,6 +709,7 @@ FolderItem *folder_get_default_outbox(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->outbox;
@@ -425,6 +719,7 @@ FolderItem *folder_get_default_draft(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->draft;
@@ -434,6 +729,7 @@ FolderItem *folder_get_default_queue(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->queue;
@@ -443,11 +739,120 @@ FolderItem *folder_get_default_trash(void)
 {
        Folder *folder;
 
+       if (!folder_list) return NULL;
        folder = FOLDER(folder_list->data);
        g_return_val_if_fail(folder != NULL, NULL);
        return folder->trash;
 }
 
+#define CREATE_FOLDER_IF_NOT_EXIST(member, dir, type)          \
+{                                                              \
+       if (!folder->member) {                                  \
+               item = folder_item_new(folder, dir, dir);       \
+               item->stype = type;                             \
+               folder_item_append(rootitem, item);             \
+               folder->member = item;                          \
+       }                                                       \
+}
+
+void folder_set_missing_folders(void)
+{
+       Folder *folder;
+       FolderItem *rootitem;
+       FolderItem *item;
+       GList *list;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->type != F_MH) continue;
+               rootitem = FOLDER_ITEM(folder->node->data);
+               g_return_if_fail(rootitem != NULL);
+
+               if (folder->inbox && folder->outbox && folder->draft &&
+                   folder->queue && folder->trash)
+                       continue;
+
+               if (folder->create_tree(folder) < 0) {
+                       g_warning("%s: can't create the folder tree.\n",
+                                 LOCAL_FOLDER(folder)->rootpath);
+                       continue;
+               }
+
+               CREATE_FOLDER_IF_NOT_EXIST(inbox,  INBOX_DIR,  F_INBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(outbox, OUTBOX_DIR, F_OUTBOX);
+               CREATE_FOLDER_IF_NOT_EXIST(draft,  DRAFT_DIR,  F_DRAFT);
+               CREATE_FOLDER_IF_NOT_EXIST(queue,  QUEUE_DIR,  F_QUEUE);
+               CREATE_FOLDER_IF_NOT_EXIST(trash,  TRASH_DIR,  F_TRASH);
+       }
+}
+
+static gboolean folder_unref_account_func(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+       PrefsAccount *account = data;
+
+       if (item->account == account)
+               item->account = NULL;
+
+       return FALSE;
+}
+
+void folder_unref_account_all(PrefsAccount *account)
+{
+       Folder *folder;
+       GList *list;
+
+       if (!account) return;
+
+       for (list = folder_list; list != NULL; list = list->next) {
+               folder = list->data;
+               if (folder->account == account)
+                       folder->account = NULL;
+               g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                               folder_unref_account_func, account);
+       }
+}
+
+#undef CREATE_FOLDER_IF_NOT_EXIST
+
+gchar *folder_get_path(Folder *folder)
+{
+       gchar *path;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+
+       switch(FOLDER_TYPE(folder)) {
+
+               case F_MH:
+                       path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+                       break;
+
+               case F_IMAP:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_imap_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->recv_server,
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->userid,
+                                          NULL);
+                       break;
+
+               case F_NEWS:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_news_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->nntp_server,
+                                          NULL);
+                       break;
+
+               default:
+                       path = NULL;
+                       break;
+       }
+       
+       return path;
+}
+
 gchar *folder_item_get_path(FolderItem *item)
 {
        gchar *folder_path;
@@ -455,68 +860,310 @@ gchar *folder_item_get_path(FolderItem *item)
 
        g_return_val_if_fail(item != NULL, NULL);
 
-       if (FOLDER_TYPE(item->folder) == F_MH)
-               folder_path = g_strdup(LOCAL_FOLDER(item->folder)->rootpath);
-       else if (FOLDER_TYPE(item->folder) == F_MBOX) {
-               path = mbox_get_virtual_path(item);
-               if (path == NULL)
-                       return NULL;
-               folder_path = g_strconcat(get_mbox_cache_dir(),
-                                         G_DIR_SEPARATOR_S, path, NULL);
-               g_free(path);
+       if(FOLDER_TYPE(item->folder) != F_MBOX) {
+               folder_path = folder_get_path(item->folder);
+               g_return_val_if_fail(folder_path != NULL, NULL);
+
+               if (folder_path[0] == G_DIR_SEPARATOR) {
+                       if (item->path)
+                               path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strdup(folder_path);
+               } else {
+                       if (item->path)
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, NULL);
+               }
 
-               return folder_path;
-       }
-       else if (FOLDER_TYPE(item->folder) == F_IMAP) {
-               g_return_val_if_fail(item->folder->account != NULL, NULL);
-               folder_path = g_strconcat(get_imap_cache_dir(),
-                                         G_DIR_SEPARATOR_S,
-                                         item->folder->account->recv_server,
-                                         G_DIR_SEPARATOR_S,
-                                         item->folder->account->userid,
-                                         NULL);
-       } else if (FOLDER_TYPE(item->folder) == F_NEWS) {
-               g_return_val_if_fail(item->folder->account != NULL, NULL);
-               folder_path = g_strconcat(get_news_cache_dir(),
-                                         G_DIR_SEPARATOR_S,
-                                         item->folder->account->nntp_server,
-                                         NULL);
-       } else
-               return NULL;
+               g_free(folder_path);
+       } else {
+               gchar *itempath;
 
-       g_return_val_if_fail(folder_path != NULL, NULL);
+               itempath = mbox_get_virtual_path(item);
+               if (itempath == NULL)
+                       return NULL;
+               path = g_strconcat(get_mbox_cache_dir(),
+                                         G_DIR_SEPARATOR_S, itempath, NULL);
+               g_free(itempath);
+       }
+       return path;
+}
 
-       if (folder_path[0] == G_DIR_SEPARATOR) {
-               if (item->path)
-                       path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strdup(folder_path);
+void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
+{
+       if (!(dest->stype == F_OUTBOX ||
+             dest->stype == F_QUEUE  ||
+             dest->stype == F_DRAFT  ||
+             dest->stype == F_TRASH)) {
+               flags->perm_flags = MSG_NEW|MSG_UNREAD;
        } else {
-               if (item->path)
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, NULL);
+               flags->perm_flags = 0;
        }
+       flags->tmp_flags = MSG_CACHED;
+       if (dest->folder->type == F_MH) {
+               if (dest->stype == F_QUEUE) {
+                       MSG_SET_TMP_FLAGS(*flags, MSG_QUEUED);
+               } else if (dest->stype == F_DRAFT) {
+                       MSG_SET_TMP_FLAGS(*flags, MSG_DRAFT);
+               }
+       } else if (dest->folder->type == F_IMAP) {
+               MSG_SET_TMP_FLAGS(*flags, MSG_IMAP);
+       } else if (dest->folder->type == F_NEWS) {
+               MSG_SET_TMP_FLAGS(*flags, MSG_NEWS);
+       }
+}
 
-       g_free(folder_path);
-       return path;
+static gint folder_sort_cache_list_by_msgnum(gconstpointer a, gconstpointer b)
+{
+       MsgInfo *msginfo_a = (MsgInfo *) a;
+       MsgInfo *msginfo_b = (MsgInfo *) b;
+
+       return (msginfo_a->msgnum - msginfo_b->msgnum);
+}
+
+static gint folder_sort_folder_list(gconstpointer a, gconstpointer b)
+{
+       guint gint_a = GPOINTER_TO_INT(a);
+       guint gint_b = GPOINTER_TO_INT(b);
+       
+       return (gint_a - gint_b);
 }
 
-void folder_item_scan(FolderItem *item)
+gint folder_item_scan(FolderItem *item)
 {
        Folder *folder;
+       GSList *folder_list, *cache_list, *folder_list_cur, *cache_list_cur, *new_list = NULL;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
 
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, -1);
+       if (item->path == NULL) return -1;
 
        folder = item->folder;
 
-       g_return_if_fail(folder->scan != NULL);
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(folder->get_num_list != NULL, -1);
+
+       debug_print("Scanning folder %s for cache changes.\n", item->path);
+
+       /* Get list of messages for folder and cache */
+       if (!folder->check_msgnum_validity || 
+          folder->check_msgnum_validity(folder, item)) {
+               if (!item->cache)
+                       folder_item_read_cache(item);
+               cache_list = msgcache_get_msg_list(item->cache);
+       } else {
+               if (item->cache)
+                       msgcache_destroy(item->cache);
+               item->cache = msgcache_new();
+               cache_list = NULL;
+       }
+       folder_list = folder->get_num_list(item->folder, item);
+
+       /* Sort both lists */
+       cache_list = g_slist_sort(cache_list, folder_sort_cache_list_by_msgnum);
+       folder_list = g_slist_sort(folder_list, folder_sort_folder_list);
+
+       cache_list_cur = cache_list;
+       folder_list_cur = folder_list;
+
+       if (cache_list_cur != NULL) {
+               GSList *cache_list_last;
+       
+               cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+               cache_list_last = g_slist_last(cache_list);
+               cache_max_num = ((MsgInfo *)cache_list_last->data)->msgnum;
+       } else {
+               cache_cur_num = G_MAXINT;
+               cache_max_num = 0;
+       }
 
-       folder->scan(folder, item);
+       if (folder_list_cur != NULL) {
+               GSList *folder_list_last;
+       
+               folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+               folder_list_last = g_slist_last(folder_list);
+               folder_max_num = GPOINTER_TO_INT(folder_list_last->data);
+       } else {
+               folder_cur_num = G_MAXINT;
+               folder_max_num = 0;
+       }
+
+       while ((cache_cur_num != G_MAXINT) || (folder_cur_num != G_MAXINT)) {
+               /*
+                *  Message only exists in the folder
+                *  Remember message for fetching
+                */
+               if (folder_cur_num < cache_cur_num) {
+                       gboolean add = FALSE;
+
+                       switch(folder->type) {
+                               case F_NEWS:
+                                       if (folder_cur_num < cache_max_num)
+                                               break;
+                                       
+                                       if (prefs_common.max_articles == 0) {
+                                               add = TRUE;
+                                       }
+
+                                       if (folder_max_num <= prefs_common.max_articles) {
+                                               add = TRUE;
+                                       } else if (folder_cur_num > (folder_max_num - prefs_common.max_articles)) {
+                                               add = TRUE;
+                                       }
+                                       break;
+                               default:
+                                       add = TRUE;
+                                       break;
+                       }
+                       
+                       if (add) {
+                               new_list = g_slist_prepend(new_list, GINT_TO_POINTER(folder_cur_num));
+                               debug_print("Remembered message %d for fetching\n", folder_cur_num);
+                       }
+
+                       /* Move to next folder number */
+                       folder_list_cur = folder_list_cur->next;
+
+                       if (folder_list_cur != NULL)
+                               folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+                       else
+                               folder_cur_num = G_MAXINT;
+
+                       continue;
+               }
+
+               /*
+                *  Message only exists in the cache
+                *  Remove the message from the cache
+                */
+               if (cache_cur_num < folder_cur_num) {
+                       msgcache_remove_msg(item->cache, cache_cur_num);
+                       debug_print("Removed message %d from cache.\n", cache_cur_num);
+
+                       /* Move to next cache number */
+                       cache_list_cur = cache_list_cur->next;
+
+                       if (cache_list_cur != NULL)
+                               cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+                       else
+                               cache_cur_num = G_MAXINT;
+
+                       continue;
+               }
+
+               /*
+                *  Message number exists in folder and cache!
+                *  Check if the message has been modified
+                */
+               if (cache_cur_num == folder_cur_num) {
+                       MsgInfo *msginfo;
+
+                       msginfo = msgcache_get_msg(item->cache, folder_cur_num);
+                       if (folder->is_msg_changed && folder->is_msg_changed(folder, item, msginfo)) {
+                               MsgInfo *newmsginfo;
+
+                               msgcache_remove_msg(item->cache, msginfo->msgnum);
+
+                               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, item, folder_cur_num))) {
+                                       msgcache_add_msg(item->cache, newmsginfo);
+                                       if (MSG_IS_NEW(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
+                                               newcnt++;
+                                       if (MSG_IS_UNREAD(newmsginfo->flags) && !MSG_IS_IGNORE_THREAD(newmsginfo->flags))
+                                               unreadcnt++;
+                                       procmsg_msginfo_free(newmsginfo);
+                               }                                       
+
+                               debug_print("Updated msginfo for message %d.\n", folder_cur_num);
+                       } else {
+                               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       newcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       unreadcnt++;
+                       }
+                       totalcnt++;
+                       procmsg_msginfo_free(msginfo);
+
+                       /* Move to next folder and cache number */
+                       cache_list_cur = cache_list_cur->next;
+                       folder_list_cur = folder_list_cur->next;
+
+                       if (cache_list_cur != NULL)
+                               cache_cur_num = ((MsgInfo *)cache_list_cur->data)->msgnum;
+                       else
+                               cache_cur_num = G_MAXINT;
+
+                       if (folder_list_cur != NULL)
+                               folder_cur_num = GPOINTER_TO_INT(folder_list_cur->data);
+                       else
+                               folder_cur_num = G_MAXINT;
+
+                       continue;
+               }
+       }
+
+       for(cache_list_cur = cache_list; cache_list_cur != NULL; cache_list_cur = g_slist_next(cache_list_cur)) {
+               procmsg_msginfo_free((MsgInfo *) cache_list_cur->data);
+       }
+
+       g_slist_free(cache_list);
+       g_slist_free(folder_list);
+
+       if (folder->fetch_msginfos) {
+               GSList *elem;
+               GSList *newmsg_list;
+               MsgInfo *msginfo;
+               
+               if (new_list) {
+                       newmsg_list = folder->fetch_msginfos(folder, item, new_list);
+                       for (elem = newmsg_list; elem != NULL; elem = g_slist_next(elem)) {
+                               msginfo = (MsgInfo *) elem->data;
+                               msgcache_add_msg(item->cache, msginfo);
+                               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       newcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                       unreadcnt++;
+                               totalcnt++;
+                               procmsg_msginfo_free(msginfo);
+                       }
+                       g_slist_free(newmsg_list);
+               }
+       } else if (folder->fetch_msginfo) {
+               GSList *elem;
+       
+               for (elem = new_list; elem != NULL; elem = g_slist_next(elem)) {
+                       MsgInfo *msginfo;
+                       guint num;
+
+                       num = GPOINTER_TO_INT(elem->data);
+                       msginfo = folder->fetch_msginfo(folder, item, num);
+                       if (msginfo != NULL) {
+                               msgcache_add_msg(item->cache, msginfo);
+                               if (MSG_IS_NEW(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                   newcnt++;
+                               if (MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_IGNORE_THREAD(msginfo->flags))
+                                   unreadcnt++;
+                               totalcnt++;
+                               procmsg_msginfo_free(msginfo);
+                               debug_print("Added newly found message %d to cache.\n", num);
+                       }
+               }
+       }
+
+       item->new = newcnt;
+       item->unread = unreadcnt;
+       item->total = totalcnt;
+       
+       g_slist_free(new_list);
+
+       folderview_update_item(item, FALSE);
+
+       return 0;
 }
 
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
@@ -527,7 +1174,188 @@ static void folder_item_scan_foreach_func(gpointer key, gpointer val,
 
 void folder_item_scan_foreach(GHashTable *table)
 {
-       g_hash_table_foreach(table, folder_item_scan_foreach_func, NULL);
+       g_hash_table_foreach(table, folder_item_scan_foreach_func, NULL);
+}
+
+void folder_count_total_cache_memusage(FolderItem *item, gpointer data)
+{
+       gint *memusage = (gint *)data;
+
+       if (item->cache == NULL)
+               return;
+       
+       *memusage += msgcache_get_memory_usage(item->cache);
+}
+
+gint folder_cache_time_compare_func(gconstpointer a, gconstpointer b)
+{
+       FolderItem *fa = (FolderItem *)a;
+       FolderItem *fb = (FolderItem *)b;
+       
+       return (gint) (msgcache_get_last_access_time(fa->cache) - msgcache_get_last_access_time(fb->cache));
+}
+
+void folder_find_expired_caches(FolderItem *item, gpointer data)
+{
+       GSList **folder_item_list = (GSList **)data;
+       gint difftime, expiretime;
+       
+       if (item->cache == NULL)
+               return;
+
+       if (item->opened > 0)
+               return;
+
+       difftime = (gint) (time(NULL) - msgcache_get_last_access_time(item->cache));
+       expiretime = prefs_common.cache_min_keep_time * 60;
+       debug_print("Cache unused time: %d (Expire time: %d)\n", difftime, expiretime);
+       if (difftime > expiretime) {
+               *folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
+       }
+}
+
+void folder_item_free_cache(FolderItem *item)
+{
+       g_return_if_fail(item != NULL);
+       
+       if (item->cache == NULL)
+               return;
+       
+       if (item->opened > 0)
+               return;
+
+       folder_item_write_cache(item);
+       msgcache_destroy(item->cache);
+       item->cache = NULL;
+}
+
+void folder_clean_cache_memory()
+{
+       gint memusage = 0;
+
+       folder_func_to_all_folders(folder_count_total_cache_memusage, &memusage);       
+       debug_print("Total cache memory usage: %d\n", memusage);
+       
+       if (memusage > (prefs_common.cache_max_mem_usage * 1024)) {
+               GSList *folder_item_list = NULL, *listitem;
+               
+               debug_print("Trying to free cache memory\n");
+
+               folder_func_to_all_folders(folder_find_expired_caches, &folder_item_list);      
+               listitem = folder_item_list;
+               while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
+                       FolderItem *item = (FolderItem *)(listitem->data);
+
+                       debug_print("Freeing cache memory for %s\n", item->path);
+                       memusage -= msgcache_get_memory_usage(item->cache);
+                       folder_item_free_cache(item);
+                       listitem = listitem->next;
+               }
+               g_slist_free(folder_item_list);
+       }
+}
+
+void folder_item_read_cache(FolderItem *item)
+{
+       gchar *cache_file, *mark_file;
+       
+       g_return_if_fail(item != NULL);
+
+       cache_file = folder_item_get_cache_file(item);
+       mark_file = folder_item_get_mark_file(item);
+       item->cache = msgcache_read_cache(item, cache_file);
+       if (!item->cache) {
+               item->cache = msgcache_new();
+               folder_item_scan(item);
+       }
+       msgcache_read_mark(item->cache, mark_file);
+       g_free(cache_file);
+       g_free(mark_file);
+
+       folder_clean_cache_memory();
+}
+
+void folder_item_write_cache(FolderItem *item)
+{
+       gchar *cache_file, *mark_file;
+       PrefsFolderItem *prefs;
+       gint filemode = 0;
+       gchar *id;
+       
+       if (!item || !item->path || !item->cache)
+               return;
+
+       id = folder_item_get_identifier(item);
+       debug_print("Save cache for folder %s\n", id);
+       g_free(id);
+
+       cache_file = folder_item_get_cache_file(item);
+       mark_file = folder_item_get_mark_file(item);
+       if (msgcache_write(cache_file, mark_file, item->cache) < 0) {
+               prefs = item->prefs;
+               if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+                       /* for cache file */
+                       filemode = prefs->folder_chmod;
+                       if (filemode & S_IRGRP) filemode |= S_IWGRP;
+                       if (filemode & S_IROTH) filemode |= S_IWOTH;
+                       chmod(cache_file, filemode);
+               }
+        }
+
+       g_free(cache_file);
+       g_free(mark_file);
+}
+
+MsgInfo *folder_item_fetch_msginfo(FolderItem *item, gint num)
+{
+       Folder *folder;
+       MsgInfo *msginfo;
+       
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       folder = item->folder;
+       if (!item->cache)
+               folder_item_read_cache(item);
+       
+       if ((msginfo = msgcache_get_msg(item->cache, num)) != NULL)
+               return msginfo;
+       
+       g_return_val_if_fail(folder->fetch_msginfo, NULL);
+       if ((msginfo = folder->fetch_msginfo(folder, item, num)) != NULL) {
+               msgcache_add_msg(item->cache, msginfo);
+               return msginfo;
+       }
+       
+       return NULL;
+}
+
+MsgInfo *folder_item_fetch_msginfo_by_id(FolderItem *item, const gchar *msgid)
+{
+       Folder *folder;
+       MsgInfo *msginfo;
+       
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       folder = item->folder;
+       if (!item->cache)
+               folder_item_read_cache(item);
+       
+       if ((msginfo = msgcache_get_msg_by_id(item->cache, msgid)) != NULL)
+               return msginfo;
+
+       return NULL;
+}
+
+GSList *folder_item_get_msg_list(FolderItem *item)
+{
+       g_return_val_if_fail(item != NULL, NULL);
+       
+       if (item->cache == 0)
+               folder_item_read_cache(item);
+
+       g_return_val_if_fail(item->cache != NULL, NULL);
+       
+       return msgcache_get_msg_list(item->cache);
 }
 
 gchar *folder_item_fetch_msg(FolderItem *item, gint num)
@@ -538,11 +1366,8 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, NULL);
        g_return_val_if_fail(folder->fetch_msg != NULL, NULL);
 
-       if (item->last_num < 0) folder->scan(folder, item);
-
        return folder->fetch_msg(folder, item, num);
 }
 
@@ -551,19 +1376,37 @@ gint folder_item_add_msg(FolderItem *dest, const gchar *file,
 {
        Folder *folder;
        gint num;
+       MsgInfo *msginfo;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->add_msg != NULL, -1);
 
-       if (dest->last_num < 0) folder->scan(folder, dest);
+       if (!dest->cache)
+               folder_item_read_cache(dest);
 
        num = folder->add_msg(folder, dest, file, remove_source);
-       if (num > 0) dest->last_num = num;
+
+        if (num > 0) {
+               msginfo = folder->fetch_msginfo(folder, dest, num);
+
+               if (msginfo != NULL) {
+                       if (MSG_IS_NEW(msginfo->flags))
+                               dest->new++;
+                       if (MSG_IS_UNREAD(msginfo->flags))
+                               dest->unread++;
+                       dest->total++;
+
+                       msgcache_add_msg(dest->cache, msginfo);
+
+                       procmsg_msginfo_free(msginfo);
+               }
+
+                dest->last_num = num;
+        }
 
        return num;
 }
@@ -591,37 +1434,63 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
        gint num;
-       gchar * filename;
-       Folder * src_folder;
+       Folder *src_folder;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->remove_msg != NULL, -1);
        g_return_val_if_fail(folder->copy_msg != NULL, -1);
 
-       if (dest->last_num < 0) folder->scan(folder, dest);
+       if (!dest->cache) folder_item_read_cache(dest);
 
        src_folder = msginfo->folder->folder;
 
        num = folder->copy_msg(folder, dest, msginfo);
-       if (num != -1)
-               src_folder->remove_msg(src_folder,
-                                      msginfo->folder,
-                                      msginfo->msgnum);
+       
+       if (num != -1) {
+               MsgInfo *newmsginfo;
+    
+               /* Add new msginfo to dest folder */
+               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+                       newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
+                       
+                       if (dest->stype == F_OUTBOX || dest->stype == F_QUEUE  ||
+                           dest->stype == F_DRAFT  || dest->stype == F_TRASH)
+                               MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
+                                                    MSG_NEW|MSG_UNREAD|MSG_DELETED);
+                       msgcache_add_msg(dest->cache, newmsginfo);
+
+                       if (MSG_IS_NEW(newmsginfo->flags))
+                               dest->new++;
+                       if (MSG_IS_UNREAD(newmsginfo->flags))
+                               dest->unread++;
+                       dest->total++;
+                       dest->need_update = TRUE;
+
+                       procmsg_msginfo_free(newmsginfo);
+               }
+
+               /* remove source message from it's folder */
+               if (src_folder->remove_msg) {
+                       src_folder->remove_msg(src_folder, msginfo->folder,
+                                              msginfo->msgnum);
+                       msgcache_remove_msg(msginfo->folder->cache, msginfo->msgnum);
+
+                       if (MSG_IS_NEW(msginfo->flags))
+                               msginfo->folder->new--;
+                       if (MSG_IS_UNREAD(msginfo->flags))
+                               msginfo->folder->unread--;
+                       msginfo->folder->total--;
+                       msginfo->folder->need_update = TRUE;
+               }
+       }
        
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       src_folder = msginfo->folder->folder;
-
-       if (msginfo->folder && src_folder->scan)
-               src_folder->scan(src_folder, msginfo->folder);
-       folder->scan(folder, dest);
-
        return num;
 }
 
@@ -639,6 +1508,7 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        num = folder->move_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
@@ -647,41 +1517,109 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
-       FolderItem * item;
-       GSList * l;
-       gchar * filename;
+       FolderItem *item;
+       GSList *newmsgnums = NULL;
+       GSList *l, *l2;
+       gint num;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->copy_msg != NULL, -1);
        g_return_val_if_fail(folder->remove_msg != NULL, -1);
 
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
+       /* 
+        * Copy messages to destination folder and 
+        * store new message numbers in newmsgnums
+        */
        item = NULL;
-       for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
                MsgInfo * msginfo = (MsgInfo *) l->data;
 
                if (!item && msginfo->folder != NULL)
                        item = msginfo->folder;
 
-               if (folder->copy_msg(folder, dest, msginfo) != -1)
+               num = folder->copy_msg(folder, dest, msginfo);
+               newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
+       }
+
+       /* Read cache for dest folder */
+       if (!dest->cache) folder_item_read_cache(dest);
+       
+       /* 
+        * Fetch new MsgInfos for new messages in dest folder,
+        * add them to the msgcache and update folder message counts
+        */
+       l2 = newmsgnums;
+       for (l = msglist; l != NULL; l = g_slist_next(l)) {
+               MsgInfo *msginfo = (MsgInfo *) l->data;
+
+               num = GPOINTER_TO_INT(l2->data);
+
+               if (num != -1) {
+                       MsgInfo *newmsginfo;
+
+                       newmsginfo = folder->fetch_msginfo(folder, dest, num);
+                       if (newmsginfo) {
+                               newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
+                               if (dest->stype == F_OUTBOX ||
+                                   dest->stype == F_QUEUE  ||
+                                   dest->stype == F_DRAFT  ||
+                                   dest->stype == F_TRASH)
+                                       MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
+                                                            MSG_NEW|MSG_UNREAD|MSG_DELETED);
+                               msgcache_add_msg(dest->cache, newmsginfo);
+
+                               if (MSG_IS_NEW(newmsginfo->flags))
+                                       dest->new++;
+                               if (MSG_IS_UNREAD(newmsginfo->flags))
+                                       dest->unread++;
+                               dest->total++;
+                               dest->need_update = TRUE;
+
+                               procmsg_msginfo_free(newmsginfo);
+                       }
+               }
+               l2 = g_slist_next(l2);
+       }
+
+       /*
+        * Remove source messages from their folders if
+        * copying was successfull and update folder
+        * message counts
+        */
+       l2 = newmsgnums;
+       for (l = msglist; l != NULL; l = g_slist_next(l)) {
+               MsgInfo *msginfo = (MsgInfo *) l->data;
+
+               num = GPOINTER_TO_INT(l2->data);
+               
+               if (num != -1) {
                        item->folder->remove_msg(item->folder,
                                                 msginfo->folder,
                                                 msginfo->msgnum);
+                       if (!item->cache)
+                               folder_item_read_cache(item);
+                       msgcache_remove_msg(item->cache, msginfo->msgnum);
+
+                       if (MSG_IS_NEW(msginfo->flags))
+                               msginfo->folder->new--;
+                       if (MSG_IS_UNREAD(msginfo->flags))
+                               msginfo->folder->unread--;
+                       msginfo->folder->total--;                       
+                       msginfo->folder->need_update = TRUE;
+               }
+
+               l2 = g_slist_next(l2);
        }
 
+
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       if (item && item->folder->scan)
-               item->folder->scan(item->folder, item);
-       folder->scan(folder, dest);
-
+       g_slist_free(newmsgnums);
        return dest->last_num;
 }
 
@@ -708,26 +1646,44 @@ gint folder_item_copy_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
        gint num;
-       gchar * filename;
-       Folder * src_folder;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
 
        folder = dest->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->copy_msg != NULL, -1);
 
-       if (dest->last_num < 0) folder->scan(folder, dest);
+       if (!dest->cache) folder_item_read_cache(dest);
        
        num = folder->copy_msg(folder, dest, msginfo);
+       if (num != -1) {
+               MsgInfo *newmsginfo;
+
+               if (NULL != (newmsginfo = folder->fetch_msginfo(folder, dest, num))) {
+                       newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
+                       if (dest->stype == F_OUTBOX ||
+                           dest->stype == F_QUEUE  ||
+                           dest->stype == F_DRAFT  ||
+                           dest->stype == F_TRASH)
+                               MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
+                                                    MSG_NEW|MSG_UNREAD|MSG_DELETED);
+                       msgcache_add_msg(dest->cache, newmsginfo);
+
+                       if (MSG_IS_NEW(newmsginfo->flags))
+                               dest->new++;
+                       if (MSG_IS_UNREAD(newmsginfo->flags))
+                               dest->unread++;
+                       dest->total++;
+                       dest->need_update = TRUE;
+
+                       procmsg_msginfo_free(newmsginfo);
+               }                       
+       }
 
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       folder->scan(folder, dest);
-
        return num;
 }
 
@@ -745,6 +1701,7 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 
        num = folder->copy_msgs_with_dest(folder, dest, msglist);
        if (num > 0) dest->last_num = num;
+       else dest->op_count = 0;
 
        return num;
 }
@@ -754,58 +1711,129 @@ gint folder_item_copy_msgs_with_dest(FolderItem *dest, GSList *msglist)
 {
        Folder *folder;
        gint num;
-       GSList * l;
-       gchar * filename;
+       GSList *newmsgnums = NULL;
+       GSList *l, *l2;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
        folder = dest->folder;
  
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->copy_msg != NULL, -1);
 
-       if (dest->last_num < 0) folder->scan(folder, dest);
-
-       for(l = msglist ; l != NULL ; l = g_slist_next(l)) {
+       /* 
+        * Copy messages to destination folder and 
+        * store new message numbers in newmsgnums
+        */
+       for (l = msglist ; l != NULL ; l = g_slist_next(l)) {
                MsgInfo * msginfo = (MsgInfo *) l->data;
 
-               folder->copy_msg(folder, dest, msginfo);
+               num = folder->copy_msg(folder, dest, msginfo);
+               newmsgnums = g_slist_append(newmsgnums, GINT_TO_POINTER(num));
        }
 
+       /* Read cache for dest folder */
+       if (!dest->cache) folder_item_read_cache(dest);
+
+       /* 
+        * Fetch new MsgInfos for new messages in dest folder,
+        * add them to the msgcache and update folder message counts
+        */
+       l2 = newmsgnums;
+       for (l = msglist; l != NULL; l = g_slist_next(l)) {
+               MsgInfo *msginfo = (MsgInfo *) l->data;
+
+               num = GPOINTER_TO_INT(l2->data);
+
+               if (num != -1) {
+                       MsgInfo *newmsginfo;
+
+                       newmsginfo = folder->fetch_msginfo(folder, dest, num);
+                       if (newmsginfo) {
+                               newmsginfo->flags.perm_flags = msginfo->flags.perm_flags;
+                               if (dest->stype == F_OUTBOX ||
+                                   dest->stype == F_QUEUE  ||
+                                   dest->stype == F_DRAFT  ||
+                                   dest->stype == F_TRASH)
+                                       MSG_UNSET_PERM_FLAGS(newmsginfo->flags,
+                                                            MSG_NEW|MSG_UNREAD|MSG_DELETED);
+                               msgcache_add_msg(dest->cache, newmsginfo);
+
+                               if (MSG_IS_NEW(newmsginfo->flags))
+                                       dest->new++;
+                               if (MSG_IS_UNREAD(newmsginfo->flags))
+                                       dest->unread++;
+                               dest->total++;
+                               dest->need_update = TRUE;
+
+                               procmsg_msginfo_free(newmsginfo);
+                       }
+               }
+               l2 = g_slist_next(l2);
+       }
+       
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       folder->scan(folder, dest);
-
+       g_slist_free(newmsgnums);
        return dest->last_num;
 }
 
 gint folder_item_remove_msg(FolderItem *item, gint num)
 {
        Folder *folder;
-       gint result;
+       gint ret;
+       MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, -1);
 
        folder = item->folder;
+       if (!item->cache) folder_item_read_cache(item);
+
+       ret = folder->remove_msg(folder, item, num);
+
+       msginfo = msgcache_get_msg(item->cache, num);
+       if (msginfo != NULL) {
+               if (MSG_IS_NEW(msginfo->flags))
+                       item->new--;
+               if (MSG_IS_UNREAD(msginfo->flags))
+                       item->unread--;
+               procmsg_msginfo_free(msginfo);
+               msgcache_remove_msg(item->cache, num);
+       }
+       item->total--;
+       item->need_update = TRUE;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
-       g_return_val_if_fail(folder->remove_msg != NULL, -1);
+       return ret;
+}
+
+gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
+{
+       Folder *folder;
+       gint ret = 0;
 
-       if (folder->finished_remove)
-               folder->finished_remove(folder, item);
+       g_return_val_if_fail(item != NULL, -1);
+       
+       folder = item->folder;
+       if (folder->remove_msgs) {
+               ret = folder->remove_msgs(folder, item, msglist);
+               if (ret == 0)
+                       folder->scan(folder);
+               return ret;
+       }
 
-       result = folder->remove_msg(folder, item, num);
+       if (!item->cache) folder_item_read_cache(item);
 
-       if (item->last_num < 0) folder->scan(folder, item);
+       while (msglist != NULL) {
+               MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
-       if (result == 0){
-               if (folder->finished_remove)
-                       folder->finished_remove(folder, item);
+               ret = folder_item_remove_msg(item, msginfo->msgnum);
+               if (ret != 0) break;
+               msgcache_remove_msg(item->cache, msginfo->msgnum);
+               msglist = msglist->next;
        }
 
-       return result;
+       return ret;
 }
 
 gint folder_item_remove_all_msg(FolderItem *item)
@@ -817,16 +1845,21 @@ gint folder_item_remove_all_msg(FolderItem *item)
 
        folder = item->folder;
 
-       g_return_val_if_fail(folder->scan != NULL, -1);
        g_return_val_if_fail(folder->remove_all_msg != NULL, -1);
 
-       if (item->last_num < 0) folder->scan(folder, item);
-
        result = folder->remove_all_msg(folder, item);
 
-       if (result == 0){
+       if (result == 0) {
                if (folder->finished_remove)
                        folder->finished_remove(folder, item);
+
+               folder_item_free_cache(item);
+               item->cache = msgcache_new();
+
+               item->new = 0;
+               item->unread = 0;
+               item->total = 0;
+               item->need_update = TRUE;
        }
 
        return result;
@@ -881,150 +1914,6 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        return file;
 }
 
-
-static void folder_init(Folder *folder, FolderType type, const gchar *name)
-{
-       FolderItem *item;
-
-       g_return_if_fail(folder != NULL);
-
-       folder->type = type;
-       folder_set_name(folder, name);
-       folder->account = NULL;
-       folder->inbox = NULL;
-       folder->outbox = NULL;
-       folder->draft = NULL;
-       folder->queue = NULL;
-       folder->trash = NULL;
-       folder->ui_func = NULL;
-       folder->ui_func_data = NULL;
-       item = folder_item_new(name, NULL);
-       item->folder = folder;
-       folder->node = g_node_new(item);
-       folder->data = NULL;
-
-       switch (type) {
-       case F_MH:
-               folder->get_msg_list        = mh_get_msg_list;
-               folder->fetch_msg           = mh_fetch_msg;
-               folder->add_msg             = mh_add_msg;
-               /*
-               folder->move_msg            = mh_move_msg;
-               folder->move_msgs_with_dest = mh_move_msgs_with_dest;
-               folder->copy_msg            = mh_copy_msg;
-               folder->copy_msgs_with_dest = mh_copy_msgs_with_dest;
-               */
-               folder->copy_msg            = mh_copy_msg;
-               folder->remove_msg          = mh_remove_msg;
-               folder->remove_all_msg      = mh_remove_all_msg;
-               folder->is_msg_changed      = mh_is_msg_changed;
-               folder->scan                = mh_scan_folder;
-               folder->scan_tree           = mh_scan_tree;
-               folder->create_tree         = mh_create_tree;
-               folder->create_folder       = mh_create_folder;
-               folder->rename_folder       = mh_rename_folder;
-               folder->remove_folder       = mh_remove_folder;
-               break;
-       case F_IMAP:
-               folder->get_msg_list        = imap_get_msg_list;
-               folder->fetch_msg           = imap_fetch_msg;
-               folder->add_msg             = imap_add_msg;
-               folder->move_msg            = imap_move_msg;
-               folder->move_msgs_with_dest = imap_move_msgs_with_dest;
-               folder->copy_msg            = imap_copy_msg;
-               folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
-               folder->remove_msg          = imap_remove_msg;
-               folder->remove_all_msg      = imap_remove_all_msg;
-               folder->scan                = imap_scan_folder;
-               folder->scan_tree           = imap_scan_tree;
-               folder->create_tree         = imap_create_tree;
-               folder->create_folder       = imap_create_folder;
-               folder->remove_folder       = imap_remove_folder;
-               break;
-       case F_NEWS:
-               folder->get_msg_list        = news_get_article_list;
-               folder->fetch_msg           = news_fetch_msg;
-               folder->scan                = news_scan_group;
-               break;
-       case F_MBOX:
-               folder->get_msg_list        = mbox_get_msg_list;
-               folder->fetch_msg           = mbox_fetch_msg;
-               folder->scan                = mbox_scan_folder;
-               folder->add_msg             = mbox_add_msg;
-               folder->remove_all_msg      = mbox_remove_all_msg;
-               folder->remove_msg          = mbox_remove_msg;
-               /*
-               folder->move_msg            = mbox_move_msg;
-               folder->move_msgs_with_dest = mbox_move_msgs_with_dest;
-               folder->copy_msg            = mbox_copy_msg;
-               folder->copy_msgs_with_dest = mbox_copy_msgs_with_dest;
-               */
-               folder->copy_msg            = mbox_copy_msg;
-
-               folder->create_tree         = mbox_create_tree;
-               folder->create_folder       = mbox_create_folder;
-               folder->rename_folder       = mbox_rename_folder;
-               folder->remove_folder       = mbox_remove_folder;
-
-               folder->update_mark         = mbox_update_mark;
-               folder->change_flags        = mbox_change_flags;
-               folder->finished_copy       = mbox_finished_copy;
-
-               break;
-       default:
-               break;
-       }
-
-       switch (type) {
-       case F_MH:
-       case F_MBOX:
-       case F_MAILDIR:
-               LOCAL_FOLDER(folder)->rootpath = NULL;
-               break;
-       case F_IMAP:
-       case F_NEWS:
-               REMOTE_FOLDER(folder)->session = NULL;
-               break;
-       default:
-               break;
-       }
-}
-
-static void local_folder_destroy(LocalFolder *lfolder)
-{
-       g_return_if_fail(lfolder != NULL);
-
-       g_free(lfolder->rootpath);
-}
-
-static void remote_folder_destroy(RemoteFolder *rfolder)
-{
-       g_return_if_fail(rfolder != NULL);
-
-       if (rfolder->session)
-               session_destroy(rfolder->session);
-}
-
-static void mh_folder_destroy(MHFolder *folder)
-{
-       local_folder_destroy(LOCAL_FOLDER(folder));
-}
-
-static void mbox_folder_destroy(MboxFolder *folder)
-{
-       local_folder_destroy(LOCAL_FOLDER(folder));
-}
-
-static void imap_folder_destroy(IMAPFolder *folder)
-{
-       remote_folder_destroy(REMOTE_FOLDER(folder));
-}
-
-static void news_folder_destroy(NewsFolder *folder)
-{
-       remote_folder_destroy(REMOTE_FOLDER(folder));
-}
-
 static gboolean folder_build_tree(GNode *node, gpointer data)
 {
        Folder *folder = FOLDER(data);
@@ -1035,8 +1924,13 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
-       gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE;
-       gint mtime = 0, new = 0, unread = 0, total = 0;
+       gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
+                threaded = TRUE, apply_sub = FALSE;
+       gboolean ret_rcpt = FALSE, hidereadmsgs = FALSE; /* CLAWS */
+       FolderSortKey sort_key = SORT_BY_NONE;
+       FolderSortType sort_type = SORT_ASCENDING;
+       gint new = 0, unread = 0, total = 0;
+       time_t mtime = 0;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
        if (!node->parent) return FALSE;
@@ -1069,12 +1963,8 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        name = attr->value;
                else if (!strcmp(attr->name, "path"))
                        path = attr->value;
-               else if (!strcmp(attr->name, "account_id")) {
-                       account = account_find_from_id(atoi(attr->value));
-                       if (!account) g_warning("account_id: %s not found\n",
-                                               attr->value);
-               } else if (!strcmp(attr->name, "mtime"))
-                       mtime = atoi(attr->value);
+               else if (!strcmp(attr->name, "mtime"))
+                       mtime = strtoul(attr->value, NULL, 10);
                else if (!strcmp(attr->name, "new"))
                        new = atoi(attr->value);
                else if (!strcmp(attr->name, "unread"))
@@ -1087,11 +1977,52 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        no_select = *attr->value == '1' ? TRUE : FALSE;
                else if (!strcmp(attr->name, "collapsed"))
                        collapsed = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "threaded"))
+                       threaded =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "hidereadmsgs"))
+                       hidereadmsgs =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "reqretrcpt"))
+                       ret_rcpt =  *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "sort_key")) {
+                       if (!strcmp(attr->value, "none"))
+                               sort_key = SORT_BY_NONE;
+                       else if (!strcmp(attr->value, "number"))
+                               sort_key = SORT_BY_NUMBER;
+                       else if (!strcmp(attr->value, "size"))
+                               sort_key = SORT_BY_SIZE;
+                       else if (!strcmp(attr->value, "date"))
+                               sort_key = SORT_BY_DATE;
+                       else if (!strcmp(attr->value, "from"))
+                               sort_key = SORT_BY_FROM;
+                       else if (!strcmp(attr->value, "subject"))
+                               sort_key = SORT_BY_SUBJECT;
+                       else if (!strcmp(attr->value, "score"))
+                               sort_key = SORT_BY_SCORE;
+                       else if (!strcmp(attr->value, "label"))
+                               sort_key = SORT_BY_LABEL;
+                       else if (!strcmp(attr->value, "mark"))
+                               sort_key = SORT_BY_MARK;
+                       else if (!strcmp(attr->value, "unread"))
+                               sort_key = SORT_BY_UNREAD;
+                       else if (!strcmp(attr->value, "mime"))
+                               sort_key = SORT_BY_MIME;
+                       else if (!strcmp(attr->value, "locked"))
+                               sort_key = SORT_BY_LOCKED;
+               } else if (!strcmp(attr->name, "sort_type")) {
+                       if (!strcmp(attr->value, "ascending"))
+                               sort_type = SORT_ASCENDING;
+                       else
+                               sort_type = SORT_DESCENDING;
+               } else if (!strcmp(attr->name, "account_id")) {
+                       account = account_find_from_id(atoi(attr->value));
+                       if (!account) g_warning("account_id: %s not found\n",
+                                               attr->value);
+               } else if (!strcmp(attr->name, "apply_sub"))
+                       apply_sub = *attr->value == '1' ? TRUE : FALSE;
        }
 
-       item = folder_item_new(name, path);
+       item = folder_item_new(folder, name, path);
        item->stype = stype;
-       item->account = account;
        item->mtime = mtime;
        item->new = new;
        item->unread = unread;
@@ -1099,6 +2030,11 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        item->no_sub = no_sub;
        item->no_select = no_select;
        item->collapsed = collapsed;
+       item->threaded  = threaded;
+       item->hide_read_msgs  = hidereadmsgs;
+       item->ret_rcpt  = ret_rcpt;
+       item->sort_key  = sort_key;
+       item->sort_type = sort_type;
        item->parent = FOLDER_ITEM(node->parent->data);
        item->folder = folder;
        switch (stype) {
@@ -1107,10 +2043,10 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        case F_DRAFT:  folder->draft  = item; break;
        case F_QUEUE:  folder->queue  = item; break;
        case F_TRASH:  folder->trash  = item; break;
-       default:
-               break;
+       default:       break;
        }
-
+       item->account = account;
+       item->apply_sub = apply_sub;
        prefs_folder_item_read_config(item);
 
        node->data = item;
@@ -1128,7 +2064,8 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        const gchar *name = NULL;
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
-       gboolean collapsed = FALSE;
+       gboolean collapsed = FALSE, threaded = TRUE, apply_sub = FALSE;
+       gboolean ret_rcpt = FALSE; /* CLAWS */
 
        if (g_node_depth(node) != 2) return FALSE;
        g_return_val_if_fail(node->data != NULL, FALSE);
@@ -1159,12 +2096,18 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                        name = attr->value;
                else if (!strcmp(attr->name, "path"))
                        path = attr->value;
+               else if (!strcmp(attr->name, "collapsed"))
+                       collapsed = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "threaded"))
+                       threaded = *attr->value == '1' ? TRUE : FALSE;
                else if (!strcmp(attr->name, "account_id")) {
                        account = account_find_from_id(atoi(attr->value));
                        if (!account) g_warning("account_id: %s not found\n",
                                                attr->value);
-               } else if (!strcmp(attr->name, "collapsed"))
-                       collapsed = *attr->value == '1' ? TRUE : FALSE;
+               } else if (!strcmp(attr->name, "apply_sub"))
+                       apply_sub = *attr->value == '1' ? TRUE : FALSE;
+               else if (!strcmp(attr->name, "reqretrcpt"))
+                       ret_rcpt = *attr->value == '1' ? TRUE : FALSE;
        }
 
        folder = folder_new(type, name, path);
@@ -1177,6 +2120,10 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
        folder->node = node;
        folder_add(folder);
        FOLDER_ITEM(node->data)->collapsed = collapsed;
+       FOLDER_ITEM(node->data)->threaded  = threaded;
+       FOLDER_ITEM(node->data)->account   = account;
+       FOLDER_ITEM(node->data)->apply_sub = apply_sub;
+       FOLDER_ITEM(node->data)->ret_rcpt  = ret_rcpt;
 
        g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
                        folder_build_tree, folder);
@@ -1198,13 +2145,19 @@ static gchar *folder_get_list_path(void)
 static void folder_write_list_recursive(GNode *node, gpointer data)
 {
        FILE *fp = (FILE *)data;
-       FolderItem *item = FOLDER_ITEM(node->data);
+       FolderItem *item;
        gint i, depth;
        static gchar *folder_type_str[] = {"mh", "mbox", "maildir", "imap",
                                           "news", "unknown"};
        static gchar *folder_item_stype_str[] = {"normal", "inbox", "outbox",
                                                 "draft", "queue", "trash"};
+       static gchar *sort_key_str[] = {"none", "number", "size", "date",
+                                       "from", "subject", "score", "label",
+                                       "mark", "unread", "mime", "locked" };
+       g_return_if_fail(node != NULL);
+       g_return_if_fail(fp != NULL);
 
+       item = FOLDER_ITEM(node->data);
        g_return_if_fail(item != NULL);
 
        depth = g_node_depth(node);
@@ -1225,11 +2178,15 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                                (fp, LOCAL_FOLDER(folder)->rootpath);
                        fputs("\"", fp);
                }
+               if (item->collapsed && node->children)
+                       fputs(" collapsed=\"1\"", fp);
                if (folder->account)
                        fprintf(fp, " account_id=\"%d\"",
                                folder->account->account_id);
-               if (item->collapsed)
-                       fputs(" collapsed=\"1\"", fp);
+               if (item->apply_sub)
+                       fputs(" apply_sub=\"1\"", fp);
+               if (item->ret_rcpt) 
+                       fputs(" reqretrcpt=\"1\"", fp);
        } else {
                fprintf(fp, "<folderitem type=\"%s\"",
                        folder_item_stype_str[item->stype]);
@@ -1243,18 +2200,42 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        xml_file_put_escape_str(fp, item->path);
                        fputs("\"", fp);
                }
-               if (item->account)
-                       fprintf(fp, " account_id=\"%d\"",
-                               item->account->account_id);
+               
                if (item->no_sub)
                        fputs(" no_sub=\"1\"", fp);
                if (item->no_select)
                        fputs(" no_select=\"1\"", fp);
-               if (item->collapsed)
+               if (item->collapsed && node->children)
                        fputs(" collapsed=\"1\"", fp);
+               if (item->threaded)
+                       fputs(" threaded=\"1\"", fp);
+               else
+                       fputs(" threaded=\"0\"", fp);
+               if (item->hide_read_msgs)
+                       fputs(" hidereadmsgs=\"1\"", fp);
+               else
+                       fputs(" hidereadmsgs=\"0\"", fp);
+               if (item->ret_rcpt)
+                       fputs(" reqretrcpt=\"1\"", fp);
+
+               if (item->sort_key != SORT_BY_NONE) {
+                       fprintf(fp, " sort_key=\"%s\"",
+                               sort_key_str[item->sort_key]);
+                       if (item->sort_type == SORT_ASCENDING)
+                               fprintf(fp, " sort_type=\"ascending\"");
+                       else
+                               fprintf(fp, " sort_type=\"descending\"");
+               }
+
                fprintf(fp,
-                       " mtime=\"%ld\" new=\"%d\" unread=\"%d\" total=\"%d\"",
+                       " mtime=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
                        item->mtime, item->new, item->unread, item->total);
+                       
+               if (item->account)
+                       fprintf(fp, " account_id=\"%d\"",
+                               item->account->account_id);
+               if (item->apply_sub)
+                       fputs(" apply_sub=\"1\"", fp);
        }
 
        if (node->children) {
@@ -1277,51 +2258,44 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                fputs(" />\n", fp);
 }
 
-typedef struct _type_str {
-       gchar * str;
-       gint type;
-} type_str;
-
-
-static type_str type_str_table[] = 
-{
-       {"#mh", F_MH},
-       {"#mbox", F_MBOX},
-       {"#maildir", F_MAILDIR},
-       {"#imap", F_IMAP},
-       {"#news", F_NEWS}
-};
+static void folder_update_op_count_rec(GNode *node) {
+       FolderItem *fitem = FOLDER_ITEM(node->data);
 
+       if (g_node_depth(node) > 0) {
+               if (fitem->op_count > 0) {
+                       fitem->op_count = 0;
+                       folderview_update_item(fitem, 0);
+               }
+               if (node->children) {
+                       GNode *child;
 
-static gchar * folder_get_type_string(gint type)
-{
-       gint i;
+                       child = node->children;
+                       while (child) {
+                               GNode *cur;
 
-       for(i = 0 ; i < sizeof(type_str_table) / sizeof(type_str) ; i++) {
-               if (type_str_table[i].type == type)
-                       return type_str_table[i].str;
+                               cur = child;
+                               child = cur->next;
+                               folder_update_op_count_rec(cur);
+                       }
+               }
        }
-       return NULL;
 }
 
-static gint folder_get_type_from_string(gchar * str)
-{
-       gint i;
+void folder_update_op_count() {
+       GList *cur;
+       Folder *folder;
 
-       for(i = 0 ; i < sizeof(type_str_table) / sizeof(type_str) ; i++) {
-               if (g_strcasecmp(type_str_table[i].str, str))
-                       return type_str_table[i].type;
+       for (cur = folder_list; cur != NULL; cur = cur->next) {
+               folder = cur->data;
+               folder_update_op_count_rec(folder->node);
        }
-       return F_UNKNOWN;
 }
 
-gchar * folder_get_identifier(Folder * folder)
-{
-       gchar * type_str;
-       type_str = folder_get_type_string(folder->type);
+typedef struct _type_str {
+       gchar * str;
+       gint type;
+} type_str;
 
-       return g_strconcat(type_str, "/", folder->name, NULL);
-}
 
 /*
 static gchar * folder_item_get_tree_identifier(FolderItem * item)
@@ -1345,84 +2319,173 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
 }
 */
 
-gchar * folder_item_get_identifier(FolderItem * item)
-{
-       gchar * path;
-       gchar * id;
-       gchar * folder_str;
+/* CLAWS: temporary local folder for filtering */
+static Folder *processing_folder;
+static FolderItem *processing_folder_item;
 
-       folder_str = folder_get_identifier(item->folder);
+static void folder_create_processing_folder(void)
+{
+#define PROCESSING_FOLDER ".processing"        
+       Folder     *tmpparent;
+       gchar      *tmpname;
 
-       if (item->path == NULL) {
-               g_free(folder_str);
-               return NULL;
+       tmpparent = folder_get_default_folder();
+       g_assert(tmpparent);
+       debug_print("tmpparentroot %s\n", LOCAL_FOLDER(tmpparent)->rootpath);
+       if (LOCAL_FOLDER(tmpparent)->rootpath[0] == '/')
+               tmpname = g_strconcat(LOCAL_FOLDER(tmpparent)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+                                     NULL);
+       else
+               tmpname = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                     LOCAL_FOLDER(tmpparent)->rootpath,
+                                     G_DIR_SEPARATOR_S, PROCESSING_FOLDER,
+                                     NULL);
+
+       processing_folder = folder_new(F_MH, "PROCESSING", LOCAL_FOLDER(tmpparent)->rootpath);
+       g_assert(processing_folder);
+
+       if (!is_dir_exist(tmpname)) {
+               debug_print("*TMP* creating %s\n", tmpname);
+               processing_folder_item = processing_folder->create_folder(processing_folder,
+                                                                         processing_folder->node->data,
+                                                                         PROCESSING_FOLDER);
+               g_assert(processing_folder_item);                                                                         
        }
-
-       id = g_strconcat(folder_str, "/", item->path, NULL);
-
-       return id;
+       else {
+               debug_print("*TMP* already created\n");
+               processing_folder_item = folder_item_new(processing_folder, ".processing", ".processing");
+               g_assert(processing_folder_item);
+               folder_item_append(processing_folder->node->data, processing_folder_item);
+       }
+       g_free(tmpname);
 }
 
-Folder * folder_find_from_name(const gchar * name)
+FolderItem *folder_get_default_processing(void)
 {
-       GList *list;
-       Folder *folder;
-
-       for (list = g_list_first(folder_list); list != NULL;
-            list = list->next) {
-               folder = list->data;
-               if (strcmp(name, folder->name) == 0)
-                       return folder;
+       if (!processing_folder_item) {
+               folder_create_processing_folder();
        }
-       return NULL;
+       return processing_folder_item;
 }
 
-FolderItem * folder_find_item_from_identifier(const gchar *identifier)
+/* folder_persist_prefs_new() - return hash table with persistent
+ * settings (and folder name as key). 
+ * (note that in claws other options are in the PREFS_FOLDER_ITEM_RC
+ * file, so those don't need to be included in PersistPref yet) 
+ */
+GHashTable *folder_persist_prefs_new(Folder *folder)
 {
-       Folder *folder;
-       gpointer d[2];
-       gchar * str;
-       gchar * p;
-       gint type;
-       gchar * name;
-       gchar * path;
+       GHashTable *pptable;
 
-       Xalloca(str, strlen(identifier) + 1, return NULL);
-       strcpy(str, identifier);
+       g_return_val_if_fail(folder, NULL);
+       pptable = g_hash_table_new(g_str_hash, g_str_equal);
+       folder_get_persist_prefs_recursive(folder->node, pptable);
+       return pptable;
+}
 
-       /* extract box type */
+void folder_persist_prefs_free(GHashTable *pptable)
+{
+       g_return_if_fail(pptable);
+       g_hash_table_foreach_remove(pptable, persist_prefs_free, NULL);
+       g_hash_table_destroy(pptable);
+}
 
-       p = strchr(str, '/');
+const PersistPrefs *folder_get_persist_prefs(GHashTable *pptable, const char *name)
+{
+       if (pptable == NULL || name == NULL) return NULL;
+       return g_hash_table_lookup(pptable, name);
+}
 
-       if (p == NULL)
-               return NULL;
+void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+{
+       const PersistPrefs *pp;
+       gchar *id = folder_item_get_identifier(item);
 
-       *p = '\0';
+       pp = folder_get_persist_prefs(pptable, id); 
+       g_free(id);
 
-       type = folder_get_type_from_string(str);
+       if (!pp) return;
 
-       str = p + 1;
+       /* CLAWS: since not all folder properties have been migrated to 
+        * folderlist.xml, we need to call the old stuff first before
+        * setting things that apply both to Main and Claws. */
+       prefs_folder_item_read_config(item); 
+        
+       item->collapsed = pp->collapsed;
+       item->threaded  = pp->threaded;
+       item->ret_rcpt  = pp->ret_rcpt;
+       item->hide_read_msgs = pp->hide_read_msgs;
+       item->sort_key  = pp->sort_key;
+       item->sort_type = pp->sort_type;
+}
 
-       /* extract box name */
+static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
+{
+       FolderItem *item = FOLDER_ITEM(node->data);
+       PersistPrefs *pp;
+       GNode *child, *cur;
+       gchar *id;
 
-       p = strchr(str, '/');
+       g_return_if_fail(node != NULL);
+       g_return_if_fail(item != NULL);
 
-       if (p == NULL)
-               return NULL;
+       /* NOTE: item->path == NULL means top level folder; not interesting
+        * to store preferences of that one.  */
+       if (item->path) {
+               id = folder_item_get_identifier(item);
+               pp = g_new0(PersistPrefs, 1);
+               g_return_if_fail(pp != NULL);
+               pp->collapsed = item->collapsed;
+               pp->threaded  = item->threaded;
+               pp->ret_rcpt  = item->ret_rcpt; 
+               pp->hide_read_msgs = item->hide_read_msgs;
+               pp->sort_key  = item->sort_key;
+               pp->sort_type = item->sort_type;
+               g_hash_table_insert(pptable, id, pp);
+       }
 
-       *p = '\0';
+       if (node->children) {
+               child = node->children;
+               while (child) {
+                       cur = child;
+                       child = cur->next;
+                       folder_get_persist_prefs_recursive(cur, pptable);
+               }
+       }       
+}
 
-       name = str;
+static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
+{
+       if (key) 
+               g_free(key);
+       if (val) 
+               g_free(val);
+       return TRUE;    
+}
 
-       folder = folder_find_from_name(name);
-       if (folder == NULL)
+void folder_item_apply_processing(FolderItem *item)
+{
+       GSList *processing_list;
+       GSList *mlist, *cur;
+       
+       g_return_if_fail(item != NULL);
+       
+       processing_list = item->prefs->processing;
+       if (processing_list == NULL)
                return;
 
-       path = p + 1;
+       mlist = folder_item_get_msg_list(item);
+       
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo;
+
+               msginfo = (MsgInfo *) cur->data;
+               filter_message_by_msginfo(processing_list, msginfo);
+               procmsg_msginfo_free(msginfo);
+       }
+       
+       folderview_update_items_when_required(FALSE);
 
-       d[0] = (gpointer)path;
-       d[1] = NULL;
-       g_node_traverse(folder->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
-                       folder_item_find_func, d);
-       return d[1];
+       g_slist_free(mlist);
 }