sync with latest 0.9.0pre1
[claws.git] / src / imap.c
index 6973b26c1c3fe8fe7103aebf19b2af2b2f4476b5..8d7b6c4c6d3fdfb336ff07998dd1c889585a457f 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include <unistd.h>
 #include <ctype.h>
 #include <time.h>
-#if HAVE_LIBJCONV
-#  include <jconv.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 "intl.h"
 #include "imap.h"
 #include "socket.h"
 #include "ssl.h"
 #include "recv.h"
-#include "procmsg.h"
 #include "procheader.h"
-#include "folder.h"
-#include "statusbar.h"
 #include "prefs_account.h"
 #include "codeconv.h"
 #include "utils.h"
 #include "inputdialog.h"
+#include "log.h"
+
+typedef struct _IMAPFolder     IMAPFolder;
+typedef struct _IMAPSession    IMAPSession;
+typedef struct _IMAPNameSpace  IMAPNameSpace;
+typedef struct _IMAPFolderItem IMAPFolderItem;
+
+#include "prefs_account.h"
+
+#define IMAP_FOLDER(obj)       ((IMAPFolder *)obj)
+#define IMAP_SESSION(obj)      ((IMAPSession *)obj)
+
+struct _IMAPFolder
+{
+       RemoteFolder rfolder;
+
+       /* list of IMAPNameSpace */
+       GList *ns_personal;
+       GList *ns_others;
+       GList *ns_shared;
+};
+
+struct _IMAPSession
+{
+       Session session;
+
+       gchar **capability;
+       gchar *mbox;
+       time_t last_access_time;
+       gboolean authenticated;
+       guint cmd_count;
+};
+
+struct _IMAPNameSpace
+{
+       gchar *name;
+       gchar separator;
+};
+
+#define IMAP_SUCCESS   0
+#define IMAP_SOCKET    2
+#define IMAP_AUTHFAIL  3
+#define IMAP_PROTOCOL  4
+#define IMAP_SYNTAX    5
+#define IMAP_IOERR     6
+#define IMAP_ERROR     7
+
+#define IMAPBUFSIZE    8192
+
+typedef enum
+{
+       IMAP_FLAG_SEEN          = 1 << 0,
+       IMAP_FLAG_ANSWERED      = 1 << 1,
+       IMAP_FLAG_FLAGGED       = 1 << 2,
+       IMAP_FLAG_DELETED       = 1 << 3,
+       IMAP_FLAG_DRAFT         = 1 << 4
+} IMAPFlags;
+
+#define IMAP_IS_SEEN(flags)    ((flags & IMAP_FLAG_SEEN) != 0)
+#define IMAP_IS_ANSWERED(flags)        ((flags & IMAP_FLAG_ANSWERED) != 0)
+#define IMAP_IS_FLAGGED(flags) ((flags & IMAP_FLAG_FLAGGED) != 0)
+#define IMAP_IS_DELETED(flags) ((flags & IMAP_FLAG_DELETED) != 0)
+#define IMAP_IS_DRAFT(flags)   ((flags & IMAP_FLAG_DRAFT) != 0)
+
 
 #define IMAP4_PORT     143
-#if USE_SSL
+#if USE_OPENSSL
 #define IMAPS_PORT     993
 #endif
 
        }                                                       \
 }
 
-static GList *session_list = NULL;
+typedef gchar * IMAPSet;
+
+struct _IMAPFolderItem
+{
+       FolderItem item;
+
+       guint lastuid;
+       guint uid_next;
+       GSList *uid_list;
+};
+
+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 void imap_session_authenticate(IMAPSession * session,
+                                     const PrefsAccount * account);
+static void imap_session_destroy(Session * session);
+
+static gchar *imap_fetch_msg(Folder * folder, FolderItem * item, gint uid);
+static gint imap_add_msg(Folder * folder,
+                        FolderItem * dest,
+                        const gchar * file, gboolean remove_source);
+
+static gint imap_copy_msg(Folder * folder,
+                         FolderItem * dest, MsgInfo * msginfo);
+
+static gint imap_remove_msg(Folder * folder, FolderItem * item, gint uid);
+static gint imap_remove_all_msg(Folder * folder, FolderItem * item);
+
+static gboolean imap_is_msg_changed(Folder * folder,
+                                   FolderItem * item, MsgInfo * msginfo);
+
+static gint imap_scan_folder(Folder * folder, FolderItem * item);
+static void imap_scan_tree(Folder * folder);
+
+static gint imap_create_tree(Folder * folder);
+
+static FolderItem *imap_create_folder(Folder * folder,
+                                     FolderItem * parent,
+                                     const gchar * name);
+static gint imap_rename_folder(Folder * folder,
+                              FolderItem * item, const gchar * name);
+static gint imap_remove_folder(Folder * folder, FolderItem * item);
 
-static gint imap_cmd_count = 0;
 
 static void imap_folder_init           (Folder         *folder,
                                         const gchar    *name,
                                         const gchar    *path);
 
+static FolderItem *imap_folder_item_new        (Folder         *folder);
+static void imap_folder_item_destroy   (Folder         *folder,
+                                        FolderItem     *item);
+
 static IMAPSession *imap_session_get   (Folder         *folder);
 
 static gint imap_scan_tree_recursive   (IMAPSession    *session,
                                         FolderItem     *item);
 static GSList *imap_parse_list         (Folder         *folder,
                                         IMAPSession    *session,
-                                        const gchar    *real_path);
+                                        const gchar    *real_path,
+                                        gchar          *separator);
 
 static void imap_create_missing_folders        (Folder                 *folder);
 static FolderItem *imap_create_special_folder
@@ -95,22 +209,10 @@ static gint imap_do_copy           (Folder         *folder,
                                         FolderItem     *dest,
                                         MsgInfo        *msginfo,
                                         gboolean        remove_source);
-static gint imap_do_copy_msgs_with_dest        (Folder         *folder,
-                                        FolderItem     *dest, 
-                                        GSList         *msglist,
-                                        gboolean        remove_source);
 
-static GSList *imap_get_uncached_messages      (IMAPSession    *session,
-                                                FolderItem     *item,
-                                                guint32         first_uid,
-                                                guint32         last_uid);
-static GSList *imap_delete_cached_messages     (GSList         *mlist,
-                                                FolderItem     *item,
-                                                guint32         first_uid,
-                                                guint32         last_uid);
 static void imap_delete_all_cached_messages    (FolderItem     *item);
 
-#if USE_SSL
+#if USE_OPENSSL
 static SockInfo *imap_open             (const gchar    *server,
                                         gushort         port,
                                         SSLType         ssl_type);
@@ -119,7 +221,7 @@ static SockInfo *imap_open          (const gchar    *server,
                                         gushort         port);
 #endif
 
-#if USE_SSL
+#if USE_OPENSSL
 static SockInfo *imap_open_tunnel(const gchar *server,
                                  const gchar *tunnelcmd,
                                  SSLType ssl_type);
@@ -128,15 +230,14 @@ static SockInfo *imap_open_tunnel(const gchar *server,
                                  const gchar *tunnelcmd);
 #endif
 
-#if USE_SSL
-static SockInfo *imap_init_sock(SockInfo *sock, SSLType         ssl_type);
+#if USE_OPENSSL
+static SockInfo *imap_init_sock(SockInfo *sock, SSLType        ssl_type);
 #else
 static SockInfo *imap_init_sock(SockInfo *sock);
 #endif
 
 static gint imap_set_message_flags     (IMAPSession    *session,
-                                        guint32         first_uid,
-                                        guint32         last_uid,
+                                        MsgNumberList  *numlist,
                                         IMAPFlags       flag,
                                         gboolean        is_set);
 static gint imap_select                        (IMAPSession    *session,
@@ -146,9 +247,6 @@ static gint imap_select                     (IMAPSession    *session,
                                         gint           *recent,
                                         gint           *unseen,
                                         guint32        *uid_validity);
-static gint imap_get_uid               (IMAPSession    *session,
-                                        gint            msgnum,
-                                        guint32        *uid);
 static gint imap_status                        (IMAPSession    *session,
                                         IMAPFolder     *folder,
                                         const gchar    *path,
@@ -160,6 +258,8 @@ static gint imap_status                     (IMAPSession    *session,
 
 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,
@@ -176,77 +276,75 @@ static MsgFlags imap_parse_flags  (const gchar    *flag_str);
 static MsgInfo *imap_parse_envelope    (SockInfo       *sock,
                                         FolderItem     *item,
                                         GString        *line_str);
-static gint imap_greeting              (SockInfo *sock,
-                                        gboolean *is_preauth);
+static gint imap_greeting              (IMAPSession    *session);
+static gboolean imap_has_capability    (IMAPSession    *session,
+                                        const gchar    *cap);
+void imap_free_capabilities            (IMAPSession    *session);
+static const IMAPSet numberlist_to_imapset(MsgNumberList *list);
 
 /* low-level IMAP4rev1 commands */
-static gint imap_cmd_login     (SockInfo       *sock,
+static gint imap_cmd_login     (IMAPSession    *sock,
                                 const gchar    *user,
                                 const gchar    *pass);
-static gint imap_cmd_logout    (SockInfo       *sock);
-static gint imap_cmd_noop      (SockInfo       *sock);
-static gint imap_cmd_starttls  (SockInfo       *sock);
-static gint imap_cmd_namespace (SockInfo       *sock,
+static gint imap_cmd_logout    (IMAPSession    *sock);
+static gint imap_cmd_noop      (IMAPSession    *sock);
+static gint imap_cmd_starttls  (IMAPSession    *sock);
+static gint imap_cmd_namespace (IMAPSession    *sock,
                                 gchar         **ns_str);
-static gint imap_cmd_list      (SockInfo       *sock,
+static gint imap_cmd_list      (IMAPSession    *session,
                                 const gchar    *ref,
                                 const gchar    *mailbox,
                                 GPtrArray      *argbuf);
-static gint imap_cmd_do_select (SockInfo       *sock,
+static gint imap_cmd_do_select (IMAPSession    *sock,
                                 const gchar    *folder,
                                 gboolean        examine,
                                 gint           *exists,
                                 gint           *recent,
                                 gint           *unseen,
                                 guint32        *uid_validity);
-static gint imap_cmd_select    (SockInfo       *sock,
+static gint imap_cmd_select    (IMAPSession    *sock,
                                 const gchar    *folder,
                                 gint           *exists,
                                 gint           *recent,
                                 gint           *unseen,
                                 guint32        *uid_validity);
-static gint imap_cmd_examine   (SockInfo       *sock,
+static gint imap_cmd_examine   (IMAPSession    *sock,
                                 const gchar    *folder,
                                 gint           *exists,
                                 gint           *recent,
                                 gint           *unseen,
                                 guint32        *uid_validity);
-static gint imap_cmd_create    (SockInfo       *sock,
+static gint imap_cmd_create    (IMAPSession    *sock,
                                 const gchar    *folder);
-static gint imap_cmd_rename    (SockInfo       *sock,
+static gint imap_cmd_rename    (IMAPSession    *sock,
                                 const gchar    *oldfolder,
                                 const gchar    *newfolder);
-static gint imap_cmd_delete    (SockInfo       *sock,
+static gint imap_cmd_delete    (IMAPSession    *sock,
                                 const gchar    *folder);
-static gint imap_cmd_envelope  (SockInfo       *sock,
-                                guint32         first_uid,
-                                guint32         last_uid);
-#if 0
-static gint imap_cmd_search    (SockInfo       *sock,
-                                GSList         *numlist);
-#endif
-static gint imap_cmd_fetch     (SockInfo       *sock,
+static gint imap_cmd_envelope  (IMAPSession    *sock,
+                                IMAPSet         set);
+static gint imap_cmd_fetch     (IMAPSession    *sock,
                                 guint32         uid,
                                 const gchar    *filename);
-static gint imap_cmd_append    (SockInfo       *sock,
+static gint imap_cmd_append    (IMAPSession    *session,
                                 const gchar    *destfolder,
-                                const gchar    *file);
-static gint imap_cmd_copy      (SockInfo       *sock,
-                                guint32         uid,
-                                const gchar    *destfolder);
-static gint imap_cmd_store     (SockInfo       *sock,
-                                guint32         first_uid,
-                                guint32         last_uid,
+                                const gchar    *file,
+                                gint32         *newuid);
+static gint imap_cmd_copy      (IMAPSession    *session,
+                                gint32         msgnum,
+                                const gchar    *destfolder,
+                                gint32         *new_uid);
+static gint imap_cmd_store     (IMAPSession    *sock,
+                                IMAPSet         set,
                                 gchar          *sub_cmd);
-static gint imap_cmd_expunge   (SockInfo       *sock);
+static gint imap_cmd_expunge   (IMAPSession    *sock);
 
-static gint imap_cmd_ok                (SockInfo       *sock,
+static gint imap_cmd_ok                (IMAPSession    *session,
                                 GPtrArray      *argbuf);
-static void imap_cmd_gen_send  (SockInfo       *sock,
+static void imap_gen_send      (IMAPSession    *sock,
                                 const gchar    *format, ...);
-static gint imap_cmd_gen_recv  (SockInfo       *sock,
-                                gchar          *buf,
-                                gint            size);
+static gint imap_gen_recv      (IMAPSession    *sock,
+                                gchar         **buf);
 
 /* misc utility functions */
 static gchar *strchr_cpy                       (const gchar    *src,
@@ -258,11 +356,9 @@ static gchar *get_quoted                   (const gchar    *src,
                                                 gchar          *dest,
                                                 gint            len);
 static gchar *search_array_contain_str         (GPtrArray      *array,
-                                                gchar          *str);
+                                                const gchar    *str);
 static gchar *search_array_str                 (GPtrArray      *array,
-                                                gchar          *str);
-static gchar *search_array_starts              (GPtrArray *array,
-                                                const gchar *str);
+                                                const gchar    *str);
 static void imap_path_separator_subst          (gchar          *str,
                                                 gchar           separator);
 
@@ -271,83 +367,112 @@ static gchar *imap_locale_to_modified_utf7       (const gchar    *from);
 
 static gboolean imap_rename_folder_func                (GNode          *node,
                                                 gpointer        data);
-GSList *imap_get_num_list                      (Folder         *folder,
-                                                FolderItem     *item);
-MsgInfo *imap_fetch_msginfo                    (Folder         *folder,
+static gint imap_get_num_list                  (Folder         *folder,
+                                                FolderItem     *item,
+                                                GSList        **list);
+static GSList *imap_get_msginfos               (Folder         *folder,
+                                                FolderItem     *item,
+                                                GSList         *msgnum_list);
+static MsgInfo *imap_get_msginfo               (Folder         *folder,
                                                 FolderItem     *item,
                                                 gint            num);
-gboolean imap_check_msgnum_validity            (Folder         *folder,
+static gboolean imap_check_msgnum_validity     (Folder         *folder,
                                                 FolderItem     *item);
+static void imap_change_flags                  (Folder         *folder,
+                                                FolderItem     *item,
+                                                MsgInfo        *msginfo,
+                                                MsgPermFlags   newflags);
+
+FolderClass imap_class =
+{
+       F_IMAP,
+       "imap",
+       "IMAP4",
+
+       /* Folder functions */
+       imap_folder_new,
+       imap_folder_destroy,
+       imap_scan_tree,
+       imap_create_tree,
+
+       /* FolderItem functions */
+       imap_folder_item_new,
+       imap_folder_item_destroy,
+       imap_create_folder,
+       imap_rename_folder,
+       imap_remove_folder,
+       imap_get_num_list,
+       NULL,
+       NULL,
+       NULL,
+       imap_check_msgnum_validity,
+
+       /* Message functions */
+       imap_get_msginfo,
+       imap_get_msginfos,
+       imap_fetch_msg,
+       imap_add_msg,
+       imap_copy_msg,
+       imap_remove_msg,
+       imap_remove_all_msg,
+       imap_is_msg_changed,
+       imap_change_flags,
+};
+
+FolderClass *imap_get_class(void)
+{
+       return &imap_class;
+}
 
 Folder *imap_folder_new(const gchar *name, const gchar *path)
 {
        Folder *folder;
 
        folder = (Folder *)g_new0(IMAPFolder, 1);
+       folder->klass = &imap_class;
        imap_folder_init(folder, name, path);
 
        return folder;
 }
 
-void imap_folder_destroy(IMAPFolder *folder)
+void imap_folder_destroy(Folder *folder)
 {
-       g_free(folder->selected_folder);
-       
+       gchar *dir;
+
+       dir = folder_get_path(folder);
+       if (is_dir_exist(dir))
+               remove_dir_recursive(dir);
+       g_free(dir);
+
        folder_remote_folder_destroy(REMOTE_FOLDER(folder));
 }
 
 static void imap_folder_init(Folder *folder, const gchar *name,
                             const gchar *path)
 {
-       folder->type = F_IMAP;
-
        folder_remote_folder_init((Folder *)folder, name, path);
-
-/*
-       folder->get_msg_list        = imap_get_msg_list;
-*/
-       folder->fetch_msg             = imap_fetch_msg;
-       folder->add_msg               = imap_add_msg;
-       folder->move_msg              = imap_move_msg;
-       folder->move_msgs_with_dest   = imap_move_msgs_with_dest;
-       folder->copy_msg              = imap_copy_msg;
-       folder->copy_msgs_with_dest   = imap_copy_msgs_with_dest;
-       folder->remove_msg            = imap_remove_msg;
-       folder->remove_all_msg        = imap_remove_all_msg;
-       folder->is_msg_changed        = imap_is_msg_changed;
-/*
-       folder->scan                = imap_scan_folder;
-*/
-       folder->scan_tree             = imap_scan_tree;
-       folder->create_tree           = imap_create_tree;
-       folder->create_folder         = imap_create_folder;
-       folder->rename_folder         = imap_rename_folder;
-       folder->remove_folder         = imap_remove_folder;
-       folder->check_msgnum_validity = imap_check_msgnum_validity;
-
-       folder->get_num_list          = imap_get_num_list;
-       folder->fetch_msginfo         = imap_fetch_msginfo;
-       
-       ((IMAPFolder *)folder)->selected_folder = NULL;
 }
 
-FolderItem *imap_folder_item_new()
+static FolderItem *imap_folder_item_new(Folder *folder)
 {
        IMAPFolderItem *item;
        
        item = g_new0(IMAPFolderItem, 1);
        item->lastuid = 0;
+       item->uid_next = 0;
        item->uid_list = NULL;
 
        return (FolderItem *)item;
 }
 
-void imap_folder_item_destroy(FolderItem *_item)
+static void imap_folder_item_destroy(Folder *folder, FolderItem *_item)
 {
        IMAPFolderItem *item = (IMAPFolderItem *)_item;
 
        g_return_if_fail(item != NULL);
        g_slist_free(item->uid_list);
+
+       g_free(_item);
 }
 
 static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
@@ -355,6 +480,7 @@ static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
        IMAPFolderItem *item = (IMAPFolderItem *)node->data;
        
        item->lastuid = 0;
+       item->uid_next = 0;
        g_slist_free(item->uid_list);
        item->uid_list = NULL;
        
@@ -373,13 +499,14 @@ static void imap_reset_uid_lists(Folder *folder)
 static IMAPSession *imap_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
+       IMAPSession *session = NULL;
        gushort port;
 
        g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_IMAP, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
-#if USE_SSL
+#if USE_OPENSSL
        port = folder->account->set_imapport ? folder->account->imapport
                : folder->account->ssl_imap == SSL_TUNNEL
                ? IMAPS_PORT : IMAP4_PORT;
@@ -388,20 +515,35 @@ static IMAPSession *imap_session_get(Folder *folder)
                : IMAP4_PORT;
 #endif
 
-       if (!rfolder->session) {
-               rfolder->session =
-                       imap_session_new(folder->account);
-               if (rfolder->session) {
-                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
-                                            IMAP_FOLDER(folder));
-                       rfolder->session->last_access_time = time(NULL);
-                       g_free(((IMAPFolder *)folder)->selected_folder);
-                       ((IMAPFolder *)folder)->selected_folder = NULL;
-                       imap_reset_uid_lists(folder);
-               }
-               statusbar_pop_all();
-               return IMAP_SESSION(rfolder->session);
+       /* Make sure we have a session */
+       if (rfolder->session != NULL) {
+               session = IMAP_SESSION(rfolder->session);
+       } else {
+               imap_reset_uid_lists(folder);
+               session = imap_session_new(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;
+       }
+
+       /* Make sure we have parsed the IMAP namespace */
+       imap_parse_namespace(IMAP_SESSION(session),
+                            IMAP_FOLDER(folder));
 
        /* I think the point of this code is to avoid sending a
         * keepalive if we've used the session recently and therefore
@@ -411,49 +553,52 @@ static IMAPSession *imap_session_get(Folder *folder)
         * A better solution than sending a NOOP every time would be
         * for every command to be prepared to retry until it is
         * successfully sent. -- mbp */
-       if (time(NULL) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
-               rfolder->session->last_access_time = time(NULL);
-               statusbar_pop_all();
-               return IMAP_SESSION(rfolder->session);
-       }
-
-       if (imap_cmd_noop(rfolder->session->sock) != IMAP_SUCCESS) {
-               log_warning(_("IMAP4 connection to %s:%d has been"
-                             " disconnected. Reconnecting...\n"),
-                           folder->account->recv_server, port);
-               session_destroy(rfolder->session);
-               rfolder->session =
-                       imap_session_new(folder->account);
-               if (rfolder->session) {
-                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
-                                            IMAP_FOLDER(folder));
-                       g_free(((IMAPFolder *)folder)->selected_folder);
-                       ((IMAPFolder *)folder)->selected_folder = NULL;
-                       imap_reset_uid_lists(folder);
+       if (time(NULL) - session->last_access_time > SESSION_TIMEOUT) {
+               /* verify that the session is still alive */
+               if (imap_cmd_noop(session) != IMAP_SUCCESS) {
+                       /* Check if this is the first try to establish a
+                          connection, if yes we don't try to reconnect */
+                       if (rfolder->session == NULL) {
+                               log_warning(_("Connecting %s:%d failed"),
+                                           folder->account->recv_server, port);
+                               session_destroy(SESSION(session));
+                               session = NULL;
+                       } else {
+                               log_warning(_("IMAP4 connection to %s:%d has been"
+                                             " disconnected. Reconnecting...\n"),
+                                           folder->account->recv_server, port);
+                               session_destroy(SESSION(session));
+                               /* Clear folders session to make imap_session_get create
+                                  a new session, because of rfolder->session == NULL
+                                  it will not try to reconnect again and so avoid an
+                                  endless loop */
+                               rfolder->session = NULL;
+                               session = imap_session_get(folder);
+                       }
                }
        }
 
-       if (rfolder->session)
-               rfolder->session->last_access_time = time(NULL);
-       statusbar_pop_all();
-       return IMAP_SESSION(rfolder->session);
+       rfolder->session = SESSION(session);
+       if (session) {
+               session->last_access_time = time(NULL);
+       }
+       return IMAP_SESSION(session);
 }
 
-Session *imap_session_new(const PrefsAccount *account)
+IMAPSession *imap_session_new(const PrefsAccount *account)
 {
        IMAPSession *session;
        SockInfo *imap_sock;
        gushort port;
-       gchar *pass;
        gboolean is_preauth;
 
-#ifdef USE_SSL
+#ifdef USE_OPENSSL
        /* FIXME: IMAP over SSL only... */ 
        SSLType ssl_type;
 
        port = account->set_imapport ? account->imapport
-               : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
-       ssl_type = account->ssl_imap ? TRUE : FALSE;    
+               : account->ssl_imap == SSL_TUNNEL ? IMAPS_PORT : IMAP4_PORT;
+       ssl_type = account->ssl_imap;   
 #else
        port = account->set_imapport ? account->imapport
                : IMAP4_PORT;
@@ -461,7 +606,7 @@ Session *imap_session_new(const PrefsAccount *account)
 
        if (account->set_tunnelcmd) {
                log_message(_("creating tunneled IMAP4 connection\n"));
-#if USE_SSL
+#if USE_OPENSSL
                if ((imap_sock = imap_open_tunnel(account->recv_server, 
                                                  account->tunnelcmd,
                                                  ssl_type)) == NULL)
@@ -476,7 +621,7 @@ Session *imap_session_new(const PrefsAccount *account)
                log_message(_("creating IMAP4 connection to %s:%d ...\n"),
                            account->recv_server, port);
                
-#if USE_SSL
+#if USE_OPENSSL
                if ((imap_sock = imap_open(account->recv_server, port,
                                           ssl_type)) == NULL)
 #else
@@ -485,160 +630,89 @@ Session *imap_session_new(const PrefsAccount *account)
                        return NULL;
        }
 
-       /* Only need to log in if the connection was not PREAUTH */
-       imap_greeting(imap_sock, &is_preauth);
-       log_message("IMAP connection is %s-authenticated\n",
-                   (is_preauth) ? "pre" : "un");
-       if (!is_preauth) {
-               g_return_val_if_fail(account->userid != NULL, NULL);
-
-               pass = account->passwd;
-               if (!pass) {
-                       gchar *tmp_pass;
-                       tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
-                       if (!tmp_pass)
-                               return NULL;
-                       Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return NULL;});
-                       g_free(tmp_pass);
-               }
-
-               if (imap_cmd_login(imap_sock, account->userid, pass) != IMAP_SUCCESS) {
-                       imap_cmd_logout(imap_sock);
-                       sock_close(imap_sock);
-                       return NULL;
-               }
-       }
-
-       session = g_new(IMAPSession, 1);
+       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)->connected        = TRUE;
-       SESSION(session)->phase            = SESSION_READY;
-       SESSION(session)->last_access_time = time(NULL);
-       SESSION(session)->data             = NULL;
-       session->mbox = NULL;
-
-       session_list = g_list_append(session_list, session);
 
-       return SESSION(session);
-}
+       SESSION(session)->destroy          = imap_session_destroy;
 
-void imap_session_destroy(IMAPSession *session)
-{
-       sock_close(SESSION(session)->sock);
-       SESSION(session)->sock = NULL;
+       session->capability = NULL;
 
-       g_free(session->mbox);
-
-       session_list = g_list_remove(session_list, session);
-}
-
-void imap_session_destroy_all(void)
-{
-       while (session_list != NULL) {
-               IMAPSession *session = (IMAPSession *)session_list->data;
+       session->mbox = NULL;
+       session->authenticated = is_preauth;
+       session->cmd_count = 0;
 
-               imap_cmd_logout(SESSION(session)->sock);
+       /* Only need to log in if the connection was not PREAUTH */
+       if (imap_greeting(session) != IMAP_SUCCESS) {
                session_destroy(SESSION(session));
+               return NULL;
        }
-}
 
-#define THROW goto catch
-
-GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
-{
-       GSList *mlist = NULL;
-       IMAPSession *session;
-       gint ok, exists = 0, recent = 0, unseen = 0;
-       guint32 uid_validity = 0;
-       guint32 first_uid = 0, last_uid = 0, begin;
-
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_IMAP, NULL);
-       g_return_val_if_fail(folder->account != NULL, NULL);
+#if USE_OPENSSL
+       if (account->ssl_imap == SSL_STARTTLS && imap_has_capability(session, "STARTTLS")) {
+               gint ok;
 
-       session = imap_session_get(folder);
+               ok = imap_cmd_starttls(session);
+               if (ok != IMAP_SUCCESS) {
+                       log_warning(_("Can't start TLS session.\n"));
+                       session_destroy(SESSION(session));
+                       return NULL;
+               }
+               if (!ssl_init_socket_with_method(SESSION(session)->sock, SSL_METHOD_TLSv1)) {
+                       session_destroy(SESSION(session));
+                       return NULL;
+               }
 
-       if (!session) {
-               mlist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_msg_list(mlist);
-               procmsg_set_flags(mlist, item);
-               statusbar_pop_all();
-               return mlist;
-       }
+               imap_free_capabilities(session);
+               session->authenticated = is_preauth;
+               session->cmd_count = 1;
 
-       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
-                        &exists, &recent, &unseen, &uid_validity);
-       if (ok != IMAP_SUCCESS) THROW;
-       if (exists > 0) {
-               ok = imap_get_uid(session, 1, &first_uid);
-               if (ok != IMAP_SUCCESS) THROW;
-               if (1 != exists) {
-                       ok = imap_get_uid(session, exists, &last_uid);
-                       if (ok != IMAP_SUCCESS) THROW;
-               } else
-                       last_uid = first_uid;
-       } else {
-               imap_delete_all_cached_messages(item);
-               statusbar_pop_all();
-               return NULL;
+               if (imap_greeting(session) != IMAP_SUCCESS) {
+                       session_destroy(SESSION(session));
+                       return NULL;
+               }               
        }
+#endif
+       log_message("IMAP connection is %s-authenticated\n",
+                   (is_preauth) ? "pre" : "un");
 
-       if (use_cache) {
-               guint32 cache_last;
-
-               mlist = procmsg_read_cache(item, FALSE);
-               procmsg_set_flags(mlist, item);
-               cache_last = procmsg_get_last_num_in_msg_list(mlist);
+       return session;
+}
 
-               /* calculating the range of envelope to get */
-               if (item->mtime != uid_validity) {
-                       /* mailbox is changed (get all) */
-                       begin = first_uid;
-               } else if (last_uid < cache_last) {
-                       /* mailbox is changed (get all) */
-                       begin = first_uid;
-               } else if (last_uid == cache_last) {
-                       /* mailbox unchanged (get none)*/
-                       begin = 0;
-               } else {
-                       begin = cache_last + 1;
-               }
+void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account)
+{
+       gchar *pass;
 
-               item->mtime = uid_validity;
+       g_return_if_fail(account->userid != NULL);
 
-               if (first_uid > 0 && last_uid > 0) {
-                       mlist = imap_delete_cached_messages(mlist, item,
-                                                           0, first_uid - 1);
-                       mlist = imap_delete_cached_messages(mlist, item,
-                                                           last_uid + 1,
-                                                           UINT_MAX);
-               }
-               if (begin > 0)
-                       mlist = imap_delete_cached_messages(mlist, item,
-                                                           begin, UINT_MAX);
-       } else {
-               imap_delete_all_cached_messages(item);
-               begin = first_uid;
+       pass = account->passwd;
+       if (!pass) {
+               gchar *tmp_pass;
+               tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
+               if (!tmp_pass)
+                       return;
+               Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return;});
+               g_free(tmp_pass);
        }
 
-       if (begin > 0 && begin <= last_uid) {
-               GSList *newlist;
-               newlist = imap_get_uncached_messages(session, item,
-                                                    begin, last_uid);
-               mlist = g_slist_concat(mlist, newlist);
+       if (imap_cmd_login(session, account->userid, pass) != IMAP_SUCCESS) {
+               imap_cmd_logout(session);
+               return;
        }
 
-       item->last_num = last_uid;
-
-catch:
-       statusbar_pop_all();
-       return mlist;
+       session->authenticated = TRUE;
 }
 
-#undef THROW
+void imap_session_destroy(Session *session)
+{
+       sock_close(session->sock);
+       session->sock = NULL;
+
+       g_free(IMAP_SESSION(session)->mbox);
+       imap_free_capabilities(IMAP_SESSION(session));
+}
 
 gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
 {
@@ -656,7 +730,7 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
        g_free(path);
  
        if (is_file_exist(filename)) {
-               debug_print(_("message %d has been already cached.\n"), uid);
+               debug_print("message %d has been already cached.\n", uid);
                return filename;
        }
 
@@ -668,20 +742,17 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
 
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
                         NULL, NULL, NULL, NULL);
-       statusbar_pop_all();
        if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't select mailbox %s\n"), item->path);
+               g_warning("can't select mailbox %s\n", item->path);
                g_free(filename);
                return NULL;
        }
 
-       debug_print(_("getting message %d...\n"), uid);
-       ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
-
-       statusbar_pop_all();
+       debug_print("getting message %d...\n", uid);
+       ok = imap_cmd_fetch(session, (guint32)uid, filename);
 
        if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't fetch message %d\n"), uid);
+               g_warning("can't fetch message %d\n", uid);
                g_free(filename);
                return NULL;
        }
@@ -694,9 +765,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
 {
        gchar *destdir;
        IMAPSession *session;
-       gint messages, recent, unseen;
-       guint32 uid_next, uid_validity;
-       gint ok;
+       gint ok, newuid;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(dest != NULL, -1);
@@ -705,20 +774,12 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
        session = imap_session_get(folder);
        if (!session) return -1;
 
-       ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
-                        &messages, &recent, &uid_next, &uid_validity, &unseen);
-       statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't append message %s\n"), file);
-               return -1;
-       }
-
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
-       ok = imap_cmd_append(SESSION(session)->sock, destdir, file);
+       ok = imap_cmd_append(session, destdir, file, &newuid);
        g_free(destdir);
 
        if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't append message %s\n"), file);
+               g_warning("can't append message %s\n", file);
                return -1;
        }
 
@@ -727,7 +788,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
                        FILE_OP_ERROR(file, "unlink");
        }
 
-       return uid_next;
+       return newuid;
 }
 
 static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
@@ -735,12 +796,11 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
 {
        gchar *destdir;
        IMAPSession *session;
-       gint messages, recent, unseen;
-       guint32 uid_next, uid_validity;
+       guint32 newuid = 0;
        gint ok;
-
+       
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->type == F_IMAP, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
 
@@ -748,156 +808,48 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
        if (!session) return -1;
 
        if (msginfo->folder == dest) {
-               g_warning(_("the src folder is identical to the dest.\n"));
-               return -1;
-       }
-
-       ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
-                        &messages, &recent, &uid_next, &uid_validity, &unseen);
-       statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't copy message\n"));
+               g_warning("the src folder is identical to the dest.\n");
                return -1;
        }
 
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
+       /* ensure source folder selected */
+       ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+                        NULL, NULL, NULL, NULL);
+       if (ok != IMAP_SUCCESS)
+               return -1;
+        
        if (remove_source)
-               debug_print(_("Moving message %s%c%d to %s ...\n"),
+               debug_print("Moving message %s%c%d to %s ...\n",
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, destdir);
        else
-               debug_print(_("Copying message %s%c%d to %s ...\n"),
+               debug_print("Copying message %s%c%d to %s ...\n",
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, destdir);
 
-       ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
+       ok = imap_cmd_copy(session, msginfo->msgnum, destdir, &newuid);
 
        if (ok == IMAP_SUCCESS && remove_source) {
-               imap_set_message_flags(session, msginfo->msgnum, msginfo->msgnum,
-                                      IMAP_FLAG_DELETED, TRUE);
-               ok = imap_cmd_expunge(SESSION(session)->sock);
-       }
-
-       g_free(destdir);
-       statusbar_pop_all();
-
-       if (ok == IMAP_SUCCESS)
-               return uid_next;
-       else
-               return -1;
-}
-
-static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest, 
-                                       GSList *msglist,
-                                       gboolean remove_source)
-{
-       gchar *destdir;
-       GSList *cur;
-       MsgInfo *msginfo;
-       IMAPSession *session;
-       gint ok = IMAP_SUCCESS;
-
-       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;
-
-       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
-
-       for (cur = msglist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-
-               if (msginfo->folder == dest) {
-                       g_warning(_("the src folder is identical to the dest.\n"));
-                       continue;
-               }
-
-               if (remove_source)
-                       debug_print(_("Moving message %s%c%d to %s ...\n"),
-                                   msginfo->folder->path, G_DIR_SEPARATOR,
-                                   msginfo->msgnum, destdir);
-               else
-                       debug_print(_("Copying message %s%c%d to %s ...\n"),
-                                   msginfo->folder->path, G_DIR_SEPARATOR,
-                                   msginfo->msgnum, destdir);
+               MsgNumberList numlist;
 
-               ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum,
-                                  destdir);
-
-               if (ok == IMAP_SUCCESS && remove_source) {
-                       imap_set_message_flags
-                               (session, msginfo->msgnum, msginfo->msgnum,
-                                IMAP_FLAG_DELETED, TRUE);
-               }
+               numlist.next = NULL;
+               numlist.data = GINT_TO_POINTER(msginfo->msgnum);
+               
+               imap_set_message_flags(session, &numlist,
+                                      IMAP_FLAG_DELETED, TRUE);
+               ok = imap_cmd_expunge(session);
        }
 
-       if (remove_source)
-               ok = imap_cmd_expunge(SESSION(session)->sock);
-
        g_free(destdir);
-       statusbar_pop_all();
 
        if (ok == IMAP_SUCCESS)
-               return 0;
+               return newuid;
        else
                return -1;
 }
 
-gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
-{
-       gchar *srcfile;
-       gint ret = 0;
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msginfo != NULL, -1);
-       g_return_val_if_fail(msginfo->folder != NULL, -1);
-
-       if (folder == msginfo->folder->folder)
-               return imap_do_copy(folder, dest, msginfo, TRUE);
-
-       srcfile = procmsg_get_message_file(msginfo);
-       if (!srcfile) return -1;
-
-       ret = imap_add_msg(folder, dest, srcfile, FALSE);
-       g_free(srcfile);
-
-       if (ret != -1) {
-               if(folder_item_remove_msg(msginfo->folder, msginfo->msgnum)) {
-                       ret = -1;
-               }
-       }
-               
-       return ret;
-}
-
-gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest, 
-                             GSList *msglist)
-{
-       MsgInfo *msginfo;
-       GSList *cur;
-       gint ret = 0;
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
-
-       msginfo = (MsgInfo *)msglist->data;
-       if (folder == msginfo->folder->folder)
-               return imap_do_copy_msgs_with_dest(folder, dest, msglist, TRUE);
-
-       for (cur = msglist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               ret = imap_move_msg(folder, dest, msginfo);
-               if (ret == -1) break;
-       }
-
-       return ret;
-}
-
 gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 {
        gchar *srcfile;
@@ -921,76 +873,57 @@ gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        return ret;
 }
 
-gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest, 
-                             GSList *msglist)
-{
-       MsgInfo *msginfo;
-       GSList *cur;
-       gint ret = 0;
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(dest != NULL, -1);
-       g_return_val_if_fail(msglist != NULL, -1);
-
-       msginfo = (MsgInfo *)msglist->data;
-       if (folder == msginfo->folder->folder)
-               return imap_do_copy_msgs_with_dest
-                       (folder, dest, msglist, FALSE);
-
-       for (cur = msglist; cur != NULL; cur = cur->next) {
-               msginfo = (MsgInfo *)cur->data;
-               ret = imap_copy_msg(folder, dest, msginfo);
-               if (ret == -1) break;
-       }
-
-       return ret;
-}
-
 gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
 {
-       gint exists, recent, unseen;
-       guint32 uid_validity;
        gint ok;
        IMAPSession *session;
-
+       gchar *dir;
+       MsgNumberList numlist;
+       
        g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->type == F_IMAP, -1);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
        g_return_val_if_fail(item != NULL, -1);
 
        session = imap_session_get(folder);
        if (!session) return -1;
 
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
-                        &exists, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
+                        NULL, NULL, NULL, NULL);
        if (ok != IMAP_SUCCESS)
                return ok;
 
+       numlist.next = NULL;
+       numlist.data = GINT_TO_POINTER(uid);
+       
        ok = imap_set_message_flags
                (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
-                (guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
-       statusbar_pop_all();
+               &numlist, IMAP_FLAG_DELETED, TRUE);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't set deleted flags: %d\n"), uid);
                return ok;
        }
 
-       ok = imap_cmd_expunge(SESSION(session)->sock);
-       statusbar_pop_all();
+       ok = imap_cmd_expunge(session);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
        }
 
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, uid, uid);
+       g_free(dir);
+
        return IMAP_SUCCESS;
 }
 
 gint imap_remove_all_msg(Folder *folder, FolderItem *item)
 {
-       gint exists, recent, unseen;
-       guint32 uid_validity;
+        gint exists, recent, unseen;
+        guint32 uid_validity;
        gint ok;
        IMAPSession *session;
+       gchar *dir;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
@@ -1000,28 +933,30 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
 
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
                         &exists, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
        if (ok != IMAP_SUCCESS)
                return ok;
        if (exists == 0)
                return IMAP_SUCCESS;
 
-       imap_cmd_gen_send(SESSION(session)->sock,
-                         "STORE 1:%d +FLAGS (\\Deleted)", exists);
-       ok = imap_cmd_ok(SESSION(session)->sock, NULL);
-       statusbar_pop_all();
+       imap_gen_send(session,
+                     "STORE 1:%d +FLAGS (\\Deleted)", exists);
+       ok = imap_cmd_ok(session, NULL);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't set deleted flags: 1:%d\n"), exists);
                return ok;
        }
 
-       ok = imap_cmd_expunge(SESSION(session)->sock);
-       statusbar_pop_all();
+       ok = imap_cmd_expunge(session);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
        }
 
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
+       g_free(dir);
+
        return IMAP_SUCCESS;
 }
 
@@ -1046,12 +981,11 @@ gint imap_scan_folder(Folder *folder, FolderItem *item)
 
        ok = imap_status(session, IMAP_FOLDER(folder), item->path,
                         &messages, &recent, &uid_next, &uid_validity, &unseen);
-       statusbar_pop_all();
        if (ok != IMAP_SUCCESS) return -1;
 
-       item->new = unseen > 0 ? recent : 0;
-       item->unread = unseen;
-       item->total = messages;
+       item->new_msgs = unseen > 0 ? recent : 0;
+       item->unread_msgs = unseen;
+       item->total_msgs = messages;
        item->last_num = (messages > 0 && uid_next > 0) ? uid_next - 1 : 0;
        /* item->mtime = uid_validity; */
 
@@ -1068,7 +1002,15 @@ void imap_scan_tree(Folder *folder)
        g_return_if_fail(folder->account != NULL);
 
        session = imap_session_get(folder);
-       if (!session) return;
+       if (!session) {
+               if (!folder->node) {
+                       folder_tree_destroy(folder);
+                       item = folder_item_new(folder, folder->name, NULL);
+                       item->folder = folder;
+                       folder->node = g_node_new(item);
+               }
+               return;
+       }
 
        if (folder->account->imap_dir && *folder->account->imap_dir) {
                Xstrdup_a(root_folder, folder->account->imap_dir, return);
@@ -1124,11 +1066,11 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
                  {g_free(real_path); return IMAP_ERROR;});
        QUOTE_IF_REQUIRED(wildcard_path, wildcard_path);
 
-       imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" %s",
-                         wildcard_path);
+       imap_gen_send(session, "LIST \"\" %s",
+                     wildcard_path);
 
        strtailchomp(real_path, separator);
-       item_list = imap_parse_list(folder, session, real_path);
+       item_list = imap_parse_list(folder, session, real_path, NULL);
        g_free(real_path);
 
        for (cur = item_list; cur != NULL; cur = cur->next) {
@@ -1170,11 +1112,12 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
        return IMAP_SUCCESS;
 }
 
-static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar *real_path)
+static GSList *imap_parse_list(Folder *folder, IMAPSession *session,
+                              const gchar *real_path, gchar *separator)
 {
        gchar buf[IMAPBUFSIZE];
        gchar flags[256];
-       gchar separator[16];
+       gchar separator_str[16];
        gchar *p;
        gchar *name;
        gchar *loc_name, *loc_path;
@@ -1189,7 +1132,7 @@ static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar
 
        for (;;) {
                if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) <= 0) {
-                       log_warning(_("error occured while getting LIST.\n"));
+                       log_warning(_("error occurred while getting LIST.\n"));
                        break;
                }
                strretchomp(buf);
@@ -1210,11 +1153,13 @@ static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar
                if (!p) continue;
                while (*p == ' ') p++;
 
-               p = strchr_cpy(p, ' ', separator, sizeof(separator));
+               p = strchr_cpy(p, ' ', separator_str, sizeof(separator_str));
                if (!p) continue;
-               extract_quote(separator, '"');
-               if (!strcmp(separator, "NIL"))
-                       separator[0] = '\0';
+               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++;
@@ -1223,12 +1168,12 @@ static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar
                                            buf, sizeof(buf), str);
                else
                        strncpy2(buf, p, sizeof(buf));
-               strtailchomp(buf, separator[0]);
+               strtailchomp(buf, separator_str[0]);
                if (buf[0] == '\0') continue;
                if (!strcmp(buf, real_path)) continue;
 
-               if (separator[0] != '\0')
-                       subst_char(buf, separator[0], '/');
+               if (separator_str[0] != '\0')
+                       subst_char(buf, separator_str[0], '/');
                name = g_basename(buf);
                if (name[0] == '.') continue;
 
@@ -1249,7 +1194,6 @@ static GSList *imap_parse_list(Folder *folder, IMAPSession *session, const gchar
        }
 
        g_string_free(str, TRUE);
-       statusbar_pop_all();
 
        return item_list;
 }
@@ -1307,12 +1251,12 @@ static FolderItem *imap_create_special_folder(Folder *folder,
        new_item = imap_create_folder(folder, item, name);
 
        if (!new_item) {
-               g_warning(_("Can't create '%s'\n"), name);
+               g_warning("Can't create '%s'\n", name);
                if (!folder->inbox) return NULL;
 
                new_item = imap_create_folder(folder, folder->inbox, name);
                if (!new_item)
-                       g_warning(_("Can't create '%s' under INBOX\n"), name);
+                       g_warning("Can't create '%s' under INBOX\n", name);
                else
                        new_item->stype = stype;
        } else
@@ -1371,13 +1315,13 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
                gboolean exist = FALSE;
 
                argbuf = g_ptr_array_new();
-               ok = imap_cmd_list(SESSION(session)->sock, NULL, imap_path,
+               ok = imap_cmd_list(session, NULL, imap_path,
                                   argbuf);
-               statusbar_pop_all();
                if (ok != IMAP_SUCCESS) {
                        log_warning(_("can't create mailbox: LIST failed\n"));
                        g_free(imap_path);
                        g_free(dirpath);
+                       ptr_array_free_strings(argbuf);
                        g_ptr_array_free(argbuf, TRUE);
                        return NULL;
                }
@@ -1390,11 +1334,11 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
                                break;
                        }
                }
+               ptr_array_free_strings(argbuf);
                g_ptr_array_free(argbuf, TRUE);
 
                if (!exist) {
-                       ok = imap_cmd_create(SESSION(session)->sock, imap_path);
-                       statusbar_pop_all();
+                       ok = imap_cmd_create(session, imap_path);
                        if (ok != IMAP_SUCCESS) {
                                log_warning(_("can't create mailbox\n"));
                                g_free(imap_path);
@@ -1445,9 +1389,8 @@ gint imap_rename_folder(Folder *folder, FolderItem *item, const gchar *name)
 
        g_free(session->mbox);
        session->mbox = NULL;
-       ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
+       ok = imap_cmd_examine(session, "INBOX",
                              &exists, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
        if (ok != IMAP_SUCCESS) {
                g_free(real_oldpath);
                return -1;
@@ -1464,8 +1407,7 @@ gint imap_rename_folder(Folder *folder, FolderItem *item, const gchar *name)
        real_newpath = imap_locale_to_modified_utf7(newpath);
        imap_path_separator_subst(real_newpath, separator);
 
-       ok = imap_cmd_rename(SESSION(session)->sock, real_oldpath, real_newpath);
-       statusbar_pop_all();
+       ok = imap_cmd_rename(session, real_oldpath, real_newpath);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't rename mailbox: %s to %s\n"),
                            real_oldpath, real_newpath);
@@ -1522,16 +1464,14 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
 
        path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
 
-       ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
+       ok = imap_cmd_examine(session, "INBOX",
                              &exists, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
        if (ok != IMAP_SUCCESS) {
                g_free(path);
                return -1;
        }
 
-       ok = imap_cmd_delete(SESSION(session)->sock, path);
-       statusbar_pop_all();
+       ok = imap_cmd_delete(session, path);
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't delete mailbox\n"));
                g_free(path);
@@ -1550,7 +1490,7 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
 
 static GSList *imap_get_uncached_messages(IMAPSession *session,
                                          FolderItem *item,
-                                         guint32 first_uid, guint32 last_uid)
+                                         MsgNumberList *numlist)
 {
        gchar *tmp;
        GSList *newlist = NULL;
@@ -1561,10 +1501,9 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
        g_return_val_if_fail(session != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(item->folder != NULL, NULL);
-       g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
-       g_return_val_if_fail(first_uid <= last_uid, NULL);
+       g_return_val_if_fail(FOLDER_CLASS(item->folder) == &imap_class, NULL);
 
-       if (imap_cmd_envelope(SESSION(session)->sock, first_uid, last_uid)
+       if (imap_cmd_envelope(session, numberlist_to_imapset(numlist))
            != IMAP_SUCCESS) {
                log_warning(_("can't get envelope\n"));
                return NULL;
@@ -1620,60 +1559,25 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
        return newlist;
 }
 
-static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
-                                          guint32 first_uid, guint32 last_uid)
-{
-       GSList *cur, *next;
-       MsgInfo *msginfo;
-       gchar *dir;
-
-       g_return_val_if_fail(item != NULL, mlist);
-       g_return_val_if_fail(item->folder != NULL, mlist);
-       g_return_val_if_fail(item->folder->type == F_IMAP, mlist);
-
-       debug_print(_("Deleting cached messages %u - %u ... "),
-                   first_uid, last_uid);
-
-       dir = folder_item_get_path(item);
-       remove_numbered_files(dir, first_uid, last_uid);
-       g_free(dir);
-
-       for (cur = mlist; cur != NULL; ) {
-               next = cur->next;
-
-               msginfo = (MsgInfo *)cur->data;
-               if (msginfo != NULL && first_uid <= msginfo->msgnum &&
-                   msginfo->msgnum <= last_uid) {
-                       procmsg_msginfo_free(msginfo);
-                       mlist = g_slist_remove(mlist, msginfo);
-               }
-
-               cur = next;
-       }
-
-       debug_print(_("done.\n"));
-
-       return mlist;
-}
-
 static void imap_delete_all_cached_messages(FolderItem *item)
 {
        gchar *dir;
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
-       g_return_if_fail(item->folder->type == F_IMAP);
+       g_return_if_fail(FOLDER_CLASS(item->folder) == &imap_class);
 
-       debug_print(_("Deleting all cached messages... "));
+       debug_print("Deleting all cached messages...\n");
 
        dir = folder_item_get_path(item);
-       remove_all_numbered_files(dir);
+       if (is_dir_exist(dir))
+               remove_all_numbered_files(dir);
        g_free(dir);
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
 }
 
-#if USE_SSL
+#if USE_OPENSSL
 static SockInfo *imap_open_tunnel(const gchar *server,
                           const gchar *tunnelcmd,
                           SSLType ssl_type)
@@ -1684,11 +1588,12 @@ static SockInfo *imap_open_tunnel(const gchar *server,
 {
        SockInfo *sock;
 
-       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL) {
                log_warning(_("Can't establish IMAP4 session with: %s\n"),
                            server);
                return NULL;
-#if USE_SSL
+       }
+#if USE_OPENSSL
        return imap_init_sock(sock, ssl_type);
 #else
        return imap_init_sock(sock);
@@ -1696,7 +1601,7 @@ static SockInfo *imap_open_tunnel(const gchar *server,
 }
 
 
-#if USE_SSL
+#if USE_OPENSSL
 static SockInfo *imap_open(const gchar *server, gushort port,
                           SSLType ssl_type)
 #else
@@ -1711,48 +1616,23 @@ static SockInfo *imap_open(const gchar *server, gushort port)
                return NULL;
        }
 
-#if USE_SSL
+#if USE_OPENSSL
        if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
                log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
                            server, port);
                sock_close(sock);
                return NULL;
        }
-       return imap_init_sock(sock, ssl_type);
-#else
-       return imap_init_sock(sock);
 #endif
+       return sock;
 }
 
-#if USE_SSL
+#if USE_OPENSSL
 static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
 #else
 static SockInfo *imap_init_sock(SockInfo *sock)
 #endif
 {
-       imap_cmd_count = 0;
-#if USE_SSL
-       if (ssl_type == SSL_STARTTLS) {
-               gint ok;
-
-               ok = imap_cmd_starttls(sock);
-               if (ok != IMAP_SUCCESS) {
-                       log_warning(_("Can't start TLS session.\n"));
-                       sock_close(sock);
-                       return NULL;
-               }
-               if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
-                       sock_close(sock);
-                       return NULL;
-               }
-       }
-#endif
-
-       if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
-               log_warning(_("Can't establish IMAP4 session.\n"));
-               sock_close(sock);
-               return NULL;
-       }
 
        return sock;
 }
@@ -1821,13 +1701,23 @@ static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
            folder->ns_shared   != NULL)
                return;
 
-       if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
+       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])
@@ -1835,7 +1725,33 @@ static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
        if (str_array[0] && str_array[1] && str_array[2])
                folder->ns_shared = imap_parse_namespace_str(str_array[2]);
        g_strfreev(str_array);
-       return;
+       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(NULL, 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,
@@ -1943,6 +1859,7 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
 
                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;
@@ -1985,6 +1902,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
 
        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;
@@ -2000,7 +1918,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
                g_free(nextline);
        } while (block_len < len);
 
-       debug_print("IMAP4< [contents of RFC822.HEADER]\n");
+       debug_print("IMAP4< [contents of BODY.PEEK[HEADER.FIELDS (...)]]\n");
 
        *headers = g_strndup(cur_pos, len);
        cur_pos += len;
@@ -2109,10 +2027,24 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
                } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
                        cur_pos += 12;
                        size = strtol(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+               } else if (!strncmp(cur_pos, "BODY[HEADER.FIELDS ", 19)) {
                        gchar *headers;
 
-                       cur_pos += 14;
+                       cur_pos += 19;
+                       if (*cur_pos != '(') {
+                               g_warning("*cur_pos != '('\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
+                       cur_pos++;
+                       PARSE_ONE_ELEMENT(')');
+                       if (*cur_pos != ']') {
+                               g_warning("*cur_pos != ']'\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
+                       cur_pos++;
+
                        cur_pos = imap_get_header(sock, cur_pos, &headers,
                                                  line_str);
                        msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
@@ -2133,75 +2065,8 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
        return msginfo;
 }
 
-gint imap_msg_set_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
-{
-       Folder *folder;
-       IMAPSession *session;
-       IMAPFlags iflags = 0;
-       gint ok = IMAP_SUCCESS;
-
-       g_return_val_if_fail(msginfo != NULL, -1);
-       g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
-       g_return_val_if_fail(msginfo->folder != NULL, -1);
-       g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
-
-       folder = msginfo->folder->folder;
-       g_return_val_if_fail(folder->type == F_IMAP, -1);
-
-       session = imap_session_get(folder);
-       if (!session) return -1;
-
-       if (flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
-       if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
-       if (iflags) {
-               ok = imap_set_message_flags(session, msginfo->msgnum,
-                                           msginfo->msgnum, iflags, TRUE);
-               if (ok != IMAP_SUCCESS) return ok;
-       }
-
-       if (flags & MSG_UNREAD)
-               ok = imap_set_message_flags(session, msginfo->msgnum,
-                                           msginfo->msgnum, IMAP_FLAG_SEEN,
-                                           FALSE);
-       return ok;
-}
-
-gint imap_msg_unset_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
-{
-       Folder *folder;
-       IMAPSession *session;
-       IMAPFlags iflags = 0;
-       gint ok = IMAP_SUCCESS;
-
-       g_return_val_if_fail(msginfo != NULL, -1);
-       g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
-       g_return_val_if_fail(msginfo->folder != NULL, -1);
-       g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
-
-       folder = msginfo->folder->folder;
-       g_return_val_if_fail(folder->type == F_IMAP, -1);
-
-       session = imap_session_get(folder);
-       if (!session) return -1;
-
-       if (flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
-       if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
-       if (iflags) {
-               ok = imap_set_message_flags(session, msginfo->msgnum,
-                                           msginfo->msgnum, iflags, FALSE);
-               if (ok != IMAP_SUCCESS) return ok;
-       }
-
-       if (flags & MSG_UNREAD)
-               ok = imap_set_message_flags(session, msginfo->msgnum,
-                                           msginfo->msgnum, IMAP_FLAG_SEEN,
-                                           TRUE);
-       return ok;
-}
-
 static gint imap_set_message_flags(IMAPSession *session,
-                                  guint32 first_uid,
-                                  guint32 last_uid,
+                                  MsgNumberList *numlist,
                                   IMAPFlags flags,
                                   gboolean is_set)
 {
@@ -2221,7 +2086,7 @@ static gint imap_set_message_flags(IMAPSession *session,
 
        g_string_append_c(buf, ')');
 
-       ok = imap_cmd_store(SESSION(session)->sock, first_uid, last_uid,
+       ok = imap_cmd_store(session, numberlist_to_imapset(numlist),
                            buf->str);
        g_string_free(buf, TRUE);
 
@@ -2250,7 +2115,7 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
        session->mbox = NULL;
 
        real_path = imap_get_real_path(folder, path);
-       ok = imap_cmd_select(SESSION(session)->sock, real_path,
+       ok = imap_cmd_select(session, real_path,
                             exists, recent, unseen, uid_validity);
        if (ok != IMAP_SUCCESS)
                log_warning(_("can't select folder: %s\n"), real_path);
@@ -2258,44 +2123,11 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
                session->mbox = g_strdup(path);
        g_free(real_path);
 
-       g_free(folder->selected_folder);
-       folder->selected_folder = g_strdup(path);
-       
        return ok;
 }
 
 #define THROW(err) { ok = err; goto catch; }
 
-static gint imap_get_uid(IMAPSession *session, gint msgnum, guint32 *uid)
-{
-       gint ok;
-       GPtrArray *argbuf;
-       gchar *str;
-       gint num;
-
-       *uid = 0;
-       argbuf = g_ptr_array_new();
-
-       imap_cmd_gen_send(SESSION(session)->sock, "FETCH %d (UID)", msgnum);
-       if ((ok = imap_cmd_ok(SESSION(session)->sock, argbuf)) != IMAP_SUCCESS)
-               THROW(ok);
-
-       str = search_array_contain_str(argbuf, "FETCH");
-       if (!str) THROW(IMAP_ERROR);
-
-       if (sscanf(str, "%d FETCH (UID %d)", &num, uid) != 2 ||
-           num != msgnum) {
-               g_warning("imap_get_uid(): invalid FETCH line.\n");
-               THROW(IMAP_ERROR);
-       }
-
-catch:
-       ptr_array_free_strings(argbuf);
-       g_ptr_array_free(argbuf, TRUE);
-
-       return ok;
-}
-
 static gint imap_status(IMAPSession *session, IMAPFolder *folder,
                        const gchar *path,
                        gint *messages, gint *recent,
@@ -2314,11 +2146,11 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder,
 
        real_path = imap_get_real_path(folder, path);
        QUOTE_IF_REQUIRED(real_path_, real_path);
-       imap_cmd_gen_send(SESSION(session)->sock, "STATUS %s "
-                         "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)",
-                         real_path_);
+       imap_gen_send(session, "STATUS %s "
+                     "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)",
+                     real_path_);
 
-       ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+       ok = imap_cmd_ok(session, argbuf);
        if (ok != IMAP_SUCCESS) THROW(ok);
 
        str = search_array_str(argbuf, "STATUS");
@@ -2362,61 +2194,135 @@ catch:
 #undef THROW
 
 
-/* low-level IMAP4rev1 commands */
+/* low-level IMAP4rev1 commands */
+
+static gint imap_cmd_login(IMAPSession *session,
+                          const gchar *user, const gchar *pass)
+{
+       gchar *user_, *pass_;
+       gint ok;
+
+       QUOTE_IF_REQUIRED(user_, user);
+       QUOTE_IF_REQUIRED(pass_, pass);
+       imap_gen_send(session, "LOGIN %s %s", user_, pass_);
+
+       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);
+}
+
+/* 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);
+
+       return 0;
+}
 
-static gint imap_cmd_login(SockInfo *sock,
-                          const gchar *user, const gchar *pass)
+static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
 {
-       gchar *user_, *pass_;
-       gint ok;
-
-       QUOTE_IF_REQUIRED(user_, user);
-       QUOTE_IF_REQUIRED(pass_, pass);
-       imap_cmd_gen_send(sock, "LOGIN %s %s", user_, pass_);
-
-       ok = imap_cmd_ok(sock, NULL);
-       if (ok != IMAP_SUCCESS)
-               log_warning(_("IMAP4 login failed.\n"));
+       gchar **p;
+       
+       for (p = session->capability; *p != NULL; ++p)
+               if (g_strcasecmp(*p, cap) == 0)
+                       return TRUE;
 
-       return ok;
+       return FALSE;
 }
 
-static gint imap_cmd_logout(SockInfo *sock)
+void imap_free_capabilities(IMAPSession *session)
 {
-       imap_cmd_gen_send(sock, "LOGOUT");
-       return imap_cmd_ok(sock, NULL);
+       g_strfreev(session->capability);
+       session->capability = NULL;
 }
 
-/* Send a NOOP, and examine the server's response to see whether this
- * connection is pre-authenticated or not. */
-static gint imap_greeting(SockInfo *sock, gboolean *is_preauth)
+static const IMAPSet numberlist_to_imapset(MsgNumberList *list)
 {
-       GPtrArray *argbuf;
-       gint r;
+       static GString *imapset = NULL;
+       MsgNumberList *numlist, *elem;
+       guint first, last, next;
 
-       imap_cmd_gen_send(sock, "NOOP");
-       argbuf = g_ptr_array_new(); /* will hold messages sent back */
-       r = imap_cmd_ok(sock, argbuf);
-       *is_preauth = search_array_starts(argbuf, "PREAUTH") != NULL;
-       
-       return r;
+       if (imapset == NULL)
+               imapset = g_string_sized_new(256);
+       else
+               g_string_truncate(imapset, 0);
+
+       numlist = g_slist_copy(list);
+       numlist = g_slist_sort(numlist, g_int_compare);
+
+       first = GPOINTER_TO_INT(numlist->data);
+       last = first;
+       for(elem = g_slist_next(numlist); elem != NULL; elem = g_slist_next(elem)) {
+               next = GPOINTER_TO_INT(elem->data);
+               if(next != (last + 1)) {
+                       if (imapset->len > 0)
+                               g_string_append(imapset, ",");
+                       if (first == last)
+                               g_string_sprintfa(imapset, "%d", first);
+                       else
+                               g_string_sprintfa(imapset, "%d:%d", first, last);
+
+                       first = next;
+               }
+               last = next;
+       }
+       if (imapset->len > 0)
+               g_string_append(imapset, ",");
+       if (first == last)
+               g_string_sprintfa(imapset, "%d", first);
+       else
+               g_string_sprintfa(imapset, "%d:%d", first, last);
+
+       g_slist_free(numlist);
+
+       return imapset->str;
 }
 
-static gint imap_cmd_noop(SockInfo *sock)
+static gint imap_cmd_noop(IMAPSession *session)
 {
-       imap_cmd_gen_send(sock, "NOOP");
-       return imap_cmd_ok(sock, NULL);
+       imap_gen_send(session, "NOOP");
+       return imap_cmd_ok(session, NULL);
 }
 
-static gint imap_cmd_starttls(SockInfo *sock)
+static gint imap_cmd_starttls(IMAPSession *session)
 {
-       imap_cmd_gen_send(sock, "STARTTLS");
-       return imap_cmd_ok(sock, NULL);
+       imap_gen_send(session, "STARTTLS");
+       return imap_cmd_ok(session, NULL);
 }
 
 #define THROW(err) { ok = err; goto catch; }
 
-static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
+static gint imap_cmd_namespace(IMAPSession *session, gchar **ns_str)
 {
        gint ok;
        GPtrArray *argbuf;
@@ -2424,8 +2330,8 @@ static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
 
        argbuf = g_ptr_array_new();
 
-       imap_cmd_gen_send(sock, "NAMESPACE");
-       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW(ok);
+       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);
@@ -2441,7 +2347,7 @@ catch:
 
 #undef THROW
 
-static gint imap_cmd_list(SockInfo *sock, const gchar *ref,
+static gint imap_cmd_list(IMAPSession *session, const gchar *ref,
                          const gchar *mailbox, GPtrArray *argbuf)
 {
        gchar *ref_, *mailbox_;
@@ -2451,14 +2357,14 @@ static gint imap_cmd_list(SockInfo *sock, const gchar *ref,
 
        QUOTE_IF_REQUIRED(ref_, ref);
        QUOTE_IF_REQUIRED(mailbox_, mailbox);
-       imap_cmd_gen_send(sock, "LIST %s %s", ref_, mailbox_);
+       imap_gen_send(session, "LIST %s %s", ref_, mailbox_);
 
-       return imap_cmd_ok(sock, argbuf);
+       return imap_cmd_ok(session, argbuf);
 }
 
 #define THROW goto catch
 
-static gint imap_cmd_do_select(SockInfo *sock, const gchar *folder,
+static gint imap_cmd_do_select(IMAPSession *session, const gchar *folder,
                               gboolean examine,
                               gint *exists, gint *recent, gint *unseen,
                               guint32 *uid_validity)
@@ -2478,9 +2384,9 @@ static gint imap_cmd_do_select(SockInfo *sock, const gchar *folder,
                select_cmd = "SELECT";
 
        QUOTE_IF_REQUIRED(folder_, folder);
-       imap_cmd_gen_send(sock, "%s %s", select_cmd, folder_);
+       imap_gen_send(session, "%s %s", select_cmd, folder_);
 
-       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW;
+       if ((ok = imap_cmd_ok(session, argbuf)) != IMAP_SUCCESS) THROW;
 
        resp_str = search_array_contain_str(argbuf, "EXISTS");
        if (resp_str) {
@@ -2522,72 +2428,113 @@ catch:
        return ok;
 }
 
-static gint imap_cmd_select(SockInfo *sock, const gchar *folder,
+static gint imap_cmd_select(IMAPSession *session, const gchar *folder,
                            gint *exists, gint *recent, gint *unseen,
                            guint32 *uid_validity)
 {
-       return imap_cmd_do_select(sock, folder, FALSE,
+       return imap_cmd_do_select(session, folder, FALSE,
                                  exists, recent, unseen, uid_validity);
 }
 
-static gint imap_cmd_examine(SockInfo *sock, const gchar *folder,
+static gint imap_cmd_examine(IMAPSession *session, const gchar *folder,
                             gint *exists, gint *recent, gint *unseen,
                             guint32 *uid_validity)
 {
-       return imap_cmd_do_select(sock, folder, TRUE,
+       return imap_cmd_do_select(session, folder, TRUE,
                                  exists, recent, unseen, uid_validity);
 }
 
 #undef THROW
 
-static gint imap_cmd_create(SockInfo *sock, const gchar *folder)
+static gint imap_cmd_create(IMAPSession *session, const gchar *folder)
 {
        gchar *folder_;
 
        QUOTE_IF_REQUIRED(folder_, folder);
-       imap_cmd_gen_send(sock, "CREATE %s", folder_);
+       imap_gen_send(session, "CREATE %s", folder_);
 
-       return imap_cmd_ok(sock, NULL);
+       return imap_cmd_ok(session, NULL);
 }
 
-static gint imap_cmd_rename(SockInfo *sock, const gchar *old_folder,
+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_cmd_gen_send(sock, "RENAME %s %s", old_folder_, new_folder_);
+       imap_gen_send(session, "RENAME %s %s", old_folder_, new_folder_);
 
-       return imap_cmd_ok(sock, NULL);
+       return imap_cmd_ok(session, NULL);
 }
 
-static gint imap_cmd_delete(SockInfo *sock, const gchar *folder)
+static gint imap_cmd_delete(IMAPSession *session, const gchar *folder)
 {
        gchar *folder_;
 
        QUOTE_IF_REQUIRED(folder_, folder);
-       imap_cmd_gen_send(sock, "DELETE %s", folder_);
+       imap_gen_send(session, "DELETE %s", folder_);
 
-       return imap_cmd_ok(sock, NULL);
+       return imap_cmd_ok(session, NULL);
 }
 
-static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
+static gint imap_cmd_search(IMAPSession *session, const gchar *criteria, GSList **list)
 {
        gint ok;
-       gchar buf[IMAPBUFSIZE];
+       gchar *uidlist;
+       GPtrArray *argbuf;
+
+       g_return_val_if_fail(criteria != NULL, IMAP_ERROR);
+       g_return_val_if_fail(list != NULL, IMAP_ERROR);
+
+       *list = NULL;
+       
+       argbuf = g_ptr_array_new();
+       imap_gen_send(session, "UID SEARCH %s", criteria);
+
+       ok = imap_cmd_ok(session, argbuf);
+       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, "%d", &msgnum) == 1)
+                               *list = g_slist_append(*list, GINT_TO_POINTER(msgnum));
+               }
+               g_strfreev(strlist);
+       }
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+
+       return IMAP_SUCCESS;
+}
+
+static gint imap_cmd_fetch(IMAPSession *session, guint32 uid, const gchar *filename)
+{
+       gint ok;
+       gchar *buf;
        gchar *cur_pos;
        gchar size_str[32];
        glong size_num;
 
        g_return_val_if_fail(filename != NULL, IMAP_ERROR);
 
-       imap_cmd_gen_send(sock, "UID FETCH %d BODY[]", uid);
+       imap_gen_send(session, "UID FETCH %d BODY.PEEK[]", uid);
 
-       while ((ok = imap_cmd_gen_recv(sock, buf, sizeof(buf)))
+       while ((ok = imap_gen_recv(session, &buf))
               == IMAP_SUCCESS) {
-               if (buf[0] != '*' || buf[1] != ' ')
+               if (buf[0] != '*' || buf[1] != ' ') {
+                       g_free(buf);
                        return IMAP_ERROR;
+               }
                if (strstr(buf, "FETCH") != NULL)
                        break;
        }
@@ -2595,35 +2542,54 @@ static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
                return ok;
 
        cur_pos = strchr(buf, '{');
-       g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);
+       if (cur_pos == NULL) {
+               g_free(buf);
+               return IMAP_ERROR;
+       }
        cur_pos = strchr_cpy(cur_pos + 1, '}', size_str, sizeof(size_str));
-       g_return_val_if_fail(cur_pos != NULL, IMAP_ERROR);
+       if (cur_pos == NULL) {
+               g_free(buf);
+               return IMAP_ERROR;
+       }
        size_num = atol(size_str);
+       g_return_val_if_fail(size_num > 0, IMAP_ERROR);
 
-       if (*cur_pos != '\0') return IMAP_ERROR;
+       if (*cur_pos != '\0') {
+               g_free(buf);
+               return IMAP_ERROR;
+       }
 
-       if (recv_bytes_write_to_file(sock, size_num, filename) != 0)
+       if (recv_bytes_write_to_file(SESSION(session)->sock, size_num, filename) != 0) {
+               g_free(buf);
                return IMAP_ERROR;
+       }
 
-       if (imap_cmd_gen_recv(sock, buf, sizeof(buf)) != IMAP_SUCCESS)
+       if (imap_gen_recv(session, &buf) != IMAP_SUCCESS) {
+               g_free(buf);
                return IMAP_ERROR;
+       }
 
-       if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')')
+       if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')') {
+               g_free(buf);
                return IMAP_ERROR;
+       }
 
-       ok = imap_cmd_ok(sock, NULL);
+       g_free(buf);
+       ok = imap_cmd_ok(session, NULL);
 
        return ok;
 }
 
-static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
-                           const gchar *file)
+static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
+                           const gchar *file, gint32 *new_uid)
 {
        gint ok;
-       gint size;
+       gint size, newuid;
        gchar *destfolder_;
-       gchar buf[BUFFSIZE];
+       gchar buf[BUFFSIZE], *imapbuf;
        FILE *fp;
+       GPtrArray *reply;
+       gchar *okmsginfo;
 
        g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
@@ -2633,22 +2599,23 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
                return -1;
        }
        QUOTE_IF_REQUIRED(destfolder_, destfolder);
-       imap_cmd_gen_send(sock, "APPEND %s (\\Seen) {%d}", destfolder_, size);
+       imap_gen_send(session, "APPEND %s (\\Seen) {%d}", destfolder_, size);
 
-       ok = imap_cmd_gen_recv(sock, buf, sizeof(buf));
-       if (ok != IMAP_SUCCESS || buf[0] != '+' || buf[1] != ' ') {
+       ok = imap_gen_recv(session, &imapbuf);
+       if (ok != IMAP_SUCCESS || imapbuf[0] != '+' || imapbuf[1] != ' ') {
                log_warning(_("can't append %s to %s\n"), file, destfolder_);
+               g_free(imapbuf);
                fclose(fp);
                return IMAP_ERROR;
        }
+       g_free(imapbuf);
 
        log_print("IMAP4> %s\n", _("(sending file...)"));
 
        while (fgets(buf, sizeof(buf), fp) != NULL) {
                strretchomp(buf);
-               if (sock_puts(sock, buf) < 0) {
+               if (sock_puts(SESSION(session)->sock, buf) < 0) {
                        fclose(fp);
-                       sock_close(sock);
                        return -1;
                }
        }
@@ -2656,67 +2623,127 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
        if (ferror(fp)) {
                FILE_OP_ERROR(file, "fgets");
                fclose(fp);
-               sock_close(sock);
                return -1;
        }
 
-       sock_puts(sock, "");
+       sock_puts(SESSION(session)->sock, "");
 
        fclose(fp);
-       return imap_cmd_ok(sock, NULL);
+
+       reply = g_ptr_array_new();
+
+       *new_uid = 0;
+       ok = imap_cmd_ok(session, reply);
+       if (ok != IMAP_SUCCESS)
+               log_warning(_("can't append message to %s\n"), destfolder_);
+       else if (
+           (new_uid != NULL) && 
+           (imap_has_capability(session, "UIDPLUS") && reply->len > 0) &&
+           ((okmsginfo = g_ptr_array_index(reply, reply->len - 1)) != NULL) &&
+           (sscanf(okmsginfo, "%*u OK [APPENDUID %*u %u]", &newuid) == 1)) {
+               *new_uid = newuid;
+       }
+
+       ptr_array_free_strings(reply);
+       g_ptr_array_free(reply, TRUE);
+       return ok;
 }
 
-static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
+
+static gint imap_cmd_copy(IMAPSession * session,
+                         gint32 msgnum,
+                         const gchar * destfolder, gint32 * new_uid)
 {
        gint ok;
+       gint32 olduid, newuid;
+       gchar *okmsginfo;
        gchar *destfolder_;
+       GPtrArray *reply;
 
        g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
+       g_return_val_if_fail(session != NULL, IMAP_ERROR);
+       g_return_val_if_fail(new_uid != NULL, IMAP_ERROR);
 
        QUOTE_IF_REQUIRED(destfolder_, destfolder);
-       imap_cmd_gen_send(sock, "UID COPY %d %s", uid, destfolder_);
+       imap_gen_send(session, "UID COPY %d %s", msgnum, destfolder_);
 
-       ok = imap_cmd_ok(sock, NULL);
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't copy %d to %s\n"), uid, destfolder_);
-               return -1;
-       }
+       reply = g_ptr_array_new();
 
+       *new_uid = 0;
+       ok = imap_cmd_ok(session, reply);
+       if (ok != IMAP_SUCCESS)
+               log_warning(_("can't copy %d to %s\n"), msgnum, destfolder_);
+       else if (imap_has_capability(session, "UIDPLUS") && reply->len > 0)
+               if ((okmsginfo = g_ptr_array_index(reply, reply->len - 1)) != NULL &&
+                   sscanf(okmsginfo, "%*u OK [COPYUID %*u %u %u]", &olduid, &newuid) == 2 &&
+                   olduid == msgnum)
+                       *new_uid = newuid;
+
+       ptr_array_free_strings(reply);
+       g_ptr_array_free(reply, TRUE);
        return ok;
 }
 
-gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
+gint imap_cmd_envelope(IMAPSession *session, IMAPSet set)
 {
-       imap_cmd_gen_send
-               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE RFC822.HEADER)",
-                first_uid, last_uid);
+       static GString *header_fields = NULL;
+
+       if (header_fields == NULL) {
+               const HeaderEntry *headers, *elem;
+
+               headers = procheader_get_headernames(FALSE);
+               header_fields = g_string_new("");
+
+               for (elem = headers; elem->name != NULL; ++elem) {
+                       gint namelen = strlen(elem->name);
+
+                       /* Header fields ending with space are not rfc822 headers */
+                       if (elem->name[namelen - 1] == ' ')
+                               continue;
+
+                       /* strip : at the of header field */
+                       if(elem->name[namelen - 1] == ':')
+                               namelen--;
+                       
+                       if (namelen <= 0)
+                               continue;
+
+                       g_string_sprintfa(header_fields, "%s%.*s",
+                                       header_fields->str[0] != '\0' ? " " : "",
+                                       namelen, elem->name);
+               }
+       }
+
+       imap_gen_send
+               (session, "UID FETCH %s (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
+                set, header_fields->str);
 
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_store(SockInfo *sock, guint32 first_uid, guint32 last_uid,
+static gint imap_cmd_store(IMAPSession *session, IMAPSet set,
                           gchar *sub_cmd)
 {
        gint ok;
 
-       imap_cmd_gen_send(sock, "UID STORE %d:%d %s",
-                         first_uid, last_uid, sub_cmd);
+       imap_gen_send(session, "UID STORE %s %s",
+                         set, sub_cmd);
 
-       if ((ok = imap_cmd_ok(sock, NULL)) != IMAP_SUCCESS) {
-               log_warning(_("error while imap command: STORE %d:%d %s\n"),
-                           first_uid, last_uid, sub_cmd);
+       if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS) {
+               log_warning(_("error while imap command: STORE %s %s\n"),
+                           set, sub_cmd);
                return ok;
        }
 
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_expunge(SockInfo *sock)
+static gint imap_cmd_expunge(IMAPSession *session)
 {
        gint ok;
 
-       imap_cmd_gen_send(sock, "EXPUNGE");
-       if ((ok = imap_cmd_ok(sock, NULL)) != IMAP_SUCCESS) {
+       imap_gen_send(session, "EXPUNGE");
+       if ((ok = imap_cmd_ok(session, NULL)) != IMAP_SUCCESS) {
                log_warning(_("error while imap command: EXPUNGE\n"));
                return ok;
        }
@@ -2724,14 +2751,14 @@ static gint imap_cmd_expunge(SockInfo *sock)
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
+static gint imap_cmd_ok(IMAPSession *session, GPtrArray *argbuf)
 {
        gint ok;
-       gchar buf[IMAPBUFSIZE];
+       gchar *buf;
        gint cmd_num;
        gchar cmd_status[IMAPBUFSIZE];
 
-       while ((ok = imap_cmd_gen_recv(sock, buf, sizeof(buf)))
+       while ((ok = imap_gen_recv(session, &buf))
               == IMAP_SUCCESS) {
                if (buf[0] == '*' && buf[1] == ' ') {
                        if (argbuf)
@@ -2739,21 +2766,26 @@ static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
                        continue;
                }
 
-               if (sscanf(buf, "%d %s", &cmd_num, cmd_status) < 2)
+               if (sscanf(buf, "%d %s", &cmd_num, cmd_status) < 2) {
+                       g_free(buf);
                        return IMAP_ERROR;
-               else if (cmd_num == imap_cmd_count &&
+               } else if (cmd_num == session->cmd_count &&
                         !strcmp(cmd_status, "OK")) {
                        if (argbuf)
                                g_ptr_array_add(argbuf, g_strdup(buf));
+                       g_free(buf);
                        return IMAP_SUCCESS;
-               } else
+               } else {
+                       g_free(buf);
                        return IMAP_ERROR;
+               }
        }
+       g_free(buf);
 
        return ok;
 }
 
-static void imap_cmd_gen_send(SockInfo *sock, const gchar *format, ...)
+static void imap_gen_send(IMAPSession *session, const gchar *format, ...)
 {
        gchar buf[IMAPBUFSIZE];
        gchar tmp[IMAPBUFSIZE];
@@ -2764,26 +2796,26 @@ static void imap_cmd_gen_send(SockInfo *sock, const gchar *format, ...)
        g_vsnprintf(tmp, sizeof(tmp), format, args);
        va_end(args);
 
-       imap_cmd_count++;
+       session->cmd_count++;
 
-       g_snprintf(buf, sizeof(buf), "%d %s\r\n", imap_cmd_count, tmp);
+       g_snprintf(buf, sizeof(buf), "%d %s\r\n", session->cmd_count, tmp);
        if (!strncasecmp(tmp, "LOGIN ", 6) && (p = strchr(tmp + 6, ' '))) {
                *p = '\0';
-               log_print("IMAP4> %d %s ********\n", imap_cmd_count, tmp);
+               log_print("IMAP4> %d %s ********\n", session->cmd_count, tmp);
        } else
-               log_print("IMAP4> %d %s\n", imap_cmd_count, tmp);
+               log_print("IMAP4> %d %s\n", session->cmd_count, tmp);
 
-       sock_write(sock, buf, strlen(buf));
+       sock_write_all(SESSION(session)->sock, buf, strlen(buf));
 }
 
-static gint imap_cmd_gen_recv(SockInfo *sock, gchar *buf, gint size)
+static gint imap_gen_recv(IMAPSession *session, gchar **buf)
 {
-       if (sock_gets(sock, buf, size) == -1)
+       if ((*buf = sock_getline(SESSION(session)->sock)) == NULL)
                return IMAP_SOCKET;
 
-       strretchomp(buf);
+       strretchomp(*buf);
 
-       log_print("IMAP4< %s\n", buf);
+       log_print("IMAP4< %s\n", *buf);
 
        return IMAP_SUCCESS;
 }
@@ -2830,23 +2862,7 @@ static gchar *get_quoted(const gchar *src, gchar ch, gchar *dest, gint len)
        return (gchar *)(*p == ch ? p + 1 : p);
 }
 
-static gchar *search_array_starts(GPtrArray *array, const gchar *str)
-{
-       gint i;
-       size_t len;
-
-       g_return_val_if_fail(str != NULL, NULL);
-       len = strlen(str);
-       for (i = 0; i < array->len; i++) {
-               gchar *tmp;
-               tmp = g_ptr_array_index(array, i);
-               if (strncmp(tmp, str, len) == 0)
-                       return tmp;
-       }
-       return NULL;
-}
-
-static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
+static gchar *search_array_contain_str(GPtrArray *array, const gchar *str)
 {
        gint i;
 
@@ -2861,7 +2877,7 @@ static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
        return NULL;
 }
 
-static gchar *search_array_str(GPtrArray *array, gchar *str)
+static gchar *search_array_str(GPtrArray *array, const gchar *str)
 {
        gint i;
        gint len;
@@ -2898,7 +2914,7 @@ static void imap_path_separator_subst(gchar *str, gchar separator)
 
 static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
 {
-#if !HAVE_LIBJCONV
+#if !HAVE_ICONV
        return g_strdup(mutf7_str);
 #else
        static iconv_t cd = (iconv_t)-1;
@@ -2916,7 +2932,7 @@ static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
        if (cd == (iconv_t)-1) {
                cd = iconv_open(conv_get_current_charset_str(), "UTF-7");
                if (cd == (iconv_t)-1) {
-                       g_warning(_("iconv cannot convert UTF-7 to %s\n"),
+                       g_warning("iconv cannot convert UTF-7 to %s\n",
                                  conv_get_current_charset_str());
                        iconv_ok = FALSE;
                        return g_strdup(mutf7_str);
@@ -2952,7 +2968,8 @@ static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
        to_len = strlen(mutf7_str) * 5;
        to_p = to_str = g_malloc(to_len + 1);
 
-       if (iconv(cd, &norm_utf7_p, &norm_utf7_len, &to_p, &to_len) == -1) {
+       if (iconv(cd, (ICONV_CONST gchar **)&norm_utf7_p, &norm_utf7_len,
+                 &to_p, &to_len) == -1) {
                g_warning(_("iconv cannot convert UTF-7 to %s\n"),
                          conv_get_current_charset_str());
                g_string_free(norm_utf7, TRUE);
@@ -2966,12 +2983,12 @@ static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
        *to_p = '\0';
 
        return to_str;
-#endif /* !HAVE_LIBJCONV */
+#endif /* !HAVE_ICONV */
 }
 
 static gchar *imap_locale_to_modified_utf7(const gchar *from)
 {
-#if !HAVE_LIBJCONV
+#if !HAVE_ICONV
        return g_strdup(from);
 #else
        static iconv_t cd = (iconv_t)-1;
@@ -2987,7 +3004,7 @@ static gchar *imap_locale_to_modified_utf7(const gchar *from)
        if (cd == (iconv_t)-1) {
                cd = iconv_open("UTF-7", conv_get_current_charset_str());
                if (cd == (iconv_t)-1) {
-                       g_warning(_("iconv cannot convert %s to UTF-7\n"),
+                       g_warning("iconv cannot convert %s to UTF-7\n",
                                  conv_get_current_charset_str());
                        iconv_ok = FALSE;
                        return g_strdup(from);
@@ -3018,9 +3035,9 @@ static gchar *imap_locale_to_modified_utf7(const gchar *from)
                             mblen++)
                                ;
                        from_len -= mblen;
-                       if (iconv(cd, &from_tmp, &mblen,
+                       if (iconv(cd, (ICONV_CONST gchar **)&from_tmp, &mblen,
                                  &norm_utf7_p, &norm_utf7_len) == -1) {
-                               g_warning(_("iconv cannot convert %s to UTF-7\n"),
+                               g_warning("iconv cannot convert %s to UTF-7\n",
                                          conv_get_current_charset_str());
                                return g_strdup(from);
                        }
@@ -3062,7 +3079,7 @@ static gchar *imap_locale_to_modified_utf7(const gchar *from)
        g_string_free(to_str, FALSE);
 
        return to;
-#endif
+#endif /* !HAVE_ICONV */
 }
 
 static gboolean imap_rename_folder_func(GNode *node, gpointer data)
@@ -3094,144 +3111,262 @@ static gboolean imap_rename_folder_func(GNode *node, gpointer data)
        return FALSE;
 }
 
-GSList *imap_get_num_list(Folder *folder, FolderItem *_item)
+static gint get_list_of_uids(Folder *folder, IMAPFolderItem *item, GSList **msgnum_list)
 {
-       IMAPFolderItem *item = (IMAPFolderItem *)_item;
+       gint ok, nummsgs = 0, lastuid_old;
        IMAPSession *session;
-       GSList *msgnum_list = NULL;
-       gint i, lastuid_old;
-       gint ok, exists = 0, recent = 0, unseen = 0;
-       guint32 uid_validity = 0;
-       GPtrArray *argbuf;
-       gchar *cmdbuf = NULL;
-       
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->item.path != NULL, NULL);
-       g_return_val_if_fail(folder->type == F_IMAP, NULL);
-       g_return_val_if_fail(folder->account != NULL, NULL);
+       GSList *uidlist, *elem;
+       gchar *cmd_buf;
 
        session = imap_session_get(folder);
-       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(session != NULL, -1);
 
        ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
-                        &exists, &recent, &unseen, &uid_validity);
+                        NULL, NULL, NULL, NULL);
        if (ok != IMAP_SUCCESS)
-               return NULL;
+               return -1;
 
-       if(item->item.mtime != uid_validity) {
-               item->lastuid = 0;
-               g_slist_free(item->uid_list);
-               item->uid_list = NULL;
-               
-               item->item.mtime = uid_validity;
-       }
-       
-       argbuf = g_ptr_array_new();
-       if(item->lastuid) {
-               cmdbuf = g_strdup_printf("UID FETCH %d:* (UID)", (item->lastuid + 1));
-       } else {
-               cmdbuf = g_strdup("FETCH 1:* (UID)");
+       cmd_buf = g_strdup_printf("UID %d:*", item->lastuid + 1);
+       ok = imap_cmd_search(session, cmd_buf, &uidlist);
+       g_free(cmd_buf);
+
+       if (ok == IMAP_SOCKET) {
+               session_destroy((Session *)session);
+               ((RemoteFolder *)folder)->session = NULL;
+               return -1;
        }
-       imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
-       g_free(cmdbuf);
-       ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+
        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(session, argbuf);
+               if (ok != IMAP_SUCCESS) {
+                       ptr_array_free_strings(argbuf);
+                       g_ptr_array_free(argbuf, TRUE);
+                       return -1;
+               }
+       
+               for(i = 0; i < argbuf->len; i++) {
+                       int ret, msgnum;
+       
+                       if((ret = sscanf(g_ptr_array_index(argbuf, i), 
+                                   "%*d FETCH (UID %d)", &msgnum)) == 1)
+                               uidlist = g_slist_prepend(uidlist, GINT_TO_POINTER(msgnum));
+               }
                ptr_array_free_strings(argbuf);
                g_ptr_array_free(argbuf, TRUE);
-               return NULL;
        }
 
        lastuid_old = item->lastuid;
-       msgnum_list = g_slist_copy(item->uid_list);
-       debug_print("Got %d uids from cache\n", g_slist_length(msgnum_list));
-       for(i = 0; i < argbuf->len; i++) {
-               int ret, msgidx, msgnum;
-       
-               if((ret = sscanf(g_ptr_array_index(argbuf, i), "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2) {
-                       if(msgnum > lastuid_old) {
-                               msgnum_list = g_slist_prepend(msgnum_list, GINT_TO_POINTER(msgnum));
-                               item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+       *msgnum_list = g_slist_copy(item->uid_list);
+       nummsgs = g_slist_length(*msgnum_list);
+       debug_print("Got %d uids from cache\n", g_slist_length(item->uid_list));
 
-                               if(msgnum > item->lastuid)
-                                       item->lastuid = msgnum;
-                       }
+       for (elem = uidlist; elem != NULL; elem = g_slist_next(elem)) {
+               guint msgnum;
+
+               msgnum = GPOINTER_TO_INT(elem->data);
+               if (msgnum > lastuid_old) {
+                       *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(msgnum));
+                       item->uid_list = g_slist_prepend(item->uid_list, GINT_TO_POINTER(msgnum));
+                       nummsgs++;
+
+                       if(msgnum > item->lastuid)
+                               item->lastuid = msgnum;
                }
        }
+       g_slist_free(uidlist);
 
-       return msgnum_list;
+       return nummsgs;
 }
 
-MsgInfo *imap_fetch_msginfo(Folder *_folder, FolderItem *item, gint num)
+gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
 {
-       IMAPFolder *folder = (IMAPFolder *)_folder;
-       gchar *tmp;
+       IMAPFolderItem *item = (IMAPFolderItem *)_item;
        IMAPSession *session;
-       GString *str;
-       MsgInfo *msginfo;
-       
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->folder != NULL, NULL);
-       g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
+       gint ok, nummsgs = 0, exists, recent, unseen, uid_val, uid_next;
+       GSList *uidlist;
+       gchar *dir;
 
-       session = imap_session_get(_folder);
-       g_return_val_if_fail(session != NULL, NULL);
+       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);
+       g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, -1);
+       g_return_val_if_fail(folder->account != NULL, -1);
 
-       if(strcmp(folder->selected_folder, item->path) != 0) {
-               gint ok, exists = 0, recent = 0, unseen = 0;
-               guint32 uid_validity = 0;
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, -1);
 
-               ok = imap_select(session, IMAP_FOLDER(folder), item->path,
-                                &exists, &recent, &unseen, &uid_validity);
-               if (ok != IMAP_SUCCESS)
-                       return NULL;
-       }
+       ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+                        &exists, &recent, &uid_next, &uid_val, &unseen);
+       if (ok != IMAP_SUCCESS)
+               return -1;
+
+       /* If old uid_next matches new uid_next we can be sure no message
+          was added to the folder */
+       if (uid_next == item->uid_next) {
+               nummsgs = g_slist_length(item->uid_list);
                
-       if (imap_cmd_envelope(SESSION(session)->sock, num, num)
-           != IMAP_SUCCESS) {
-               log_warning(_("can't get envelope\n"));
-               return NULL;
+               /* If number of messages is still the same we
+                   know our caches message numbers are still valid,
+                   otherwise if the number of messages has decrease
+                  we discard our cache to start a new scan to find
+                  out which numbers have been removed */
+               if (exists == nummsgs) {
+                       *msgnum_list = g_slist_copy(item->uid_list);
+                       return nummsgs;
+               } else if (exists < nummsgs) {
+                       debug_print("Freeing imap uid cache");
+                       item->lastuid = 0;
+                       g_slist_free(item->uid_list);
+                       item->uid_list = NULL;
+               }
        }
+       item->uid_next = uid_next;
 
-       str = g_string_new(NULL);
+       if (exists == 0) {
+               *msgnum_list = NULL;
+               return 0;
+       }
 
-       if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
-               log_warning(_("error occurred while getting envelope.\n"));
-               g_string_free(str, TRUE);
-               return NULL;
+       nummsgs = get_list_of_uids(folder, item, &uidlist);
+
+       if (nummsgs != exists) {
+               /* Cache contains more messages then folder, we have cached
+                   an old UID of a message that was removed and new messages
+                   have been added too, otherwise the uid_next check would
+                  not have failed */
+               debug_print("Freeing imap uid cache");
+               item->lastuid = 0;
+               g_slist_free(item->uid_list);
+               item->uid_list = NULL;
+
+               g_slist_free(*msgnum_list);
+
+               nummsgs = get_list_of_uids(folder, item, &uidlist);
        }
-       strretchomp(tmp);
-       log_print("IMAP4< %s\n", tmp);
-       g_string_assign(str, tmp);
-       g_free(tmp);
 
-       /* if the server did not return a envelope */
-       if (str->str[0] != '*') {
-               g_string_free(str, TRUE);
-               return NULL;
+       *msgnum_list = uidlist;
+
+       dir = folder_item_get_path((FolderItem *)item);
+       debug_print("removing old messages from %s\n", dir);
+       remove_numbered_files_not_in_list(dir, *msgnum_list);
+       g_free(dir);
+
+       return nummsgs;
+}
+
+static MsgInfo *imap_parse_msg(const gchar *file, FolderItem *item)
+{
+       MsgInfo *msginfo;
+       MsgFlags flags;
+
+       flags.perm_flags = MSG_NEW|MSG_UNREAD;
+       flags.tmp_flags = 0;
+
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(file != NULL, NULL);
+
+       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);
        }
 
-       msginfo = imap_parse_envelope(SESSION(session)->sock,
-                                     item, str);
+       msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
+       if (!msginfo) return NULL;
 
-       /* Read all data on the socket until the server is read for a new command */
-       tmp = NULL;
-       do {
-               g_free(tmp);
-               tmp = sock_getline(SESSION(session)->sock);
-       } while (!(tmp == NULL || tmp[0] != '*' || tmp[1] != ' '));
-       g_free(tmp);
+       msginfo->folder = item;
+
+       return msginfo;
+}
+
+GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+{
+       IMAPSession *session;
+       MsgInfoList *ret = NULL;
+       gint ok;
 
-       /* if message header could not be parsed */
-       if (!msginfo) {
-               log_warning(_("can't parse envelope: %s\n"), str->str);
+       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);
+
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        NULL, NULL, NULL, NULL);
+       if (ok != IMAP_SUCCESS)
                return NULL;
+
+       if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
+               ret = g_slist_concat(ret,
+                       imap_get_uncached_messages(
+                       session, item, msgnum_list));
+       } else {
+               MsgNumberList *sorted_list, *elem;
+               gint startnum, lastnum;
+
+               sorted_list = g_slist_sort(g_slist_copy(msgnum_list), g_int_compare);
+
+               startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
+
+               for (elem = sorted_list;; elem = g_slist_next(elem)) {
+                       guint num;
+
+                       if (elem)
+                               num = GPOINTER_TO_INT(elem->data);
+
+                       if (num > lastnum + 1 || elem == NULL) {
+                               int i;
+                               for (i = startnum; i <= lastnum; ++i) {
+                                       gchar *file;
+                       
+                                       file = imap_fetch_msg(folder, item, i);
+                                       if (file != NULL) {
+                                               MsgInfo *msginfo = imap_parse_msg(file, item);
+                                               if (msginfo != NULL) {
+                                                       msginfo->msgnum = i;
+                                                       ret = g_slist_append(ret, msginfo);
+                                               }
+                                               g_free(file);
+                                       }
+                               }
+
+                               if (elem == NULL)
+                                       break;
+
+                               startnum = num;
+                       }
+                       lastnum = num;
+               }
+
+               g_slist_free(sorted_list);
        }
 
-       g_string_free(str, TRUE);
+       return ret;
+}
 
-       msginfo->folder = item;
+MsgInfo *imap_get_msginfo(Folder *folder, FolderItem *item, gint uid)
+{
+       MsgInfo *msginfo = NULL;
+       MsgInfoList *msginfolist;
+       MsgNumberList numlist;
+
+       numlist.next = NULL;
+       numlist.data = GINT_TO_POINTER(uid);
+
+       msginfolist = imap_get_msginfos(folder, item, &numlist);
+       if (msginfolist != NULL) {
+               msginfo = msginfolist->data;
+               g_slist_free(msginfolist);
+       }
 
        return msginfo;
 }
@@ -3246,7 +3381,7 @@ gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
        g_return_val_if_fail(folder != NULL, FALSE);
        g_return_val_if_fail(item != NULL, FALSE);
        g_return_val_if_fail(item->item.folder != NULL, FALSE);
-       g_return_val_if_fail(item->item.folder->type == F_IMAP, FALSE);
+       g_return_val_if_fail(FOLDER_CLASS(item->item.folder) == &imap_class, FALSE);
 
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, FALSE);
@@ -3256,5 +3391,71 @@ gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
        if (ok != IMAP_SUCCESS)
                return FALSE;
 
-       return item->item.mtime == uid_validity;
+       if(item->item.mtime == uid_validity)
+               return TRUE;
+
+       debug_print("Freeing imap uid cache");
+       item->lastuid = 0;
+       g_slist_free(item->uid_list);
+       item->uid_list = NULL;
+               
+       item->item.mtime = uid_validity;
+
+       imap_delete_all_cached_messages((FolderItem *)item);
+
+       return FALSE;
+}
+
+void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPermFlags newflags)
+{
+       IMAPSession *session;
+       IMAPFlags flags_set = 0, flags_unset = 0;
+       gint ok = IMAP_SUCCESS;
+       MsgNumberList numlist;
+       
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->klass == &imap_class);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder == folder);
+       g_return_if_fail(msginfo != NULL);
+       g_return_if_fail(msginfo->folder == item);
+
+       session = imap_session_get(folder);
+       if (!session) return;
+
+       if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+           NULL, NULL, NULL, NULL)) != 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))
+               flags_unset |= IMAP_FLAG_FLAGGED;
+
+       if (!MSG_IS_UNREAD(msginfo->flags) &&  (newflags & MSG_UNREAD))
+               flags_unset |= IMAP_FLAG_SEEN;
+       if ( MSG_IS_UNREAD(msginfo->flags) && !(newflags & MSG_UNREAD))
+               flags_set |= IMAP_FLAG_SEEN;
+
+       if (!MSG_IS_REPLIED(msginfo->flags) &&  (newflags & MSG_REPLIED))
+               flags_set |= IMAP_FLAG_ANSWERED;
+       if ( MSG_IS_REPLIED(msginfo->flags) && !(newflags & MSG_REPLIED))
+               flags_set |= IMAP_FLAG_ANSWERED;
+
+       numlist.next = NULL;
+       numlist.data = GINT_TO_POINTER(msginfo->msgnum);
+       
+       if (flags_set) {
+               ok = imap_set_message_flags(session, &numlist, flags_set, TRUE);
+               if (ok != IMAP_SUCCESS) return;
+       }
+
+       if (flags_unset) {
+               ok = imap_set_message_flags(session, &numlist, flags_unset, FALSE);
+               if (ok != IMAP_SUCCESS) return;
+       }
+
+       msginfo->flags.perm_flags = newflags;
+
+       return;
 }