2005-07-06 [colin] 1.9.12cvs25
[claws.git] / src / imap.c
index 1f30f10326bab5745079a70633f4c60e70c6bb60..57e69184e8c23cb17829e3fe9c2676e988f4524a 100644 (file)
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
+#include "imap.h"
+#include "imap_gtk.h"
+
+#ifdef HAVE_LIBETPAN
+
 #include <stdlib.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <ctype.h>
 #include <time.h>
+#include <errno.h>
 #if HAVE_ICONV
 #  include <iconv.h>
 #endif
 #if USE_OPENSSL
 #  include "ssl.h"
 #endif
+
 #include "folder.h"
 #include "session.h"
 #include "procmsg.h"
-#include "imap.h"
-#include "imap_gtk.h"
 #include "socket.h"
-#include "ssl.h"
 #include "recv.h"
 #include "procheader.h"
 #include "prefs_account.h"
 #include "sylpheed.h"
 #include "statusbar.h"
 #include "msgcache.h"
-
-#ifdef USE_PTHREAD
-#include <pthread.h>
-#endif
+#include "imap-thread.h"
 
 typedef struct _IMAPFolder     IMAPFolder;
 typedef struct _IMAPSession    IMAPSession;
@@ -102,6 +103,7 @@ struct _IMAPSession
        /* CLAWS */
        gboolean folder_content_changed;
        guint exists;
+       Folder * folder;
 };
 
 struct _IMAPNameSpace
@@ -143,23 +145,6 @@ typedef enum
 
 #define IMAP_CMD_LIMIT 1000
 
-#define QUOTE_IF_REQUIRED(out, str)                            \
-{                                                              \
-       if (*str != '"' && strpbrk(str, " \t(){}[]%*\\") != NULL) {     \
-               gchar *__tmp;                                   \
-               gint len;                                       \
-                                                               \
-               len = strlen(str) + 3;                          \
-               Xalloca(__tmp, len, return IMAP_ERROR);         \
-               g_snprintf(__tmp, len, "\"%s\"", str);          \
-               out = __tmp;                                    \
-       } else {                                                \
-               Xstrdup_a(out, str, return IMAP_ERROR);         \
-       }                                                       \
-}
-
-typedef gchar * IMAPSet;
-
 struct _IMAPFolderItem
 {
        FolderItem item;
@@ -178,7 +163,8 @@ static Folder       *imap_folder_new        (const gchar    *name,
                                         const gchar    *path);
 static void     imap_folder_destroy    (Folder         *folder);
 
-static IMAPSession *imap_session_new   (const PrefsAccount     *account);
+static IMAPSession *imap_session_new   (Folder         *folder,
+                                        const PrefsAccount     *account);
 static void    imap_session_authenticate(IMAPSession           *session,
                                          const PrefsAccount    *account);
 static void    imap_session_destroy    (Session        *session);
@@ -244,7 +230,6 @@ static void imap_folder_item_destroy        (Folder         *folder,
 
 static IMAPSession *imap_session_get   (Folder         *folder);
 
-static gint imap_greeting              (IMAPSession    *session);
 static gint imap_auth                  (IMAPSession    *session,
                                         const gchar    *user,
                                         const gchar    *pass,
@@ -252,10 +237,6 @@ static gint imap_auth                      (IMAPSession    *session,
 
 static gint imap_scan_tree_recursive   (IMAPSession    *session,
                                         FolderItem     *item);
-static GSList *imap_parse_list         (IMAPFolder     *folder,
-                                        IMAPSession    *session,
-                                        const gchar    *real_path,
-                                        gchar          *separator);
 
 static void imap_create_missing_folders        (Folder         *folder);
 static FolderItem *imap_create_special_folder
@@ -272,31 +253,6 @@ 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,
-                                        SSLType         ssl_type);
-#else
-static SockInfo *imap_open             (const gchar    *server,
-                                        gushort         port);
-#endif
-
-#if USE_OPENSSL
-static SockInfo *imap_open_tunnel(const gchar *server,
-                                 const gchar *tunnelcmd,
-                                 SSLType ssl_type);
-#else
-static SockInfo *imap_open_tunnel(const gchar *server,
-                                 const gchar *tunnelcmd);
-#endif
-
-#if USE_OPENSSL
-static SockInfo *imap_init_sock(SockInfo *sock, SSLType        ssl_type);
-#else
-static SockInfo *imap_init_sock(SockInfo *sock);
-#endif
-
-static gchar *imap_get_flag_str                (IMAPFlags       flags);
 static gint imap_set_message_flags     (IMAPSession    *session,
                                         MsgNumberList  *numlist,
                                         IMAPFlags       flags,
@@ -319,10 +275,6 @@ static gint imap_status                    (IMAPSession    *session,
                                         gint           *unseen,
                                         gboolean        block);
 
-static void imap_parse_namespace               (IMAPSession    *session,
-                                                IMAPFolder     *folder);
-static void imap_get_namespace_by_list         (IMAPSession    *session,
-                                                IMAPFolder     *folder);
 static IMAPNameSpace *imap_find_namespace      (IMAPFolder     *folder,
                                                 const gchar    *path);
 static gchar imap_get_path_separator           (IMAPFolder     *folder,
@@ -330,26 +282,9 @@ static gchar imap_get_path_separator               (IMAPFolder     *folder,
 static gchar *imap_get_real_path               (IMAPFolder     *folder,
                                                 const gchar    *path);
 
-static gchar *imap_parse_atom          (SockInfo       *sock,
-                                        gchar          *src,
-                                        gchar          *dest,
-                                        gint            dest_len,
-                                        GString        *str);
-static MsgFlags imap_parse_flags       (const gchar    *flag_str);
-static MsgInfo *imap_parse_envelope    (SockInfo       *sock,
-                                        FolderItem     *item,
-                                        GString        *line_str);
-
-static gboolean imap_has_capability    (IMAPSession    *session,
-                                        const gchar    *cap);
 static void imap_free_capabilities     (IMAPSession    *session);
 
 /* low-level IMAP4rev1 commands */
-static gint imap_cmd_authenticate
-                               (IMAPSession    *session,
-                                const gchar    *user,
-                                const gchar    *pass,
-                                IMAPAuthType    type);
 static gint imap_cmd_login     (IMAPSession    *session,
                                 const gchar    *user,
                                 const gchar    *pass);
@@ -358,20 +293,6 @@ static gint imap_cmd_noop  (IMAPSession    *session);
 #if USE_OPENSSL
 static gint imap_cmd_starttls  (IMAPSession    *session);
 #endif
-static gint imap_cmd_namespace (IMAPSession    *session,
-                                gchar         **ns_str);
-static gint imap_cmd_list      (IMAPSession    *session,
-                                const gchar    *ref,
-                                const gchar    *mailbox,
-                                GPtrArray      *argbuf);
-static gint imap_cmd_do_select (IMAPSession    *session,
-                                const gchar    *folder,
-                                gboolean        examine,
-                                gint           *exists,
-                                gint           *recent,
-                                gint           *unseen,
-                                guint32        *uid_validity,
-                                gboolean        block);
 static gint imap_cmd_select    (IMAPSession    *session,
                                 const gchar    *folder,
                                 gint           *exists,
@@ -393,8 +314,6 @@ static gint imap_cmd_rename (IMAPSession    *sock,
                                 const gchar    *newfolder);
 static gint imap_cmd_delete    (IMAPSession    *session,
                                 const gchar    *folder);
-static gint imap_cmd_envelope  (IMAPSession    *session,
-                                IMAPSet         set);
 static gint imap_cmd_fetch     (IMAPSession    *sock,
                                 guint32         uid,
                                 const gchar    *filename,
@@ -405,59 +324,22 @@ static gint imap_cmd_append       (IMAPSession    *session,
                                 const gchar    *file,
                                 IMAPFlags       flags,
                                 guint32        *new_uid);
-static gint imap_cmd_copy       (IMAPSession    *session, 
-                                 const gchar    *seq_set, 
-                                 const gchar    *destfolder,
-                                GRelation      *uid_mapping);
+static gint imap_cmd_copy       (IMAPSession *session,
+                                struct mailimap_set * set,
+                                const gchar *destfolder,
+                                GRelation *uid_mapping);
 static gint imap_cmd_store     (IMAPSession    *session,
-                                IMAPSet         set,
-                                gchar          *sub_cmd);
-static gint imap_cmd_expunge   (IMAPSession    *session,
-                                IMAPSet         seq_set);
-static gint imap_cmd_close      (IMAPSession    *session);
-
-static gint imap_cmd_ok                (IMAPSession    *session,
-                                GPtrArray      *argbuf);
-static gint imap_cmd_ok_block  (IMAPSession    *session,
-                                GPtrArray      *argbuf);
-static gint imap_cmd_ok_with_block
-                               (IMAPSession    *session, 
-                                GPtrArray      *argbuf, 
-                                gboolean       block);
-static void imap_gen_send      (IMAPSession    *session,
-                                const gchar    *format, ...);
-static gint imap_gen_recv      (IMAPSession    *session,
-                                gchar         **ret);
-static gint imap_gen_recv_block        (IMAPSession    *session,
-                                gchar         **ret);
-static gint imap_gen_recv_with_block   
-                               (IMAPSession    *session,
-                                gchar         **ret,
-                                gboolean        block);
+                                struct mailimap_set * set,
+                                IMAPFlags flags,
+                                int do_add);
+static gint imap_cmd_expunge   (IMAPSession    *session);
 
-/* misc utility functions */
-static gchar *strchr_cpy                       (const gchar    *src,
-                                                gchar           ch,
-                                                gchar          *dest,
-                                                gint            len);
-static gchar *get_quoted                       (const gchar    *src,
-                                                gchar           ch,
-                                                gchar          *dest,
-                                                gint            len);
-static gchar *search_array_contain_str         (GPtrArray      *array,
-                                                const gchar    *str);
-static gchar *search_array_str                 (GPtrArray      *array,
-                                                const gchar    *str);
 static void imap_path_separator_subst          (gchar          *str,
                                                 gchar           separator);
 
 static gchar *imap_utf8_to_modified_utf7       (const gchar    *from);
 static gchar *imap_modified_utf7_to_utf8       (const gchar    *mutf7_str);
 
-static GSList *imap_get_seq_set_from_numlist    (MsgNumberList  *msglist);
-static GSList *imap_get_seq_set_from_msglist   (MsgInfoList    *msglist);
-static void imap_seq_set_free                   (GSList         *seq_list);
-
 static gboolean imap_rename_folder_func                (GNode          *node,
                                                 gpointer        data);
 static gint imap_get_num_list                  (Folder         *folder,
@@ -484,6 +366,21 @@ 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);
+
+
+/* data types conversion libetpan <-> sylpheed */
+static GSList * imap_list_from_lep(IMAPFolder * folder,
+                                  clist * list, const gchar * real_path);
+static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist);
+static GSList * imap_get_lep_set_from_msglist(MsgInfoList *msglist);
+static GSList * imap_uid_list_from_lep(clist * list);
+static GSList * imap_uid_list_from_lep_tab(carray * list);
+static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info,
+                                      FolderItem *item);
+static void imap_lep_set_free(GSList *seq_list);
+static struct mailimap_flag_list * imap_flag_to_lep(IMAPFlags flags);
+
+
 static GHashTable *flags_set_table = NULL;
 static GHashTable *flags_unset_table = NULL;
 typedef struct _hashtable_data {
@@ -503,55 +400,6 @@ typedef struct _thread_data {
 #endif
 } thread_data;
 
-#ifdef USE_PTHREAD
-void *imap_getline_thread(void *data)
-{
-       thread_data *td = (thread_data *)data;
-       gchar *line = NULL;
-       
-       line = sock_getline(td->sock);
-       
-       td->done = TRUE;
-       
-       return (void *)line;
-}
-#endif
-
-/* imap_getline just wraps sock_getline inside a thread, 
- * performing gtk updates so that the interface isn't frozen.
- */
-static gchar *imap_getline(SockInfo *sock)
-{
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       thread_data *td = g_new0(thread_data, 1);
-       pthread_t pt;
-       gchar *line;
-       td->sock = sock;
-       td->done = FALSE;
-       
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       imap_getline_thread, td) != 0) {
-               g_free(td);
-               return sock_getline(sock);
-       }
-       
-       debug_print("+++waiting for imap_getline_thread...\n");
-       while(!td->done) {
-               /* don't let the interface freeze while waiting */
-               sylpheed_do_idle();
-       }
-       debug_print("---imap_getline_thread done\n");
-
-       /* get the thread's return value and clean its resources */
-       pthread_join(pt, (void *)&line);
-       g_free(td);
-
-       return line;
-#else
-       return sock_getline(sock);
-#endif
-}
-
 FolderClass *imap_get_class(void)
 {
        if (imap_class.idstr == NULL) {
@@ -592,28 +440,14 @@ FolderClass *imap_get_class(void)
                imap_class.change_flags = imap_change_flags;
                imap_class.get_flags = imap_get_flags;
                imap_class.set_batch = imap_set_batch;
+#ifdef USE_PTREAD
+               pthread_mutex_init(&imap_mutex, NULL);
+#endif
        }
        
        return &imap_class;
 }
 
-static gchar *get_seq_set_from_seq_list(GSList *seq_list)
-{
-       gchar *val = NULL;
-       gchar *tmp = NULL;
-       GSList *cur = NULL;
-       
-       for (cur = seq_list; cur != NULL; cur = cur->next) {
-               tmp = val?g_strdup(val):NULL;
-               g_free(val);
-               val = g_strconcat(tmp?tmp:"", tmp?",":"",(gchar *)cur->data,
-                                 NULL);
-               g_free(tmp);
-       }
-       return val;
-}
-
-
 static Folder *imap_folder_new(const gchar *name, const gchar *path)
 {
        Folder *folder;
@@ -629,6 +463,7 @@ static void imap_folder_destroy(Folder *folder)
 {
        gchar *dir;
 
+       imap_done(folder);
        dir = imap_folder_get_path(folder);
        if (is_dir_exist(dir))
                remove_dir_recursive(dir);
@@ -686,49 +521,13 @@ static void imap_reset_uid_lists(Folder *folder)
        g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL); 
 }
 
-/* Send CAPABILITY, and examine the server's response to see whether this
- * connection is pre-authenticated or not and build a list of CAPABILITIES. */
-static gint imap_greeting(IMAPSession *session)
-{
-       gchar *capstr;
-       GPtrArray *argbuf;
-
-       imap_gen_send(session, "CAPABILITY");
-       
-       argbuf = g_ptr_array_new();
-
-       if (imap_cmd_ok(session, argbuf) != IMAP_SUCCESS ||
-           ((capstr = search_array_str(argbuf, "CAPABILITY ")) == NULL)) {
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
-               return -1;
-       }
-
-       session->authenticated = search_array_str(argbuf, "PREAUTH") != NULL;
-       
-       capstr += strlen("CAPABILITY ");
-
-       IMAP_SESSION(session)->capability = g_strsplit(capstr, " ", 0);
-       
-       ptr_array_free_strings(argbuf);
-       g_ptr_array_free(argbuf, TRUE);
-
-       if (imap_has_capability(session, "UIDPLUS")) 
-               session->uidplus = TRUE; 
-
-       return 0;
-}
-
 static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass,
                      IMAPAuthType type)
 {
        gint ok;
 
-       if (type == 0 || type == IMAP_AUTH_LOGIN)
-               ok = imap_cmd_login(session, user, pass);
-       else
-               ok = imap_cmd_authenticate(session, user, pass, type);
-
+       ok = imap_cmd_login(session, user, pass);
+       
        if (ok == IMAP_SUCCESS)
                session->authenticated = TRUE;
 
@@ -753,30 +552,26 @@ static IMAPSession *imap_session_get(Folder *folder)
                session = IMAP_SESSION(rfolder->session);
        } else {
                imap_reset_uid_lists(folder);
-               session = imap_session_new(folder->account);
+               session = imap_session_new(folder, folder->account);
        }
        if(session == NULL)
                return NULL;
 
-       if (SESSION(session)->sock->state == CONN_DISCONNECTED) {
-               debug_print("IMAP server disconnected\n");
-               session_destroy(SESSION(session));
-               imap_reset_uid_lists(folder);
-               session = imap_session_new(folder->account);
-       }
-
        /* Make sure session is authenticated */
        if (!IMAP_SESSION(session)->authenticated)
                imap_session_authenticate(IMAP_SESSION(session), folder->account);
+       
        if (!IMAP_SESSION(session)->authenticated) {
                session_destroy(SESSION(session));
                rfolder->session = NULL;
                return NULL;
        }
 
+#if 0
        /* Make sure we have parsed the IMAP namespace */
        imap_parse_namespace(IMAP_SESSION(session),
                             IMAP_FOLDER(folder));
+#endif
 
        /* I think the point of this code is to avoid sending a
         * keepalive if we've used the session recently and therefore
@@ -820,12 +615,14 @@ static IMAPSession *imap_session_get(Folder *folder)
        return IMAP_SESSION(session);
 }
 
-static IMAPSession *imap_session_new(const PrefsAccount *account)
+static IMAPSession *imap_session_new(Folder * folder,
+                                    const PrefsAccount *account)
 {
        IMAPSession *session;
-       SockInfo *imap_sock;
        gushort port;
-
+       int r;
+       int authenticated;
+       
 #ifdef USE_OPENSSL
        /* FIXME: IMAP over SSL only... */ 
        SSLType ssl_type;
@@ -838,55 +635,63 @@ static IMAPSession *imap_session_new(const PrefsAccount *account)
                : IMAP4_PORT;
 #endif
 
+       imap_init(folder);
+       statusbar_print_all(_("Connecting to IMAP4 server: %s..."), folder->account->recv_server);
        if (account->set_tunnelcmd) {
-               log_message(_("creating tunneled IMAP4 connection\n"));
-#if USE_OPENSSL
-               if ((imap_sock = imap_open_tunnel(account->recv_server, 
-                                                 account->tunnelcmd,
-                                                 ssl_type)) == NULL)
-#else
-               if ((imap_sock = imap_open_tunnel(account->recv_server, 
-                                                 account->tunnelcmd)) == NULL)
+               r = imap_threaded_connect_cmd(folder,
+                                             account->tunnelcmd,
+                                             account->recv_server,
+                                             port);
+       }
+       else {
+#ifdef USE_OPENSSL
+               if (ssl_type == SSL_TUNNEL) {
+                       r = imap_threaded_connect_ssl(folder,
+                                                     account->recv_server,
+                                                     port);
+               }
+               else 
 #endif
-                       return NULL;
-       } else {
-               g_return_val_if_fail(account->recv_server != NULL, NULL);
-
-               log_message(_("creating IMAP4 connection to %s:%d ...\n"),
-                           account->recv_server, port);
+               {
+                       r = imap_threaded_connect(folder,
+                                                 account->recv_server,
+                                                 port);
+               }
+       }
+       
+       statusbar_pop_all();
+       if (r == MAILIMAP_NO_ERROR_AUTHENTICATED) {
+               authenticated = TRUE;
+       }
+       else if (r == MAILIMAP_NO_ERROR_NON_AUTHENTICATED) {
+               authenticated = FALSE;
+       }
+       else {
+               if(!prefs_common.no_recv_err_panel) {
+                       alertpanel_error(_("Can't connect to IMAP4 server: %s:%d"),
+                                        account->recv_server, port);
+               }
                
-#if USE_OPENSSL
-               if ((imap_sock = imap_open(account->recv_server, port,
-                                          ssl_type)) == NULL)
-#else
-               if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
-#endif
-                       return NULL;
+               return NULL;
        }
-
+       
        session = g_new0(IMAPSession, 1);
        session_init(SESSION(session));
        SESSION(session)->type             = SESSION_IMAP;
        SESSION(session)->server           = g_strdup(account->recv_server);
-       SESSION(session)->sock             = imap_sock;
-
+       SESSION(session)->sock             = NULL;
+       
        SESSION(session)->destroy          = imap_session_destroy;
 
        session->capability = NULL;
-
-       session->authenticated = FALSE;
+       
+       session->authenticated = authenticated;
        session->mbox = NULL;
        session->cmd_count = 0;
-
-       /* Only need to log in if the connection was not PREAUTH */
-       if (imap_greeting(session) != IMAP_SUCCESS) {
-               session_destroy(SESSION(session));
-               return NULL;
-       }
+       session->folder = folder;
 
 #if USE_OPENSSL
-       if (account->ssl_imap == SSL_STARTTLS && 
-           imap_has_capability(session, "STARTTLS")) {
+       if (account->ssl_imap == SSL_STARTTLS) {
                gint ok;
 
                ok = imap_cmd_starttls(session);
@@ -895,26 +700,16 @@ static IMAPSession *imap_session_new(const PrefsAccount *account)
                        session_destroy(SESSION(session));
                        return NULL;
                }
-               if (!ssl_init_socket_with_method(SESSION(session)->sock, 
-                   SSL_METHOD_TLSv1)) {
-                       session_destroy(SESSION(session));
-                       return NULL;
-               }
 
                imap_free_capabilities(session);
                session->authenticated = FALSE;
                session->uidplus = FALSE;
                session->cmd_count = 1;
-
-               if (imap_greeting(session) != IMAP_SUCCESS) {
-                       session_destroy(SESSION(session));
-                       return NULL;
-               }               
        }
 #endif
        log_message("IMAP connection is %s-authenticated\n",
                    (session->authenticated) ? "pre" : "un");
-
+       
        return session;
 }
 
@@ -937,6 +732,7 @@ static void imap_session_authenticate(IMAPSession *session,
        statusbar_print_all(_("Connecting to IMAP4 server %s...\n"),
                                account->recv_server);
        if (imap_auth(session, account->userid, pass, account->imap_auth_type) != IMAP_SUCCESS) {
+               imap_threaded_disconnect(session->folder);
                imap_cmd_logout(session);
                statusbar_pop_all();
                
@@ -948,6 +744,8 @@ static void imap_session_authenticate(IMAPSession *session,
 
 static void imap_session_destroy(Session *session)
 {
+       imap_threaded_disconnect(IMAP_SESSION(session)->folder);
+       
        imap_free_capabilities(IMAP_SESSION(session));
        g_free(IMAP_SESSION(session)->mbox);
        sock_close(session->sock);
@@ -1011,7 +809,7 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                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);
@@ -1078,13 +876,15 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
        MsgFileInfo *fileinfo;
        gint ok;
 
+
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(file_list != NULL, -1);
-
+       
        session = imap_session_get(folder);
-       if (!session) return -1;
-
+       if (!session) {
+               return -1;
+       }
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        for (cur = file_list; cur != NULL; cur = cur->next) {
@@ -1145,8 +945,9 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
        g_return_val_if_fail(folder != 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;
        }
@@ -1165,21 +966,22 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
        }
 
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
-       seq_list = imap_get_seq_set_from_msglist(msglist);
+       seq_list = imap_get_lep_set_from_msglist(msglist);
        uid_mapping = g_relation_new(2);
        g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
        
        for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
-               gchar *seq_set = (gchar *)cur->data;
-
-               debug_print("Copying message %s%c[%s] to %s ...\n",
-                           src->path, G_DIR_SEPARATOR,
-                           seq_set, destdir);
+               struct mailimap_set * seq_set;
+               
+               seq_set = cur->data;
+               
+               debug_print("Copying messages from %s to %s ...\n",
+                           src->path, destdir);
 
                ok = imap_cmd_copy(session, seq_set, destdir, uid_mapping);
                if (ok != IMAP_SUCCESS) {
                        g_relation_destroy(uid_mapping);
-                       imap_seq_set_free(seq_list);
+                       imap_lep_set_free(seq_list);
                        return -1;
                }
        }
@@ -1204,7 +1006,7 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
        }
 
        g_relation_destroy(uid_mapping);
-       imap_seq_set_free(seq_list);
+       imap_lep_set_free(seq_list);
 
        g_free(destdir);
        
@@ -1245,8 +1047,10 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
        msginfo = (MsgInfo *)msglist->data;
        g_return_val_if_fail(msginfo->folder != NULL, -1);
 
-       if (folder == msginfo->folder->folder)
-               return imap_do_copy_msgs(folder, dest, msglist, relation);
+       if (folder == msginfo->folder->folder) {
+               ret = imap_do_copy_msgs(folder, dest, msglist, relation);
+               return ret;
+       }
 
        file_list = procmsg_get_message_file_list(msglist);
        g_return_val_if_fail(file_list != NULL, -1);
@@ -1301,7 +1105,7 @@ static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
                log_warning(_("can't set deleted flags\n"));
                return ok;
        }
-       ok = imap_cmd_expunge(session, NULL);
+       ok = imap_cmd_expunge(session);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
@@ -1325,7 +1129,8 @@ static gint imap_remove_msgs(Folder *folder, FolderItem *dest,
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
+       if (msglist == NULL)
+               return 0;
 
        msginfo = (MsgInfo *)msglist->data;
        g_return_val_if_fail(msginfo->folder != NULL, -1);
@@ -1350,30 +1155,6 @@ static gboolean imap_is_msg_changed(Folder *folder, FolderItem *item,
 
 static gint imap_close(Folder *folder, FolderItem *item)
 {
-       gint ok;
-       IMAPSession *session;
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(item != NULL, -1);
-       g_return_val_if_fail(item->path != NULL, -1);
-
-       session = imap_session_get(folder);
-       if (!session) return -1;
-
-       if (session->mbox) {
-               if (strcmp2(session->mbox, item->path) != 0) return -1;
-
-               ok = imap_cmd_close(session);
-               if (ok != IMAP_SUCCESS)
-                       log_warning(_("can't close folder\n"));
-
-               g_free(session->mbox);
-
-               session->mbox = NULL;
-
-               return ok;
-       }
-
        return 0;
 }
 
@@ -1399,10 +1180,10 @@ static gint imap_scan_tree(Folder *folder)
 
        if (folder->account->imap_dir && *folder->account->imap_dir) {
                gchar *real_path;
-               GPtrArray *argbuf;
-               gint ok;
+               int r;
+               clist * lep_list;
 
-               Xstrdup_a(root_folder, folder->account->imap_dir, return -1);
+               Xstrdup_a(root_folder, folder->account->imap_dir, {return -1;});
                extract_quote(root_folder, '"');
                subst_char(root_folder,
                           imap_get_path_separator(IMAP_FOLDER(folder),
@@ -1414,14 +1195,10 @@ static gint imap_scan_tree(Folder *folder)
                debug_print("IMAP root directory: %s\n", real_path);
 
                /* check if root directory exist */
-               argbuf = g_ptr_array_new();
-               ok = imap_cmd_list(session, NULL, real_path, argbuf);
-               if (ok != IMAP_SUCCESS ||
-                   search_array_str(argbuf, "LIST ") == NULL) {
-                       log_warning(_("root folder %s does not exist\n"), real_path);
-                       g_ptr_array_free(argbuf, TRUE);
-                       g_free(real_path);
 
+               r = imap_threaded_list(session->folder, "", real_path,
+                                      &lep_list);
+               if ((r != MAILIMAP_NO_ERROR) || (clist_count(lep_list) == 0)) {
                        if (!folder->node) {
                                item = folder_item_new(folder, folder->name, NULL);
                                item->folder = folder;
@@ -1429,7 +1206,9 @@ static gint imap_scan_tree(Folder *folder)
                        }
                        return -1;
                }
-               g_ptr_array_free(argbuf, TRUE);
+               
+               mailimap_list_result_free(lep_list);
+               
                g_free(real_path);
        }
 
@@ -1460,7 +1239,9 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
        gchar *wildcard_path;
        gchar separator;
        gchar wildcard[3];
-
+       clist * lep_list;
+       int r;
+       
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
        g_return_val_if_fail(item->no_sub == FALSE, -1);
@@ -1486,13 +1267,17 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
 
        Xstrcat_a(wildcard_path, real_path, wildcard,
                  {g_free(real_path); return IMAP_ERROR;});
-       QUOTE_IF_REQUIRED(wildcard_path, wildcard_path);
-
-       imap_gen_send(session, "LIST \"\" %s",
-                     wildcard_path);
-
-       strtailchomp(real_path, separator);
-       item_list = imap_parse_list(imapfolder, session, real_path, NULL);
+       lep_list = NULL;
+       r = imap_threaded_list(folder, "", wildcard_path, &lep_list);
+       if (r != MAILIMAP_NO_ERROR) {
+               item_list = NULL;
+       }
+       else {
+               item_list = imap_list_from_lep(imapfolder,
+                                              lep_list, real_path);
+               mailimap_list_result_free(lep_list);
+       }
+       
        g_free(real_path);
 
        node = item->node->children;
@@ -1578,97 +1363,6 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
        return IMAP_SUCCESS;
 }
 
-static GSList *imap_parse_list(IMAPFolder *folder, IMAPSession *session,
-                              const gchar *real_path, gchar *separator)
-{
-       gchar buf[IMAPBUFSIZE];
-       gchar flags[256];
-       gchar separator_str[16];
-       gchar *p;
-       gchar *base;
-       gchar *loc_name, *loc_path;
-       GSList *item_list = NULL;
-       GString *str;
-       FolderItem *new_item;
-
-       debug_print("getting list of %s ...\n",
-                   *real_path ? real_path : "\"\"");
-
-       str = g_string_new(NULL);
-
-       for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) <= 0) {
-                       log_warning(_("error occurred while getting LIST.\n"));
-                       break;
-               }
-               strretchomp(buf);
-               if (buf[0] != '*' || buf[1] != ' ') {
-                       log_print("IMAP4< %s\n", buf);
-                       if (sscanf(buf, "%*d %16s", buf) < 1 ||
-                           strcmp(buf, "OK") != 0)
-                               log_warning(_("error occurred while getting LIST.\n"));
-                               
-                       break;
-               }
-               debug_print("IMAP4< %s\n", buf);
-
-               g_string_assign(str, buf);
-               p = str->str + 2;
-               if (strncmp(p, "LIST ", 5) != 0) continue;
-               p += 5;
-
-               if (*p != '(') continue;
-               p++;
-               p = strchr_cpy(p, ')', flags, sizeof(flags));
-               if (!p) continue;
-               while (*p == ' ') p++;
-
-               p = strchr_cpy(p, ' ', separator_str, sizeof(separator_str));
-               if (!p) continue;
-               extract_quote(separator_str, '"');
-               if (!strcmp(separator_str, "NIL"))
-                       separator_str[0] = '\0';
-               if (separator)
-                       *separator = separator_str[0];
-
-               buf[0] = '\0';
-               while (*p == ' ') p++;
-               if (*p == '{' || *p == '"')
-                       p = imap_parse_atom(SESSION(session)->sock, p,
-                                           buf, sizeof(buf), str);
-               else
-                       strncpy2(buf, p, sizeof(buf));
-               strtailchomp(buf, separator_str[0]);
-               if (buf[0] == '\0') continue;
-               if (!strcmp(buf, real_path)) continue;
-
-               if (separator_str[0] != '\0')
-                       subst_char(buf, separator_str[0], '/');
-               base = g_path_get_basename(buf);
-               if (base[0] == '.') continue;
-
-               loc_name = imap_modified_utf7_to_utf8(base);
-               loc_path = imap_modified_utf7_to_utf8(buf);
-               new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
-               if (strcasestr(flags, "\\Noinferiors") != NULL)
-                       new_item->no_sub = TRUE;
-               if (strcmp(buf, "INBOX") != 0 &&
-                   strcasestr(flags, "\\Noselect") != NULL)
-                       new_item->no_select = TRUE;
-
-               item_list = g_slist_append(item_list, new_item);
-
-               debug_print("folder '%s' found.\n", loc_path);
-               g_free(base);
-               g_free(loc_path);
-               g_free(loc_name);
-       }
-
-       g_string_free(str, TRUE);
-
-       return item_list;
-}
-
 static gint imap_create_tree(Folder *folder)
 {
        g_return_val_if_fail(folder != NULL, -1);
@@ -1689,17 +1383,6 @@ static void imap_create_missing_folders(Folder *folder)
        if (!folder->inbox)
                folder->inbox = imap_create_special_folder
                        (folder, F_INBOX, "INBOX");
-#if 0
-       if (!folder->outbox)
-               folder->outbox = imap_create_special_folder
-                       (folder, F_OUTBOX, "Sent");
-       if (!folder->draft)
-               folder->draft = imap_create_special_folder
-                       (folder, F_DRAFT, "Drafts");
-       if (!folder->queue)
-               folder->queue = imap_create_special_folder
-                       (folder, F_QUEUE, "Queue");
-#endif
        if (!folder->trash)
                folder->trash = imap_create_special_folder
                        (folder, F_TRASH, "Trash");
@@ -1799,7 +1482,9 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        g_return_val_if_fail(name != NULL, NULL);
 
        session = imap_session_get(folder);
-       if (!session) return NULL;
+       if (!session) {
+               return NULL;
+       }
 
        if (!folder_item_parent(parent) && strcmp(name, "INBOX") == 0)
                dirpath = g_strdup(name);
@@ -1810,7 +1495,7 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        else if (folder->account->imap_dir && *folder->account->imap_dir) {
                gchar *imap_dir;
 
-               Xstrdup_a(imap_dir, folder->account->imap_dir, return NULL);
+               Xstrdup_a(imap_dir, folder->account->imap_dir, {return NULL;});
                strtailchomp(imap_dir, '/');
                dirpath = g_strconcat(imap_dir, "/", name, NULL);
        } else
@@ -1820,7 +1505,10 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
           sub folder */
        imap_path = imap_utf8_to_modified_utf7(dirpath);
        strtailchomp(dirpath, '/');
-       Xstrdup_a(new_name, name, {g_free(dirpath); return NULL;});
+       Xstrdup_a(new_name, name, {
+               g_free(dirpath);                
+               return NULL;});
+
        strtailchomp(new_name, '/');
        separator = imap_get_path_separator(IMAP_FOLDER(folder), imap_path);
        imap_path_separator_subst(imap_path, separator);
@@ -1828,13 +1516,13 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
 
        if (strcmp(name, "INBOX") != 0) {
                GPtrArray *argbuf;
-               gint i;
                gboolean exist = FALSE;
-
+               int r;
+               clist * lep_list;
+               
                argbuf = g_ptr_array_new();
-               ok = imap_cmd_list(session, NULL, imap_path,
-                                  argbuf);
-               if (ok != IMAP_SUCCESS) {
+               r = imap_threaded_list(folder, "", imap_path, &lep_list);
+               if (r != MAILIMAP_NO_ERROR) {
                        log_warning(_("can't create mailbox: LIST failed\n"));
                        g_free(imap_path);
                        g_free(dirpath);
@@ -1842,18 +1530,10 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
                        g_ptr_array_free(argbuf, TRUE);
                        return NULL;
                }
-
-               for (i = 0; i < argbuf->len; i++) {
-                       gchar *str;
-                       str = g_ptr_array_index(argbuf, i);
-                       if (!strncmp(str, "LIST ", 5)) {
-                               exist = TRUE;
-                               break;
-                       }
-               }
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
-
+               
+               if (clist_count(lep_list) > 0)
+                       exist = TRUE;
+               
                if (!exist) {
                        ok = imap_cmd_create(session, imap_path);
                        if (ok != IMAP_SUCCESS) {
@@ -1906,8 +1586,9 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
        }
 
        session = imap_session_get(folder);
-       if (!session) return -1;
-
+       if (!session) {
+               return -1;
+       }
        real_oldpath = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
        g_free(session->mbox);
@@ -1967,7 +1648,7 @@ static gint imap_rename_folder(Folder *folder, FolderItem *item,
        return 0;
 }
 
-static gint imap_remove_folder(Folder *folder, FolderItem *item)
+static gint imap_remove_folder_real(Folder *folder, FolderItem *item)
 {
        gint ok;
        IMAPSession *session;
@@ -1981,8 +1662,9 @@ static gint imap_remove_folder(Folder *folder, FolderItem *item)
        g_return_val_if_fail(item->path != NULL, -1);
 
        session = imap_session_get(folder);
-       if (!session) return -1;
-
+       if (!session) {
+               return -1;
+       }
        path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
        ok = imap_cmd_examine(session, "INBOX",
@@ -2009,6 +1691,28 @@ static gint imap_remove_folder(Folder *folder, FolderItem *item)
        return 0;
 }
 
+static gint imap_remove_folder(Folder *folder, FolderItem *item)
+{
+       GNode *node, *next;
+
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(item->node != NULL, -1);
+
+       node = item->node->children;
+       while (node != NULL) {
+               next = node->next;
+               if (imap_remove_folder(folder, FOLDER_ITEM(node->data)) < 0)
+                       return -1;
+               node = next;
+       }
+       debug_print("IMAP removing %s\n", item->path);
+
+       if (imap_remove_all_msg(folder, item) < 0)
+               return -1;
+       return imap_remove_folder_real(folder, item);
+}
+
 typedef struct _uncached_data {
        IMAPSession *session;
        FolderItem *item;
@@ -2024,152 +1728,144 @@ static void *imap_get_uncached_messages_thread(void *data)
        IMAPSession *session = stuff->session;
        FolderItem *item = stuff->item;
        MsgNumberList *numlist = stuff->numlist;
-
-       gchar *tmp;
+       
        GSList *newlist = NULL;
        GSList *llast = NULL;
-       GString *str = NULL;
-       MsgInfo *msginfo;
        GSList *seq_list, *cur;
-       IMAPSet imapset;
-       
-       stuff->total = g_slist_length(numlist);
-       stuff->cur = 0;
 
+       debug_print("uncached_messages\n");
+       
        if (session == NULL || item == NULL || item->folder == NULL
            || FOLDER_CLASS(item->folder) != &imap_class) {
                stuff->done = TRUE;
                return NULL;
        }
-
-       seq_list = imap_get_seq_set_from_numlist(numlist);
+       
+       seq_list = imap_get_lep_set_from_numlist(numlist);
+       debug_print("get msgs info\n");
        for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
+               struct mailimap_set * imapset;
+               unsigned int i;
+               int r;
+               carray * env_list;
+               int count;
+               
                imapset = cur->data;
-
-               if (imap_cmd_envelope(session, imapset)
-                   != IMAP_SUCCESS) {
-                       log_warning(_("can't get envelope\n"));
+               
+               r = imap_threaded_fetch_env(session->folder,
+                                           imapset, &env_list);
+               if (r != MAILIMAP_NO_ERROR)
                        continue;
-               }
-
-               str = g_string_new(NULL);
-
-               for (;;) {
-                       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);
-                       if (tmp[0] != '*' || tmp[1] != ' ') {
-                               log_print("IMAP4< %s\n", tmp);
-                               g_free(tmp);
-                               break;
-                       }
-                       if (strstr(tmp, "FETCH") == NULL) {
-                               log_print("IMAP4< %s\n", tmp);
-                               g_free(tmp);
-                               continue;
-                       }
-                       log_print("IMAP4< %s\n", tmp);
-                       g_string_assign(str, tmp);
-                       g_free(tmp);
+               
+               count = 0;
+               for(i = 0 ; i < carray_count(env_list) ; i ++) {
+                       struct imap_fetch_env_info * info;
+                       MsgInfo * msginfo;
                        
-                       stuff->cur++;
-
-                       msginfo = imap_parse_envelope
-                               (SESSION(session)->sock, item, str);
-                       if (!msginfo) {
-                               log_warning(_("can't parse envelope: %s\n"), str->str);
-                               continue;
-                       }
-                       if (item->stype == F_QUEUE) {
-                               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_QUEUED);
-                       } else if (item->stype == F_DRAFT) {
-                               MSG_SET_TMP_FLAGS(msginfo->flags, MSG_DRAFT);
-                       }
-
+                       info = carray_get(env_list, i);
+                       msginfo = imap_envelope_from_lep(info, item);
                        msginfo->folder = item;
-
                        if (!newlist)
                                llast = newlist = g_slist_append(newlist, msginfo);
                        else {
                                llast = g_slist_append(llast, msginfo);
                                llast = llast->next;
                        }
+                       count ++;
                }
-               if (str)
-                       g_string_free(str, TRUE);
+               
+               imap_fetch_env_free(env_list);
        }
-       imap_seq_set_free(seq_list);
        
        session_set_access_time(SESSION(session));
        stuff->done = TRUE;
-
        return newlist;
 }
 
+#define MAX_MSG_NUM 50
+
 static GSList *imap_get_uncached_messages(IMAPSession *session,
                                        FolderItem *item,
                                        MsgNumberList *numlist)
 {
-       uncached_data *data = g_new0(uncached_data, 1);
        GSList *result = NULL;
-       gint last_cur = 0;
-#ifdef USE_PTHREAD
-       pthread_t pt;
-#endif
-       data->done = FALSE;
-       data->session = session;
-       data->item = item;
-       data->numlist = numlist;
-       data->cur = 0;
-       data->total = 0;
+       GSList * cur;
+       uncached_data *data = g_new0(uncached_data, 1);
+       int finished;
        
-       if (prefs_common.work_offline && !imap_gtk_should_override()) {
-               g_free(data);
-               return NULL;
-       }
-
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       imap_get_uncached_messages_thread, data) != 0) {
-               result = (GSList *)imap_get_uncached_messages_thread(data);
-               g_free(data);
-               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) {
+       finished = 0;
+       cur = numlist;
+       data->total = g_slist_length(numlist);
+       debug_print("messages list : %i\n", data->total);
+       log_print(_("IMAP> Getting uncached messages for %s\n"), item->path);
+       while (cur != NULL) {
+               GSList * partial_result;
+               int count;
+               GSList * newlist;
+               GSList * llast;
+               
+               llast = NULL;
+               count = 0;
+               newlist = NULL;
+               while (count < MAX_MSG_NUM) {
+                       void * p;
+                       
+                       p = cur->data;
+                       
+                       if (newlist == NULL)
+                               llast = newlist = g_slist_append(newlist, p);
+                       else {
+                               llast = g_slist_append(llast, p);
+                               llast = llast->next;
+                       }
+                       count ++;
+                       
+                       cur = cur->next;
+                       if (cur == NULL)
+                               break;
+               }
+               
+               data->done = FALSE;
+               data->session = session;
+               data->item = item;
+               data->numlist = newlist;
+               data->cur += count;
+               
+               if (prefs_common.work_offline && !imap_gtk_should_override()) {
+                       g_free(data);
+                       log_error(_("IMAP< Error\n"));
+                       return NULL;
+               }
+               
+               partial_result =
+                       (GSList *)imap_get_uncached_messages_thread(data);
+               
+               {
                        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(mainwindow_get_mainwindow()->progressbar),
+                                (gfloat)data->cur / (gfloat)data->total);
+                       debug_print("update progress %g\n",
+                               (gfloat)data->cur / (gfloat)data->total);
                }
+               
+               g_slist_free(newlist);
+               
+               result = g_slist_concat(result, partial_result);
        }
+       g_free(data);
+       
        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 */
-       pthread_join(pt, (void *)&result);
-#else
-       result = (GSList *)imap_get_uncached_messages_thread(data);
-#endif
-       g_free(data);
+       
+       log_print(_("IMAP< Done\n"));
        return result;
 }
 
@@ -2191,234 +1887,6 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        debug_print("done.\n");
 }
 
-#if USE_OPENSSL
-static SockInfo *imap_open_tunnel(const gchar *server,
-                          const gchar *tunnelcmd,
-                          SSLType ssl_type)
-#else
-static SockInfo *imap_open_tunnel(const gchar *server,
-                          const gchar *tunnelcmd)
-#endif
-{
-       SockInfo *sock;
-
-       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL) {
-               log_warning(_("Can't establish IMAP4 session with: %s\n"),
-                           server);
-               return NULL;
-       }
-#if USE_OPENSSL
-       return imap_init_sock(sock, ssl_type);
-#else
-       return imap_init_sock(sock);
-#endif
-}
-
-void *imap_open_thread(void *data)
-{
-       SockInfo *sock = NULL;
-       thread_data *td = (thread_data *)data;
-       if ((sock = sock_connect(td->server, td->port)) == NULL) {
-               log_warning(_("Can't connect to IMAP4 server: %s:%d\n"),
-                           td->server, td->port);
-               td->done = TRUE;
-               return NULL;
-       }
-
-       td->done = TRUE;
-       return sock;
-}
-
-#if USE_OPENSSL
-static SockInfo *imap_open(const gchar *server, gushort port,
-                          SSLType ssl_type)
-#else
-static SockInfo *imap_open(const gchar *server, gushort port)
-#endif
-{
-       thread_data *td = g_new0(thread_data, 1);
-#if USE_PTHREAD
-       pthread_t pt;
-#endif
-       SockInfo *sock = NULL;
-
-#if USE_OPENSSL
-       td->ssl_type = ssl_type;
-#endif
-       td->server = g_strdup(server);
-       td->port = port;
-       td->done = FALSE;
-
-       statusbar_print_all(_("Connecting to IMAP4 server: %s..."), server);
-
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       imap_open_thread, td) != 0) {
-               statusbar_pop_all();
-               sock = imap_open_thread(td);
-       } else {        
-               debug_print("+++waiting for imap_open_thread...\n");
-               while(!td->done) {
-                       /* don't let the interface freeze while waiting */
-                       sylpheed_do_idle();
-               }
-
-               /* get the thread's return value and clean its resources */
-               pthread_join(pt, (void *)&sock);
-       }
-#else
-       sock = imap_open_thread(td);
-#endif
-#if USE_OPENSSL
-       if (sock && td->ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
-               log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
-                           td->server, td->port);
-               sock_close(sock);
-               sock = NULL;
-               td->done = TRUE;
-       }
-#endif
-       g_free(td->server);
-       g_free(td);
-
-       debug_print("---imap_open_thread returned %p\n", sock);
-       statusbar_pop_all();
-
-       if(!sock && !prefs_common.no_recv_err_panel) {
-               alertpanel_error(_("Can't connect to IMAP4 server: %s:%d"),
-                                server, port);
-       }
-
-       return sock;
-}
-
-#if USE_OPENSSL
-static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
-#else
-static SockInfo *imap_init_sock(SockInfo *sock)
-#endif
-{
-
-       return sock;
-}
-
-static GList *imap_parse_namespace_str(gchar *str)
-{
-       guchar *p = str;
-       gchar *name;
-       gchar *separator;
-       IMAPNameSpace *namespace;
-       GList *ns_list = NULL;
-
-       while (*p != '\0') {
-               /* parse ("#foo" "/") */
-
-               while (*p && *p != '(') p++;
-               if (*p == '\0') break;
-               p++;
-
-               while (*p && *p != '"') p++;
-               if (*p == '\0') break;
-               p++;
-               name = p;
-
-               while (*p && *p != '"') p++;
-               if (*p == '\0') break;
-               *p = '\0';
-               p++;
-
-               while (*p && isspace(*p)) p++;
-               if (*p == '\0') break;
-               if (strncmp(p, "NIL", 3) == 0)
-                       separator = NULL;
-               else if (*p == '"') {
-                       p++;
-                       separator = p;
-                       while (*p && *p != '"') p++;
-                       if (*p == '\0') break;
-                       *p = '\0';
-                       p++;
-               } else break;
-
-               while (*p && *p != ')') p++;
-               if (*p == '\0') break;
-               p++;
-
-               namespace = g_new(IMAPNameSpace, 1);
-               namespace->name = g_strdup(name);
-               namespace->separator = separator ? separator[0] : '\0';
-               ns_list = g_list_append(ns_list, namespace);
-       }
-
-       return ns_list;
-}
-
-static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
-{
-       gchar *ns_str;
-       gchar **str_array;
-
-       g_return_if_fail(session != NULL);
-       g_return_if_fail(folder != NULL);
-
-       if (folder->ns_personal != NULL ||
-           folder->ns_others   != NULL ||
-           folder->ns_shared   != NULL)
-               return;
-
-       if (!imap_has_capability(session, "NAMESPACE")) {
-               imap_get_namespace_by_list(session, folder);
-               return;
-       }
-       
-       if (imap_cmd_namespace(session, &ns_str)
-           != IMAP_SUCCESS) {
-               log_warning(_("can't get namespace\n"));
-               return;
-       }
-
-       str_array = strsplit_parenthesis(ns_str, '(', ')', 3);
-       if (str_array == NULL) {
-               g_free(ns_str);
-               imap_get_namespace_by_list(session, folder);
-               return;
-       }
-       if (str_array[0])
-               folder->ns_personal = imap_parse_namespace_str(str_array[0]);
-       if (str_array[0] && str_array[1])
-               folder->ns_others = imap_parse_namespace_str(str_array[1]);
-       if (str_array[0] && str_array[1] && str_array[2])
-               folder->ns_shared = imap_parse_namespace_str(str_array[2]);
-       g_strfreev(str_array);
-       g_free(ns_str);
-}
-
-static void imap_get_namespace_by_list(IMAPSession *session, IMAPFolder *folder)
-{
-       GSList *item_list, *cur;
-       gchar separator = '\0';
-       IMAPNameSpace *namespace;
-
-       g_return_if_fail(session != NULL);
-       g_return_if_fail(folder != NULL);
-
-       if (folder->ns_personal != NULL ||
-           folder->ns_others   != NULL ||
-           folder->ns_shared   != NULL)
-               return;
-
-       imap_gen_send(session, "LIST \"\" \"\"");
-       item_list = imap_parse_list(folder, session, "", &separator);
-       for (cur = item_list; cur != NULL; cur = cur->next)
-               folder_item_destroy(FOLDER_ITEM(cur->data));
-       g_slist_free(item_list);
-
-       namespace = g_new(IMAPNameSpace, 1);
-       namespace->name = g_strdup("");
-       namespace->separator = separator;
-       folder->ns_personal = g_list_append(NULL, namespace);
-}
-
 static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
                                                    const gchar *path)
 {
@@ -2487,299 +1955,29 @@ static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
        return real_path;
 }
 
-static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
-                             gchar *dest, gint dest_len, GString *str)
-{
-       gchar *cur_pos = src;
-       gchar *nextline;
-
-       g_return_val_if_fail(str != NULL, cur_pos);
-
-       /* read the next line if the current response buffer is empty */
-       while (isspace(*(guchar *)cur_pos)) cur_pos++;
-       while (*cur_pos == '\0') {
-               if ((nextline = imap_getline(sock)) == NULL)
-                       return cur_pos;
-               g_string_assign(str, nextline);
-               cur_pos = str->str;
-               strretchomp(nextline);
-               /* log_print("IMAP4< %s\n", nextline); */
-               debug_print("IMAP4< %s\n", nextline);
-               g_free(nextline);
-
-               while (isspace(*(guchar *)cur_pos)) cur_pos++;
-       }
-
-       if (!strncmp(cur_pos, "NIL", 3)) {
-               *dest = '\0';
-               cur_pos += 3;
-       } else if (*cur_pos == '\"') {
-               gchar *p;
-
-               p = get_quoted(cur_pos, '\"', dest, dest_len);
-               cur_pos = p ? p : cur_pos + 2;
-       } else if (*cur_pos == '{') {
-               gchar buf[32];
-               gint len;
-               gint line_len = 0;
-
-               cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
-               len = atoi(buf);
-               g_return_val_if_fail(len >= 0, cur_pos);
-
-               g_string_truncate(str, 0);
-               cur_pos = str->str;
-
-               do {
-                       if ((nextline = imap_getline(sock)) == NULL)
-                               return cur_pos;
-                       line_len += strlen(nextline);
-                       g_string_append(str, nextline);
-                       cur_pos = str->str;
-                       strretchomp(nextline);
-                       /* log_print("IMAP4< %s\n", nextline); */
-                       debug_print("IMAP4< %s\n", nextline);
-                       g_free(nextline);
-               } while (line_len < len);
-
-               memcpy(dest, cur_pos, MIN(len, dest_len - 1));
-               dest[MIN(len, dest_len - 1)] = '\0';
-               cur_pos += len;
-       }
-
-       return cur_pos;
-}
-
-static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
-                             GString *str)
-{
-       gchar *nextline;
-       gchar buf[32];
-       gint len;
-       gint block_len = 0;
-
-       *headers = NULL;
-
-       g_return_val_if_fail(str != NULL, cur_pos);
-
-       while (isspace(*(guchar *)cur_pos)) cur_pos++;
-
-       g_return_val_if_fail(*cur_pos == '{', cur_pos);
-
-       cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
-       len = atoi(buf);
-       g_return_val_if_fail(len >= 0, cur_pos);
-
-       g_string_truncate(str, 0);
-       cur_pos = str->str;
-
-       do {
-               if ((nextline = sock_getline(sock)) == NULL) {
-                       *headers = NULL;
-                       return cur_pos;
-               }
-               block_len += strlen(nextline);
-               g_string_append(str, nextline);
-               cur_pos = str->str;
-               strretchomp(nextline);
-               /* debug_print("IMAP4< %s\n", nextline); */
-               g_free(nextline);
-       } while (block_len < len);
-
-       debug_print("IMAP4< [contents of BODY.PEEK[HEADER_FIELDS (...)]\n");
-
-       *headers = g_strndup(cur_pos, len);
-       cur_pos += len;
-
-       while (isspace(*(guchar *)cur_pos)) cur_pos++;
-       while (*cur_pos == '\0') {
-               if ((nextline = sock_getline(sock)) == NULL)
-                       return cur_pos;
-               g_string_assign(str, nextline);
-               cur_pos = str->str;
-               strretchomp(nextline);
-               debug_print("IMAP4< %s\n", nextline);
-               g_free(nextline);
-
-               while (isspace(*(guchar *)cur_pos)) cur_pos++;
-       }
-
-       return cur_pos;
-}
-
-static MsgFlags imap_parse_flags(const gchar *flag_str)  
-{
-       const gchar *p = flag_str;
-       MsgFlags flags = {0, 0};
-
-       flags.perm_flags = MSG_UNREAD;
-
-       while ((p = strchr(p, '\\')) != NULL) {
-               p++;
-
-               if (g_ascii_strncasecmp(p, "Recent", 6) == 0 && MSG_IS_UNREAD(flags)) {
-                       MSG_SET_PERM_FLAGS(flags, MSG_NEW);
-               } else if (g_ascii_strncasecmp(p, "Seen", 4) == 0) {
-                       MSG_UNSET_PERM_FLAGS(flags, MSG_NEW|MSG_UNREAD);
-               } else if (g_ascii_strncasecmp(p, "Deleted", 7) == 0) {
-                       MSG_SET_PERM_FLAGS(flags, MSG_DELETED);
-               } else if (g_ascii_strncasecmp(p, "Flagged", 7) == 0) {
-                       MSG_SET_PERM_FLAGS(flags, MSG_MARKED);
-               } else if (g_ascii_strncasecmp(p, "Answered", 8) == 0) {
-                       MSG_SET_PERM_FLAGS(flags, MSG_REPLIED);
-               }
-       }
-
-       return flags;
-}
-
-static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
-                                   GString *line_str)
-{
-       gchar buf[IMAPBUFSIZE];
-       MsgInfo *msginfo = NULL;
-       gchar *cur_pos;
-       gint msgnum;
-       guint32 uid = 0;
-       size_t size = 0;
-       MsgFlags flags = {0, 0}, imap_flags = {0, 0};
-
-       g_return_val_if_fail(line_str != NULL, NULL);
-       g_return_val_if_fail(line_str->str[0] == '*' &&
-                            line_str->str[1] == ' ', NULL);
-
-       MSG_SET_TMP_FLAGS(flags, MSG_IMAP);
-       if (item->stype == F_QUEUE) {
-               MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
-       } else if (item->stype == F_DRAFT) {
-               MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
-       }
-
-       cur_pos = line_str->str + 2;
-
-#define PARSE_ONE_ELEMENT(ch)                                  \
-{                                                              \
-       cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf));    \
-       if (cur_pos == NULL) {                                  \
-               g_warning("cur_pos == NULL\n");                 \
-               procmsg_msginfo_free(msginfo);                  \
-               return NULL;                                    \
-       }                                                       \
-}
-
-       PARSE_ONE_ELEMENT(' ');
-       msgnum = atoi(buf);
-
-       PARSE_ONE_ELEMENT(' ');
-       g_return_val_if_fail(!strcmp(buf, "FETCH"), NULL);
-
-       g_return_val_if_fail(*cur_pos == '(', NULL);
-       cur_pos++;
-
-       while (*cur_pos != '\0' && *cur_pos != ')') {
-               while (*cur_pos == ' ') cur_pos++;
-
-               if (!strncmp(cur_pos, "UID ", 4)) {
-                       cur_pos += 4;
-                       uid = strtoul(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "FLAGS ", 6)) {
-                       cur_pos += 6;
-                       if (*cur_pos != '(') {
-                               g_warning("*cur_pos != '('\n");
-                               procmsg_msginfo_free(msginfo);
-                               return NULL;
-                       }
-                       cur_pos++;
-                       PARSE_ONE_ELEMENT(')');
-                       imap_flags = imap_parse_flags(buf);
-               } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
-                       cur_pos += 12;
-                       size = strtol(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "BODY[HEADER.FIELDS ", 19)) {
-                       gchar *headers;
-
-                       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);
-                       g_free(headers);
-               } else {
-                       g_warning("invalid FETCH response: %s\n", cur_pos);
-                       break;
-               }
-       }
-
-       if (msginfo) {
-               msginfo->msgnum = uid;
-               msginfo->size = size;
-               msginfo->flags.tmp_flags |= imap_flags.tmp_flags;
-               msginfo->flags.perm_flags = imap_flags.perm_flags;
-       }
-
-       return msginfo;
-}
-
-static gchar *imap_get_flag_str(IMAPFlags flags)
-{
-       GString *str;
-       gchar *ret;
-
-       str = g_string_new(NULL);
-
-       if (IMAP_IS_SEEN(flags))        g_string_append(str, "\\Seen ");
-       if (IMAP_IS_ANSWERED(flags))    g_string_append(str, "\\Answered ");
-       if (IMAP_IS_FLAGGED(flags))     g_string_append(str, "\\Flagged ");
-       if (IMAP_IS_DELETED(flags))     g_string_append(str, "\\Deleted ");
-       if (IMAP_IS_DRAFT(flags))       g_string_append(str, "\\Draft");
-
-       if (str->len > 0 && str->str[str->len - 1] == ' ')
-               g_string_truncate(str, str->len - 1);
-
-       ret = str->str;
-       g_string_free(str, FALSE);
-
-       return ret;
-}
-
 static gint imap_set_message_flags(IMAPSession *session,
                                   MsgNumberList *numlist,
                                   IMAPFlags flags,
                                   gboolean is_set)
 {
-       gchar *cmd;
-       gchar *flag_str;
        gint ok = 0;
        GSList *seq_list;
-       IMAPSet imapset;
-
-       flag_str = imap_get_flag_str(flags);
-       cmd = g_strconcat(is_set ? "+FLAGS.SILENT (" : "-FLAGS.SILENT (",
-                         flag_str, ")", NULL);
-       g_free(flag_str);
-
-       seq_list = imap_get_seq_set_from_numlist(numlist);
-       imapset = get_seq_set_from_seq_list(seq_list);
+       GSList * cur;
 
-       ok = imap_cmd_store(session, imapset, cmd);
+       seq_list = imap_get_lep_set_from_numlist(numlist);
        
-       g_free(imapset);
-       imap_seq_set_free(seq_list);
-       g_free(cmd);
-
-       return ok;
+       for(cur = seq_list ; cur != NULL ; cur = g_slist_next(cur)) {
+               struct mailimap_set * imapset;
+               
+               imapset = cur->data;
+               
+               ok = imap_cmd_store(session, imapset,
+                                   flags, is_set);
+       }
+       
+       imap_lep_set_free(seq_list);
+       
+       return IMAP_SUCCESS;
 }
 
 typedef struct _select_data {
@@ -2792,23 +1990,6 @@ typedef struct _select_data {
        gboolean done;
 } select_data;
 
-static void *imap_select_thread(void *data)
-{
-       select_data *stuff = (select_data *)data;
-       IMAPSession *session = stuff->session;
-       gchar *real_path = stuff->real_path;
-       gint *exists = stuff->exists;
-       gint *recent = stuff->recent;
-       gint *unseen = stuff->unseen;
-       guint32 *uid_validity = stuff->uid_validity;
-       gint ok;
-       
-       ok = imap_cmd_select(session, real_path,
-                            exists, recent, unseen, uid_validity, TRUE);
-       stuff->done = TRUE;
-       return GINT_TO_POINTER(ok);
-}
-               
 static gint imap_select(IMAPSession *session, IMAPFolder *folder,
                        const gchar *path,
                        gint *exists, gint *recent, gint *unseen,
@@ -2832,45 +2013,9 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
        session->mbox = NULL;
 
        real_path = imap_get_real_path(folder, path);
-       
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (block == FALSE) {
-               select_data *data = g_new0(select_data, 1);
-               void *tmp;
-               pthread_t pt;
-               data->session = session;
-               data->real_path = real_path;
-               data->exists = exists;
-               data->recent = recent;
-               data->unseen = unseen;
-               data->uid_validity = uid_validity;
-               data->done = FALSE;
-               
-               if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                               imap_select_thread, data) != 0) {
-                       ok = GPOINTER_TO_INT(imap_select_thread(data));
-                       g_free(data);
-               } else {
-                       debug_print("+++waiting for imap_select_thread...\n");
-                       while(!data->done) {
-                               /* don't let the interface freeze while waiting */
-                               sylpheed_do_idle();
-                       }
-                       debug_print("---imap_select_thread done\n");
 
-                       /* get the thread's return value and clean its resources */
-                       pthread_join(pt, &tmp);
-                       ok = GPOINTER_TO_INT(tmp);
-                       g_free(data);
-               }
-       } else {
-               ok = imap_cmd_select(session, real_path,
+       ok = imap_cmd_select(session, real_path,
                             exists, recent, unseen, uid_validity, block);
-       }
-#else
-       ok = imap_cmd_select(session, real_path,
-                            exists, recent, unseen, uid_validity, block);
-#endif
        if (ok != IMAP_SUCCESS)
                log_warning(_("can't select folder: %s\n"), real_path);
        else {
@@ -2882,86 +2027,74 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
        return ok;
 }
 
-#define THROW(err) { ok = err; goto catch; }
-
 static gint imap_status(IMAPSession *session, IMAPFolder *folder,
                        const gchar *path,
                        gint *messages, gint *recent,
                        guint32 *uid_next, guint32 *uid_validity,
                        gint *unseen, gboolean block)
 {
+       int r;
+       clistiter * iter;
+       struct mailimap_mailbox_data_status * data_status;
+       int got_values;
        gchar *real_path;
-       gchar *real_path_;
-       gint ok;
-       GPtrArray *argbuf = NULL;
-       gchar *str;
-
-       if (messages && recent && uid_next && uid_validity && unseen) {
-               *messages = *recent = *uid_next = *uid_validity = *unseen = 0;
-               argbuf = g_ptr_array_new();
-       }
 
        real_path = imap_get_real_path(folder, path);
-       QUOTE_IF_REQUIRED(real_path_, real_path);
-       imap_gen_send(session, "STATUS %s "
-                         "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)",
-                         real_path_);
-
-       ok = imap_cmd_ok_with_block(session, argbuf, block);
-       if (ok != IMAP_SUCCESS || !argbuf) THROW(ok);
-
-       str = search_array_str(argbuf, "STATUS");
-       if (!str) THROW(IMAP_ERROR);
-
-       str = strchr(str, '(');
-       if (!str) THROW(IMAP_ERROR);
-       str++;
-       while (*str != '\0' && *str != ')') {
-               while (*str == ' ') str++;
-
-               if (!strncmp(str, "MESSAGES ", 9)) {
-                       str += 9;
-                       *messages = strtol(str, &str, 10);
-               } else if (!strncmp(str, "RECENT ", 7)) {
-                       str += 7;
-                       *recent = strtol(str, &str, 10);
-               } else if (!strncmp(str, "UIDNEXT ", 8)) {
-                       str += 8;
-                       *uid_next = strtoul(str, &str, 10);
-               } else if (!strncmp(str, "UIDVALIDITY ", 12)) {
-                       str += 12;
-                       *uid_validity = strtoul(str, &str, 10);
-               } else if (!strncmp(str, "UNSEEN ", 7)) {
-                       str += 7;
-                       *unseen = strtol(str, &str, 10);
-               } else {
-                       g_warning("invalid STATUS response: %s\n", str);
-                       break;
-               }
-       }
 
-catch:
+       r = imap_threaded_status(FOLDER(folder), real_path, &data_status);
        g_free(real_path);
-       if (argbuf) {
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("status err %d\n", r);
+               return IMAP_ERROR;
        }
-
-       return ok;
-}
-
-#undef THROW
-
-static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
-{
-       gchar **p;
        
-       for (p = session->capability; *p != NULL; ++p) {
-               if (!g_ascii_strcasecmp(*p, cap))
-                       return TRUE;
+       if (data_status->st_info_list == NULL) {
+               mailimap_mailbox_data_status_free(data_status);
+               debug_print("status->st_info_list == NULL\n");
+               return IMAP_ERROR;
        }
-
-       return FALSE;
+       
+       got_values = 0;
+       for(iter = clist_begin(data_status->st_info_list) ; iter != NULL ;
+           iter = clist_next(iter)) {
+               struct mailimap_status_info * info;             
+               
+               info = clist_content(iter);
+               switch (info->st_att) {
+               case MAILIMAP_STATUS_ATT_MESSAGES:
+                       * messages = info->st_value;
+                       got_values |= 1 << 0;
+                       break;
+                       
+               case MAILIMAP_STATUS_ATT_RECENT:
+                       * recent = info->st_value;
+                       got_values |= 1 << 1;
+                       break;
+                       
+               case MAILIMAP_STATUS_ATT_UIDNEXT:
+                       * uid_next = info->st_value;
+                       got_values |= 1 << 2;
+                       break;
+                       
+               case MAILIMAP_STATUS_ATT_UIDVALIDITY:
+                       * uid_validity = info->st_value;
+                       got_values |= 1 << 3;
+                       break;
+                       
+               case MAILIMAP_STATUS_ATT_UNSEEN:
+                       * unseen = info->st_value;
+                       got_values |= 1 << 4;
+                       break;
+               }
+       }
+       mailimap_mailbox_data_status_free(data_status);
+       
+       if (got_values != ((1 << 4) + (1 << 3) +
+                          (1 << 2) + (1 << 1) + (1 << 0))) {
+               debug_print("status: incomplete values received (%d)\n", got_values);
+               return IMAP_ERROR;
+       }
+       return IMAP_SUCCESS;
 }
 
 static void imap_free_capabilities(IMAPSession *session)
@@ -2972,6 +2105,7 @@ static void imap_free_capabilities(IMAPSession *session)
 
 /* low-level IMAP4rev1 commands */
 
+#if 0
 static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
                                  const gchar *pass, IMAPAuthType type)
 {
@@ -2997,18 +2131,18 @@ static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
        challenge_len = base64_decode(challenge, buf + 2, -1);
        challenge[challenge_len] = '\0';
        g_free(buf);
-       log_print("IMAP< [Decoded: %s]\n", challenge);
+       log_print(_("IMAP< [Decoded: %s]\n"), challenge);
 
        md5_hex_hmac(hexdigest, challenge, challenge_len, pass, strlen(pass));
        g_free(challenge);
 
        response = g_strdup_printf("%s %s", user, hexdigest);
-       log_print("IMAP> [Encoded: %s]\n", response);
+       log_print(_("IMAP> [Encoded: %s]\n"), response);
        response64 = g_malloc((strlen(response) + 3) * 2 + 1);
        base64_encode(response64, response, strlen(response));
        g_free(response);
 
-       log_print("IMAP> %s\n", response64);
+       log_print(_("IMAP> %s\n"), response64);
        sock_puts(SESSION(session)->sock, response64);
        ok = imap_cmd_ok(session, NULL);
        if (ok != IMAP_SUCCESS)
@@ -3016,845 +2150,289 @@ static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
 
        return ok;
 }
+#endif
 
 static gint imap_cmd_login(IMAPSession *session,
                           const gchar *user, const gchar *pass)
 {
-       gchar *ans;
+       int r;
        gint ok;
-
-       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"));
-
-       return ok;
-}
-
-static gint imap_cmd_logout(IMAPSession *session)
-{
-       imap_gen_send(session, "LOGOUT");
-       return imap_cmd_ok(session, NULL);
-}
-
-static gint imap_cmd_noop(IMAPSession *session)
-{
-       imap_gen_send(session, "NOOP");
-       return imap_cmd_ok(session, NULL);
-}
-
-#if USE_OPENSSL
-static gint imap_cmd_starttls(IMAPSession *session)
-{
-       imap_gen_send(session, "STARTTLS");
-       return imap_cmd_ok(session, NULL);
-}
-#endif
-
-#define THROW(err) { ok = err; goto catch; }
-
-static gint imap_cmd_namespace(IMAPSession *session, gchar **ns_str)
-{
-       gint ok;
-       GPtrArray *argbuf;
-       gchar *str;
-
-       argbuf = g_ptr_array_new();
-
-       imap_gen_send(session, "NAMESPACE");
-       if ((ok = imap_cmd_ok(session, argbuf)) != IMAP_SUCCESS) THROW(ok);
-
-       str = search_array_str(argbuf, "NAMESPACE");
-       if (!str) THROW(IMAP_ERROR);
-
-       *ns_str = g_strdup(str);
-
-catch:
-       ptr_array_free_strings(argbuf);
-       g_ptr_array_free(argbuf, TRUE);
-
-       return ok;
-}
-
-#undef THROW
-
-static gint imap_cmd_list(IMAPSession *session, const gchar *ref,
-                         const gchar *mailbox, GPtrArray *argbuf)
-{
-       gchar *ref_, *mailbox_;
-
-       if (!ref) ref = "\"\"";
-       if (!mailbox) mailbox = "\"\"";
-
-       QUOTE_IF_REQUIRED(ref_, ref);
-       QUOTE_IF_REQUIRED(mailbox_, mailbox);
-       imap_gen_send(session, "LIST %s %s", ref_, mailbox_);
-
-       return imap_cmd_ok(session, argbuf);
-}
-
-#define THROW goto catch
-
-static gint imap_cmd_do_select(IMAPSession *session, const gchar *folder,
-                              gboolean examine,
-                              gint *exists, gint *recent, gint *unseen,
-                              guint32 *uid_validity, gboolean block)
-{
-       gint ok;
-       gchar *resp_str;
-       GPtrArray *argbuf;
-       gchar *select_cmd;
-       gchar *folder_;
-       unsigned int uid_validity_;
-
-       *exists = *recent = *unseen = *uid_validity = 0;
-       argbuf = g_ptr_array_new();
-
-       if (examine)
-               select_cmd = "EXAMINE";
-       else
-               select_cmd = "SELECT";
-
-       QUOTE_IF_REQUIRED(folder_, folder);
-       imap_gen_send(session, "%s %s", select_cmd, folder_);
-
-       if ((ok = imap_cmd_ok_with_block(session, argbuf, block)) != IMAP_SUCCESS) THROW;
-
-       resp_str = search_array_contain_str(argbuf, "EXISTS");
-       if (resp_str) {
-               if (sscanf(resp_str,"%d EXISTS", exists) != 1) {
-                       g_warning("imap_cmd_select(): invalid EXISTS line.\n");
-                       THROW;
-               }
-       }
-
-       resp_str = search_array_contain_str(argbuf, "RECENT");
-       if (resp_str) {
-               if (sscanf(resp_str, "%d RECENT", recent) != 1) {
-                       g_warning("imap_cmd_select(): invalid RECENT line.\n");
-                       THROW;
-               }
-       }
-
-       resp_str = search_array_contain_str(argbuf, "UIDVALIDITY");
-       if (resp_str) {
-               if (sscanf(resp_str, "OK [UIDVALIDITY %u] ", &uid_validity_)
-                   != 1) {
-                       g_warning("imap_cmd_select(): invalid UIDVALIDITY line.\n");
-                       THROW;
-               }
-               *uid_validity = uid_validity_;
-       }
-
-       resp_str = search_array_contain_str(argbuf, "UNSEEN");
-       if (resp_str) {
-               if (sscanf(resp_str, "OK [UNSEEN %d] ", unseen) != 1) {
-                       g_warning("imap_cmd_select(): invalid UNSEEN line.\n");
-                       THROW;
+       static time_t last_login_err = 0;
+
+       log_print(_("IMAP> Logging in to %s\n"), SESSION(session)->server);
+       r = imap_threaded_login(session->folder, user, pass);
+       if (r != MAILIMAP_NO_ERROR) {
+               if (time(NULL) - last_login_err > 10) {
+                       alertpanel_error(_("Connection to %s failed: login refused."),
+                                       SESSION(session)->server);
                }
+               last_login_err = time(NULL);
+               log_error(_("IMAP< Error\n"));
+               ok = IMAP_ERROR;
+       } else {
+               log_print(_("IMAP< Done\n"));
+               ok = IMAP_SUCCESS;
        }
-
-catch:
-       ptr_array_free_strings(argbuf);
-       g_ptr_array_free(argbuf, TRUE);
-
        return ok;
 }
 
-static gint imap_cmd_select(IMAPSession *session, const gchar *folder,
-                           gint *exists, gint *recent, gint *unseen,
-                           guint32 *uid_validity, gboolean block)
-{
-       return imap_cmd_do_select(session, folder, FALSE,
-                                 exists, recent, unseen, uid_validity, block);
-}
-
-static gint imap_cmd_examine(IMAPSession *session, const gchar *folder,
-                            gint *exists, gint *recent, gint *unseen,
-                            guint32 *uid_validity, gboolean block)
-{
-       return imap_cmd_do_select(session, folder, TRUE,
-                                 exists, recent, unseen, uid_validity, block);
-}
-
-#undef THROW
-
-static gint imap_cmd_create(IMAPSession *session, const gchar *folder)
-{
-       gchar *folder_;
-
-       QUOTE_IF_REQUIRED(folder_, folder);
-       imap_gen_send(session, "CREATE %s", folder_);
-
-       return imap_cmd_ok(session, NULL);
-}
-
-static gint imap_cmd_rename(IMAPSession *session, const gchar *old_folder,
-                           const gchar *new_folder)
-{
-       gchar *old_folder_, *new_folder_;
-
-       QUOTE_IF_REQUIRED(old_folder_, old_folder);
-       QUOTE_IF_REQUIRED(new_folder_, new_folder);
-       imap_gen_send(session, "RENAME %s %s", old_folder_, new_folder_);
-
-       return imap_cmd_ok(session, NULL);
-}
-
-static gint imap_cmd_delete(IMAPSession *session, const gchar *folder)
+static gint imap_cmd_logout(IMAPSession *session)
 {
-       gchar *folder_;
+       log_print(_("IMAP> Logging out of %s\n"), SESSION(session)->server);
+       imap_threaded_disconnect(session->folder);
 
-       QUOTE_IF_REQUIRED(folder_, folder);
-       imap_gen_send(session, "DELETE %s", folder_);
-
-       return imap_cmd_ok(session, NULL);
+       return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_search(IMAPSession *session, const gchar *criteria, 
-                           GSList **list, gboolean block)
+static gint imap_cmd_noop(IMAPSession *session)
 {
-       gint ok;
-       gchar *uidlist;
-       GPtrArray *argbuf;
-
-       g_return_val_if_fail(criteria != NULL, IMAP_ERROR);
-       g_return_val_if_fail(list != NULL, IMAP_ERROR);
-
-       *list = NULL;
+       int r;
+       unsigned int exists;
        
-       argbuf = g_ptr_array_new();
-       imap_gen_send(session, "UID SEARCH %s", criteria);
-
-       ok = imap_cmd_ok_with_block(session, argbuf, block);
-       if (ok != IMAP_SUCCESS) {
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
-               return ok;
-       }
-
-       if ((uidlist = search_array_str(argbuf, "SEARCH ")) != NULL) {
-               gchar **strlist, **p;
-
-               strlist = g_strsplit(uidlist + 7, " ", 0);
-               for (p = strlist; *p != NULL; ++p) {
-                       guint msgnum;
-
-                       if (sscanf(*p, "%u", &msgnum) == 1)
-                               *list = g_slist_append(*list, GINT_TO_POINTER(msgnum));
-               }
-               g_strfreev(strlist);
+       r = imap_threaded_noop(session->folder, &exists);
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("noop err %d\n", r);
+               return IMAP_ERROR;
        }
-       ptr_array_free_strings(argbuf);
-       g_ptr_array_free(argbuf, TRUE);
-
+       session->exists = exists;
+       
        return IMAP_SUCCESS;
 }
 
-typedef struct _fetch_data {
-       IMAPSession *session;
-       guint32 uid;
-       const gchar *filename;
-       gboolean headers;
-       gboolean body;
-       gboolean done;
-} fetch_data;
-
-static void *imap_cmd_fetch_thread(void *data)
+#if USE_OPENSSL
+static gint imap_cmd_starttls(IMAPSession *session)
 {
-       fetch_data *stuff = (fetch_data *)data;
-       IMAPSession *session = stuff->session;
-       guint32 uid = stuff->uid;
-       const gchar *filename = stuff->filename;
+       int r;
        
-       gint ok;
-       gchar *buf = NULL;
-       gchar *cur_pos;
-       gchar size_str[32];
-       glong size_num;
-
-       if (filename == NULL) {
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(IMAP_ERROR);
-       }
-       
-       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);
-                       stuff->done = TRUE;
-                       return GINT_TO_POINTER(IMAP_ERROR);
-               }
-               if (strstr(buf, "FETCH") != NULL) break;
-               g_free(buf);
-       }
-       if (ok != IMAP_SUCCESS) {
-               g_free(buf);
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(ok);
-       }
-
-#define RETURN_ERROR_IF_FAIL(cond)     \
-       if (!(cond)) {                  \
-               g_free(buf);            \
-               stuff->done = TRUE;     \
-               return GINT_TO_POINTER(IMAP_ERROR);     \
-       }
-
-       cur_pos = strchr(buf, '{');
-       RETURN_ERROR_IF_FAIL(cur_pos != NULL);
-       cur_pos = strchr_cpy(cur_pos + 1, '}', size_str, sizeof(size_str));
-       RETURN_ERROR_IF_FAIL(cur_pos != NULL);
-       size_num = atol(size_str);
-       RETURN_ERROR_IF_FAIL(size_num >= 0);
-
-       RETURN_ERROR_IF_FAIL(*cur_pos == '\0');
-
-#undef RETURN_ERROR_IF_FAIL
-
-       g_free(buf);
-
-       if (recv_bytes_write_to_file(SESSION(session)->sock,
-                                    size_num, filename) != 0) {
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(IMAP_ERROR);
-       }
-       if (imap_gen_recv_block(session, &buf) != IMAP_SUCCESS) {
-               g_free(buf);
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(IMAP_ERROR);
-       }
-
-       if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')') {
-               g_free(buf);
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(IMAP_ERROR);
+       log_print(_("IMAP> Starting TLS\n"));
+       r = imap_threaded_starttls(session->folder);
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("starttls err %d\n", r);
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
        }
-       g_free(buf);
-
-       ok = imap_cmd_ok_block(session, NULL);
-
-       stuff->done = TRUE;
-       return GINT_TO_POINTER(ok);
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
-
-static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
-                               const gchar *filename, gboolean headers,
-                               gboolean body)
-{
-       fetch_data *data = g_new0(fetch_data, 1);
-       int result = 0;
-#ifdef USE_PTHREAD
-       void *tmp;
-       pthread_t pt;
 #endif
-       data->done = FALSE;
-       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);
-               return -1;
-       }
-
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       imap_cmd_fetch_thread, data) != 0) {
-               result = GPOINTER_TO_INT(imap_cmd_fetch_thread(data));
-               g_free(data);
-               return result;
-       }
-       debug_print("+++waiting for imap_cmd_fetch_thread...\n");
-       while(!data->done) {
-               /* don't let the interface freeze while waiting */
-               sylpheed_do_idle();
-       }
-       debug_print("---imap_cmd_fetch_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_fetch_thread(data));
-#endif
-       g_free(data);
-       return result;
-}
-
-static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
-                           const gchar *file, IMAPFlags flags, 
-                           guint32 *new_uid)
+static gint imap_cmd_select(IMAPSession *session, const gchar *folder,
+                           gint *exists, gint *recent, gint *unseen,
+                           guint32 *uid_validity, gboolean block)
 {
-       gint ok;
-       gint size;
-       gchar *destfolder_;
-       gchar *flag_str;
-       unsigned int new_uid_;
-       gchar *ret = NULL;
-       gchar buf[BUFFSIZE];
-       FILE *fp;
-       GPtrArray *argbuf;
-       gchar *resp_str;
+       int r;
 
-       g_return_val_if_fail(file != NULL, IMAP_ERROR);
-
-       size = get_file_size_as_crlf(file);
-       if ((fp = fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
-               return -1;
-       }
-       QUOTE_IF_REQUIRED(destfolder_, destfolder);
-       flag_str = imap_get_flag_str(flags);
-       imap_gen_send(session, "APPEND %s (%s) {%d}", 
-                     destfolder_, flag_str, size);
-       g_free(flag_str);
-
-       ok = imap_gen_recv(session, &ret);
-       if (ok != IMAP_SUCCESS || ret[0] != '+' || ret[1] != ' ') {
-               log_warning(_("can't append %s to %s\n"), file, destfolder_);
-               g_free(ret);
-               fclose(fp);
+       log_print(_("IMAP> Selecting %s\n"), folder);
+       r = imap_threaded_select(session->folder, folder,
+                                exists, recent, unseen, uid_validity);
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("select err %d\n", r);
+               log_error(_("IMAP< Error\n"));
                return IMAP_ERROR;
-       }
-       g_free(ret);
-
-       log_print("IMAP4> %s\n", "(sending file...)");
-
-       while (fgets(buf, sizeof(buf), fp) != NULL) {
-               strretchomp(buf);
-               if (sock_puts(SESSION(session)->sock, buf) < 0) {
-                       fclose(fp);
-                       return -1;
-               }
-       }
-
-       if (ferror(fp)) {
-               FILE_OP_ERROR(file, "fgets");
-               fclose(fp);
-               return -1;
-       }
-
-       sock_puts(SESSION(session)->sock, "");
-
-       fclose(fp);
-
-       if (new_uid != NULL)
-               *new_uid = 0;
-
-       if (new_uid != NULL && session->uidplus) {
-               argbuf = g_ptr_array_new();
-
-               ok = imap_cmd_ok(session, argbuf);
-               if ((ok == IMAP_SUCCESS) && (argbuf->len > 0)) {
-                       resp_str = g_ptr_array_index(argbuf, argbuf->len - 1);
-                       if (resp_str &&
-                           sscanf(resp_str, "%*u OK [APPENDUID %*u %u]",
-                                  &new_uid_) == 1) {
-                               *new_uid = new_uid_;
-                       }
-               }
-
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
-       } else
-               ok = imap_cmd_ok(session, NULL);
-
-       if (ok != IMAP_SUCCESS)
-               log_warning(_("can't append message to %s\n"),
-                           destfolder_);
-
-       return ok;
+       }
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
-static MsgNumberList *imapset_to_numlist(IMAPSet imapset)
+static gint imap_cmd_examine(IMAPSession *session, const gchar *folder,
+                            gint *exists, gint *recent, gint *unseen,
+                            guint32 *uid_validity, gboolean block)
 {
-       gchar **ranges, **range;
-       unsigned int low, high;
-       MsgNumberList *uids = NULL;
-       
-       ranges = g_strsplit(imapset, ",", 0);
-       for (range = ranges; *range != NULL; range++) {
-               if (sscanf(*range, "%u:%u", &low, &high) == 1)
-                       uids = g_slist_prepend(uids, GINT_TO_POINTER(low));
-               else {
-                       int i;
-                       for (i = low; i <= high; i++)
-                               uids = g_slist_prepend(uids, GINT_TO_POINTER(i));
-               }
-       }
-       uids = g_slist_reverse(uids);
-       g_strfreev(ranges);
+       int r;
 
-       return uids;
+       log_print(_("IMAP> Examining %s\n"), folder);
+       r = imap_threaded_examine(session->folder, folder,
+                                 exists, recent, unseen, uid_validity);
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("examine err %d\n", r);
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
+       }
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_copy(IMAPSession *session, const gchar *seq_set,
-                         const gchar *destfolder, GRelation *uid_mapping)
+static gint imap_cmd_create(IMAPSession *session, const gchar *folder)
 {
-       gint ok;
-       gchar *destfolder_;
-       
-       g_return_val_if_fail(session != NULL, IMAP_ERROR);
-       g_return_val_if_fail(seq_set != NULL, IMAP_ERROR);
-       g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
-
-       QUOTE_IF_REQUIRED(destfolder_, destfolder);
-       imap_gen_send(session, "UID COPY %s %s", seq_set, destfolder_);
-
-       if (uid_mapping != NULL && session->uidplus) {
-               GPtrArray *reply;               
-               gchar *resp_str = NULL, *olduids_str, *newuids_str;
-               MsgNumberList *olduids, *old_cur, *newuids, *new_cur;
-
-               reply = g_ptr_array_new();
-               ok = imap_cmd_ok(session, reply);
-               if ((ok == IMAP_SUCCESS) && (reply->len > 0)) {
-                       resp_str = g_ptr_array_index(reply, reply->len - 1);
-                       if (resp_str) {
-                               olduids_str = g_new0(gchar, strlen(resp_str));
-                               newuids_str = g_new0(gchar, strlen(resp_str));
-                               if (sscanf(resp_str, "%*s OK [COPYUID %*u %[0-9,:] %[0-9,:]]",
-                                          olduids_str, newuids_str) == 2) {
-                                       olduids = imapset_to_numlist(olduids_str);
-                                       newuids = imapset_to_numlist(newuids_str);
-
-                                       old_cur = olduids;
-                                       new_cur = newuids;
-                                       while(old_cur != NULL && new_cur != NULL) {
-                                               g_relation_insert(uid_mapping, 
-                                                                 GPOINTER_TO_INT(old_cur->data),
-                                                                 GPOINTER_TO_INT(new_cur->data));
-                                               old_cur = g_slist_next(old_cur);
-                                               new_cur = g_slist_next(new_cur);
-                                       }
-
-                                       g_slist_free(olduids);
-                                       g_slist_free(newuids);
-                               }
-                               g_free(olduids_str);
-                               g_free(newuids_str);
-                       }
-               }
-               ptr_array_free_strings(reply);
-               g_ptr_array_free(reply, TRUE);
-       } else
-               ok = imap_cmd_ok(session, NULL);
-
-       if (ok != IMAP_SUCCESS)
-               log_warning(_("can't copy %s to %s\n"), seq_set, destfolder_);
-
-       return ok;
+       int r;
+       log_print(_("IMAP> Creating %s\n"), folder);
+       r = imap_threaded_create(session->folder, folder);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
+       }
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
-gint imap_cmd_envelope(IMAPSession *session, IMAPSet set)
+static gint imap_cmd_rename(IMAPSession *session, const gchar *old_folder,
+                           const gchar *new_folder)
 {
-       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 BODY.PEEK[HEADER.FIELDS (%s)])",
-                set, header_fields);
-
+       int r;
+       log_print(_("IMAP> Renaming %s to %s\n"), old_folder, new_folder);
+       r = imap_threaded_rename(session->folder, old_folder,
+                                new_folder);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
+       }
+       log_print(_("IMAP< Done\n"));
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_store(IMAPSession *session, IMAPSet seq_set,
-                          gchar *sub_cmd)
+static gint imap_cmd_delete(IMAPSession *session, const gchar *folder)
 {
-       gint ok;
-
-       imap_gen_send(session, "UID STORE %s %s", seq_set, sub_cmd);
-
-       if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS) {
-               log_warning(_("error while imap command: STORE %s %s\n"),
-                           seq_set, sub_cmd);
-               return ok;
+       int r;
+       
+       log_print(_("IMAP> Deleting %s\n"), folder);
+       r = imap_threaded_delete(session->folder, folder);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
        }
-
+       log_print(_("IMAP< Done\n"));
        return IMAP_SUCCESS;
 }
 
-typedef struct _expunge_data {
+typedef struct _fetch_data {
        IMAPSession *session;
-       IMAPSet seq_set;
+       guint32 uid;
+       const gchar *filename;
+       gboolean headers;
+       gboolean body;
        gboolean done;
-} expunge_data;
+} fetch_data;
 
-static void *imap_cmd_expunge_thread(void *data)
+static void *imap_cmd_fetch_thread(void *data)
 {
-       expunge_data *stuff = (expunge_data *)data;
+       fetch_data *stuff = (fetch_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_with_block(session, NULL, TRUE)) != IMAP_SUCCESS) {
-               log_warning(_("error while imap command: EXPUNGE\n"));
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(ok);
+       guint32 uid = stuff->uid;
+       const gchar *filename = stuff->filename;
+       int r;
+       
+       if (stuff->body) {
+               r = imap_threaded_fetch_content(session->folder,
+                                              uid, 1, filename);
+       }
+       else {
+               r = imap_threaded_fetch_content(session->folder,
+                                               uid, 0, filename);
+       }
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("fetch err %d\n", r);
+               return GINT_TO_POINTER(IMAP_ERROR);
        }
-
-       stuff->done = TRUE;
        return GINT_TO_POINTER(IMAP_SUCCESS);
 }
 
-static gint imap_cmd_expunge(IMAPSession *session, IMAPSet seq_set)
+static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
+                               const gchar *filename, gboolean headers,
+                               gboolean body)
 {
-       expunge_data *data = g_new0(expunge_data, 1);
-       int result;
-#ifdef USE_PTHREAD
-       void *tmp;
-       pthread_t pt;
-#endif
+       fetch_data *data = g_new0(fetch_data, 1);
+       int result = 0;
        data->done = FALSE;
        data->session = session;
-       data->seq_set = seq_set;
+       data->uid = uid;
+       data->filename = filename;
+       data->headers = headers;
+       data->body = body;
 
        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
+       result = GPOINTER_TO_INT(imap_cmd_fetch_thread(data));
        g_free(data);
        return result;
 }
 
-static gint imap_cmd_close(IMAPSession *session)
-{
-       gint ok;
-
-       imap_gen_send(session, "CLOSE");
-       if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS)
-               log_warning(_("error while imap command: CLOSE\n"));
-
-       return ok;
-}
-
-static gint imap_cmd_ok_with_block(IMAPSession *session, GPtrArray *argbuf, gboolean block)
-{
-       gint ok = IMAP_SUCCESS;
-       gchar *buf;
-       gint cmd_num;
-       gchar *data;
-
-       while ((ok = imap_gen_recv_with_block(session, &buf, block))
-              == IMAP_SUCCESS) {
-               /* make sure data is long enough for any substring of buf */
-               data = alloca(strlen(buf) + 1);
-
-               /* untagged line read */
-               if (buf[0] == '*' && buf[1] == ' ') {
-                       gint num;
-                       if (argbuf)
-                               g_ptr_array_add(argbuf, g_strdup(buf + 2));
-
-                       if (sscanf(buf + 2, "%d %s", &num, data) >= 2) {
-                               if (!strcmp(data, "EXISTS")) {
-                                       session->exists = num;
-                                       session->folder_content_changed = TRUE;
-                               }
-
-                               if(!strcmp(data, "EXPUNGE")) {
-                                       session->exists--;
-                                       session->folder_content_changed = TRUE;
-                               }
-                       }
-               /* tagged line with correct tag and OK response found */
-               } else if ((sscanf(buf, "%d %s", &cmd_num, data) >= 2) &&
-                          (cmd_num == session->cmd_count) &&
-                          !strcmp(data, "OK")) {
-                       if (argbuf)
-                               g_ptr_array_add(argbuf, g_strdup(buf));
-                       break;
-               /* everything else */
-               } else {
-                       ok = IMAP_ERROR;
-                       break;
-               }
-               g_free(buf);
-       }
-       g_free(buf);
-
-       return ok;
-}
-static gint imap_cmd_ok(IMAPSession *session, GPtrArray *argbuf)
-{
-       return imap_cmd_ok_with_block(session, argbuf, FALSE);
-}
-static gint imap_cmd_ok_block(IMAPSession *session, GPtrArray *argbuf)
-{
-       return imap_cmd_ok_with_block(session, argbuf, TRUE);
-}
-static void imap_gen_send(IMAPSession *session, const gchar *format, ...)
-{
-       gchar *buf;
-       gchar *tmp;
-       gchar *p;
-       va_list args;
-
-       va_start(args, format);
-       tmp = g_strdup_vprintf(format, args);
-       va_end(args);
-
-       session->cmd_count++;
-
-       buf = g_strdup_printf("%d %s\r\n", session->cmd_count, tmp);
-       if (!g_ascii_strncasecmp(tmp, "LOGIN ", 6) && (p = strchr(tmp + 6, ' '))) {
-               *p = '\0';
-               log_print("IMAP4> %d %s ********\n", session->cmd_count, tmp);
-       } else
-               log_print("IMAP4> %d %s\n", session->cmd_count, tmp);
-
-       sock_write_all(SESSION(session)->sock, buf, strlen(buf));
-       g_free(tmp);
-       g_free(buf);
-}
 
-static gint imap_gen_recv_with_block(IMAPSession *session, gchar **ret, gboolean block)
+static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
+                           const gchar *file, IMAPFlags flags, 
+                           guint32 *new_uid)
 {
-       if (!block) {
-               if ((*ret = imap_getline(SESSION(session)->sock)) == NULL)
-                       return IMAP_SOCKET;
-       } else {
-               if ((*ret = sock_getline(SESSION(session)->sock)) == NULL)
-                       return IMAP_SOCKET;
-       }
-       strretchomp(*ret);
+       struct mailimap_flag_list * flag_list;
+       int r;
+       
+       g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
-       log_print("IMAP4< %s\n", *ret);
+       flag_list = imap_flag_to_lep(flags);
+       r = imap_threaded_append(session->folder, destfolder,
+                        file, flag_list);
        
-       session_set_access_time(SESSION(session));
+       if (new_uid != NULL)
+               *new_uid = 0;
 
+       if (r != MAILIMAP_NO_ERROR) {
+               debug_print("append err %d\n", r);
+               return IMAP_ERROR;
+       }
        return IMAP_SUCCESS;
 }
 
-static gint imap_gen_recv_block(IMAPSession *session, gchar **ret)
-{
-       return imap_gen_recv_with_block(session, ret, TRUE);
-}
-
-static gint imap_gen_recv(IMAPSession *session, gchar **ret)
-{
-       return imap_gen_recv_with_block(session, ret, FALSE);
-}
-/* misc utility functions */
-
-static gchar *strchr_cpy(const gchar *src, gchar ch, gchar *dest, gint len)
-{
-       gchar *tmp;
-
-       dest[0] = '\0';
-       tmp = strchr(src, ch);
-       if (!tmp)
-               return NULL;
-
-       memcpy(dest, src, MIN(tmp - src, len - 1));
-       dest[MIN(tmp - src, len - 1)] = '\0';
-
-       return tmp + 1;
-}
-
-static gchar *get_quoted(const gchar *src, gchar ch, gchar *dest, gint len)
+static gint imap_cmd_copy(IMAPSession *session, struct mailimap_set * set,
+                         const gchar *destfolder, GRelation *uid_mapping)
 {
-       const gchar *p = src;
-       gint n = 0;
-
-       g_return_val_if_fail(*p == ch, NULL);
-
-       *dest = '\0';
-       p++;
+       int r;
+       
+       g_return_val_if_fail(session != NULL, IMAP_ERROR);
+       g_return_val_if_fail(set != NULL, IMAP_ERROR);
+       g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
 
-       while (*p != '\0' && *p != ch) {
-               if (n < len - 1) {
-                       if (*p == '\\' && *(p + 1) != '\0')
-                               p++;
-                       *dest++ = *p++;
-               } else
-                       p++;
-               n++;
+       log_print(_("IMAP> Copying to %s\n"), destfolder);
+       r = imap_threaded_copy(session->folder, set, destfolder);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
        }
-
-       *dest = '\0';
-       return (gchar *)(*p == ch ? p + 1 : p);
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
-static gchar *search_array_contain_str(GPtrArray *array, const gchar *str)
+static gint imap_cmd_store(IMAPSession *session, struct mailimap_set * set,
+                          IMAPFlags flags, int do_add)
 {
-       gint i;
-
-       for (i = 0; i < array->len; i++) {
-               gchar *tmp;
-
-               tmp = g_ptr_array_index(array, i);
-               if (strstr(tmp, str) != NULL)
-                       return tmp;
+       int r;
+       struct mailimap_flag_list * flag_list;
+       struct mailimap_store_att_flags * store_att_flags;
+       
+       flag_list = imap_flag_to_lep(flags);
+       
+       if (do_add)
+               store_att_flags =
+                       mailimap_store_att_flags_new_add_flags_silent(flag_list);
+       else
+               store_att_flags =
+                       mailimap_store_att_flags_new_remove_flags_silent(flag_list);
+       
+       log_print(_("IMAP> Storing\n"));
+       r = imap_threaded_store(session->folder, set, store_att_flags);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
        }
-
-       return NULL;
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
-static gchar *search_array_str(GPtrArray *array, const gchar *str)
+static gint imap_cmd_expunge(IMAPSession *session)
 {
-       gint i;
-       gint len;
-
-       len = strlen(str);
-
-       for (i = 0; i < array->len; i++) {
-               gchar *tmp;
-
-               tmp = g_ptr_array_index(array, i);
-               if (!strncmp(tmp, str, len))
-                       return tmp;
+       int r;
+       
+       if (prefs_common.work_offline && !imap_gtk_should_override()) {
+               return -1;
        }
-
-       return NULL;
+       log_print(_("IMAP> Expunging\n"));
+       r = imap_threaded_expunge(session->folder);
+       if (r != MAILIMAP_NO_ERROR) {
+               log_error(_("IMAP< Error\n"));
+               return IMAP_ERROR;
+       }
+       log_print(_("IMAP< Done\n"));
+       return IMAP_SUCCESS;
 }
 
 static void imap_path_separator_subst(gchar *str, gchar separator)
@@ -4053,84 +2631,6 @@ static gchar *imap_utf8_to_modified_utf7(const gchar *from)
        return to;
 }
 
-static GSList *imap_get_seq_set_from_numlist(MsgNumberList *numlist)
-{
-       GString *str;
-       GSList *sorted_list, *cur;
-       guint first, last, next;
-       gchar *ret_str;
-       GSList *ret_list = NULL;
-
-       if (numlist == NULL)
-               return NULL;
-
-       str = g_string_sized_new(256);
-
-       sorted_list = g_slist_copy(numlist);
-       sorted_list = g_slist_sort(sorted_list, g_int_compare);
-
-       first = GPOINTER_TO_INT(sorted_list->data);
-
-       for (cur = sorted_list; cur != NULL; cur = g_slist_next(cur)) {
-               last = GPOINTER_TO_INT(cur->data);
-               if (cur->next)
-                       next = GPOINTER_TO_INT(cur->next->data);
-               else
-                       next = 0;
-
-               if (last + 1 != next || next == 0) {
-                       if (str->len > 0)
-                               g_string_append_c(str, ',');
-                       if (first == last)
-                               g_string_append_printf(str, "%u", first);
-                       else
-                               g_string_append_printf(str, "%u:%u", first, last);
-
-                       first = next;
-
-                       if (str->len > IMAP_CMD_LIMIT) {
-                               ret_str = g_strdup(str->str);
-                               ret_list = g_slist_append(ret_list, ret_str);
-                               g_string_truncate(str, 0);
-                       }
-               }
-       }
-
-       if (str->len > 0) {
-               ret_str = g_strdup(str->str);
-               ret_list = g_slist_append(ret_list, ret_str);
-       }
-
-       g_slist_free(sorted_list);
-       g_string_free(str, TRUE);
-
-       return ret_list;
-}
-
-static GSList *imap_get_seq_set_from_msglist(MsgInfoList *msglist)
-{
-       MsgNumberList *numlist = NULL;
-       MsgInfoList *cur;
-       GSList *seq_list;
-
-       for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
-               MsgInfo *msginfo = (MsgInfo *) cur->data;
-
-               numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
-       }
-       seq_list = imap_get_seq_set_from_numlist(numlist);
-       g_slist_free(numlist);
-
-       return seq_list;
-}
-
-static void imap_seq_set_free(GSList *seq_list)
-{
-       slist_free_strings(seq_list);
-       g_slist_free(seq_list);
-}
-
-
 static gboolean imap_rename_folder_func(GNode *node, gpointer data)
 {
        FolderItem *item = node->data;
@@ -4176,8 +2676,10 @@ static void *get_list_of_uids_thread(void *data)
        gint ok, nummsgs = 0, lastuid_old;
        IMAPSession *session;
        GSList *uidlist, *elem;
-       gchar *cmd_buf;
-
+       struct mailimap_set * set;
+       clist * lep_uidlist;
+       int r;
+       
        session = imap_session_get(folder);
        if (session == NULL) {
                stuff->done = TRUE;
@@ -4191,45 +2693,31 @@ static void *get_list_of_uids_thread(void *data)
                return GINT_TO_POINTER(-1);
        }
 
-       cmd_buf = g_strdup_printf("UID %d:*", item->lastuid + 1);
-       ok = imap_cmd_search(session, cmd_buf, &uidlist, TRUE);
-       g_free(cmd_buf);
-
-       if (ok == IMAP_SOCKET) {
-               session_destroy((Session *)session);
-               ((RemoteFolder *)folder)->session = NULL;
-               stuff->done = TRUE;
-               return GINT_TO_POINTER(-1);
-       }
-
-       if (ok != IMAP_SUCCESS) {
-               gint i;
-               GPtrArray *argbuf;
-
-               argbuf = g_ptr_array_new();
-
-               cmd_buf = g_strdup_printf("UID FETCH %d:* (UID)", item->lastuid + 1);
-               imap_gen_send(session, cmd_buf);
-               g_free(cmd_buf);
-               ok = imap_cmd_ok_block(session, argbuf);
-               if (ok != IMAP_SUCCESS) {
-                       ptr_array_free_strings(argbuf);
-                       g_ptr_array_free(argbuf, TRUE);
-                       stuff->done = TRUE;
-                       return GINT_TO_POINTER(-1);
-               }
-       
-               for(i = 0; i < argbuf->len; i++) {
-                       int ret, msgnum;
+       uidlist = NULL;
        
-                       if((ret = sscanf(g_ptr_array_index(argbuf, i), 
-                                   "%*d FETCH (UID %d)", &msgnum)) == 1)
-                               uidlist = g_slist_prepend(uidlist, GINT_TO_POINTER(msgnum));
+       set = mailimap_set_new_interval(item->lastuid + 1, 0);
+       r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SIMPLE, set,
+                                &lep_uidlist);
+       if (r == MAILIMAP_NO_ERROR) {
+               GSList * fetchuid_list;
+               
+               fetchuid_list =
+                       imap_uid_list_from_lep(lep_uidlist);
+               uidlist = g_slist_concat(fetchuid_list, uidlist);
+       }
+       else {
+               GSList * fetchuid_list;
+               carray * lep_uidtab;
+               
+               r = imap_threaded_fetch_uid(folder, item->lastuid + 1,
+                                           &lep_uidtab);
+               if (r == MAILIMAP_NO_ERROR) {
+                       fetchuid_list =
+                               imap_uid_list_from_lep_tab(lep_uidtab);
+                       uidlist = g_slist_concat(fetchuid_list, uidlist);
                }
-               ptr_array_free_strings(argbuf);
-               g_ptr_array_free(argbuf, TRUE);
        }
-
+       
        lastuid_old = item->lastuid;
        *msgnum_list = g_slist_copy(item->uid_list);
        nummsgs = g_slist_length(*msgnum_list);
@@ -4258,10 +2746,6 @@ static gint get_list_of_uids(Folder *folder, IMAPFolderItem *item, GSList **msgn
 {
        gint result;
        get_list_uid_data *data = g_new0(get_list_uid_data, 1);
-#ifdef USE_PTHREAD
-       void *tmp;
-       pthread_t pt;
-#endif
        data->done = FALSE;
        data->folder = folder;
        data->item = item;
@@ -4272,26 +2756,7 @@ static gint get_list_of_uids(Folder *folder, IMAPFolderItem *item, GSList **msgn
                return -1;
        }
 
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       get_list_of_uids_thread, data) != 0) {
-               result = GPOINTER_TO_INT(get_list_of_uids_thread(data));
-               g_free(data);
-               return result;
-       }
-       debug_print("+++waiting for get_list_of_uids_thread...\n");
-       while(!data->done) {
-               /* don't let the interface freeze while waiting */
-               sylpheed_do_idle();
-       }
-       debug_print("---get_list_of_uids_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(get_list_of_uids_thread(data));
-#endif
        g_free(data);
        return result;
 
@@ -4305,7 +2770,9 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        GSList *uidlist = NULL;
        gchar *dir;
        gboolean selected_folder;
-
+       
+       debug_print("get_num_list\n");
+       
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->item.path != NULL, -1);
@@ -4315,21 +2782,26 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, -1);
 
+       log_print(_("IMAP> Getting numbers list for %s\n"), item->item.path);
+
        selected_folder = (session->mbox != NULL) &&
                          (!strcmp(session->mbox, item->item.path));
        if (selected_folder) {
                ok = imap_cmd_noop(session);
-               if (ok != IMAP_SUCCESS)
+               if (ok != IMAP_SUCCESS) {
+                       log_error(_("IMAP< Error\n"));
                        return -1;
+               }
                exists = session->exists;
 
                *old_uids_valid = TRUE;
        } else {
                ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
                                 &exists, &recent, &uid_next, &uid_val, &unseen, FALSE);
-               if (ok != IMAP_SUCCESS)
+               if (ok != IMAP_SUCCESS) {
+                       log_error(_("IMAP< Error\n"));
                        return -1;
-
+               }
                if(item->item.mtime == uid_val)
                        *old_uids_valid = TRUE;
                else {
@@ -4362,6 +2834,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                   out which numbers have been removed */
                if (exists == nummsgs) {
                        *msgnum_list = g_slist_copy(item->uid_list);
+                       log_print(_("IMAP< Done\n"));
                        return nummsgs;
                } else if (exists < nummsgs) {
                        debug_print("Freeing imap uid cache");
@@ -4373,11 +2846,17 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 
        if (exists == 0) {
                *msgnum_list = NULL;
+               log_print(_("IMAP< Done\n"));
                return 0;
        }
 
        nummsgs = get_list_of_uids(folder, item, &uidlist);
 
+       if (nummsgs < 0) {
+               log_error(_("IMAP< Error\n"));
+               return -1;
+       }
+
        if (nummsgs != exists) {
                /* Cache contains more messages then folder, we have cached
                    an old UID of a message that was removed and new messages
@@ -4399,7 +2878,10 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        debug_print("removing old messages from %s\n", dir);
        remove_numbered_files_not_in_list(dir, *msgnum_list);
        g_free(dir);
-
+       
+       debug_print("get_num_list - ok - %i\n", nummsgs);
+       
+       log_print(_("IMAP< Done\n"));
        return nummsgs;
 }
 
@@ -4429,12 +2911,15 @@ static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item)
        return msginfo;
 }
 
-GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+GSList *imap_get_msginfos(Folder *folder, FolderItem *item,
+                         GSList *msgnum_list)
 {
        IMAPSession *session;
        MsgInfoList *ret = NULL;
        gint ok;
-
+       
+       debug_print("get_msginfos\n");
+       
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(msgnum_list != NULL, NULL);
@@ -4450,8 +2935,8 @@ GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
 
        if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
                ret = g_slist_concat(ret,
-                       imap_get_uncached_messages(
-                       session, item, msgnum_list));
+                       imap_get_uncached_messages(session, item,
+                                                  msgnum_list));
        } else {
                MsgNumberList *sorted_list, *elem;
                gint startnum, lastnum;
@@ -4540,7 +3025,8 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
                if (ok != IMAP_SUCCESS)
                        return FALSE;
 
-               if (session->folder_content_changed)
+               if (session->folder_content_changed
+               ||  session->exists != item->item.total_msgs)
                        return TRUE;
        } else {
                ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
@@ -4571,12 +3057,14 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
        g_return_if_fail(msginfo->folder == item);
 
        session = imap_session_get(folder);
-       if (!session) return;
-       
+       if (!session) {
+               return;
+       }
        if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
-           NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS)
+           NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
                return;
-               
+       }
+
        if (!MSG_IS_MARKED(msginfo->flags) &&  (newflags & MSG_MARKED))
                flags_set |= IMAP_FLAG_FLAGGED;
        if ( MSG_IS_MARKED(msginfo->flags) && !(newflags & MSG_MARKED))
@@ -4626,12 +3114,16 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
                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 (ok != IMAP_SUCCESS) {
+                               return;
+                       }
                }
 
                if (flags_unset) {
                        ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
-                       if (ok != IMAP_SUCCESS) return;
+                       if (ok != IMAP_SUCCESS) {
+                               return;
+                       }
                }
        }
        msginfo->flags.perm_flags = newflags;
@@ -4670,12 +3162,12 @@ static gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
        }
 
        if (!session->uidplus) {
-               ok = imap_cmd_expunge(session, NULL);
+               ok = imap_cmd_expunge(session);
        } else {
                gchar *uidstr;
 
                uidstr = g_strdup_printf("%u", uid);
-               ok = imap_cmd_expunge(session, uidstr);
+               ok = imap_cmd_expunge(session);
                g_free(uidstr);
        }
        if (ok != IMAP_SUCCESS) {
@@ -4776,31 +3268,65 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                        return GINT_TO_POINTER(-1);
                }
 
+               if (unseen_cnt > exists_cnt / 2)
+                       reverse_seen = TRUE;
        } 
-
-       if (unseen_cnt > exists_cnt / 2)
-               reverse_seen = TRUE;
+       else {
+               if (item->unread_msgs > item->total_msgs / 2)
+                       reverse_seen = TRUE;
+       }
 
        cmd_buf = g_string_new(NULL);
 
        sorted_list = g_slist_sort(g_slist_copy(msginfo_list), compare_msginfo);
 
-       seq_list = imap_get_seq_set_from_msglist(msginfo_list);
+       seq_list = imap_get_lep_set_from_msglist(msginfo_list);
 
        for (cur = seq_list; cur != NULL; cur = g_slist_next(cur)) {
-               IMAPSet imapset = cur->data;
-
-               g_string_sprintf(cmd_buf, "%sSEEN UID %s", reverse_seen ? "" : "UN", imapset);
-               imap_cmd_search(session, cmd_buf->str, &p_unseen, TRUE);
-               unseen = g_slist_concat(unseen, p_unseen);
-
-               g_string_sprintf(cmd_buf, "ANSWERED UID %s", imapset);
-               imap_cmd_search(session, cmd_buf->str, &p_answered, TRUE);
-               answered = g_slist_concat(answered, p_answered);
+               struct mailimap_set * imapset;
+               clist * lep_uidlist;
+               int r;
+               
+               imapset = cur->data;
+               if (reverse_seen) {
+                       r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
+                                                imapset, &lep_uidlist);
+               }
+               else {
+                       r = imap_threaded_search(folder,
+                                                IMAP_SEARCH_TYPE_UNSEEN,
+                                                imapset, &lep_uidlist);
+               }
+               if (r == MAILIMAP_NO_ERROR) {
+                       GSList * uidlist;
+                       
+                       uidlist = imap_uid_list_from_lep(lep_uidlist);
+                       mailimap_search_result_free(lep_uidlist);
+                       
+                       unseen = g_slist_concat(unseen, uidlist);
+               }
+               
+               r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
+                                        imapset, &lep_uidlist);
+               if (r == MAILIMAP_NO_ERROR) {
+                       GSList * uidlist;
+                       
+                       uidlist = imap_uid_list_from_lep(lep_uidlist);
+                       mailimap_search_result_free(lep_uidlist);
+                       
+                       answered = g_slist_concat(answered, uidlist);
+               }
 
-               g_string_sprintf(cmd_buf, "FLAGGED UID %s", imapset);
-               imap_cmd_search(session, cmd_buf->str, &p_flagged, TRUE);
-               flagged = g_slist_concat(flagged, p_flagged);
+               r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
+                                        imapset, &lep_uidlist);
+               if (r == MAILIMAP_NO_ERROR) {
+                       GSList * uidlist;
+                       
+                       uidlist = imap_uid_list_from_lep(lep_uidlist);
+                       mailimap_search_result_free(lep_uidlist);
+                       
+                       flagged = g_slist_concat(flagged, uidlist);
+               }
        }
 
        p_unseen = unseen;
@@ -4832,7 +3358,7 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                g_relation_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
        }
 
-       imap_seq_set_free(seq_list);
+       imap_lep_set_free(seq_list);
        g_slist_free(flagged);
        g_slist_free(answered);
        g_slist_free(unseen);
@@ -4848,10 +3374,6 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
 {
        gint result;
        get_flags_data *data = g_new0(get_flags_data, 1);
-#ifdef USE_PTHREAD
-       void *tmp;
-       pthread_t pt;
-#endif
        data->done = FALSE;
        data->folder = folder;
        data->item = item;
@@ -4863,26 +3385,8 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
                return -1;
        }
 
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
-       if (pthread_create(&pt, PTHREAD_CREATE_JOINABLE,
-                       imap_get_flags_thread, data) != 0) {
-               result = GPOINTER_TO_INT(imap_get_flags_thread(data));
-               g_free(data);
-               return result;
-       }
-       debug_print("+++waiting for imap_get_flags_thread...\n");
-       while(!data->done) {
-               /* don't let the interface freeze while waiting */
-               sylpheed_do_idle();
-       }
-       debug_print("---imap_get_flags_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_get_flags_thread(data));
-#endif
+       
        g_free(data);
        return result;
 
@@ -4959,3 +3463,343 @@ static void imap_set_batch (Folder *folder, FolderItem *_item, gboolean batch)
                process_hashtable();
        }
 }
+
+
+
+/* data types conversion libetpan <-> sylpheed */
+
+
+
+#define ETPAN_IMAP_MB_MARKED      1
+#define ETPAN_IMAP_MB_UNMARKED    2
+#define ETPAN_IMAP_MB_NOSELECT    4
+#define ETPAN_IMAP_MB_NOINFERIORS 8
+
+static int imap_flags_to_flags(struct mailimap_mbx_list_flags * imap_flags)
+{
+  int flags;
+  clistiter * cur;
+  
+  flags = 0;
+  if (imap_flags->mbf_type == MAILIMAP_MBX_LIST_FLAGS_SFLAG) {
+    switch (imap_flags->mbf_sflag) {
+    case MAILIMAP_MBX_LIST_SFLAG_MARKED:
+      flags |= ETPAN_IMAP_MB_MARKED;
+      break;
+    case MAILIMAP_MBX_LIST_SFLAG_NOSELECT:
+      flags |= ETPAN_IMAP_MB_NOSELECT;
+      break;
+    case MAILIMAP_MBX_LIST_SFLAG_UNMARKED:
+      flags |= ETPAN_IMAP_MB_UNMARKED;
+      break;
+    }
+  }
+  
+  for(cur = clist_begin(imap_flags->mbf_oflags) ; cur != NULL ;
+      cur = clist_next(cur)) {
+    struct mailimap_mbx_list_oflag * oflag;
+    
+    oflag = clist_content(cur);
+    
+    switch (oflag->of_type) {
+    case MAILIMAP_MBX_LIST_OFLAG_NOINFERIORS:
+      flags |= ETPAN_IMAP_MB_NOINFERIORS;
+      break;
+    }
+  }
+  
+  return flags;
+}
+
+static GSList * imap_list_from_lep(IMAPFolder * folder,
+                                  clist * list, const gchar * real_path)
+{
+       clistiter * iter;
+       GSList * item_list;
+       
+       item_list = NULL;
+       
+       for(iter = clist_begin(list) ; iter != NULL ;
+           iter = clist_next(iter)) {
+               struct mailimap_mailbox_list * mb;
+               int flags;
+               char delimiter;
+               char * name;
+               char * dup_name;
+               gchar * base;
+               gchar * loc_name;
+               gchar * loc_path;
+               FolderItem *new_item;
+               
+               mb = clist_content(iter);
+               
+               flags = 0;
+               if (mb->mb_flag != NULL)
+                       flags = imap_flags_to_flags(mb->mb_flag);
+               
+               delimiter = mb->mb_delimiter;
+               name = mb->mb_name;
+               
+               dup_name = strdup(name);                
+               if (delimiter != '\0')
+                       subst_char(dup_name, delimiter, '/');
+               
+               base = g_path_get_basename(dup_name);
+               if (base[0] == '.') {
+                       g_free(base);
+                       free(dup_name);
+                       continue;
+               }
+               
+               if (strcmp(dup_name, real_path) == 0) {
+                       g_free(base);
+                       free(dup_name);
+                       continue;
+               }
+               
+               loc_name = imap_modified_utf7_to_utf8(base);
+               loc_path = imap_modified_utf7_to_utf8(dup_name);
+               
+               new_item = folder_item_new(FOLDER(folder), loc_name, loc_path);
+               if ((flags & ETPAN_IMAP_MB_NOINFERIORS) != 0)
+                       new_item->no_sub = TRUE;
+               if (strcmp(dup_name, "INBOX") != 0 &&
+                   ((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
+                       new_item->no_select = TRUE;
+               
+               item_list = g_slist_append(item_list, new_item);
+               
+               debug_print("folder '%s' found.\n", loc_path);
+               g_free(base);
+               g_free(loc_path);
+               g_free(loc_name);
+               
+               free(dup_name);
+       }
+       
+       return item_list;
+}
+
+static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist)
+{
+       GSList *sorted_list, *cur;
+       guint first, last, next;
+       GSList *ret_list = NULL;
+       unsigned int count;
+       struct mailimap_set * current_set;
+       unsigned int item_count;
+       
+       if (numlist == NULL)
+               return NULL;
+       
+       count = 0;
+       current_set = mailimap_set_new_empty();
+       
+       sorted_list = g_slist_copy(numlist);
+       sorted_list = g_slist_sort(sorted_list, g_int_compare);
+
+       first = GPOINTER_TO_INT(sorted_list->data);
+       
+       item_count = 0;
+       for (cur = sorted_list; cur != NULL; cur = g_slist_next(cur)) {
+               if (GPOINTER_TO_INT(cur->data) == 0)
+                       continue;
+               
+               item_count ++;
+               
+               last = GPOINTER_TO_INT(cur->data);
+               if (cur->next)
+                       next = GPOINTER_TO_INT(cur->next->data);
+               else
+                       next = 0;
+
+               if (last + 1 != next || next == 0) {
+
+                       struct mailimap_set_item * item;
+                       item = mailimap_set_item_new(first, last);
+                       mailimap_set_add(current_set, item);
+                       count ++;
+                       
+                       first = next;
+                       
+                       if (count >= IMAP_SET_MAX_COUNT) {
+                               ret_list = g_slist_append(ret_list,
+                                                         current_set);
+                               current_set = mailimap_set_new_empty();
+                               count = 0;
+                               item_count = 0;
+                       }
+               }
+       }
+       
+       if (clist_count(current_set->set_list) > 0) {
+               ret_list = g_slist_append(ret_list,
+                                         current_set);
+       }
+       
+       g_slist_free(sorted_list);
+
+       return ret_list;
+}
+
+static GSList * imap_get_lep_set_from_msglist(MsgInfoList *msglist)
+{
+       MsgNumberList *numlist = NULL;
+       MsgInfoList *cur;
+       GSList *seq_list;
+
+       for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
+               MsgInfo *msginfo = (MsgInfo *) cur->data;
+
+               numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+       }
+       seq_list = imap_get_lep_set_from_numlist(numlist);
+       g_slist_free(numlist);
+
+       return seq_list;
+}
+
+static GSList * imap_uid_list_from_lep(clist * list)
+{
+       clistiter * iter;
+       GSList * result;
+       
+       result = NULL;
+       
+       for(iter = clist_begin(list) ; iter != NULL ;
+           iter = clist_next(iter)) {
+               uint32_t * puid;
+               
+               puid = clist_content(iter);
+               result = g_slist_append(result, GINT_TO_POINTER(* puid));
+       }
+       
+       return result;
+}
+
+static GSList * imap_uid_list_from_lep_tab(carray * list)
+{
+       unsigned int i;
+       GSList * result;
+       
+       result = NULL;
+       
+       for(i = 0 ; i < carray_count(list) ; i ++) {
+               uint32_t * puid;
+               
+               puid = carray_get(list, i);
+               result = g_slist_append(result, GINT_TO_POINTER(* puid));
+       }
+       
+       return result;
+}
+
+static MsgInfo *imap_envelope_from_lep(struct imap_fetch_env_info * info,
+                                      FolderItem *item)
+{
+       MsgInfo *msginfo = NULL;
+       guint32 uid = 0;
+       size_t size = 0;
+       MsgFlags flags = {0, 0};
+       
+       MSG_SET_TMP_FLAGS(flags, MSG_IMAP);
+       if (item->stype == F_QUEUE) {
+               MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
+       } else if (item->stype == F_DRAFT) {
+               MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
+       }
+       flags.perm_flags = info->flags;
+       
+       uid = info->uid;
+       size = info->size;
+       msginfo = procheader_parse_str(info->headers, flags, FALSE, FALSE);
+       
+       if (msginfo) {
+               msginfo->msgnum = uid;
+               msginfo->size = size;
+       }
+
+       return msginfo;
+}
+
+static void imap_lep_set_free(GSList *seq_list)
+{
+       GSList * cur;
+       
+       for(cur = seq_list ; cur != NULL ; cur = g_slist_next(cur)) {
+               struct mailimap_set * imapset;
+               
+               imapset = cur->data;
+               mailimap_set_free(imapset);
+       }
+       g_slist_free(seq_list);
+}
+
+static struct mailimap_flag_list * imap_flag_to_lep(IMAPFlags flags)
+{
+       struct mailimap_flag_list * flag_list;
+       
+       flag_list = mailimap_flag_list_new_empty();
+       
+       if (IMAP_IS_SEEN(flags))
+               mailimap_flag_list_add(flag_list,
+                                      mailimap_flag_new_seen());
+       if (IMAP_IS_ANSWERED(flags))
+               mailimap_flag_list_add(flag_list,
+                                      mailimap_flag_new_answered());
+       if (IMAP_IS_FLAGGED(flags))
+               mailimap_flag_list_add(flag_list,
+                                      mailimap_flag_new_flagged());
+       if (IMAP_IS_DELETED(flags))
+               mailimap_flag_list_add(flag_list,
+                                      mailimap_flag_new_deleted());
+       if (IMAP_IS_DRAFT(flags))
+               mailimap_flag_list_add(flag_list,
+                                      mailimap_flag_new_draft());
+       
+       return flag_list;
+}
+#else /* HAVE_LIBETPAN */
+
+static FolderClass imap_class;
+
+static Folder  *imap_folder_new        (const gchar    *name,
+                                        const gchar    *path)
+{
+       return NULL;
+}
+static gint    imap_create_tree        (Folder         *folder)
+{
+       return -1;
+}
+static FolderItem *imap_create_folder  (Folder         *folder,
+                                        FolderItem     *parent,
+                                        const gchar    *name)
+{
+       return NULL;
+}
+static gint    imap_rename_folder      (Folder         *folder,
+                                        FolderItem     *item, 
+                                        const gchar    *name)
+{
+       return -1;
+}
+
+FolderClass *imap_get_class(void)
+{
+       if (imap_class.idstr == NULL) {
+               imap_class.type = F_IMAP;
+               imap_class.idstr = "imap";
+               imap_class.uistr = "IMAP4";
+
+               imap_class.new_folder = imap_folder_new;
+               imap_class.create_tree = imap_create_tree;
+               imap_class.create_folder = imap_create_folder;
+               imap_class.rename_folder = imap_rename_folder;
+               /* nothing implemented */
+       }
+
+       return &imap_class;
+}
+
+#endif