* src/folder.c
[claws.git] / src / folder.c
index 8023d9c8ad428925dcbcc02f2df4224f5f8890d1..cf2fb562b810c0fbbd260dfbda7f6de483391192 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 "xml.h"
 #include "codeconv.h"
 #include "prefs.h"
+#include "prefs_common.h"
 #include "account.h"
 #include "prefs_account.h"
-#include "mbox_folder.h"
-
-#include <sys/stat.h>
-#include <sys/types.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);
@@ -67,6 +64,12 @@ static void folder_write_list_recursive      (GNode          *node,
 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;
@@ -92,60 +95,126 @@ Folder *folder_new(FolderType type, const gchar *name, const gchar *path)
        return folder;
 }
 
-Folder *mh_folder_new(const gchar *name, const gchar *path)
+static void folder_init(Folder *folder, const gchar *name)
 {
-       Folder *folder;
+       FolderItem *item;
 
-       folder = (Folder *)g_new0(MHFolder, 1);
-       folder_init(folder, F_MH, name);
-       LOCAL_FOLDER(folder)->rootpath = g_strdup(path);
+       g_return_if_fail(folder != NULL);
 
-       return folder;
+       folder_set_name(folder, name);
+
+       /* 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->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;
+
+       /* Create root folder item */
+       item = folder_item_new(folder, name, NULL);
+       item->folder = folder;
+       folder->node = g_node_new(item);
+       folder->data = 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);
 
-       folder = (Folder *)g_new0(IMAPFolder, 1);
-       folder_init(folder, F_IMAP, name);
+       switch (folder->type) {
+       case F_MBOX:
+               mbox_folder_destroy(MBOX_FOLDER(folder));
+       case F_MH:
+               mh_folder_destroy(MH_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;
+       }
 
-       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;
+}
 
-       item = g_new0(FolderItem, 1);
+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;
+
+       switch (folder->type) {
+       case F_IMAP:
+               item = imap_folder_item_new();
+               break;
+       case F_MH:
+       case F_NEWS:
+       case F_MBOX:
+               item = g_new0(FolderItem, 1);
+               break;
+       default:
+               return NULL;
+       }
+
+       g_return_val_if_fail(item != NULL, NULL);
 
        item->stype = F_NORMAL;
        item->name = g_strdup(name);
@@ -156,13 +225,16 @@ FolderItem *folder_item_new(const gchar *name, const gchar *path)
        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->mark_queue = NULL;
        item->data = NULL;
 
        item->prefs = prefs_folder_item_new();
@@ -208,6 +280,18 @@ void folder_item_destroy(FolderItem *item)
 {
        g_return_if_fail(item != NULL);
 
+       debug_print(_("Destroying folder item %s\n"), item->path);
+
+       switch (item->folder->type) {
+       case F_IMAP:
+               imap_folder_item_destroy(item);
+               break;
+       default:
+               break;
+       }
+
+       if(item->cache)
+               folder_item_free_cache(item);
        g_free(item->name);
        g_free(item->path);
        g_free(item);
@@ -235,37 +319,22 @@ 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_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);
        g_node_destroy(folder->node);
 
        folder->inbox = NULL;
@@ -364,6 +433,32 @@ 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);
+}
+
+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();
+}
+
 struct TotalMsgCount
 {
        guint new;
@@ -371,45 +466,68 @@ struct TotalMsgCount
        guint total;
 };
 
-static gboolean folder_count_total_msgs_func(GNode *node, gpointer data)
+struct FuncToAllFoldersData
+{
+       FolderItemFunc  function;
+       gpointer        data;
+};
+
+static gboolean folder_func_to_all_folders_func(GNode *node, gpointer data)
 {
        FolderItem *item;
-       struct TotalMsgCount *count = (struct TotalMsgCount *)data;
+       struct FuncToAllFoldersData *function_data = (struct FuncToAllFoldersData *) data;
 
        g_return_val_if_fail(node->data != NULL, FALSE);
 
        item = FOLDER_ITEM(node->data);
-       count->new += item->new;
-       count->unread += item->unread;
-       count->total += item->total;
+       g_return_val_if_fail(item != NULL, FALSE);
+
+       function_data->function(item, function_data->data);
 
        return FALSE;
 }
 
-void folder_count_total_msgs(guint *new, guint *unread, guint *total)
+void folder_func_to_all_folders(FolderItemFunc function, gpointer data)
 {
        GList *list;
        Folder *folder;
-       struct TotalMsgCount count;
-
-       count.new = count.unread = count.total = 0;
-
-       debug_print(_("Counting total number of messages...\n"));
+       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_count_total_msgs_func,
-                                       &count);
+                                       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;
-
-       return;
 }
 
 Folder *folder_find_from_path(const gchar *path)
@@ -427,6 +545,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;
@@ -456,6 +588,114 @@ 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_list ? FOLDER(folder_list->data) : NULL;
@@ -511,6 +751,49 @@ FolderItem *folder_get_default_trash(void)
        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);
+       }
+}
+
+#undef CREATE_FOLDER_IF_NOT_EXIST
+
 gchar *folder_item_get_path(FolderItem *item)
 {
        gchar *folder_path;
@@ -569,17 +852,212 @@ gchar *folder_item_get_path(FolderItem *item)
        return path;
 }
 
-void folder_item_scan(FolderItem *item)
+void folder_item_set_default_flags(FolderItem *dest, MsgFlags *flags)
 {
-       Folder *folder;
+       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 {
+               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_return_if_fail(item != NULL);
+typedef enum {
+    IN_CACHE  = 1 << 0,
+    IN_FOLDER = 1 << 1,
+} FolderScanInfo;
+
+gint folder_item_scan(FolderItem *item)
+{
+       Folder *folder;
+       GSList *folder_list, *cache_list, *elem, *new_list = NULL;
+       gint i;
+       guint min = 0xffffffff, max = 0, cache_max = 0;
+       FolderScanInfo *folderscaninfo;
+       guint newcnt = 0, unreadcnt = 0, totalcnt = 0;
+       
+       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);
+
+       /* Get min und max number in folder */
+       for(elem = cache_list; elem != NULL; elem = elem->next) {
+               MsgInfo *msginfo = (MsgInfo *)elem->data;
+
+               min = MIN(msginfo->msgnum, min);
+               max = MAX(msginfo->msgnum, max);
+       }
+       cache_max = max;
+       for(elem = folder_list; elem != NULL; elem = elem->next) {
+               guint num = GPOINTER_TO_INT(elem->data);
+
+               min = MIN(num, min);
+               max = MAX(num, max);
+       }
+
+       debug_print("Folder message number range from %d to %d\n", min, max);
+
+       if(max == 0) {
+               for(elem = cache_list; elem != NULL; elem = elem->next) {
+                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+
+                       procmsg_msginfo_free(msginfo);
+               }
+               g_slist_free(folder_list);
+               g_slist_free(cache_list);
+
+               return 0;
+       }
+
+       folderscaninfo = g_new0(FolderScanInfo, max - min + 1);
+
+       for(elem = folder_list; elem != NULL; elem = elem->next) {
+               guint num = GPOINTER_TO_INT(elem->data);
+
+               folderscaninfo[num - min] |= IN_FOLDER;
+       }
+       for(elem = cache_list; elem != NULL; elem = elem->next) {
+               MsgInfo *msginfo = (MsgInfo *)elem->data;
 
-       folder->scan(folder, item);
+               folderscaninfo[msginfo->msgnum - min] |= IN_CACHE;
+               procmsg_msginfo_free(msginfo);
+       }
+
+       for(i = max - min; i >= 0; i--) {
+               guint num;
+
+               num = i + min;
+               /* Add message to cache if in folder and not in cache */
+               if( (folderscaninfo[i] & IN_FOLDER) && 
+                  !(folderscaninfo[i] & IN_CACHE) && 
+                   (folder->type != F_NEWS ||
+                       (((prefs_common.max_articles == 0) || (num > (max - prefs_common.max_articles))) &&
+                       (num > cache_max)))
+                   ) {
+                       new_list = g_slist_prepend(new_list, GINT_TO_POINTER(num));
+                       debug_print(_("Remembered message %d for fetching\n"), num);
+               }
+               /* Remove message from cache if not in folder and in cache */
+               if(!(folderscaninfo[i] & IN_FOLDER) && 
+                   (folderscaninfo[i] & IN_CACHE)) {
+                       msgcache_remove_msg(item->cache, i + min);
+                       debug_print(_("Removed message %d from cache.\n"), num);
+               }
+               /* Check if msginfo needs update if in cache and in folder */
+               if((folderscaninfo[i] & IN_FOLDER) && 
+                  (folderscaninfo[i] & IN_CACHE)) {
+                       MsgInfo *msginfo;
+
+                       msginfo = msgcache_get_msg(item->cache, num);
+                       if(folder->is_msg_changed && folder->is_msg_changed(folder, item, msginfo)) {
+                               MsgInfo *newmsginfo;
+
+                               msgcache_remove_msg(item->cache, msginfo->msgnum);
+
+                               newmsginfo = folder->fetch_msginfo(folder, item, 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"), 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);
+               }
+       }
+
+       if(folder->fetch_msginfos) {
+               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);
+                       folderview_update_item(item, FALSE);
+               }
+       } else if (folder->fetch_msginfo) {
+               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);
+                       }
+               }
+               folderview_update_item(item, FALSE);
+       }
+
+       item->new = newcnt;
+       item->unread = unreadcnt;
+       item->total = totalcnt;
+       
+       g_slist_free(folder_list);
+       g_slist_free(cache_list);
+       g_slist_free(new_list);
+       g_free(folderscaninfo);
+
+       return 0;
 }
 
 static void folder_item_scan_foreach_func(gpointer key, gpointer val,
@@ -593,6 +1071,181 @@ void folder_item_scan_foreach(GHashTable *table)
        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;
+
+       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;
+       
+       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)
 {
        Folder *folder;
@@ -601,11 +1254,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);
 }
 
@@ -614,19 +1264,33 @@ 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(MSG_IS_NEW(msginfo->flags))
+                       dest->new++;
+               if(MSG_IS_UNREAD(msginfo->flags))
+                       dest->unread++;
+               dest->total++;
+
+                dest->last_num = num;
+                msgcache_add_msg(dest->cache, msginfo);
+               procmsg_msginfo_free(msginfo);
+        }
 
        return num;
 }
@@ -654,7 +1318,6 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 {
        Folder *folder;
        gint num;
-       gchar * filename;
        Folder * src_folder;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -662,31 +1325,53 @@ gint folder_item_move_msg(FolderItem *dest, MsgInfo *msginfo)
 
        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);
-       }                                      
+               MsgInfo *newmsginfo;
+
+               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);
+
+               /* CLAWS */
+               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_NEW(newmsginfo->flags))
+                       dest->new++;
+               if (MSG_IS_UNREAD(msginfo->flags))
+                       msginfo->folder->unread--;
+               if (MSG_IS_UNREAD(newmsginfo->flags))
+                       dest->unread++;
+               msginfo->folder->total--;
+               dest->total++;
+
+               procmsg_msginfo_free(newmsginfo);
+       }
        
        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;
 }
 
@@ -713,21 +1398,23 @@ 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)) {
                MsgInfo * msginfo = (MsgInfo *) l->data;
@@ -735,19 +1422,83 @@ gint folder_item_move_msgs_with_dest(FolderItem *dest, GSList *msglist)
                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++;
+
+                               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--;                       
+               }
+
+               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;
 }
 
@@ -774,26 +1525,42 @@ 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;
+
+               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++;
+
+               procmsg_msginfo_free(newmsginfo);
+       }
 
        if (folder->finished_copy)
                folder->finished_copy(folder, dest);
 
-       folder->scan(folder, dest);
-
        return num;
 }
 
@@ -821,30 +1588,70 @@ 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);
-
+       /* 
+        * 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++;
+
+                               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;
 }
 
@@ -852,15 +1659,23 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
 {
        Folder *folder;
        gint ret;
+       MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, -1);
 
        folder = item->folder;
-       if (item->last_num < 0) folder->scan(folder, item);
+       if (!item->cache) folder_item_read_cache(item);
 
        ret = folder->remove_msg(folder, item, num);
-       if (ret == 0 && num == item->last_num)
-               folder->scan(folder, item);
+
+       msginfo = msgcache_get_msg(item->cache, num);
+       if(MSG_IS_NEW(msginfo->flags))
+               item->new--;
+       if(MSG_IS_UNREAD(msginfo->flags))
+               item->unread--;
+       item->total--;
+       procmsg_msginfo_free(msginfo);
+       msgcache_remove_msg(item->cache, num);
 
        return ret;
 }
@@ -871,11 +1686,14 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 
        g_return_val_if_fail(item != NULL, -1);
 
+       if (!item->cache) folder_item_read_cache(item);
+
        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
                ret = folder_item_remove_msg(item, msginfo->msgnum);
                if (ret != 0) break;
+               msgcache_remove_msg(item->cache, msginfo->msgnum);
                msglist = msglist->next;
        }
 
@@ -891,16 +1709,20 @@ 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;
        }
 
        return result;
@@ -955,150 +1777,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);
@@ -1110,8 +1788,11 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        const gchar *path = NULL;
        PrefsAccount *account = NULL;
        gboolean no_sub = FALSE, no_select = FALSE, collapsed = FALSE, 
-                threaded = TRUE, ret_rcpt = FALSE;
-       gint mtime = 0, new = 0, unread = 0, total = 0;
+                threaded = TRUE, ret_rcpt = FALSE, hidereadmsgs = FALSE;
+       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;
@@ -1149,7 +1830,7 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        if (!account) g_warning("account_id: %s not found\n",
                                                attr->value);
                } else if (!strcmp(attr->name, "mtime"))
-                       mtime = atoi(attr->value);
+                       mtime = strtoul(attr->value, NULL, 10);
                else if (!strcmp(attr->name, "new"))
                        new = atoi(attr->value);
                else if (!strcmp(attr->name, "unread"))
@@ -1164,11 +1845,44 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                        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;
+               }
        }
 
-       item = folder_item_new(name, path);
+       item = folder_item_new(folder, name, path);
        item->stype = stype;
        item->account = account;
        item->mtime = mtime;
@@ -1179,7 +1893,10 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        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) {
@@ -1188,8 +1905,7 @@ 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;
        }
 
        prefs_folder_item_read_config(item);
@@ -1291,6 +2007,9 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                                           "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(item != NULL);
 
@@ -1345,8 +2064,22 @@ static void folder_write_list_recursive(GNode *node, gpointer data)
                        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=\"%lu\" new=\"%d\" unread=\"%d\" total=\"%d\"",
                        item->mtime, item->new, item->unread, item->total);
@@ -1411,46 +2144,6 @@ typedef struct _type_str {
 } type_str;
 
 
-static type_str type_str_table[] = 
-{
-       {"#mh", F_MH},
-       {"#mbox", F_MBOX},
-       {"#maildir", F_MAILDIR},
-       {"#imap", F_IMAP},
-       {"#news", F_NEWS}
-};
-
-
-static gchar * folder_get_type_string(gint type)
-{
-       gint i;
-
-       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;
-       }
-       return NULL;
-}
-
-static gint folder_get_type_from_string(gchar * str)
-{
-       gint i;
-
-       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;
-       }
-       return F_UNKNOWN;
-}
-
-gchar * folder_get_identifier(Folder * folder)
-{
-       gchar * type_str;
-       type_str = folder_get_type_string(folder->type);
-
-       return g_strconcat(type_str, "/", folder->name, NULL);
-}
-
 /*
 static gchar * folder_item_get_tree_identifier(FolderItem * item)
 {
@@ -1473,85 +2166,7 @@ static gchar * folder_item_get_tree_identifier(FolderItem * item)
 }
 */
 
-gchar * folder_item_get_identifier(FolderItem * item)
-{
-       gchar * id;
-       gchar * folder_str;
-
-       g_return_val_if_fail(item->path != NULL, NULL);
-
-       folder_str = folder_get_identifier(item->folder);
-       id = g_strconcat(folder_str, "/", item->path, NULL);
-       g_free(folder_str);
-
-       return id;
-}
-
-Folder * folder_find_from_name(const gchar * name)
-{
-       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;
-       }
-       return NULL;
-}
-
-FolderItem * folder_find_item_from_identifier(const gchar *identifier)
-{
-       Folder *folder;
-       gpointer d[2];
-       gchar * str;
-       gchar * p;
-       gint type;
-       gchar * name;
-       gchar * path;
-
-       Xstrdup_a(str, identifier, return NULL);
-
-       /* extract box type */
-
-       p = strchr(str, '/');
-
-       if (p == NULL)
-               return NULL;
-
-       *p = '\0';
-
-       type = folder_get_type_from_string(str);
-
-       str = p + 1;
-
-       /* extract box name */
-
-       p = strchr(str, '/');
-
-       if (p == NULL)
-               return NULL;
-
-       *p = '\0';
-
-       name = str;
-
-       folder = folder_find_from_name(name);
-       if (folder == NULL)
-               return;
-
-       path = p + 1;
-
-       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];
-}
-
 /* CLAWS: temporary local folder for filtering */
-
 static Folder *processing_folder;
 static FolderItem *processing_folder_item;
 
@@ -1559,9 +2174,7 @@ static void folder_create_processing_folder(void)
 {
 #define PROCESSING_FOLDER ".processing"        
        Folder     *tmpparent;
-       FolderItem *tmpfolder;
        gchar      *tmpname;
-       struct stat s;
 
        tmpparent = folder_get_default_folder();
        g_assert(tmpparent);
@@ -1588,7 +2201,7 @@ static void folder_create_processing_folder(void)
        }
        else {
                debug_print("*TMP* already created\n");
-               processing_folder_item = folder_item_new(".processing", ".processing");
+               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);
        }
@@ -1603,3 +2216,125 @@ FolderItem *folder_get_default_processing(void)
        return processing_folder_item;
 }
 
+/* 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)
+{
+       GHashTable *pptable;
+
+       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;
+}
+
+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);
+}
+
+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);
+}
+
+void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
+{
+       const PersistPrefs *pp;
+
+       pp = folder_get_persist_prefs(pptable, item->path); 
+       if (!pp) return;
+
+       /* 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;
+}
+
+static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
+{
+       FolderItem *item = FOLDER_ITEM(node->data);
+       PersistPrefs *pp;
+       GNode *child, *cur;
+
+       g_return_if_fail(node != NULL);
+       g_return_if_fail(item != NULL);
+
+       /* FIXME: item->path == NULL for top level folder, so this means that 
+        * properties of MH folder root will not be stored. Not quite important, 
+        * because the top level folder properties are not special anyway. */
+       if (item->path) {
+               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, g_strdup(item->path), pp);
+       }               
+
+       if (node->children) {
+               child = node->children;
+               while (child) {
+                       cur = child;
+                       child = cur->next;
+                       folder_get_persist_prefs_recursive(cur, pptable);
+               }
+       }       
+}
+
+static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
+{
+       if (key) 
+               g_free(key);
+       if (val) 
+               g_free(val);
+       return TRUE;    
+}
+
+void folder_item_apply_processing(FolderItem *item)
+{
+       GSList *processing_list;
+       GSList *mlist, *cur;
+       GHashTable *folder_table;
+       
+       g_return_if_fail(item != NULL);
+       
+       processing_list = item->prefs->processing;
+       if (processing_list == NULL)
+               return;
+       folder_table = g_hash_table_new(NULL, NULL);
+
+       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,
+                                         folder_table);
+               procmsg_msginfo_free(msginfo);
+       }
+       
+       /* folder_item_scan_foreach(summaryview->folder_table); */
+       folderview_update_item_foreach(folder_table);
+
+       g_slist_free(mlist);
+       
+       g_hash_table_destroy(folder_table);
+}