2005-06-17 [colin] 1.9.11cvs80
[claws.git] / src / imap.c
index 39f12f35cc7b660c8206d9946abcd19eae2b72bc..5c184c17af3c9a3a1a63106ca5338040a5fbde2d 100644 (file)
@@ -60,6 +60,7 @@
 #include "alertpanel.h"
 #include "sylpheed.h"
 #include "statusbar.h"
+#include "msgcache.h"
 
 #ifdef USE_PTHREAD
 #include <pthread.h>
@@ -144,7 +145,7 @@ typedef enum
 
 #define QUOTE_IF_REQUIRED(out, str)                            \
 {                                                              \
-       if (*str != '"' && strpbrk(str, " \t(){}[]%*") != NULL) {       \
+       if (*str != '"' && strpbrk(str, " \t(){}[]%*\\") != NULL) {     \
                gchar *__tmp;                                   \
                gint len;                                       \
                                                                \
@@ -166,6 +167,7 @@ struct _IMAPFolderItem
        guint lastuid;
        guint uid_next;
        GSList *uid_list;
+       gboolean batching;
 };
 
 static void imap_folder_init           (Folder         *folder,
@@ -184,6 +186,11 @@ static void        imap_session_destroy    (Session        *session);
 static gchar   *imap_fetch_msg         (Folder         *folder, 
                                         FolderItem     *item, 
                                         gint            uid);
+static gchar   *imap_fetch_msg_full    (Folder         *folder, 
+                                        FolderItem     *item, 
+                                        gint            uid,
+                                        gboolean        headers,
+                                        gboolean        body);
 static gint    imap_add_msg            (Folder         *folder,
                                         FolderItem     *dest,
                                         const gchar    *file, 
@@ -204,6 +211,10 @@ static gint        imap_copy_msgs          (Folder         *folder,
 static gint    imap_remove_msg         (Folder         *folder, 
                                         FolderItem     *item, 
                                         gint            uid);
+static gint    imap_remove_msgs        (Folder         *folder, 
+                                        FolderItem     *dest, 
+                                        MsgInfoList    *msglist, 
+                                        GRelation      *relation);
 static gint    imap_remove_all_msg     (Folder         *folder, 
                                         FolderItem     *item);
 
@@ -258,7 +269,9 @@ static gint imap_do_copy_msgs               (Folder         *folder,
                                         GRelation      *relation);
 
 static void imap_delete_all_cached_messages    (FolderItem     *item);
-
+static void imap_set_batch             (Folder         *folder,
+                                        FolderItem     *item,
+                                        gboolean        batch);
 #if USE_OPENSSL
 static SockInfo *imap_open             (const gchar    *server,
                                         gushort         port,
@@ -384,7 +397,9 @@ static gint imap_cmd_envelope       (IMAPSession    *session,
                                 IMAPSet         set);
 static gint imap_cmd_fetch     (IMAPSession    *sock,
                                 guint32         uid,
-                                const gchar    *filename);
+                                const gchar    *filename,
+                                gboolean        headers,
+                                gboolean        body);
 static gint imap_cmd_append    (IMAPSession    *session,
                                 const gchar    *destfolder,
                                 const gchar    *file,
@@ -468,6 +483,13 @@ static gint imap_get_flags                 (Folder         *folder,
 static gchar *imap_folder_get_path             (Folder         *folder);
 static gchar *imap_item_get_path               (Folder         *folder,
                                                 FolderItem     *item);
+static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item);
+static GHashTable *flags_set_table = NULL;
+static GHashTable *flags_unset_table = NULL;
+typedef struct _hashtable_data {
+       IMAPSession *session;
+       GSList *msglist;
+} hashtable_data;
 
 static FolderClass imap_class;
 
@@ -558,16 +580,18 @@ FolderClass *imap_get_class(void)
                imap_class.get_msginfo = imap_get_msginfo;
                imap_class.get_msginfos = imap_get_msginfos;
                imap_class.fetch_msg = imap_fetch_msg;
+               imap_class.fetch_msg_full = imap_fetch_msg_full;
                imap_class.add_msg = imap_add_msg;
                imap_class.add_msgs = imap_add_msgs;
                imap_class.copy_msg = imap_copy_msg;
                imap_class.copy_msgs = imap_copy_msgs;
                imap_class.remove_msg = imap_remove_msg;
+               imap_class.remove_msgs = imap_remove_msgs;
                imap_class.remove_all_msg = imap_remove_all_msg;
                imap_class.is_msg_changed = imap_is_msg_changed;
                imap_class.change_flags = imap_change_flags;
                imap_class.get_flags = imap_get_flags;
-
+               imap_class.set_batch = imap_set_batch;
        }
        
        return &imap_class;
@@ -915,8 +939,6 @@ static void imap_session_authenticate(IMAPSession *session,
        if (imap_auth(session, account->userid, pass, account->imap_auth_type) != IMAP_SUCCESS) {
                imap_cmd_logout(session);
                statusbar_pop_all();
-               alertpanel_error(_("Can't authenticate on IMAP4 server: %s"),
-                                account->recv_server);
                
                return;
        }
@@ -933,6 +955,35 @@ static void imap_session_destroy(Session *session)
 }
 
 static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
+{
+       return imap_fetch_msg_full(folder, item, uid, TRUE, TRUE);
+}
+
+static guint get_size_with_lfs(MsgInfo *info) 
+{
+       FILE *fp = NULL;
+       guint cnt = 0;
+       gchar buf[4096];
+       
+       if (info == NULL)
+               return -1;
+       
+       fp = procmsg_open_message(info);
+       if (!fp)
+               return -1;
+       
+       while (fgets(buf, sizeof (buf), fp) != NULL) {
+               cnt += strlen(buf);
+               if (!strstr(buf, "\r") && strstr(buf, "\n"))
+                       cnt++;
+       }
+       
+       fclose(fp);
+       return cnt;
+}
+
+static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
+                                 gboolean headers, gboolean body)
 {
        gchar *path, *filename;
        IMAPSession *session;
@@ -941,6 +992,9 @@ static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
 
+       if (uid == 0)
+               return NULL;
+
        path = folder_item_get_path(item);
        if (!is_dir_exist(path))
                make_dir_hier(path);
@@ -948,8 +1002,24 @@ static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
        g_free(path);
 
        if (is_file_exist(filename)) {
-               debug_print("message %d has been already cached.\n", uid);
-               return filename;
+               /* see whether the local file represents the whole message
+                * or not. As the IMAP server reports size with \r chars,
+                * we have to update the local file (UNIX \n only) size */
+               MsgInfo *msginfo = imap_parse_msg(filename, item);
+               MsgInfo *cached = msgcache_get_msg(item->cache,uid);
+               guint have_size = get_size_with_lfs(msginfo);
+               debug_print("message %d has been already %scached (%d/%d).\n", uid,
+                               have_size == cached->size ? "fully ":"",
+                               have_size, cached? (int)cached->size : -1);
+                               
+               if (cached && (cached->size == have_size || !body)) {
+                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(msginfo);
+                       return filename;
+               } else {
+                       procmsg_msginfo_free(cached);
+                       procmsg_msginfo_free(msginfo);
+               }
        }
 
        session = imap_session_get(folder);
@@ -958,7 +1028,7 @@ static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
                return NULL;
        }
 
-       debug_print("-> fetching messages\n");
+       debug_print("IMAP fetching messages\n");
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
                         NULL, NULL, NULL, NULL, FALSE);
        if (ok != IMAP_SUCCESS) {
@@ -968,7 +1038,7 @@ static gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
        }
 
        debug_print("getting message %d...\n", uid);
-       ok = imap_cmd_fetch(session, (guint32)uid, filename);
+       ok = imap_cmd_fetch(session, (guint32)uid, filename, headers, body);
 
        if (ok != IMAP_SUCCESS) {
                g_warning("can't fetch message %d\n", uid);
@@ -1137,6 +1207,11 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
        imap_seq_set_free(seq_list);
 
        g_free(destdir);
+       
+       IMAP_FOLDER_ITEM(dest)->lastuid = 0;
+       IMAP_FOLDER_ITEM(dest)->uid_next = 0;
+       g_slist_free(IMAP_FOLDER_ITEM(dest)->uid_list);
+       IMAP_FOLDER_ITEM(dest)->uid_list = NULL;
 
        if (ok == IMAP_SUCCESS)
                return last_num;
@@ -1183,43 +1258,87 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
        return ret;
 }
 
-static gint imap_remove_all_msg(Folder *folder, FolderItem *item)
+
+static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest, 
+                               MsgInfoList *msglist, GRelation *relation)
 {
-       gint ok;
+       gchar *destdir;
+       GSList *seq_list = NULL, *cur;
+       MsgInfo *msginfo;
        IMAPSession *session;
-       gchar *dir;
-
+       gint ok = IMAP_SUCCESS;
+       GRelation *uid_mapping;
+       
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(dest != NULL, -1);
+       g_return_val_if_fail(msglist != NULL, -1);
 
        session = imap_session_get(folder);
        if (!session) {
                return -1;
        }
-       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+       msginfo = (MsgInfo *)msglist->data;
+
+       ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
                         NULL, NULL, NULL, NULL, FALSE);
        if (ok != IMAP_SUCCESS) {
                return ok;
        }
-       imap_gen_send(session, "STORE 1:* +FLAGS.SILENT (\\Deleted)");
-       ok = imap_cmd_ok(session, NULL);
+
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+       for (cur = msglist; cur; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               seq_list = g_slist_append(seq_list, GINT_TO_POINTER(msginfo->msgnum));
+       }
+
+       uid_mapping = g_relation_new(2);
+       g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
+
+       ok = imap_set_message_flags
+               (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
+               seq_list, IMAP_FLAG_DELETED, TRUE);
        if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't set deleted flags: 1:*\n"));
+               log_warning(_("can't set deleted flags\n"));
                return ok;
        }
-
        ok = imap_cmd_expunge(session, NULL);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
        }
+       
+       g_relation_destroy(uid_mapping);
+       g_slist_free(seq_list);
 
-       dir = folder_item_get_path(item);
-       if (is_dir_exist(dir))
-               remove_all_numbered_files(dir);
-       g_free(dir);
+       g_free(destdir);
 
-       return IMAP_SUCCESS;
+       if (ok == IMAP_SUCCESS)
+               return 0;
+       else
+               return -1;
+}
+
+static gint imap_remove_msgs(Folder *folder, FolderItem *dest, 
+                   MsgInfoList *msglist, GRelation *relation)
+{
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(dest != NULL, -1);
+       g_return_val_if_fail(msglist != NULL, -1);
+
+       msginfo = (MsgInfo *)msglist->data;
+       g_return_val_if_fail(msginfo->folder != NULL, -1);
+
+       return imap_do_remove_msgs(folder, dest, msglist, relation);
+}
+
+static gint imap_remove_all_msg(Folder *folder, FolderItem *item)
+{
+       GSList *list = folder_item_get_msg_list(item);
+       gint res = imap_remove_msgs(folder, item, list, NULL);
+       g_slist_free(list);
+       return res;
 }
 
 static gboolean imap_is_msg_changed(Folder *folder, FolderItem *item,
@@ -1894,6 +2013,8 @@ typedef struct _uncached_data {
        IMAPSession *session;
        FolderItem *item;
        MsgNumberList *numlist;
+       guint cur;
+       guint total;
        gboolean done;
 } uncached_data;
 
@@ -1907,10 +2028,13 @@ static void *imap_get_uncached_messages_thread(void *data)
        gchar *tmp;
        GSList *newlist = NULL;
        GSList *llast = NULL;
-       GString *str;
+       GString *str = NULL;
        MsgInfo *msginfo;
        GSList *seq_list, *cur;
        IMAPSet imapset;
+       
+       stuff->total = g_slist_length(numlist);
+       stuff->cur = 0;
 
        if (session == NULL || item == NULL || item->folder == NULL
            || FOLDER_CLASS(item->folder) != &imap_class) {
@@ -1921,6 +2045,9 @@ static void *imap_get_uncached_messages_thread(void *data)
        seq_list = imap_get_seq_set_from_numlist(numlist);
        for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
                imapset = cur->data;
+               
+               if (!imapset || strlen(imapset) == 0)
+                       continue;
 
                if (imap_cmd_envelope(session, imapset)
                    != IMAP_SUCCESS) {
@@ -1934,6 +2061,7 @@ static void *imap_get_uncached_messages_thread(void *data)
                        if ((tmp =sock_getline(SESSION(session)->sock)) == NULL) {
                                log_warning(_("error occurred while getting envelope.\n"));
                                g_string_free(str, TRUE);
+                               str = NULL;
                                break;
                        }
                        strretchomp(tmp);
@@ -1950,6 +2078,8 @@ static void *imap_get_uncached_messages_thread(void *data)
                        log_print("IMAP4< %s\n", tmp);
                        g_string_assign(str, tmp);
                        g_free(tmp);
+                       
+                       stuff->cur++;
 
                        msginfo = imap_parse_envelope
                                (SESSION(session)->sock, item, str);
@@ -1972,8 +2102,8 @@ static void *imap_get_uncached_messages_thread(void *data)
                                llast = llast->next;
                        }
                }
-
-               g_string_free(str, TRUE);
+               if (str)
+                       g_string_free(str, TRUE);
        }
        imap_seq_set_free(seq_list);
        
@@ -1989,6 +2119,7 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
 {
        uncached_data *data = g_new0(uncached_data, 1);
        GSList *result = NULL;
+       gint last_cur = 0;
 #ifdef USE_PTHREAD
        pthread_t pt;
 #endif
@@ -1996,7 +2127,9 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
        data->session = session;
        data->item = item;
        data->numlist = numlist;
-
+       data->cur = 0;
+       data->total = 0;
+       
        if (prefs_common.work_offline && !imap_gtk_should_override()) {
                g_free(data);
                return NULL;
@@ -2010,10 +2143,28 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                return result;
        }
        debug_print("+++waiting for imap_get_uncached_messages_thread...\n");
+       statusbar_print_all(_("IMAP4 Fetching uncached short headers..."));
        while(!data->done) {
                /* don't let the interface freeze while waiting */
                sylpheed_do_idle();
+               if (data->total != 0 && last_cur != data->cur && data->cur % 10 == 0) {
+                       gchar buf[32];
+                       g_snprintf(buf, sizeof(buf), "%d / %d",
+                                  data->cur, data->total);
+                       gtk_progress_bar_set_text
+                               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), buf);
+                       gtk_progress_bar_set_fraction
+                       (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar),
+                        (gfloat)data->cur / (gfloat)data->total);
+                       last_cur = data->cur;
+               }
        }
+       gtk_progress_bar_set_fraction
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), 0);
+       gtk_progress_bar_set_text
+               (GTK_PROGRESS_BAR(mainwindow_get_mainwindow()->progressbar), "");
+       statusbar_pop_all();
+
        debug_print("---imap_get_uncached_messages_thread done\n");
 
        /* get the thread's return value and clean its resources */
@@ -2426,8 +2577,10 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
        cur_pos = str->str;
 
        do {
-               if ((nextline = sock_getline(sock)) == NULL)
+               if ((nextline = sock_getline(sock)) == NULL) {
+                       *headers = NULL;
                        return cur_pos;
+               }
                block_len += strlen(nextline);
                g_string_append(str, nextline);
                cur_pos = str->str;
@@ -2436,7 +2589,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
                g_free(nextline);
        } while (block_len < len);
 
-       debug_print("IMAP4< [contents of RFC822.HEADER]\n");
+       debug_print("IMAP4< [contents of BODY.PEEK[HEADER_FIELDS (...)]\n");
 
        *headers = g_strndup(cur_pos, len);
        cur_pos += len;
@@ -2545,10 +2698,23 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
                } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
                        cur_pos += 12;
                        size = strtol(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+               } else if (!strncmp(cur_pos, "BODY[HEADER.FIELDS ", 19)) {
                        gchar *headers;
 
-                       cur_pos += 14;
+                       cur_pos += 19;
+                       if (*cur_pos != '(') {
+                               g_warning("*cur_pos != '('\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
+                       cur_pos++;
+                       PARSE_ONE_ELEMENT(')');
+                       if (*cur_pos != ']') {
+                               g_warning("*cur_pos != ']'\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
+                       cur_pos++;
                        cur_pos = imap_get_header(sock, cur_pos, &headers,
                                                  line_str);
                        msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
@@ -2857,13 +3023,25 @@ static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
 static gint imap_cmd_login(IMAPSession *session,
                           const gchar *user, const gchar *pass)
 {
-       gchar *user_, *pass_;
+       gchar *ans;
        gint ok;
 
-       QUOTE_IF_REQUIRED(user_, user);
-       QUOTE_IF_REQUIRED(pass_, pass);
-       imap_gen_send(session, "LOGIN %s %s", user_, pass_);
-
+       imap_gen_send(session, "LOGIN {%d}\r\n%s {%d}\r\n%s", 
+                               strlen(user), user, 
+                               strlen(pass), pass);
+                               
+       ok = imap_gen_recv_with_block(session, &ans, TRUE);
+       if (ok != IMAP_SUCCESS || ans[0] != '+' || ans[1] != ' ') {
+               g_free(ans);
+               return IMAP_ERROR;
+       }
+       g_free(ans);
+       ok = imap_gen_recv_with_block(session, &ans, TRUE);
+       if (ok != IMAP_SUCCESS || ans[0] != '+' || ans[1] != ' ') {
+               g_free(ans);
+               return IMAP_ERROR;
+       }
+       g_free(ans);
        ok = imap_cmd_ok(session, NULL);
        if (ok != IMAP_SUCCESS)
                log_warning(_("IMAP4 login failed.\n"));
@@ -3095,6 +3273,8 @@ typedef struct _fetch_data {
        IMAPSession *session;
        guint32 uid;
        const gchar *filename;
+       gboolean headers;
+       gboolean body;
        gboolean done;
 } fetch_data;
 
@@ -3115,9 +3295,12 @@ static void *imap_cmd_fetch_thread(void *data)
                stuff->done = TRUE;
                return GINT_TO_POINTER(IMAP_ERROR);
        }
-
-       imap_gen_send(session, "UID FETCH %d BODY.PEEK[]", uid);
-
+       
+       if (stuff->body)
+               imap_gen_send(session, "UID FETCH %d BODY.PEEK[]", uid);
+       else
+               imap_gen_send(session, "UID FETCH %d BODY.PEEK[HEADER]",
+                               uid);
        while ((ok = imap_gen_recv_block(session, &buf)) == IMAP_SUCCESS) {
                if (buf[0] != '*' || buf[1] != ' ') {
                        g_free(buf);
@@ -3178,7 +3361,8 @@ static void *imap_cmd_fetch_thread(void *data)
 }
 
 static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
-                               const gchar *filename)
+                               const gchar *filename, gboolean headers,
+                               gboolean body)
 {
        fetch_data *data = g_new0(fetch_data, 1);
        int result = 0;
@@ -3190,6 +3374,8 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
        data->session = session;
        data->uid = uid;
        data->filename = filename;
+       data->headers = headers;
+       data->body = body;
 
        if (prefs_common.work_offline && !imap_gtk_should_override()) {
                g_free(data);
@@ -3387,9 +3573,12 @@ static gint imap_cmd_copy(IMAPSession *session, const gchar *seq_set,
 
 gint imap_cmd_envelope(IMAPSession *session, IMAPSet set)
 {
+       static gchar *header_fields = 
+               "Date From To Cc Subject Message-ID References In-Reply-To" ;
+
        imap_gen_send
-               (session, "UID FETCH %s (UID FLAGS RFC822.SIZE RFC822.HEADER)",
-                set);
+               (session, "UID FETCH %s (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
+                set, header_fields);
 
        return IMAP_SUCCESS;
 }
@@ -3410,20 +3599,73 @@ static gint imap_cmd_store(IMAPSession *session, IMAPSet seq_set,
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_expunge(IMAPSession *session, IMAPSet seq_set)
+typedef struct _expunge_data {
+       IMAPSession *session;
+       IMAPSet seq_set;
+       gboolean done;
+} expunge_data;
+
+static void *imap_cmd_expunge_thread(void *data)
 {
+       expunge_data *stuff = (expunge_data *)data;
+       IMAPSession *session = stuff->session;
+       IMAPSet seq_set = stuff->seq_set;
+
        gint ok;
 
        if (seq_set && session->uidplus)
                imap_gen_send(session, "UID EXPUNGE %s", seq_set);
        else    
                imap_gen_send(session, "EXPUNGE");
-       if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS) {
+       if ((ok = imap_cmd_ok_with_block(session, NULL, TRUE)) != IMAP_SUCCESS) {
                log_warning(_("error while imap command: EXPUNGE\n"));
-               return ok;
+               stuff->done = TRUE;
+               return GINT_TO_POINTER(ok);
        }
 
-       return IMAP_SUCCESS;
+       stuff->done = TRUE;
+       return GINT_TO_POINTER(IMAP_SUCCESS);
+}
+
+static gint imap_cmd_expunge(IMAPSession *session, IMAPSet seq_set)
+{
+       expunge_data *data = g_new0(expunge_data, 1);
+       int result;
+#ifdef USE_PTHREAD
+       void *tmp;
+       pthread_t pt;
+#endif
+       data->done = FALSE;
+       data->session = session;
+       data->seq_set = seq_set;
+
+       if (prefs_common.work_offline && !imap_gtk_should_override()) {
+               g_free(data);
+               return -1;
+       }
+
+#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
+                       imap_cmd_expunge_thread, data) != 0) {
+               result = GPOINTER_TO_INT(imap_cmd_expunge_thread(data));
+               g_free(data);
+               return result;
+       }
+       debug_print("+++waiting for imap_cmd_expunge_thread...\n");
+       while(!data->done) {
+               /* don't let the interface freeze while waiting */
+               sylpheed_do_idle();
+       }
+       debug_print("---imap_cmd_expunge_thread done\n");
+
+       /* get the thread's return value and clean its resources */
+       pthread_join(pt, &tmp);
+       result = GPOINTER_TO_INT(tmp);
+#else
+       result = GPOINTER_TO_INT(imap_cmd_expunge_thread(data));
+#endif
+       g_free(data);
+       return result;
 }
 
 static gint imap_cmd_close(IMAPSession *session)
@@ -3833,6 +4075,9 @@ static GSList *imap_get_seq_set_from_numlist(MsgNumberList *numlist)
        first = GPOINTER_TO_INT(sorted_list->data);
 
        for (cur = sorted_list; cur != NULL; cur = g_slist_next(cur)) {
+               if (GPOINTER_TO_INT(cur->data) == 0)
+                       continue;
+
                last = GPOINTER_TO_INT(cur->data);
                if (cur->next)
                        next = GPOINTER_TO_INT(cur->next->data);
@@ -4183,7 +4428,8 @@ static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item)
 
        msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
        if (!msginfo) return NULL;
-
+       
+       msginfo->plaintext_file = g_strdup(file);
        msginfo->folder = item;
 
        return msginfo;
@@ -4202,7 +4448,7 @@ GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, NULL);
 
-       debug_print("-> getting msginfos\n");
+       debug_print("IMAP getting msginfos\n");
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
                         NULL, NULL, NULL, NULL, FALSE);
        if (ok != IMAP_SUCCESS)
@@ -4321,7 +4567,8 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
        IMAPFlags flags_set = 0, flags_unset = 0;
        gint ok = IMAP_SUCCESS;
        MsgNumberList numlist;
-       
+       hashtable_data *ht_data = NULL;
+
        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->klass == &imap_class);
        g_return_if_fail(item != NULL);
@@ -4331,8 +4578,6 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
 
        session = imap_session_get(folder);
        if (!session) return;
-
-       debug_print("-> changing flags\n");
        
        if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
            NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS)
@@ -4356,14 +4601,44 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
        numlist.next = NULL;
        numlist.data = GINT_TO_POINTER(msginfo->msgnum);
 
-       if (flags_set) {
-               ok = imap_set_message_flags(session, &numlist, flags_set, TRUE);
-               if (ok != IMAP_SUCCESS) return;
-       }
+       if (IMAP_FOLDER_ITEM(item)->batching) {
+               /* instead of performing an UID STORE command for each message change,
+                * as a lot of them can change "together", we just fill in hashtables
+                * and defer the treatment so that we're able to send only one
+                * command.
+                */
+               debug_print("IMAP batch mode on, deferring flags change\n");
+               if (flags_set) {
+                       ht_data = g_hash_table_lookup(flags_set_table, GINT_TO_POINTER(flags_set));
+                       if (ht_data == NULL) {
+                               ht_data = g_new0(hashtable_data, 1);
+                               ht_data->session = session;
+                               g_hash_table_insert(flags_set_table, GINT_TO_POINTER(flags_set), ht_data);
+                       }
+                       if (!g_slist_find(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum)))
+                               ht_data->msglist = g_slist_prepend(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum));
+               } 
+               if (flags_unset) {
+                       ht_data = g_hash_table_lookup(flags_unset_table, GINT_TO_POINTER(flags_unset));
+                       if (ht_data == NULL) {
+                               ht_data = g_new0(hashtable_data, 1);
+                               ht_data->session = session;
+                               g_hash_table_insert(flags_unset_table, GINT_TO_POINTER(flags_unset), ht_data);
+                       }
+                       if (!g_slist_find(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum)))
+                               ht_data->msglist = g_slist_prepend(ht_data->msglist, GINT_TO_POINTER(msginfo->msgnum));         
+               }
+       } else {
+               debug_print("IMAP changing flags\n");
+               if (flags_set) {
+                       ok = imap_set_message_flags(session, &numlist, flags_set, TRUE);
+                       if (ok != IMAP_SUCCESS) return;
+               }
 
-       if (flags_unset) {
-               ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
-               if (ok != IMAP_SUCCESS) return;
+               if (flags_unset) {
+                       ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
+                       if (ok != IMAP_SUCCESS) return;
+               }
        }
        msginfo->flags.perm_flags = newflags;
        
@@ -4618,3 +4893,75 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
        return result;
 
 }
+
+static gboolean process_flags(gpointer key, gpointer value, gpointer user_data)
+{
+       gboolean flags_set = GPOINTER_TO_INT(user_data);
+       gint flags_value = GPOINTER_TO_INT(key);
+       hashtable_data *data = (hashtable_data *)value;
+       
+       data->msglist = g_slist_reverse(data->msglist);
+       
+       debug_print("IMAP %ssetting flags to %d for %d messages\n",
+               flags_set?"":"un",
+               flags_value,
+               g_slist_length(data->msglist));
+       imap_set_message_flags(data->session, data->msglist, flags_value, flags_set);
+       
+       g_slist_free(data->msglist);    
+       g_free(data);
+       return TRUE;
+}
+
+static void process_hashtable(void)
+{
+       if (flags_set_table) {
+               g_hash_table_foreach_remove(flags_set_table, process_flags, GINT_TO_POINTER(TRUE));
+               g_free(flags_set_table);
+               flags_set_table = NULL;
+       }
+       if (flags_unset_table) {
+               g_hash_table_foreach_remove(flags_unset_table, process_flags, GINT_TO_POINTER(FALSE));
+               g_free(flags_unset_table);
+               flags_unset_table = NULL;
+       }
+}
+
+static IMAPFolderItem *batching_item = NULL;
+
+static void imap_set_batch (Folder *folder, FolderItem *_item, gboolean batch)
+{
+       IMAPFolderItem *item = (IMAPFolderItem *)_item;
+
+       g_return_if_fail(item != NULL);
+       
+       if (batch && batching_item != NULL) {
+               g_warning("already batching on %s\n", batching_item->item.path);
+               return;
+       }
+       
+       if (item->batching == batch)
+               return;
+       
+       item->batching = batch;
+       
+       batching_item = batch?item:NULL;
+       
+       if (batch) {
+               debug_print("IMAP switching to batch mode\n");
+               if (flags_set_table) {
+                       g_warning("flags_set_table non-null but we just entered batch mode!\n");
+                       flags_set_table = NULL;
+               }
+               if (flags_unset_table) {
+                       g_warning("flags_unset_table non-null but we just entered batch mode!\n");
+                       flags_unset_table = NULL;
+               }
+               flags_set_table = g_hash_table_new(NULL, g_direct_equal);
+               flags_unset_table = g_hash_table_new(NULL, g_direct_equal);
+       } else {
+               debug_print("IMAP switching away from batch mode\n");
+               /* process stuff */
+               process_hashtable();
+       }
+}