2006-08-29 [colin] 2.4.0cvs107
[claws.git] / src / folder.c
index 83d08e37442740d84e6ccfa0876684f785ecd870..cc2e53d65102aed1a2c0899afcf158d0cc21462d 100644 (file)
@@ -54,6 +54,9 @@
 #include "remotefolder.h"
 #include "partial_download.h"
 #include "statusbar.h"
+#include "gtkutils.h"
+#include "timing.h"
+#include "compose.h"
 
 /* Dependecies to be removed ?! */
 #include "prefs_common.h"
@@ -88,7 +91,6 @@ 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);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 static void folder_item_update_with_msg (FolderItem *item, FolderItemUpdateFlags update_flags,
                                          MsgInfo *msg);
@@ -197,6 +199,52 @@ void folder_init(Folder *folder, const gchar *name)
        folder->trash = NULL;
 }
 
+static void reset_parent_type(FolderItem *item, gpointer data) {
+       item->parent_stype = -1;
+}
+
+void folder_item_change_type(FolderItem *item, SpecialFolderItemType newtype)
+{
+       Folder *folder = NULL;
+       FolderUpdateData hookdata;
+
+       folder = item->folder;
+       /* unset previous root of newtype */
+       switch(newtype) {
+       case F_INBOX:
+               folder_item_change_type(folder->inbox, F_NORMAL);
+               folder->inbox = item;
+               break;
+       case F_OUTBOX:
+               folder_item_change_type(folder->outbox, F_NORMAL);
+               folder->outbox = item;
+               break;
+       case F_QUEUE:
+               folder_item_change_type(folder->queue, F_NORMAL);
+               folder->queue = item;
+               break;
+       case F_DRAFT:
+               folder_item_change_type(folder->draft, F_NORMAL);
+               folder->draft = item;
+               break;
+       case F_TRASH:
+               folder_item_change_type(folder->trash, F_NORMAL);
+               folder->trash = item;
+               break;
+       case F_NORMAL:
+       default:
+               break;
+       }
+       /* set new type for current folder and sons */
+       item->stype = newtype;
+       folder_func_to_all_folders(reset_parent_type, NULL);
+       
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_TREE_CHANGED;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+}
+
 void folder_destroy(Folder *folder)
 {
        g_return_if_fail(folder != NULL);
@@ -225,12 +273,10 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
 
                if (!attr || !attr->name || !attr->value) continue;
                if (!strcmp(attr->name, "name")) {
-                       if (folder->name != NULL)
-                               g_free(folder->name);
+                       g_free(folder->name);
                        folder->name = g_strdup(attr->value);
                        if (rootitem != NULL) {
-                               if (rootitem->name != NULL)
-                                       g_free(rootitem->name);
+                               g_free(rootitem->name);
                                rootitem->name = g_strdup(attr->value);
                        }
                } else if (!strcmp(attr->name, "account_id")) {
@@ -414,7 +460,7 @@ void folder_item_destroy(FolderItem *item)
        }
 
        if (item->cache)
-               folder_item_free_cache(item);
+               folder_item_free_cache(item, TRUE);
        if (item->prefs)
                folder_item_prefs_free(item->prefs);
        g_free(item->name);
@@ -461,12 +507,10 @@ void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
                        else if (!g_ascii_strcasecmp(attr->value, "trash"))
                                item->stype = F_TRASH;
                } else if (!strcmp(attr->name, "name")) {
-                       if (item->name != NULL)
-                               g_free(item->name);
+                       g_free(item->name);
                        item->name = g_strdup(attr->value);
                } else if (!strcmp(attr->name, "path")) {
-                       if (item->path != NULL)
-                               g_free(item->path);
+                       g_free(item->path);
                        item->path = g_strdup(attr->value);
                } else if (!strcmp(attr->name, "mtime"))
                        item->mtime = strtoul(attr->value, NULL, 10);
@@ -722,7 +766,7 @@ gint folder_read_list(void)
        }
 
        xml_free_tree(node);
-       if (folder_list)
+       if (folder_list || folder_unloaded_list)
                return 0;
        else
                return -1;
@@ -787,16 +831,22 @@ void folder_scan_tree(Folder *folder, gboolean rebuild)
 {
        GHashTable *pptable;
        FolderUpdateData hookdata;
-       
+       Folder *old_folder = folder;
+
        if (!folder->klass->scan_tree)
                return;
        
        pptable = folder_persist_prefs_new(folder);
 
        if (rebuild)
-               folder_tree_destroy(folder);
+               folder_remove(folder);
 
-       folder->klass->scan_tree(folder);
+       if (folder->klass->scan_tree(folder) < 0) {
+               if (rebuild)
+                       folder_add(old_folder);
+               return;
+       } else if (rebuild)
+               folder_add(folder);
 
        hookdata.folder = folder;
        hookdata.update_flags = FOLDER_TREE_CHANGED;
@@ -841,11 +891,17 @@ gint folder_item_rename(FolderItem *item, gchar *newname)
 
        if (retval >= 0) {
                FolderItemUpdateData hookdata;
+               FolderUpdateData hookdata2;
 
                hookdata.item = item;
                hookdata.update_flags = F_ITEM_UPDATE_NAME;
                hookdata.msg = NULL;
                hooks_invoke(FOLDER_ITEM_UPDATE_HOOKLIST, &hookdata);
+
+               hookdata2.folder = item->folder;
+               hookdata2.item = item;
+               hookdata2.update_flags = FOLDER_RENAME_FOLDERITEM;
+               hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata2);
        }
 
        return retval;
@@ -1268,6 +1324,17 @@ Folder *folder_get_default_folder(void)
        return folder_list ? FOLDER(folder_list->data) : NULL;
 }
 
+gboolean folder_have_mailbox (void)
+{
+       GList *cur;
+       for (cur = folder_list; cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = FOLDER(cur->data);
+               if (folder->inbox && folder->outbox)
+                       return TRUE;
+       }
+       return FALSE;
+}
+
 FolderItem *folder_get_default_inbox(void)
 {
        GList *flist;
@@ -1279,6 +1346,8 @@ FolderItem *folder_get_default_inbox(void)
                        continue;
                if (folder->inbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->inbox;
        }
@@ -1297,6 +1366,8 @@ FolderItem *folder_get_default_outbox(void)
                        continue;
                if (folder->outbox == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->outbox;
        }
@@ -1315,6 +1386,8 @@ FolderItem *folder_get_default_draft(void)
                        continue;
                if (folder->draft == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->draft;
        }
@@ -1333,6 +1406,8 @@ FolderItem *folder_get_default_queue(void)
                        continue;
                if (folder->queue == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->queue;
        }
@@ -1351,6 +1426,8 @@ FolderItem *folder_get_default_trash(void)
                        continue;
                if (folder->trash == NULL)
                        continue;
+               if (folder->klass->type == F_UNKNOWN)
+                       continue;
 
                return folder->trash;
        }
@@ -1510,13 +1587,20 @@ void folder_item_process_open (FolderItem *item,
 
 gint folder_item_open(FolderItem *item)
 {
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+       START_TIMING("folder_item_open"); 
+       if (item->no_select)
+               return -1;
+
+       if (item->scanning) {
+               debug_print("%s is scanning... \n", item->path ? item->path : item->name);
+               return -2;
+       }
 
        item->processing_pending = TRUE;
        folder_item_process_open (item, NULL, NULL, NULL);
        
        item->opened = TRUE;
-
+       END_TIMING();
        return 0;
 }
 
@@ -1526,7 +1610,9 @@ gint folder_item_close(FolderItem *item)
        Folder *folder;
        
        g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+
+       if (item->no_select)
+               return -1;
 
        if (item->new_msgs) {
                folder_item_update_freeze();
@@ -1560,7 +1646,8 @@ static MsgInfoList *get_msginfos(FolderItem *item, MsgNumberList *numlist)
 {
        MsgInfoList *msglist = NULL;
        Folder *folder = item->folder;
-       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       if (item->no_select)
+               return NULL;
        
        if (folder->klass->get_msginfos != NULL)
                msglist = folder->klass->get_msginfos(folder, item, numlist);
@@ -1607,7 +1694,8 @@ static gint syncronize_flags(FolderItem *item, MsgInfoList *msglist)
                return 0;
        if(item->folder->klass->get_flags == NULL)
                return 0;
-       g_return_val_if_fail(item->no_select == FALSE, 0);
+       if (item->no_select)
+               return 0;
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -1654,7 +1742,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        guint markedcnt = 0, unreadmarkedcnt = 0;
        guint cache_max_num, folder_max_num, cache_cur_num, folder_cur_num;
        gboolean update_flags = 0, old_uids_valid = FALSE;
-    
+       GHashTable *subject_table = NULL;
+       
        g_return_val_if_fail(item != NULL, -1);
        if (item->path == NULL) return -1;
 
@@ -1663,14 +1752,21 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->klass->get_num_list != NULL, -1);
 
-       debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
+       item->scanning = TRUE;
 
+       debug_print("Scanning folder %s for cache changes.\n", item->path ? item->path : "(null)");
+       
        /* Get list of messages for folder and cache */
        if (folder->klass->get_num_list(item->folder, item, &folder_list, &old_uids_valid) < 0) {
                debug_print("Error fetching list of message numbers\n");
+               item->scanning = FALSE;
                return(-1);
        }
 
+       if(prefs_common.thread_by_subject) {
+               subject_table = g_hash_table_new(g_str_hash, g_str_equal);
+       }
+       
        if (old_uids_valid) {
                if (!item->cache)
                        folder_item_read_cache(item);
@@ -1790,9 +1886,16 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                                procmsg_msginfo_free(msginfo);
 
                                debug_print("Remembering message %d to update...\n", folder_cur_num);
-                       } else
+                       } else {
                                exists_list = g_slist_prepend(exists_list, msginfo);
 
+                               if(prefs_common.thread_by_subject &&
+                                       MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                       !subject_table_lookup(subject_table, msginfo->subject)) {
+                                       subject_table_insert(subject_table, msginfo->subject, msginfo);
+                               }
+                       }
+                       
                        /* Move to next folder and cache number */
                        cache_list_cur = cache_list_cur->next;
                        folder_list_cur = folder_list_cur->next;
@@ -1830,7 +1933,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
        folder_item_update_freeze();
        if (newmsg_list != NULL) {
-               GSList *elem;
+               GSList *elem, *to_filter = NULL;
                int total = g_slist_length(newmsg_list), cur = 0;
                
                if ((filtering == TRUE) &&
@@ -1849,11 +1952,25 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                            (item->stype == F_INBOX) &&
                            (item->folder->account != NULL) && 
                            (item->folder->account->filter_on_recv) &&
-                           procmsg_msginfo_filter(msginfo))
-                               procmsg_msginfo_free(msginfo);
-                       else
+                           procmsg_msginfo_filter(msginfo,  item->folder->account))
+                               to_filter = g_slist_prepend(to_filter, msginfo);
+                       else {
                                exists_list = g_slist_prepend(exists_list, msginfo);
+                               
+                               if(prefs_common.thread_by_subject &&
+                                       MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                                       !subject_table_lookup(subject_table, msginfo->subject)) {
+                                       subject_table_insert(subject_table, msginfo->subject, msginfo);
+                               }
+                       }
                }
+               filtering_move_and_copy_msgs(to_filter);
+               for (elem = to_filter; elem; elem = g_slist_next(elem)) {
+                       MsgInfo *msginfo = (MsgInfo *)elem->data;
+                       procmsg_msginfo_free(msginfo);
+               }
+
+               g_slist_free(to_filter);
                g_slist_free(newmsg_list);
 
                statusbar_progress_all(0,0,0);
@@ -1863,7 +1980,7 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
        folder_item_set_batch(item, TRUE);
        for (elem = exists_list; elem != NULL; elem = g_slist_next(elem)) {
-               MsgInfo *msginfo;
+               MsgInfo *msginfo, *parent_msginfo;
 
                msginfo = elem->data;
                if (MSG_IS_IGNORE_THREAD(msginfo->flags) && (MSG_IS_NEW(msginfo->flags) || MSG_IS_UNREAD(msginfo->flags)))
@@ -1871,6 +1988,15 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
                if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD)) {
                        procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0, MSG_NEW | MSG_UNREAD, 0);
                }
+               if(prefs_common.thread_by_subject && !msginfo->inreplyto &&
+                       !msginfo->references && !MSG_IS_IGNORE_THREAD(msginfo->flags) &&
+                       (parent_msginfo = subject_table_lookup(subject_table, msginfo->subject)))
+               {
+                       if(MSG_IS_IGNORE_THREAD(parent_msginfo->flags)) {
+                               procmsg_msginfo_change_flags(msginfo, MSG_IGNORE_THREAD, 0,
+                                               MSG_NEW | MSG_UNREAD, 0);
+                       }
+               }
                if ((folder_has_parent_of_type(item, F_OUTBOX) ||
                     folder_has_parent_of_type(item, F_QUEUE)  ||
                     folder_has_parent_of_type(item, F_DRAFT)  ||
@@ -1892,6 +2018,16 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
        }
        folder_item_set_batch(item, FALSE);
        g_slist_free(exists_list);
+       
+       if(prefs_common.thread_by_subject) {
+               g_hash_table_destroy(subject_table);
+       }
+       
+       if (item->new_msgs != newcnt || item->unread_msgs != unreadcnt
+       ||  item->total_msgs != totalcnt || item->marked_msgs != markedcnt
+       ||  item->unreadmarked_msgs != unreadmarkedcnt) {
+               update_flags |= F_ITEM_UPDATE_CONTENT;
+       }
 
        item->new_msgs = newcnt;
        item->unread_msgs = unreadcnt;
@@ -1903,6 +2039,8 @@ gint folder_item_scan_full(FolderItem *item, gboolean filtering)
 
        folder_item_update(item, update_flags);
        folder_item_update_thaw();
+       
+       item->scanning = FALSE;
 
        return 0;
 }
@@ -1957,7 +2095,10 @@ gint folder_item_syncronize_flags(FolderItem *item)
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
        g_return_val_if_fail(item->folder->klass != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);     
+       if (item->no_select)
+               return -1;
+
+       item->scanning = TRUE;
 
        if (item->cache == NULL)
                folder_item_read_cache(item);
@@ -1971,6 +2112,8 @@ gint folder_item_syncronize_flags(FolderItem *item)
        
        g_slist_free(msglist);
 
+       item->scanning = FALSE;
+
        return ret;
 }
 
@@ -1996,24 +2139,26 @@ void folder_find_expired_caches(FolderItem *item, gpointer data)
        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) {
+
+       if (difftime > expiretime && !item->opened && !item->processing_pending) {
                *folder_item_list = g_slist_insert_sorted(*folder_item_list, item, folder_cache_time_compare_func);
        }
 }
 
-void folder_item_free_cache(FolderItem *item)
+gboolean folder_item_free_cache(FolderItem *item, gboolean force)
 {
-       g_return_if_fail(item != NULL);
+       g_return_val_if_fail(item != NULL, TRUE);
        
        if (item->cache == NULL)
-               return;
+               return TRUE;
        
-       if (item->opened > 0)
-               return;
+       if (item->opened > 0 && !force)
+               return FALSE;
 
        folder_item_write_cache(item);
        msgcache_destroy(item->cache);
        item->cache = NULL;
+       return TRUE;
 }
 
 void folder_clean_cache_memory_force(void)
@@ -2024,13 +2169,13 @@ void folder_clean_cache_memory_force(void)
        prefs_common.cache_max_mem_usage = 0;
        prefs_common.cache_min_keep_time = 0;
 
-       folder_clean_cache_memory();
+       folder_clean_cache_memory(NULL);
 
        prefs_common.cache_max_mem_usage = old_cache_max_mem_usage;
        prefs_common.cache_min_keep_time = old_cache_min_keep_time;
 }
 
-void folder_clean_cache_memory(void)
+void folder_clean_cache_memory(FolderItem *protected_item)
 {
        gint memusage = 0;
 
@@ -2046,10 +2191,16 @@ void folder_clean_cache_memory(void)
                listitem = folder_item_list;
                while((listitem != NULL) && (memusage > (prefs_common.cache_max_mem_usage * 1024))) {
                        FolderItem *item = (FolderItem *)(listitem->data);
-
+                       gint cache_size = 0;
+                       if (item == protected_item) {
+                               listitem = listitem->next;
+                               continue;
+                       }
                        debug_print("Freeing cache memory for %s\n", item->path ? item->path : item->name);
-                       memusage -= msgcache_get_memory_usage(item->cache);
-                       folder_item_free_cache(item);
+                       cache_size = msgcache_get_memory_usage(item->cache);
+                       if (folder_item_free_cache(item, FALSE))
+                               memusage -= cache_size;
+
                        listitem = listitem->next;
                }
                g_slist_free(folder_item_list);
@@ -2059,7 +2210,7 @@ void folder_clean_cache_memory(void)
 void folder_item_read_cache(FolderItem *item)
 {
        gchar *cache_file, *mark_file;
-       
+       START_TIMING("folder_item_read_cache");
        g_return_if_fail(item != NULL);
 
        if (item->path != NULL) {
@@ -2103,8 +2254,8 @@ void folder_item_read_cache(FolderItem *item)
        } else {
                item->cache = msgcache_new();
        }
-
-       folder_clean_cache_memory();
+       END_TIMING();
+       folder_clean_cache_memory(item);
 }
 
 void folder_item_write_cache(FolderItem *item)
@@ -2113,10 +2264,17 @@ void folder_item_write_cache(FolderItem *item)
        FolderItemPrefs *prefs;
        gint filemode = 0;
        gchar *id;
+       time_t last_mtime = (time_t)0;
+       gboolean need_scan = FALSE;
        
        if (!item || !item->path || !item->cache)
                return;
 
+       if (FOLDER_TYPE(item->folder) == F_MH) {
+               last_mtime = item->mtime;
+               need_scan = item->folder->klass->scan_required(item->folder, item);
+       }
+
        id = folder_item_get_identifier(item);
        debug_print("Save cache for folder %s\n", id);
        g_free(id);
@@ -2134,6 +2292,11 @@ void folder_item_write_cache(FolderItem *item)
                }
         }
 
+       if (!need_scan && FOLDER_TYPE(item->folder) == F_MH) {
+               if (item->mtime == last_mtime)
+                       item->mtime = time(NULL);
+       }
+
        g_free(cache_file);
        g_free(mark_file);
 }
@@ -2144,7 +2307,8 @@ MsgInfo *folder_item_get_msginfo(FolderItem *item, gint num)
        MsgInfo *msginfo = NULL;
        
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->no_select == FALSE, NULL);   
+       if (item->no_select)
+               return NULL;
        folder = item->folder;
        if (!item->cache)
                folder_item_read_cache(item);
@@ -2168,7 +2332,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
        
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(msgid != NULL, NULL);
-       g_return_val_if_fail(item->no_select == FALSE, FALSE);
+       if (item->no_select)
+               return FALSE;
        
        folder = item->folder;
        if (!item->cache)
@@ -2183,7 +2348,8 @@ MsgInfo *folder_item_get_msginfo_by_msgid(FolderItem *item, const gchar *msgid)
 GSList *folder_item_get_msg_list(FolderItem *item)
 {
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->no_select == FALSE, FALSE);
+       if (item->no_select)
+               return FALSE;
        
        if (item->cache == 0)
                folder_item_read_cache(item);
@@ -2207,7 +2373,12 @@ void msginfo_set_mime_flags(GNode *node, gpointer data)
                if (!mimeinfo->subtype 
                ||  strcmp(mimeinfo->subtype, "pgp-signature"))
                        procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
-       }
+       } else if (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
+               strcmp(mimeinfo->subtype, "pgp-signature") && 
+               (procmime_mimeinfo_get_parameter(mimeinfo, "name") != NULL ||
+                procmime_mimeinfo_get_parameter(mimeinfo, "filename") != NULL)) {
+               procmsg_msginfo_set_flags(msginfo, 0, MSG_HAS_ATTACHMENT);
+       } 
 
        /* don't descend below top level message for signed and encrypted info */
        if (mimeinfo->type == MIMETYPE_MESSAGE)
@@ -2236,7 +2407,8 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        folder = item->folder;
 
        g_return_val_if_fail(folder->klass->fetch_msg != NULL, NULL);
-       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       if (item->no_select)
+               return NULL;
 
        msgfile = folder->klass->fetch_msg(folder, item, num);
 
@@ -2258,6 +2430,7 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2271,7 +2444,8 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
        MsgInfo *msginfo;
 
        g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->no_select == FALSE, NULL);
+       if (item->no_select)
+               return NULL;
        
        folder = item->folder;
 
@@ -2299,6 +2473,7 @@ gchar *folder_item_fetch_msg_full(FolderItem *item, gint num, gboolean headers,
                                procmsg_msginfo_set_flags(msginfo, 0, MSG_SCANNED);
                        }
                }
+               procmsg_msginfo_free(msginfo);
        }
 
        return msgfile;
@@ -2315,7 +2490,8 @@ gint folder_item_fetch_all_msg(FolderItem *item)
        gint total = 0;
 
        g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+       if (item->no_select)
+               return -1;
 
        debug_print("fetching all messages in %s ...\n", item->path ? item->path : "(null)");
        statusbar_print_all(_("Fetching all messages in %s ...\n"), item->path ? item->path : "(null)");
@@ -2422,7 +2598,7 @@ static void copy_msginfo_flags(MsgInfo *source, MsgInfo *dest)
                perm_flags |= MSG_IGNORE_THREAD;
 
        /* Unset tmp flags that should not be copied */
-       tmp_flags &= ~(MSG_MOVE | MSG_COPY);
+       tmp_flags &= ~(MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
 
        /* unset flags that are set but should not */
        /* and set new flags */
@@ -2514,7 +2690,8 @@ gint folder_item_add_msgs(FolderItem *dest, GSList *file_list,
         g_return_val_if_fail(dest != NULL, -1);
         g_return_val_if_fail(file_list != NULL, -1);
         g_return_val_if_fail(dest->folder != NULL, -1);
-       g_return_val_if_fail(dest->no_select == FALSE, -1);
+       if (dest->no_select)
+               return -1;
 
         folder = dest->folder;
 
@@ -2650,8 +2827,10 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
                src->folder->klass->remove_folder(src->folder, src);
        folder_write_list();
 
-       if (old_id != NULL && new_id != NULL)
+       if (old_id != NULL && new_id != NULL) {
                prefs_filtering_rename_path(old_id, new_id);
+               account_rename_path(old_id, new_id);
+       }
        g_free(old_id);
        g_free(new_id);
        
@@ -2662,7 +2841,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
 {
        FolderItem *tmp = folder_item_parent(dest);
        gchar * src_identifier, * dst_identifier;
-       gchar * phys_srcpath, * phys_dstpath;
+       gchar * phys_srcpath, * phys_dstpath, *tmppath;
        
        while (tmp) {
                if (tmp == src) {
@@ -2690,10 +2869,12 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        }
 
        phys_srcpath = folder_item_get_path(src);
-       phys_dstpath = g_strconcat(folder_item_get_path(dest),
+       tmppath = folder_item_get_path(dest);
+       phys_dstpath = g_strconcat(tmppath,
                       G_DIR_SEPARATOR_S,
                       g_path_get_basename(phys_srcpath),
                       NULL);
+       g_free(tmppath);
 
        if (folder_item_parent(src) == dest || src == dest) {
                g_free(src_identifier);
@@ -2729,6 +2910,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        gboolean folderscan = FALSE;
        GRelation *relation;
        GSList *not_moved = NULL;
+       gint total = 0, curmsg = 0;
+       MsgInfo *msginfo = NULL;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -2736,7 +2919,42 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
        folder = dest->folder;
 
        g_return_val_if_fail(folder->klass->copy_msg != NULL, -1);
-       g_return_val_if_fail(dest->no_select == FALSE, -1);
+       if (dest->no_select)
+               return -1;
+
+       msginfo = (MsgInfo *)msglist->data;
+       
+       if (!msginfo)
+               return -1;
+       
+       if (!MSG_IS_QUEUED(msginfo->flags) && 
+           MSG_IS_DRAFT(msginfo->flags) && 
+           folder_has_parent_of_type(dest, F_QUEUE)) {
+               GSList *cur = msglist;
+               gboolean queue_err = FALSE;
+               for (; cur; cur = cur->next) {
+                       Compose *compose = NULL;
+                       FolderItem *queue = dest;
+                       int val = 0;
+                       
+                       msginfo = (MsgInfo *)cur->data;
+                       compose = compose_reedit(msginfo, TRUE);
+                       if (compose == NULL) {
+                               queue_err = TRUE;
+                               continue;
+                       }
+                       val = compose_queue(compose, NULL, &queue, NULL,
+                                       FALSE);
+                       if (val < 0) {
+                               queue_err = TRUE;
+                       } else if (remove_source) {
+                               folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+                       }
+                       if (val == 0)
+                               compose_close(compose);
+               }
+               return queue_err ? -1:0;
+       }
 
        relation = g_relation_new(2);
        g_relation_index(relation, 0, g_direct_hash, g_direct_equal);
@@ -2794,7 +3012,7 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 * copying was successfull and update folder
                 * message counts
                 */
-               if (item->folder->klass->remove_msgs) {
+               if (not_moved == NULL && item->folder->klass->remove_msgs) {
                        item->folder->klass->remove_msgs(item->folder,
                                                                msginfo->folder,
                                                                msglist,
@@ -2834,6 +3052,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                folderscan = TRUE;
        }
 
+       statusbar_print_all(_("Updating cache for %s..."), dest->path ? dest->path : "(null)");
+       total = g_slist_length(msglist);
        for (l = msglist; l != NULL; l = g_slist_next(l)) {
                MsgInfo *msginfo = (MsgInfo *) l->data;
                 GTuples *tuples;
@@ -2842,6 +3062,10 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                 num = GPOINTER_TO_INT(g_tuples_index(tuples, 0, 1));
                 g_tuples_destroy(tuples);
 
+               statusbar_progress_all(curmsg++,total, 100);
+               if (curmsg % 100 == 0)
+                       GTK_EVENTS_FLUSH();
+
                if (num >= 0) {
                        MsgInfo *newmsginfo = NULL;
 
@@ -2868,6 +3092,11 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                            == POP3_PARTIAL_DLOAD_DLOAD) {
                                partial_mark_for_download(newmsginfo);
                        }
+                       if (!MSG_IS_POSTFILTERED (msginfo->flags)) {
+                           procmsg_msginfo_set_flags (   msginfo, MSG_POSTFILTERED, 0);
+                           procmsg_msginfo_set_flags (newmsginfo, MSG_POSTFILTERED, 0);
+                           hooks_invoke (MAIL_POSTFILTERING_HOOKLIST, newmsginfo);
+                       }
                        procmsg_msginfo_free(newmsginfo);
 
 
@@ -2875,6 +3104,8 @@ static gint do_copy_msgs(FolderItem *dest, GSList *msglist, gboolean remove_sour
                                lastnum = num;
                }
        }
+       statusbar_progress_all(0,0,0);
+       statusbar_pop_all();
 
        g_relation_destroy(relation);
        if (not_moved != NULL) {
@@ -2967,7 +3198,8 @@ gint folder_item_remove_msg(FolderItem *item, gint num)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder->klass->remove_msg != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+       if (item->no_select)
+               return -1;
 
        if (!item->cache) folder_item_read_cache(item);
 
@@ -2990,7 +3222,8 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
        g_return_val_if_fail(item != NULL, -1);
        folder = item->folder;
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+       if (item->no_select)
+               return -1;
        inc_lock();
        if (!item->cache) folder_item_read_cache(item);
 
@@ -3025,7 +3258,8 @@ gint folder_item_remove_all_msg(FolderItem *item)
        gint result;
 
        g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->no_select == FALSE, -1);
+       if (item->no_select)
+               return -1;
 
        folder = item->folder;
 
@@ -3034,7 +3268,7 @@ gint folder_item_remove_all_msg(FolderItem *item)
                result = folder->klass->remove_all_msg(folder, item);
 
                if (result == 0) {
-                       folder_item_free_cache(item);
+                       folder_item_free_cache(item, TRUE);
                        item->cache = msgcache_new();
                }
        } else {
@@ -3062,7 +3296,8 @@ void folder_item_change_msg_flags(FolderItem *item, MsgInfo *msginfo, MsgPermFla
 {
        g_return_if_fail(item != NULL);
        g_return_if_fail(msginfo != NULL);
-       g_return_if_fail(item->no_select == FALSE);
+       if (item->no_select)
+               return;
        
        if (item->folder->klass->change_flags != NULL) {
                item->folder->klass->change_flags(item->folder, item, msginfo, newflags);
@@ -3076,7 +3311,8 @@ gboolean folder_item_is_msg_changed(FolderItem *item, MsgInfo *msginfo)
        Folder *folder;
 
        g_return_val_if_fail(item != NULL, FALSE);
-       g_return_val_if_fail(item->no_select == FALSE, FALSE);
+       if (item->no_select)
+               return FALSE;
 
        folder = item->folder;
 
@@ -3262,6 +3498,9 @@ static GNode *folder_get_xml_node(Folder *folder)
        xmlnode = xml_node_new(tag, NULL);
 
        node = g_node_new(xmlnode);
+       
+       g_return_val_if_fail (folder->node != NULL, NULL);
+       
        if (folder->node->children) {
                GNode *cur;
 
@@ -3491,10 +3730,8 @@ static void folder_get_persist_prefs_recursive(GNode *node, GHashTable *pptable)
 
 static gboolean persist_prefs_free(gpointer key, gpointer val, gpointer data)
 {
-       if (key) 
-               g_free(key);
-       if (val) 
-               g_free(val);
+       g_free(key);
+       g_free(val);
        return TRUE;    
 }
 
@@ -3505,9 +3742,16 @@ void folder_item_apply_processing(FolderItem *item)
        guint total = 0, curmsg = 0;
 
        g_return_if_fail(item != NULL);
-       g_return_if_fail(item->no_select == FALSE);     
+
+       if (item->no_select)
+              return;
+
        processing_list = item->prefs->processing;
 
+       if (!pre_global_processing && !processing_list
+       &&  !post_global_processing)
+               return;
+
        folder_item_update_freeze();
 
        mlist = folder_item_get_msg_list(item);
@@ -3525,14 +3769,20 @@ void folder_item_apply_processing(FolderItem *item)
                statusbar_progress_all(curmsg++,total, 10);
 
                 /* apply pre global rules */
-               filter_message_by_msginfo(pre_global_processing, msginfo);
-                
+               filter_message_by_msginfo(pre_global_processing, msginfo, NULL);
+               
                 /* apply rules of the folder */
-               filter_message_by_msginfo(processing_list, msginfo);
+               filter_message_by_msginfo(processing_list, msginfo, NULL);
 
                 /* apply post global rules */
-               filter_message_by_msginfo(post_global_processing, msginfo);
+               filter_message_by_msginfo(post_global_processing, msginfo, NULL);
                 
+       }
+       if (pre_global_processing || processing_list
+           || post_global_processing)
+               filtering_move_and_copy_msgs(mlist);
+       for (cur = mlist ; cur != NULL ; cur = cur->next) {
+               MsgInfo * msginfo = (MsgInfo *)cur->data;
                procmsg_msginfo_free(msginfo);
        }
        g_slist_free(mlist);
@@ -3646,10 +3896,8 @@ static void folder_item_want_synchronise_func(FolderItem *item, gpointer data)
        WantSyncData *want_sync_data = (WantSyncData *)data;
        
        if (want_sync_data->folder == NULL || item->folder == want_sync_data->folder) {
-               if(item->prefs->offlinesync && item->folder->klass->synchronise)
-                       want_sync_data->want_sync = TRUE;
-               else
-                       want_sync_data->want_sync = FALSE;
+               if (item->prefs->offlinesync && item->folder->klass->synchronise)
+                       want_sync_data->want_sync |= TRUE;
        }
 }
 
@@ -3658,6 +3906,7 @@ gboolean folder_want_synchronise(Folder *folder)
        WantSyncData *want_sync_data = g_new0(WantSyncData, 1);
        gboolean result;
        want_sync_data->folder = folder;
+       want_sync_data->want_sync = FALSE;
        
        folder_func_to_all_folders(folder_item_want_synchronise_func, want_sync_data);
        result = want_sync_data->want_sync;