0.8.10claws34
[claws.git] / src / imap.c
index f9907f8e4fe879d89e294471262cedca6cc4185d..73f6505e138b10e741b5b063eba09b4a44523410 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-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
@@ -31,6 +31,9 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <time.h>
+#if HAVE_ICONV
+#  include <iconv.h>
+#endif
 
 #include "intl.h"
 #include "imap.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"
 
 #define IMAP4_PORT     143
-#if USE_SSL
+#if USE_OPENSSL
 #define IMAPS_PORT     993
 #endif
 
-#define QUOTE_IF_REQUIRED(out, str) \
-{ \
-       if (*str != '"' && strchr(str, ' ')) { \
-               gchar *__tmp; \
-               gint len; \
- \
-               len = strlen(str) + 3; \
-               Xalloca(__tmp, len, return IMAP_ERROR); \
-               g_snprintf(__tmp, len, "\"%s\"", str); \
-               out = __tmp; \
-       } else { \
-               Xstrdup_a(out, str, return IMAP_ERROR); \
-       } \
+#define QUOTE_IF_REQUIRED(out, str)                            \
+{                                                              \
+       if (*str != '"' && strpbrk(str, " \t(){}%*") != NULL) { \
+               gchar *__tmp;                                   \
+               gint len;                                       \
                                                              \
+               len = strlen(str) + 3;                          \
+               Xalloca(__tmp, len, return IMAP_ERROR);         \
+               g_snprintf(__tmp, len, "\"%s\"", str);          \
+               out = __tmp;                                    \
+       } else {                                                \
+               Xstrdup_a(out, str, return IMAP_ERROR);         \
+       }                                                       \
 }
 
+struct _IMAPFolderItem
+{
+       FolderItem item;
+
+       guint lastuid;
+       GSList *uid_list;
+};
+
 static GList *session_list = NULL;
 
 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 gchar *imap_query_password      (const gchar    *server,
-                                        const gchar    *user);
 
 static gint imap_scan_tree_recursive   (IMAPSession    *session,
-                                        FolderItem     *item,
-                                        IMAPNameSpace  *namespace);
-static GSList *imap_parse_list         (IMAPSession    *session,
-                                        const gchar    *path);
-static gint imap_create_trash          (Folder         *folder);
+                                        FolderItem     *item);
+static GSList *imap_parse_list         (Folder         *folder,
+                                        IMAPSession    *session,
+                                        const gchar    *real_path,
+                                        gchar          *separator);
+
+static void imap_create_missing_folders        (Folder                 *folder);
+static FolderItem *imap_create_special_folder
+                                       (Folder                 *folder,
+                                        SpecialFolderItemType   stype,
+                                        const gchar            *name);
 
 static gint imap_do_copy               (Folder         *folder,
                                         FolderItem     *dest,
                                         MsgInfo        *msginfo,
                                         gboolean        remove_source);
+#if 0
 static gint imap_do_copy_msgs_with_dest        (Folder         *folder,
                                         FolderItem     *dest, 
                                         GSList         *msglist,
                                         gboolean        remove_source);
+#endif
 
 static GSList *imap_get_uncached_messages      (IMAPSession    *session,
                                                 FolderItem     *item,
@@ -100,15 +125,28 @@ static GSList *imap_delete_cached_messages        (GSList         *mlist,
                                                 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,
-                                        gchar          *buf,
-                                        gboolean        use_ssl);
+                                        SSLType         ssl_type);
 #else
 static SockInfo *imap_open             (const gchar    *server,
-                                        gushort         port,
-                                        gchar          *buf);
+                                        gushort         port);
+#endif
+
+#if USE_OPENSSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+                                 const gchar *tunnelcmd,
+                                 SSLType ssl_type);
+#else
+static SockInfo *imap_open_tunnel(const gchar *server,
+                                 const gchar *tunnelcmd);
+#endif
+
+#if USE_OPENSSL
+static SockInfo *imap_init_sock(SockInfo *sock, SSLType         ssl_type);
+#else
+static SockInfo *imap_init_sock(SockInfo *sock);
 #endif
 
 static gint imap_set_message_flags     (IMAPSession    *session,
@@ -131,13 +169,18 @@ static gint imap_status                   (IMAPSession    *session,
                                         const gchar    *path,
                                         gint           *messages,
                                         gint           *recent,
-                                        gint           *unseen,
-                                        guint32        *uid_validity);
+                                        guint32        *uid_next,
+                                        guint32        *uid_validity,
+                                        gint           *unseen);
 
 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,
+                                                const gchar    *path);
 static gchar *imap_get_real_path               (IMAPFolder     *folder,
                                                 const gchar    *path);
 
@@ -146,19 +189,15 @@ static gchar *imap_parse_atom             (SockInfo       *sock,
                                         gchar          *dest,
                                         gint            dest_len,
                                         GString        *str);
-static gchar *imap_parse_one_address   (SockInfo       *sock,
-                                        gchar          *start,
-                                        gchar          *out_from_str,
-                                        gchar          *out_fromname_str,
-                                        GString        *str);
-static gchar *imap_parse_address       (SockInfo       *sock,
-                                        gchar          *start,
-                                        gchar         **out_from_str,
-                                        gchar         **out_fromname_str,
-                                        GString        *str);
 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 void imap_get_capability                (Session        *session);
+static gboolean imap_has_capability    (IMAPSession    *session,
+                                        const gchar    *cap);
 
 /* low-level IMAP4rev1 commands */
 static gint imap_cmd_login     (SockInfo       *sock,
@@ -166,6 +205,7 @@ static gint imap_cmd_login  (SockInfo       *sock,
                                 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,
                                 gchar         **ns_str);
 static gint imap_cmd_list      (SockInfo       *sock,
@@ -193,6 +233,9 @@ static gint imap_cmd_examine        (SockInfo       *sock,
                                 guint32        *uid_validity);
 static gint imap_cmd_create    (SockInfo       *sock,
                                 const gchar    *folder);
+static gint imap_cmd_rename    (SockInfo       *sock,
+                                const gchar    *oldfolder,
+                                const gchar    *newfolder);
 static gint imap_cmd_delete    (SockInfo       *sock,
                                 const gchar    *folder);
 static gint imap_cmd_envelope  (SockInfo       *sock,
@@ -208,9 +251,10 @@ static gint imap_cmd_fetch (SockInfo       *sock,
 static gint imap_cmd_append    (SockInfo       *sock,
                                 const gchar    *destfolder,
                                 const gchar    *file);
-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);
 static gint imap_cmd_store     (SockInfo       *sock,
                                 guint32         first_uid,
                                 guint32         last_uid,
@@ -222,8 +266,7 @@ static gint imap_cmd_ok             (SockInfo       *sock,
 static void imap_cmd_gen_send  (SockInfo       *sock,
                                 const gchar    *format, ...);
 static gint imap_cmd_gen_recv  (SockInfo       *sock,
-                                gchar          *buf,
-                                gint            size);
+                                gchar         **buf);
 
 /* misc utility functions */
 static gchar *strchr_cpy                       (const gchar    *src,
@@ -235,155 +278,325 @@ 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,
+                                                const gchar    *str);
 static void imap_path_separator_subst          (gchar          *str,
                                                 gchar           separator);
 
+static gchar *imap_modified_utf7_to_locale     (const gchar    *mutf7_str);
+static gchar *imap_locale_to_modified_utf7     (const gchar    *from);
+
+static gboolean imap_rename_folder_func                (GNode          *node,
+                                                gpointer        data);
+gint imap_get_num_list                         (Folder         *folder,
+                                                FolderItem     *item,
+                                                GSList        **list);
+GSList *imap_get_msginfos                      (Folder         *folder,
+                                                FolderItem     *item,
+                                                GSList         *msgnum_list);
+MsgInfo *imap_get_msginfo                      (Folder         *folder,
+                                                FolderItem     *item,
+                                                gint            num);
+gboolean imap_check_msgnum_validity            (Folder         *folder,
+                                                FolderItem     *item);
+
+Folder *imap_folder_new(const gchar *name, const gchar *path)
+{
+       Folder *folder;
+
+       folder = (Folder *)g_new0(IMAPFolder, 1);
+       imap_folder_init(folder, name, path);
+
+       return folder;
+}
+
+void imap_folder_destroy(Folder *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->item_new              = imap_folder_item_new;
+       folder->item_destroy          = imap_folder_item_destroy;
+       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_msgs           = imap_remove_msgs;
+       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->destroy               = imap_folder_destroy;
+       folder->check_msgnum_validity = imap_check_msgnum_validity;
+
+       folder->get_num_list          = imap_get_num_list;
+       folder->get_msginfo           = imap_get_msginfo;
+       folder->get_msginfos          = imap_get_msginfos;
+}
+
+static FolderItem *imap_folder_item_new(Folder *folder)
+{
+       IMAPFolderItem *item;
+       
+       item = g_new0(IMAPFolderItem, 1);
+       item->lastuid = 0;
+       item->uid_list = NULL;
+
+       return (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)
+{
+       IMAPFolderItem *item = (IMAPFolderItem *)node->data;
+       
+       item->lastuid = 0;
+       g_slist_free(item->uid_list);
+       item->uid_list = NULL;
+       
+       return FALSE;
+}
+
+static void imap_reset_uid_lists(Folder *folder)
+{
+       if(folder->node == NULL)
+               return;
+       
+       /* Destroy all uid lists and rest last uid */
+       g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, imap_reset_uid_lists_func, NULL); 
+}
+
 static IMAPSession *imap_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
+       Session *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->account != NULL, NULL);
 
-#if USE_SSL
+#if USE_OPENSSL
        port = folder->account->set_imapport ? folder->account->imapport
-               : folder->account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+               : folder->account->ssl_imap == SSL_TUNNEL
+               ? IMAPS_PORT : IMAP4_PORT;
 #else
        port = folder->account->set_imapport ? folder->account->imapport
                : IMAP4_PORT;
 #endif
 
-       if (!rfolder->session) {
-               rfolder->session =
-#if USE_SSL
-                       imap_session_new(folder->account->recv_server, port,
-                                        folder->account->userid,
-                                        folder->account->passwd,
-                                        folder->account->ssl_imap);
-#else
-                       imap_session_new(folder->account->recv_server, port,
-                                        folder->account->userid,
-                                        folder->account->passwd);
-#endif
-               if (rfolder->session) {
-                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
-                                            IMAP_FOLDER(folder));
-                       rfolder->session->last_access_time = time(NULL);
-               }
-               statusbar_pop_all();
-               return IMAP_SESSION(rfolder->session);
-       }
-
-       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 =
-#if USE_SSL
-                       imap_session_new(folder->account->recv_server, port,
-                                        folder->account->userid,
-                                        folder->account->passwd,
-                                        folder->account->ssl_imap);
-#else
-                       imap_session_new(folder->account->recv_server, port,
-                                        folder->account->userid,
-                                        folder->account->passwd);
-#endif
-               if (rfolder->session)
-                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
-                                            IMAP_FOLDER(folder));
+       /* Make sure we have a session */
+       if (rfolder->session != NULL) {
+               session = rfolder->session;
+       } else {
+               imap_reset_uid_lists(folder);
+               session = imap_session_new(folder->account);
        }
+       if(session == NULL)
+               return NULL;
 
-       if (rfolder->session)
-               rfolder->session->last_access_time = time(NULL);
-       statusbar_pop_all();
-       return IMAP_SESSION(rfolder->session);
-}
+       /* Get CAPABILITY */
+       imap_get_capability(session); 
 
-static gchar *imap_query_password(const gchar *server, const gchar *user)
-{
-       gchar *message;
-       gchar *pass;
+       /* 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);
+               rfolder->session = NULL;
+               return NULL;
+       }
 
-       message = g_strdup_printf(_("Input password for %s on %s:"),
-                                 user, server);
-       pass = input_dialog_with_invisible(_("Input password"), message, NULL);
-       g_free(message);
+       /* 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
+        * think it's still alive.  Unfortunately, most of the code
+        * does not yet check for errors on the socket, and so if the
+        * connection drops we don't notice until the timeout expires.
+        * 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) - session->last_access_time > SESSION_TIMEOUT) {
+               /* verify that the session is still alive */
+               if (imap_cmd_noop(session->sock) != 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 = NULL;
+                       } else {
+                               log_warning(_("IMAP4 connection to %s:%d has been"
+                                             " disconnected. Reconnecting...\n"),
+                                           folder->account->recv_server, port);
+                               session_destroy(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 = SESSION(imap_session_get(folder));
+                       }
+               }
+       }
 
-       return pass;
+       rfolder->session = session;
+       if (session) {
+               session->last_access_time = time(NULL);
+       }
+       return IMAP_SESSION(session);
 }
 
-#if USE_SSL
-Session *imap_session_new(const gchar *server, gushort port,
-                         const gchar *user, const gchar *pass,
-                         gboolean use_ssl)
-#else
-Session *imap_session_new(const gchar *server, gushort port,
-                         const gchar *user, const gchar *pass)
-#endif
+Session *imap_session_new(const PrefsAccount *account)
 {
-       gchar buf[IMAPBUFSIZE];
        IMAPSession *session;
        SockInfo *imap_sock;
+       gushort port;
+       gboolean is_preauth;
 
-       g_return_val_if_fail(server != NULL, NULL);
-       g_return_val_if_fail(user != NULL, NULL);
-
-       if (!pass) {
-               gchar *tmp_pass;
-               tmp_pass = imap_query_password(server, user);
-               if (!tmp_pass)
-                       return NULL;
-               Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return NULL;});
-               g_free(tmp_pass);
-       }
+#ifdef USE_OPENSSL
+       /* FIXME: IMAP over SSL only... */ 
+       SSLType ssl_type;
 
-       log_message(_("creating IMAP4 connection to %s:%d ...\n"),
-                   server, port);
+       port = account->set_imapport ? account->imapport
+               : account->ssl_imap == SSL_TUNNEL ? IMAPS_PORT : IMAP4_PORT;
+       ssl_type = account->ssl_imap;   
+#else
+       port = account->set_imapport ? account->imapport
+               : IMAP4_PORT;
+#endif
 
-#if USE_SSL
-       if ((imap_sock = imap_open(server, port, buf, use_ssl)) == NULL)
+       if (account->set_tunnelcmd) {
+               log_message(_("creating tunneled IMAP4 connection\n"));
+#if USE_OPENSSL
+               if ((imap_sock = imap_open_tunnel(account->recv_server, 
+                                                 account->tunnelcmd,
+                                                 ssl_type)) == NULL)
 #else
-       if ((imap_sock = imap_open(server, port, buf)) == NULL)
+               if ((imap_sock = imap_open_tunnel(account->recv_server, 
+                                                 account->tunnelcmd)) == NULL)
 #endif
-               return NULL;
-       if (imap_cmd_login(imap_sock, user, pass) != IMAP_SUCCESS) {
-               imap_cmd_logout(imap_sock);
+                       return NULL;
+       } else {
+               g_return_val_if_fail(account->recv_server != NULL, NULL);
+
+               log_message(_("creating IMAP4 connection to %s:%d ...\n"),
+                           account->recv_server, port);
+               
+#if USE_OPENSSL
+               if ((imap_sock = imap_open(account->recv_server, port,
+                                          ssl_type)) == NULL)
+#else
+               if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
+#endif
+                       return NULL;
+       }
+
+       /* Only need to log in if the connection was not PREAUTH */
+       if (imap_greeting(imap_sock, &is_preauth) != IMAP_SUCCESS) {
                sock_close(imap_sock);
                return NULL;
        }
+       log_message("IMAP connection is %s-authenticated\n",
+                   (is_preauth) ? "pre" : "un");
 
        session = g_new(IMAPSession, 1);
        SESSION(session)->type             = SESSION_IMAP;
-       SESSION(session)->server           = g_strdup(server);
+       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(session)->destroy          = imap_session_destroy;
+
+       session->capability = NULL;
+
        session->mbox = NULL;
+       session->authenticated = is_preauth;
 
        session_list = g_list_append(session_list, session);
 
        return SESSION(session);
 }
 
-void imap_session_destroy(IMAPSession *session)
+void imap_session_authenticate(IMAPSession *session, const PrefsAccount *account)
 {
-       sock_close(SESSION(session)->sock);
-       SESSION(session)->sock = NULL;
+       gchar *pass;
 
-       g_free(session->mbox);
+       g_return_if_fail(account->userid != NULL);
+
+       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 (imap_cmd_login(SESSION(session)->sock, account->userid, pass) != IMAP_SUCCESS) {
+               imap_cmd_logout(SESSION(session)->sock);
+               return;
+       }
+
+       session->authenticated = TRUE;
+}
+
+void imap_session_destroy(Session *session)
+{
+       sock_close(session->sock);
+       session->sock = NULL;
+
+       g_free(IMAP_SESSION(session)->mbox);
+
+       g_strfreev(IMAP_SESSION(session)->capability);
 
        session_list = g_list_remove(session_list, session);
 }
@@ -394,7 +607,7 @@ void imap_session_destroy_all(void)
                IMAPSession *session = (IMAPSession *)session_list->data;
 
                imap_cmd_logout(SESSION(session)->sock);
-               imap_session_destroy(session);
+               session_destroy(SESSION(session));
        }
 }
 
@@ -417,9 +630,8 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 
        if (!session) {
                mlist = procmsg_read_cache(item, FALSE);
-               item->last_num = procmsg_get_last_num_in_cache(mlist);
+               item->last_num = procmsg_get_last_num_in_msg_list(mlist);
                procmsg_set_flags(mlist, item);
-               statusbar_pop_all();
                return mlist;
        }
 
@@ -436,7 +648,6 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
                        last_uid = first_uid;
        } else {
                imap_delete_all_cached_messages(item);
-               statusbar_pop_all();
                return NULL;
        }
 
@@ -445,7 +656,7 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 
                mlist = procmsg_read_cache(item, FALSE);
                procmsg_set_flags(mlist, item);
-               cache_last = procmsg_get_last_num_in_cache(mlist);
+               cache_last = procmsg_get_last_num_in_msg_list(mlist);
 
                /* calculating the range of envelope to get */
                if (item->mtime != uid_validity) {
@@ -488,7 +699,6 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
        item->last_num = last_uid;
 
 catch:
-       statusbar_pop_all();
        return mlist;
 }
 
@@ -510,7 +720,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;
        }
 
@@ -520,13 +730,19 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
                return NULL;
        }
 
-       debug_print(_("getting message %d...\n"), uid);
-       ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        NULL, NULL, NULL, NULL);
+       if (ok != IMAP_SUCCESS) {
+               g_warning("can't select mailbox %s\n", item->path);
+               g_free(filename);
+               return NULL;
+       }
 
-       statusbar_pop_all();
+       debug_print("getting message %d...\n", uid);
+       ok = imap_cmd_fetch(SESSION(session)->sock, (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;
        }
@@ -537,6 +753,7 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
 gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
                  gboolean remove_source)
 {
+       gchar *destdir;
        IMAPSession *session;
        gint ok;
 
@@ -545,12 +762,14 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
        g_return_val_if_fail(file != NULL, -1);
 
        session = imap_session_get(folder);
-       if (!session)
-               return -1;
+       if (!session) return -1;
+
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+       ok = imap_cmd_append(SESSION(session)->sock, destdir, file);
+       g_free(destdir);
 
-       ok = imap_cmd_append(SESSION(session)->sock, dest->path, file);
        if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't append message %s\n"), file);
+               g_warning("can't append message %s\n", file);
                return -1;
        }
 
@@ -559,7 +778,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
                        FILE_OP_ERROR(file, "unlink");
        }
 
-       return dest->last_num;
+       return 0;
 }
 
 static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
@@ -567,8 +786,11 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
 {
        gchar *destdir;
        IMAPSession *session;
+       IMAPFlags iflags = 0;
+       gint messages, recent, unseen;
+       guint32 newuid = 0, uid_validity;
        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(dest != NULL, -1);
@@ -578,22 +800,39 @@ 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"));
+               g_warning("the src folder is identical to the dest.\n");
                return -1;
        }
 
+       /* if we don't have UIDPLUS we get UID-NEXT and hope that the
+          message really gets this uid */
+       if (!imap_has_capability(session, "UIDPLUS")) {
+               ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
+                                &messages, &recent, &newuid, &uid_validity, &unseen);
+               if (ok != IMAP_SUCCESS) {
+                       g_warning("can't copy message\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,
@@ -601,12 +840,30 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
                ok = imap_cmd_expunge(SESSION(session)->sock);
        }
 
+       /* get the dest folder to set the flags */
+       if (newuid) {
+               ok = imap_select(session, IMAP_FOLDER(folder), dest->path,
+                                NULL, NULL, NULL, NULL);
+               if (ok != IMAP_SUCCESS)         /* the folder disappeared? */
+                       return -1;
+
+               if (msginfo->flags.perm_flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
+               if (msginfo->flags.perm_flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+               if (iflags)
+                       if (imap_set_message_flags(session, newuid, newuid, iflags, TRUE)
+                           != IMAP_SUCCESS)
+                               newuid = 0;
+       }
+
        g_free(destdir);
-       statusbar_pop_all();
 
-       return ok;
+       if (ok == IMAP_SUCCESS)
+               return newuid;
+       else
+               return -1;
 }
 
+#if 0
 static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest, 
                                        GSList *msglist,
                                        gboolean remove_source)
@@ -615,7 +872,7 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
        GSList *cur;
        MsgInfo *msginfo;
        IMAPSession *session;
-       gint ok;
+       gint ok = IMAP_SUCCESS;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(dest != NULL, -1);
@@ -630,21 +887,24 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
                msginfo = (MsgInfo *)cur->data;
 
                if (msginfo->folder == dest) {
-                       g_warning(_("the src folder is identical to the dest.\n"));
+                       g_warning("the src folder is identical to the dest.\n");
                        continue;
                }
 
+               /* ensure source folder selected */
+               ok = imap_select(session, IMAP_FOLDER(folder), 
+                                msginfo->folder->path, NULL, NULL, NULL, NULL);
+        
                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, destdir);
 
                if (ok == IMAP_SUCCESS && remove_source) {
                        imap_set_message_flags
@@ -657,39 +917,123 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
                ok = imap_cmd_expunge(SESSION(session)->sock);
 
        g_free(destdir);
-       statusbar_pop_all();
 
-       return IMAP_SUCCESS;
+       if (ok == IMAP_SUCCESS)
+               return 0;
+       else
+               return -1;
 }
+#endif
 
 gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 {
-       return imap_do_copy(folder, dest, msginfo, TRUE);
+       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;
 }
 
+#if 0
 gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest, 
                              GSList *msglist)
 {
-       return imap_do_copy_msgs_with_dest(folder, dest, msglist, TRUE);
+       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;
 }
+#endif
 
 gint imap_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 {
-       return imap_do_copy(folder, dest, msginfo, FALSE);
+       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, FALSE);
+
+       srcfile = procmsg_get_message_file(msginfo);
+       if (!srcfile) return -1;
+
+       ret = imap_add_msg(folder, dest, srcfile, FALSE);
+
+       g_free(srcfile);
+
+       return ret;
 }
 
+#if 0
 gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest, 
                              GSList *msglist)
 {
-       return imap_do_copy_msgs_with_dest(folder, dest, msglist, FALSE);
+       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;
 }
+#endif
 
 gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
 {
-       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(folder->type == F_IMAP, -1);
@@ -699,166 +1043,218 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
        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;
 
        ok = imap_set_message_flags
                (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
                 (guint32)uid, (guint32)uid, IMAP_FLAG_DELETED, TRUE);
-       statusbar_pop_all();
        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();
        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 imap_remove_msgs(Folder *folder, FolderItem *item, GSList *msglist)
 {
-       gint exists, recent, unseen;
-       guint32 uid_validity;
        gint ok;
        IMAPSession *session;
+       gchar *dir;
+       MsgInfo *msginfo;
+       GSList *cur;
+       guint32 uid;
 
        g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(folder->type == F_IMAP, -1);
        g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(msglist != NULL, -1);
 
        session = imap_session_get(folder);
        if (!session) return -1;
 
        ok = imap_select(session, IMAP_FOLDER(folder), item->path,
-                        &exists, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
+                        NULL, NULL, NULL, NULL);
        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();
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't set deleted flags: 1:%d\n"), exists);
-               return ok;
+       for (cur = msglist; cur != NULL; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               uid = msginfo->msgnum;
+               ok = imap_set_message_flags
+                       (IMAP_SESSION(REMOTE_FOLDER(folder)->session),
+                        uid, uid, 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();
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
        }
 
+       dir = folder_item_get_path(item);
+       if (is_dir_exist(dir)) {
+               for (cur = msglist; cur != NULL; cur = cur->next) {
+                       msginfo = (MsgInfo *)cur->data;
+                       uid = msginfo->msgnum;
+                       remove_numbered_files(dir, uid, uid);
+               }
+       }
+       g_free(dir);
        return IMAP_SUCCESS;
 }
 
-void imap_scan_folder(Folder *folder, FolderItem *item)
+gint imap_remove_all_msg(Folder *folder, FolderItem *item)
 {
-       IMAPSession *session;
-       gint messages, 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);
+
+       session = imap_session_get(folder);
+       if (!session) return -1;
+
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       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);
+       if (ok != IMAP_SUCCESS) {
+               log_warning(_("can't set deleted flags: 1:%d\n"), exists);
+               return ok;
+       }
+
+       ok = imap_cmd_expunge(SESSION(session)->sock);
+       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;
+}
+
+gboolean imap_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)
+{
+       /* TODO: properly implement this method */
+       return FALSE;
+}
+
+gint imap_scan_folder(Folder *folder, FolderItem *item)
+{
+       IMAPSession *session;
+       gint messages, recent, unseen;
+       guint32 uid_next, uid_validity;
+       gint ok;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
 
-       g_return_if_fail(folder != NULL);
-       g_return_if_fail(item != NULL);
-
        session = imap_session_get(folder);
-       if (!session) return;
+       if (!session) return -1;
 
        ok = imap_status(session, IMAP_FOLDER(folder), item->path,
-                        &messages, &recent, &unseen, &uid_validity);
-       statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) return;
+                        &messages, &recent, &uid_next, &uid_validity, &unseen);
+       if (ok != IMAP_SUCCESS) return -1;
 
-       item->new = recent;
+       item->new = unseen > 0 ? recent : 0;
        item->unread = unseen;
        item->total = messages;
+       item->last_num = (messages > 0 && uid_next > 0) ? uid_next - 1 : 0;
        /* item->mtime = uid_validity; */
+
+       return 0;
 }
 
 void imap_scan_tree(Folder *folder)
 {
-       IMAPFolder *imapfolder = IMAP_FOLDER(folder);
-       FolderItem *item, *inbox;
+       FolderItem *item;
        IMAPSession *session;
-       IMAPNameSpace *namespace = NULL;
        gchar *root_folder = NULL;
 
        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->account != NULL);
 
        session = imap_session_get(folder);
-       if (!session) return;
-
-       if (imapfolder->namespace && imapfolder->namespace->data)
-               namespace = (IMAPNameSpace *)imapfolder->namespace->data;
-
-       if (folder->account->imap_dir && *folder->account->imap_dir) {
-               gchar *imap_dir;
-               Xstrdup_a(imap_dir, folder->account->imap_dir, return);
-               strtailchomp(imap_dir, '/');
-               root_folder = g_strconcat
-                       (namespace && namespace->name ? namespace->name : "",
-                        imap_dir, NULL);
-               if (namespace && namespace->separator)
-                       subst_char(root_folder, namespace->separator, '/');
+       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 (root_folder)
+       if (folder->account->imap_dir && *folder->account->imap_dir) {
+               Xstrdup_a(root_folder, folder->account->imap_dir, return);
+               strtailchomp(root_folder, '/');
                debug_print("IMAP root directory: %s\n", root_folder);
+       }
 
-       folder_tree_destroy(folder);
-       item = folder_item_new(folder->name, root_folder);
+       item = folder_item_new(folder, folder->name, root_folder);
        item->folder = folder;
+       item->no_select = TRUE;
        folder->node = g_node_new(item);
-       g_free(root_folder);
 
-       imap_scan_tree_recursive(session, item, namespace);
+       imap_scan_tree_recursive(session, item);
 
-       if (!folder->inbox) {
-               inbox = folder_item_new("INBOX", "INBOX");
-               inbox->stype = F_INBOX;
-               folder_item_append(item, inbox);
-               folder->inbox = inbox;
-       }
-       if (!folder->trash)
-               imap_create_trash(folder);
+       imap_create_missing_folders(folder);
 }
 
-static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item,
-                                    IMAPNameSpace *namespace)
+static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
 {
+       Folder *folder;
        IMAPFolder *imapfolder;
        FolderItem *new_item;
        GSList *item_list, *cur;
        gchar *real_path;
        gchar *wildcard_path;
-       gchar separator = '/';
+       gchar separator;
        gchar wildcard[3];
 
        g_return_val_if_fail(item != NULL, -1);
        g_return_val_if_fail(item->folder != NULL, -1);
        g_return_val_if_fail(item->no_sub == FALSE, -1);
 
-       imapfolder = IMAP_FOLDER(item->folder);
+       folder = FOLDER(item->folder);
+       imapfolder = IMAP_FOLDER(folder);
 
-       if (namespace && namespace->separator)
-               separator = namespace->separator;
+       separator = imap_get_path_separator(imapfolder, item->path);
 
        if (item->folder->ui_func)
-               item->folder->ui_func(item->folder, item,
-                                     item->folder->ui_func_data);
+               item->folder->ui_func(folder, item, folder->ui_func_data);
 
        if (item->path) {
                wildcard[0] = separator;
@@ -868,8 +1264,7 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item,
        } else {
                wildcard[0] = '%';
                wildcard[1] = '\0';
-               real_path = g_strdup(namespace && namespace->name
-                                    ? namespace->name : "");
+               real_path = g_strdup("");
        }
 
        Xstrcat_a(wildcard_path, real_path, wildcard,
@@ -880,47 +1275,63 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item,
                          wildcard_path);
 
        strtailchomp(real_path, separator);
-       item_list = imap_parse_list(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) {
                new_item = cur->data;
                if (!strcmp(new_item->path, "INBOX")) {
-                       if (!item->folder->inbox) {
+                       if (!folder->inbox) {
                                new_item->stype = F_INBOX;
                                item->folder->inbox = new_item;
                        } else {
                                folder_item_destroy(new_item);
                                continue;
                        }
-               } else if (!item->parent && !item->folder->trash) {
-                       if (!strcasecmp(g_basename(new_item->path), "Trash")) {
+               } else if (!item->parent || item->stype == F_INBOX) {
+                       gchar *base;
+
+                       base = g_basename(new_item->path);
+
+                       if (!folder->outbox && !strcasecmp(base, "Sent")) {
+                               new_item->stype = F_OUTBOX;
+                               folder->outbox = new_item;
+                       } else if (!folder->draft && !strcasecmp(base, "Drafts")) {
+                               new_item->stype = F_DRAFT;
+                               folder->draft = new_item;
+                       } else if (!folder->queue && !strcasecmp(base, "Queue")) {
+                               new_item->stype = F_QUEUE;
+                               folder->queue = new_item;
+                       } else if (!folder->trash && !strcasecmp(base, "Trash")) {
                                new_item->stype = F_TRASH;
-                               item->folder->trash = new_item;
+                               folder->trash = new_item;
                        }
                }
                folder_item_append(item, new_item);
                if (new_item->no_select == FALSE)
-                       imap_scan_folder(new_item->folder, new_item);
+                       imap_scan_folder(folder, new_item);
                if (new_item->no_sub == FALSE)
-                       imap_scan_tree_recursive(session, new_item, namespace);
+                       imap_scan_tree_recursive(session, new_item);
        }
 
        return IMAP_SUCCESS;
 }
 
-static GSList *imap_parse_list(IMAPSession *session, const gchar *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;
        GSList *item_list = NULL;
        GString *str;
        FolderItem *new_item;
 
-       debug_print("getting list of %s ...\n", *path ? path : "\"\"");
+       debug_print("getting list of %s ...\n",
+                   *real_path ? real_path : "\"\"");
 
        str = g_string_new(NULL);
 
@@ -947,11 +1358,13 @@ static GSList *imap_parse_list(IMAPSession *session, const gchar *path)
                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++;
@@ -960,128 +1373,110 @@ static GSList *imap_parse_list(IMAPSession *session, const gchar *path)
                                            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, path)) 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;
 
-               new_item = folder_item_new(name, buf);
+               loc_name = imap_modified_utf7_to_locale(name);
+               loc_path = imap_modified_utf7_to_locale(buf);
+               new_item = folder_item_new(folder, loc_name, loc_path);
                if (strcasestr(flags, "\\Noinferiors") != NULL)
                        new_item->no_sub = TRUE;
-               if (strcasestr(flags, "\\Noselect") != NULL)
+               if (strcmp(buf, "INBOX") != 0 &&
+                   strcasestr(flags, "\\Noselect") != NULL)
                        new_item->no_select = TRUE;
 
                item_list = g_slist_append(item_list, new_item);
 
-               debug_print("folder %s has been added.\n", buf);
+               debug_print("folder %s has been added.\n", loc_path);
+               g_free(loc_path);
+               g_free(loc_name);
        }
 
        g_string_free(str, TRUE);
-       statusbar_pop_all();
 
        return item_list;
 }
 
 gint imap_create_tree(Folder *folder)
 {
-       FolderItem *item;
-
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->node != NULL, -1);
        g_return_val_if_fail(folder->node->data != NULL, -1);
        g_return_val_if_fail(folder->account != NULL, -1);
 
        imap_scan_tree(folder);
+       imap_create_missing_folders(folder);
 
-       item = FOLDER_ITEM(folder->node->data);
+       return 0;
+}
 
-       if (!folder->inbox) {
-               FolderItem *inbox;
+static void imap_create_missing_folders(Folder *folder)
+{
+       g_return_if_fail(folder != NULL);
 
-               inbox = folder_item_new("INBOX", "INBOX");
-               inbox->stype = F_INBOX;
-               folder_item_append(item, inbox);
-               folder->inbox = inbox;
-       }
+       if (!folder->inbox)
+               folder->inbox = imap_create_special_folder
+                       (folder, F_INBOX, "INBOX");
+#if 0
+       if (!folder->outbox)
+               folder->outbox = imap_create_special_folder
+                       (folder, F_OUTBOX, "Sent");
+       if (!folder->draft)
+               folder->draft = imap_create_special_folder
+                       (folder, F_DRAFT, "Drafts");
+       if (!folder->queue)
+               folder->queue = imap_create_special_folder
+                       (folder, F_QUEUE, "Queue");
+#endif
        if (!folder->trash)
-               imap_create_trash(folder);
-
-       return 0;
+               folder->trash = imap_create_special_folder
+                       (folder, F_TRASH, "Trash");
 }
 
-static gint imap_create_trash(Folder *folder)
+static FolderItem *imap_create_special_folder(Folder *folder,
+                                             SpecialFolderItemType stype,
+                                             const gchar *name)
 {
-       IMAPFolder *imapfolder = IMAP_FOLDER(folder);
        FolderItem *item;
        FolderItem *new_item;
-       gchar *trash_path;
-       gchar *imap_dir = "";
-
-       g_return_val_if_fail(folder != NULL, -1);
-       g_return_val_if_fail(folder->node != NULL, -1);
-       g_return_val_if_fail(folder->node->data != NULL, -1);
-       g_return_val_if_fail(folder->account != NULL, -1);
-
-       if (folder->account->imap_dir && *folder->account->imap_dir) {
-               gchar *tmpdir;
-
-               Xstrdup_a(tmpdir, folder->account->imap_dir, return -1);
-               strtailchomp(tmpdir, '/');
-               Xalloca(imap_dir, strlen(tmpdir) + 2, return -1);
-               g_snprintf(imap_dir, strlen(tmpdir) + 2, "%s%c", tmpdir, '/');
-       }
-
-       if (imapfolder->namespace && imapfolder->namespace->data) {
-               IMAPNameSpace *namespace =
-                       (IMAPNameSpace *)imapfolder->namespace->data;
-
-               if (*namespace->name != '\0') {
-                       gchar *name;
 
-                       Xstrdup_a(name, namespace->name, return -1);
-                       subst_char(name, namespace->separator, '/');
-                       trash_path = g_strconcat(name, imap_dir, "Trash", NULL);
-               } else
-                       trash_path = g_strconcat(imap_dir, "Trash", NULL);
-       } else
-               trash_path = g_strconcat(imap_dir, "Trash", NULL);
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(folder->node != NULL, NULL);
+       g_return_val_if_fail(folder->node->data != NULL, NULL);
+       g_return_val_if_fail(folder->account != NULL, NULL);
+       g_return_val_if_fail(name != NULL, NULL);
 
        item = FOLDER_ITEM(folder->node->data);
-       new_item = imap_create_folder(folder, item, trash_path);
+       new_item = imap_create_folder(folder, item, name);
 
        if (!new_item) {
-               gchar *path;
-
-               new_item = folder_item_new("Trash", trash_path);
-               folder_item_append(item, new_item);
-
-               path = folder_item_get_path(new_item);
-               if (!is_dir_exist(path))
-                       make_dir_hier(path);
-               g_free(path);
-       } else {
-               g_free(new_item->name);
-               new_item->name = g_strdup("Trash");
-       }
-       new_item->stype = F_TRASH;
-       folder->trash = new_item;
+               g_warning("Can't create '%s'\n", name);
+               if (!folder->inbox) return NULL;
 
-       g_free(trash_path);
+               new_item = imap_create_folder(folder, folder->inbox, name);
+               if (!new_item)
+                       g_warning("Can't create '%s' under INBOX\n", name);
+               else
+                       new_item->stype = stype;
+       } else
+               new_item->stype = stype;
 
-       return 0;
+       return new_item;
 }
 
 FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
                               const gchar *name)
 {
-       gchar *dirpath, *imappath;
+       gchar *dirpath, *imap_path;
        IMAPSession *session;
-       IMAPNameSpace *namespace;
        FolderItem *new_item;
+       gchar separator;
        gchar *new_name;
        const gchar *p;
        gint ok;
@@ -1094,7 +1489,9 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        session = imap_session_get(folder);
        if (!session) return NULL;
 
-       if (parent->path)
+       if (!parent->parent && strcmp(name, "INBOX") == 0)
+               dirpath = g_strdup(name);
+       else if (parent->path)
                dirpath = g_strconcat(parent->path, "/", name, NULL);
        else if ((p = strchr(name, '/')) != NULL && *(p + 1) != '\0')
                dirpath = g_strdup(name);
@@ -1107,15 +1504,15 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        } else
                dirpath = g_strdup(name);
 
-       Xstrdup_a(imappath, dirpath, {g_free(dirpath); return NULL;});
-       Xstrdup_a(new_name, name, {g_free(dirpath); return NULL;});
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), imappath);
-       if (namespace && namespace->separator) {
-               imap_path_separator_subst(imappath, namespace->separator);
-               imap_path_separator_subst(new_name, namespace->separator);
-               strtailchomp(new_name, namespace->separator);
-       }
+       /* keep trailing directory separator to create a folder that contains
+          sub folder */
+       imap_path = imap_locale_to_modified_utf7(dirpath);
        strtailchomp(dirpath, '/');
+       Xstrdup_a(new_name, name, {g_free(dirpath); return NULL;});
+       strtailchomp(new_name, '/');
+       separator = imap_get_path_separator(IMAP_FOLDER(folder), imap_path);
+       imap_path_separator_subst(imap_path, separator);
+       subst_char(new_name, '/', separator);
 
        if (strcmp(name, "INBOX") != 0) {
                GPtrArray *argbuf;
@@ -1123,12 +1520,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, imappath,
+               ok = imap_cmd_list(SESSION(session)->sock, 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;
                }
@@ -1141,21 +1539,23 @@ 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, imappath);
-                       statusbar_pop_all();
+                       ok = imap_cmd_create(SESSION(session)->sock, imap_path);
                        if (ok != IMAP_SUCCESS) {
                                log_warning(_("can't create mailbox\n"));
+                               g_free(imap_path);
                                g_free(dirpath);
                                return NULL;
                        }
                }
        }
 
-       new_item = folder_item_new(new_name, dirpath);
+       new_item = folder_item_new(folder, new_name, dirpath);
        folder_item_append(parent, new_item);
+       g_free(imap_path);
        g_free(dirpath);
 
        dirpath = folder_item_get_path(new_item);
@@ -1166,11 +1566,97 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        return new_item;
 }
 
+gint imap_rename_folder(Folder *folder, FolderItem *item, const gchar *name)
+{
+       gchar *dirpath;
+       gchar *newpath;
+       gchar *real_oldpath;
+       gchar *real_newpath;
+       GNode *node;
+       gchar *paths[2];
+       gchar *old_cache_dir;
+       gchar *new_cache_dir;
+       IMAPSession *session;
+       gchar separator;
+       gint ok;
+       gint exists, recent, unseen;
+       guint32 uid_validity;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->path != NULL, -1);
+       g_return_val_if_fail(name != NULL, -1);
+
+       session = imap_session_get(folder);
+       if (!session) return -1;
+
+       real_oldpath = imap_get_real_path(IMAP_FOLDER(folder), item->path);
+
+       g_free(session->mbox);
+       session->mbox = NULL;
+       ok = imap_cmd_examine(SESSION(session)->sock, "INBOX",
+                             &exists, &recent, &unseen, &uid_validity);
+       if (ok != IMAP_SUCCESS) {
+               g_free(real_oldpath);
+               return -1;
+       }
+
+       separator = imap_get_path_separator(IMAP_FOLDER(folder), item->path);
+       if (strchr(item->path, G_DIR_SEPARATOR)) {
+               dirpath = g_dirname(item->path);
+               newpath = g_strconcat(dirpath, G_DIR_SEPARATOR_S, name, NULL);
+               g_free(dirpath);
+       } else
+               newpath = g_strdup(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);
+       if (ok != IMAP_SUCCESS) {
+               log_warning(_("can't rename mailbox: %s to %s\n"),
+                           real_oldpath, real_newpath);
+               g_free(real_oldpath);
+               g_free(newpath);
+               g_free(real_newpath);
+               return -1;
+       }
+
+       g_free(item->name);
+       item->name = g_strdup(name);
+
+       old_cache_dir = folder_item_get_path(item);
+
+       node = g_node_find(item->folder->node, G_PRE_ORDER, G_TRAVERSE_ALL,
+                          item);
+       paths[0] = g_strdup(item->path);
+       paths[1] = newpath;
+       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
+                       imap_rename_folder_func, paths);
+
+       if (is_dir_exist(old_cache_dir)) {
+               new_cache_dir = folder_item_get_path(item);
+               if (rename(old_cache_dir, new_cache_dir) < 0) {
+                       FILE_OP_ERROR(old_cache_dir, "rename");
+               }
+               g_free(new_cache_dir);
+       }
+
+       g_free(old_cache_dir);
+       g_free(paths[0]);
+       g_free(newpath);
+       g_free(real_oldpath);
+       g_free(real_newpath);
+
+       return 0;
+}
+
 gint imap_remove_folder(Folder *folder, FolderItem *item)
 {
        gint ok;
        IMAPSession *session;
        gchar *path;
+       gchar *cache_dir;
        gint exists, recent, unseen;
        guint32 uid_validity;
 
@@ -1185,14 +1671,12 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
 
        ok = imap_cmd_examine(SESSION(session)->sock, "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();
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't delete mailbox\n"));
                g_free(path);
@@ -1200,6 +1684,10 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
        }
 
        g_free(path);
+       cache_dir = folder_item_get_path(item);
+       if (is_dir_exist(cache_dir) && remove_dir_recursive(cache_dir) < 0)
+               g_warning("can't remove directory '%s'\n", cache_dir);
+       g_free(cache_dir);
        folder_item_remove(item);
 
        return 0;
@@ -1236,19 +1724,31 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                        return newlist;
                }
                strretchomp(tmp);
-               log_print("IMAP4< %s\n", tmp);
                if (tmp[0] != '*' || tmp[1] != ' ') {
+                       log_print("IMAP4< %s\n", tmp);
                        g_free(tmp);
                        break;
                }
+               if (strstr(tmp, "FETCH") == NULL) {
+                       log_print("IMAP4< %s\n", tmp);
+                       g_free(tmp);
+                       continue;
+               }
+               log_print("IMAP4< %s\n", tmp);
                g_string_assign(str, tmp);
                g_free(tmp);
 
-               msginfo = imap_parse_envelope(SESSION(session)->sock, str);
+               msginfo = imap_parse_envelope
+                       (SESSION(session)->sock, item, str);
                if (!msginfo) {
                        log_warning(_("can't parse envelope: %s\n"), str->str);
                        continue;
                }
+               if (item->stype == F_QUEUE) {
+                       MSG_SET_TMP_FLAGS(msginfo->flags, MSG_QUEUED);
+               } else if (item->stype == F_DRAFT) {
+                       MSG_SET_TMP_FLAGS(msginfo->flags, MSG_DRAFT);
+               }
 
                msginfo->folder = item;
 
@@ -1276,11 +1776,12 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
        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 %d - %d ... "),
+       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);
+       if (is_dir_exist(dir))
+               remove_numbered_files(dir, first_uid, last_uid);
        g_free(dir);
 
        for (cur = mlist; cur != NULL; ) {
@@ -1296,7 +1797,7 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
                cur = next;
        }
 
-       debug_print(_("done.\n"));
+       debug_print("done.\n");
 
        return mlist;
 }
@@ -1309,20 +1810,44 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_IMAP);
 
-       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_OPENSSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+                          const gchar *tunnelcmd,
+                          SSLType ssl_type)
+#else
+static SockInfo *imap_open_tunnel(const gchar *server,
+                          const gchar *tunnelcmd)
+#endif
+{
+       SockInfo *sock;
+
+       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+               log_warning(_("Can't establish IMAP4 session with: %s\n"),
+                           server);
+               return NULL;
+#if USE_OPENSSL
+       return imap_init_sock(sock, ssl_type);
+#else
+       return imap_init_sock(sock);
+#endif
 }
 
-#if USE_SSL
-static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf,
-                          gboolean use_ssl)
+
+#if USE_OPENSSL
+static SockInfo *imap_open(const gchar *server, gushort port,
+                          SSLType ssl_type)
 #else
-static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
+static SockInfo *imap_open(const gchar *server, gushort port)
 #endif
 {
        SockInfo *sock;
@@ -1333,16 +1858,45 @@ static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
                return NULL;
        }
 
-#if USE_SSL
-       if (use_ssl && !ssl_init_socket(sock)) {
+#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
+}
 
+#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_OPENSSL
+       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;
        }
@@ -1350,92 +1904,132 @@ static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
        return sock;
 }
 
-#define THROW goto catch
-
-static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
+static GList *imap_parse_namespace_str(gchar *str)
 {
-       gchar *ns_str;
+       gchar *p = str;
        gchar *name;
        gchar *separator;
-       gchar *p;
        IMAPNameSpace *namespace;
        GList *ns_list = NULL;
 
-       g_return_if_fail(session != NULL);
-       g_return_if_fail(folder != NULL);
-
-       if (folder->namespace != NULL) return;
-
-       if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
-           != IMAP_SUCCESS) {
-               log_warning(_("can't get namespace\n"));
-               return;
-       }
-
-       /* get the first element */
-       extract_one_parenthesis_with_skip_quote(ns_str, '"', '(', ')');
-       g_strstrip(ns_str);
-       p = ns_str;
-
        while (*p != '\0') {
                /* parse ("#foo" "/") */
 
                while (*p && *p != '(') p++;
-               if (*p == '\0') THROW;
+               if (*p == '\0') break;
                p++;
 
                while (*p && *p != '"') p++;
-               if (*p == '\0') THROW;
+               if (*p == '\0') break;
                p++;
                name = p;
 
                while (*p && *p != '"') p++;
-               if (*p == '\0') THROW;
+               if (*p == '\0') break;
                *p = '\0';
                p++;
 
                while (*p && isspace(*p)) p++;
-               if (*p == '\0') THROW;
+               if (*p == '\0') break;
                if (strncmp(p, "NIL", 3) == 0)
                        separator = NULL;
                else if (*p == '"') {
                        p++;
                        separator = p;
                        while (*p && *p != '"') p++;
-                       if (*p == '\0') THROW;
+                       if (*p == '\0') break;
                        *p = '\0';
                        p++;
-               } else THROW;
+               } else break;
 
                while (*p && *p != ')') p++;
-               if (*p == '\0') THROW;
+               if (*p == '\0') break;
                p++;
 
                namespace = g_new(IMAPNameSpace, 1);
                namespace->name = g_strdup(name);
                namespace->separator = separator ? separator[0] : '\0';
                ns_list = g_list_append(ns_list, namespace);
-               IMAP_FOLDER(folder)->namespace = ns_list;
        }
 
-catch:
+       return ns_list;
+}
+
+static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
+{
+       gchar *ns_str;
+       gchar **str_array;
+
+       g_return_if_fail(session != NULL);
+       g_return_if_fail(folder != NULL);
+
+       if (folder->ns_personal != NULL ||
+           folder->ns_others   != NULL ||
+           folder->ns_shared   != NULL)
+               return;
+
+       if (!imap_has_capability(session, "NAMESPACE")) {
+               imap_get_namespace_by_list(session, folder);
+               return;
+       }
+       
+       if (imap_cmd_namespace(SESSION(session)->sock, &ns_str)
+           != IMAP_SUCCESS) {
+               log_warning(_("can't get namespace\n"));
+               return;
+       }
+
+       str_array = strsplit_parenthesis(ns_str, '(', ')', 3);
+       if (str_array == NULL) {
+               g_free(ns_str);
+               imap_get_namespace_by_list(session, folder);
+               return;
+       }
+       if (str_array[0])
+               folder->ns_personal = imap_parse_namespace_str(str_array[0]);
+       if (str_array[0] && str_array[1])
+               folder->ns_others = imap_parse_namespace_str(str_array[1]);
+       if (str_array[0] && str_array[1] && str_array[2])
+               folder->ns_shared = imap_parse_namespace_str(str_array[2]);
+       g_strfreev(str_array);
        g_free(ns_str);
-       return;
 }
 
-#undef THROW
+static void imap_get_namespace_by_list(IMAPSession *session, IMAPFolder *folder)
+{
+       GSList *item_list, *cur;
+       gchar separator = '\0';
+       IMAPNameSpace *namespace;
 
-static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
-                                         const gchar *path)
+       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_cmd_gen_send(SESSION(session)->sock, "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,
+                                                   const gchar *path)
 {
        IMAPNameSpace *namespace = NULL;
-       GList *ns_list;
-       gchar *name;
+       gchar *tmp_path, *name;
 
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(path != NULL, NULL);
+       if (!path) path = "";
 
-       ns_list = folder->namespace;
+       Xstrcat_a(tmp_path, path, "/", return NULL);
 
        for (; ns_list != NULL; ns_list = ns_list->next) {
                IMAPNameSpace *tmp_ns = ns_list->data;
@@ -1443,37 +2037,79 @@ static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
                Xstrdup_a(name, tmp_ns->name, return namespace);
                if (tmp_ns->separator && tmp_ns->separator != '/')
                        subst_char(name, tmp_ns->separator, '/');
-               if (strncmp(path, name, strlen(name)) == 0)
+               if (strncmp(tmp_path, name, strlen(name)) == 0)
                        namespace = tmp_ns;
        }
 
        return namespace;
 }
 
-static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
+static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
+                                         const gchar *path)
 {
-       gchar *real_path;
        IMAPNameSpace *namespace;
 
        g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(path != NULL, NULL);
 
-       real_path = g_strdup(path);
+       namespace = imap_find_namespace_from_list(folder->ns_personal, path);
+       if (namespace) return namespace;
+       namespace = imap_find_namespace_from_list(folder->ns_others, path);
+       if (namespace) return namespace;
+       namespace = imap_find_namespace_from_list(folder->ns_shared, path);
+       if (namespace) return namespace;
+
+       return NULL;
+}
+
+static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
+{
+       IMAPNameSpace *namespace;
+       gchar separator = '/';
+
        namespace = imap_find_namespace(folder, path);
        if (namespace && namespace->separator)
-               imap_path_separator_subst(real_path, namespace->separator);
+               separator = namespace->separator;
 
-       return real_path;
+       return separator;
 }
 
-static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
-                             gchar *dest, gint dest_len, GString *str)
+static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
 {
-       gchar *cur_pos = src;
+       gchar *real_path;
+       gchar separator;
 
-       g_return_val_if_fail(str != NULL, cur_pos);
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(path != NULL, NULL);
 
-       while (*cur_pos == ' ') cur_pos++;
+       real_path = imap_locale_to_modified_utf7(path);
+       separator = imap_get_path_separator(folder, path);
+       imap_path_separator_subst(real_path, separator);
+
+       return real_path;
+}
+
+static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
+                             gchar *dest, gint dest_len, GString *str)
+{
+       gchar *cur_pos = src;
+       gchar *nextline;
+
+       g_return_val_if_fail(str != NULL, cur_pos);
+
+       /* read the next line if the current response buffer is empty */
+       while (isspace(*cur_pos)) cur_pos++;
+       while (*cur_pos == '\0') {
+               if ((nextline = sock_getline(sock)) == NULL)
+                       return cur_pos;
+               g_string_assign(str, nextline);
+               cur_pos = str->str;
+               strretchomp(nextline);
+               /* log_print("IMAP4< %s\n", nextline); */
+               debug_print("IMAP4< %s\n", nextline);
+               g_free(nextline);
+
+               while (isspace(*cur_pos)) cur_pos++;
+       }
 
        if (!strncmp(cur_pos, "NIL", 3)) {
                *dest = '\0';
@@ -1486,124 +2122,100 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
        } else if (*cur_pos == '{') {
                gchar buf[32];
                gint len;
-               gchar *nextline;
+               gint line_len = 0;
 
                cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
                len = atoi(buf);
 
-               if ((nextline = sock_getline(sock)) == NULL)
-                       return cur_pos;
-               strretchomp(nextline);
-               log_print("IMAP4< %s\n", nextline);
-               g_string_assign(str, nextline);
-
-               len = MIN(len, strlen(nextline));
-               memcpy(dest, nextline, MIN(len, dest_len - 1));
+               g_string_truncate(str, 0);
+               cur_pos = str->str;
+
+               do {
+                       if ((nextline = sock_getline(sock)) == NULL)
+                               return cur_pos;
+                       line_len += strlen(nextline);
+                       g_string_append(str, nextline);
+                       cur_pos = str->str;
+                       strretchomp(nextline);
+                       /* log_print("IMAP4< %s\n", nextline); */
+                       debug_print("IMAP4< %s\n", nextline);
+                       g_free(nextline);
+               } while (line_len < len);
+
+               memcpy(dest, cur_pos, MIN(len, dest_len - 1));
                dest[MIN(len, dest_len - 1)] = '\0';
-               cur_pos = str->str + len;
+               cur_pos += len;
        }
 
        return cur_pos;
 }
 
-static gchar *imap_parse_one_address(SockInfo *sock, gchar *start,
-                                    gchar *out_from_str,
-                                    gchar *out_fromname_str,
-                                    GString *str)
+static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
+                             GString *str)
 {
-       gchar buf[IMAPBUFSIZE];
-       gchar *userid;
-       gchar *domain;
-       gchar *cur_pos = start;
-
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       conv_unmime_header(out_fromname_str, IMAPBUFSIZE, buf, NULL);
+       gchar *nextline;
+       gchar buf[32];
+       gint len;
+       gint block_len = 0;
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       *headers = NULL;
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       Xstrdup_a(userid, buf, return cur_pos + 1);
+       g_return_val_if_fail(str != NULL, cur_pos);
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       Xstrdup_a(domain, buf, return cur_pos + 1);
+       while (isspace(*cur_pos)) cur_pos++;
 
-       if (out_fromname_str[0] != '\0') {
-               g_snprintf(out_from_str, IMAPBUFSIZE, "\"%s\" <%s@%s>",
-                          out_fromname_str, userid, domain);
-       } else {
-               g_snprintf(out_from_str, IMAPBUFSIZE, "%s@%s",
-                          userid, domain);
-               strcpy(out_fromname_str, out_from_str);
-       }
+       g_return_val_if_fail(*cur_pos == '{', cur_pos);
 
-       while (*cur_pos == ' ') cur_pos++;
-       g_return_val_if_fail(*cur_pos == ')', NULL);
+       cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
+       len = atoi(buf);
 
-       return cur_pos + 1;
-}
+       g_string_truncate(str, 0);
+       cur_pos = str->str;
 
-static gchar *imap_parse_address(SockInfo *sock, gchar *start,
-                                gchar **out_from_str,
-                                gchar **out_fromname_str,
-                                GString *str)
-{
-       gchar buf[IMAPBUFSIZE];
-       gchar name_buf[IMAPBUFSIZE];
-       gchar *cur_pos = start;
-       GString *addr_str;
+       do {
+               if ((nextline = sock_getline(sock)) == NULL)
+                       return cur_pos;
+               block_len += strlen(nextline);
+               g_string_append(str, nextline);
+               cur_pos = str->str;
+               strretchomp(nextline);
+               /* debug_print("IMAP4< %s\n", nextline); */
+               g_free(nextline);
+       } while (block_len < len);
 
-       if (out_from_str)     *out_from_str     = NULL;
-       if (out_fromname_str) *out_fromname_str = NULL;
-       buf[0] = name_buf[0] = '\0';
+       debug_print("IMAP4< [contents of BODY.PEEK[HEADER.FIELDS (...)]]\n");
 
-       if (!strncmp(cur_pos, "NIL", 3)) {
-               if (out_from_str)     *out_from_str     = g_strdup("");
-               if (out_fromname_str) *out_fromname_str = g_strdup("");
-               return cur_pos + 3;
-       }
+       *headers = g_strndup(cur_pos, len);
+       cur_pos += len;
 
-       g_return_val_if_fail(*cur_pos == '(', NULL);
-       cur_pos++;
-
-       addr_str = g_string_new(NULL);
+       while (isspace(*cur_pos)) cur_pos++;
+       while (*cur_pos == '\0') {
+               if ((nextline = sock_getline(sock)) == NULL)
+                       return cur_pos;
+               g_string_assign(str, nextline);
+               cur_pos = str->str;
+               strretchomp(nextline);
+               debug_print("IMAP4< %s\n", nextline);
+               g_free(nextline);
 
-       for (;;) {
-               gchar ch = *cur_pos++;
-               if (ch == ')') break;
-               if (ch == '(') {
-                       cur_pos = imap_parse_one_address
-                               (sock, cur_pos, buf, name_buf, str);
-                       if (!cur_pos) {
-                               g_string_free(addr_str, TRUE);
-                               return NULL;
-                       }
-                       if (addr_str->str[0] != '\0')
-                               g_string_append(addr_str, ", ");
-                       g_string_append(addr_str, buf);
-               }
+               while (isspace(*cur_pos)) cur_pos++;
        }
 
-       if (out_from_str)     *out_from_str     = g_strdup(addr_str->str);
-       if (out_fromname_str) *out_fromname_str = g_strdup(name_buf);
-
-       g_string_free(addr_str, TRUE);
-
        return cur_pos;
 }
 
 static MsgFlags imap_parse_flags(const gchar *flag_str)  
 {
        const gchar *p = flag_str;
-       MsgFlags flags;
+       MsgFlags flags = {0, 0};
 
        flags.perm_flags = MSG_UNREAD;
-       flags.tmp_flags  = MSG_IMAP;
 
        while ((p = strchr(p, '\\')) != NULL) {
                p++;
 
-               if (g_strncasecmp(p, "Recent", 6) == 0) {
-                       MSG_SET_PERM_FLAGS(flags, MSG_NEW|MSG_UNREAD);
+               if (g_strncasecmp(p, "Recent", 6) == 0 && MSG_IS_UNREAD(flags)) {
+                       MSG_SET_PERM_FLAGS(flags, MSG_NEW);
                } else if (g_strncasecmp(p, "Seen", 4) == 0) {
                        MSG_UNSET_PERM_FLAGS(flags, MSG_NEW|MSG_UNREAD);
                } else if (g_strncasecmp(p, "Deleted", 7) == 0) {
@@ -1618,38 +2230,38 @@ static MsgFlags imap_parse_flags(const gchar *flag_str)
        return flags;
 }
 
-static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
+static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
+                                   GString *line_str)
 {
-       MsgInfo *msginfo;
        gchar buf[IMAPBUFSIZE];
-       gchar tmp[IMAPBUFSIZE];
+       MsgInfo *msginfo = NULL;
        gchar *cur_pos;
        gint msgnum;
        guint32 uid = 0;
        size_t size = 0;
-       gchar *date = NULL;
-       time_t date_t = 0;
-       gchar *subject = NULL;
-       gchar *tmp_from;
-       gchar *tmp_fromname;
-       gchar *from = NULL;
-       gchar *fromname = NULL;
-       gchar *tmp_to;
-       gchar *to = NULL;
-       gchar *inreplyto = NULL;
-       gchar *msgid = NULL;
-       MsgFlags flags = {0, 0};
+       MsgFlags flags = {0, 0}, imap_flags = {0, 0};
 
        g_return_val_if_fail(line_str != NULL, NULL);
        g_return_val_if_fail(line_str->str[0] == '*' &&
                             line_str->str[1] == ' ', NULL);
 
+       MSG_SET_TMP_FLAGS(flags, MSG_IMAP);
+       if (item->stype == F_QUEUE) {
+               MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
+       } else if (item->stype == F_DRAFT) {
+               MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
+       }
+
        cur_pos = line_str->str + 2;
 
-#define PARSE_ONE_ELEMENT(ch) \
-{ \
-       cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf)); \
-       g_return_val_if_fail(cur_pos != NULL, NULL); \
+#define PARSE_ONE_ELEMENT(ch)                                  \
+{                                                              \
+       cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf));    \
+       if (cur_pos == NULL) {                                  \
+               g_warning("cur_pos == NULL\n");                 \
+               procmsg_msginfo_free(msginfo);                  \
+               return NULL;                                    \
+       }                                                       \
 }
 
        PARSE_ONE_ELEMENT(' ');
@@ -1669,103 +2281,51 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
                        uid = strtoul(cur_pos, &cur_pos, 10);
                } else if (!strncmp(cur_pos, "FLAGS ", 6)) {
                        cur_pos += 6;
-                       g_return_val_if_fail(*cur_pos == '(', NULL);
+                       if (*cur_pos != '(') {
+                               g_warning("*cur_pos != '('\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
                        cur_pos++;
                        PARSE_ONE_ELEMENT(')');
-                       flags = imap_parse_flags(buf);
+                       imap_flags = imap_parse_flags(buf);
                } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
                        cur_pos += 12;
                        size = strtol(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "ENVELOPE ", 9)) {
-                       cur_pos += 9;
-                       g_return_val_if_fail(*cur_pos == '(', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos + 1, buf, sizeof(buf), line_str);
-                       Xstrdup_a(date, buf, return NULL);
-                       date_t = procheader_date_parse(NULL, date, 0);
-
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       if (buf[0] != '\0') {
-                               conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
-                               Xstrdup_a(subject, tmp, return NULL);
-                       }
+               } else if (!strncmp(cur_pos, "BODY[HEADER.FIELDS ", 19)) {
+                       gchar *headers;
 
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_address(sock, cur_pos + 1,
-                                                    &tmp_from, &tmp_fromname,
-                                                    line_str);
-                       Xstrdup_a(from, tmp_from,
-                                 {g_free(tmp_from); g_free(tmp_fromname);
-                                  return NULL;});
-                       Xstrdup_a(fromname, tmp_fromname,
-                                 {g_free(tmp_from); g_free(tmp_fromname);
-                                  return NULL;});
-                       g_free(tmp_from);
-                       g_free(tmp_fromname);
-
-#define SKIP_ONE_ELEMENT() \
-{ \
-       g_return_val_if_fail(*cur_pos == ' ', NULL); \
-       cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
-                                    line_str); \
-}
-
-                       /* skip sender and reply-to */
-                       SKIP_ONE_ELEMENT();
-                       SKIP_ONE_ELEMENT();
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_address(sock, cur_pos + 1,
-                                                    &tmp_to, NULL, line_str);
-                       Xstrdup_a(to, tmp_to, {g_free(tmp_to); return NULL;});
-                       g_free(tmp_to);
-
-                       /* skip Cc and Bcc */
-                       SKIP_ONE_ELEMENT();
-                       SKIP_ONE_ELEMENT();
-
-#undef SKIP_ONE_ELEMENT
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       if (buf[0] != '\0') {
-                               eliminate_parenthesis(buf, '(', ')');
-                               extract_parenthesis(buf, '<', '>');
-                               remove_space(buf);
-                               Xstrdup_a(inreplyto, buf, return NULL);
+                       cur_pos += 19;
+                       if (*cur_pos != '(') {
+                               g_warning("*cur_pos != '('\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
                        }
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       if (buf[0] != '\0') {
-                               extract_parenthesis(buf, '<', '>');
-                               remove_space(buf);
-                               Xstrdup_a(msgid, buf, return NULL);
+                       cur_pos++;
+                       PARSE_ONE_ELEMENT(')');
+                       if (*cur_pos != ']') {
+                               g_warning("*cur_pos != ']'\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
                        }
-
-                       g_return_val_if_fail(*cur_pos == ')', NULL);
                        cur_pos++;
+
+                       cur_pos = imap_get_header(sock, cur_pos, &headers,
+                                                 line_str);
+                       msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
+                       g_free(headers);
                } else {
                        g_warning("invalid FETCH response: %s\n", cur_pos);
                        break;
                }
        }
 
-       msginfo = g_new0(MsgInfo, 1);
-       msginfo->msgnum = uid;
-       msginfo->size = size;
-       msginfo->date = g_strdup(date);
-       msginfo->date_t = date_t;
-       msginfo->subject = g_strdup(subject);
-       msginfo->from = g_strdup(from);
-       msginfo->fromname = g_strdup(fromname);
-       msginfo->to = g_strdup(to);
-       msginfo->inreplyto = g_strdup(inreplyto);
-       msginfo->msgid = g_strdup(msgid);
-       msginfo->flags = flags;
+       if (msginfo) {
+               msginfo->msgnum = uid;
+               msginfo->size = size;
+               msginfo->flags.tmp_flags |= imap_flags.tmp_flags;
+               msginfo->flags.perm_flags = imap_flags.perm_flags;
+       }
 
        return msginfo;
 }
@@ -1778,7 +2338,6 @@ gint imap_msg_set_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
        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);
 
@@ -1788,6 +2347,10 @@ gint imap_msg_set_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
        session = imap_session_get(folder);
        if (!session) return -1;
 
+       if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+           NULL, NULL, NULL, NULL)) != IMAP_SUCCESS)
+               return ok;
+
        if (flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
        if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
        if (iflags) {
@@ -1811,7 +2374,6 @@ gint imap_msg_unset_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
        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);
 
@@ -1872,12 +2434,27 @@ static gint imap_select(IMAPSession *session, IMAPFolder *folder,
 {
        gchar *real_path;
        gint ok;
+       gint exists_, recent_, unseen_, uid_validity_;
+
+       if (!exists || !recent || !unseen || !uid_validity) {
+               if (session->mbox && strcmp(session->mbox, path) == 0)
+                       return IMAP_SUCCESS;
+               exists = &exists_;
+               recent = &recent_;
+               unseen = &unseen_;
+               uid_validity = &uid_validity_;
+       }
+
+       g_free(session->mbox);
+       session->mbox = NULL;
 
        real_path = imap_get_real_path(folder, path);
        ok = imap_cmd_select(SESSION(session)->sock, real_path,
                             exists, recent, unseen, uid_validity);
        if (ok != IMAP_SUCCESS)
                log_warning(_("can't select folder: %s\n"), real_path);
+       else
+               session->mbox = g_strdup(path);
        g_free(real_path);
 
        return ok;
@@ -1917,8 +2494,9 @@ catch:
 
 static gint imap_status(IMAPSession *session, IMAPFolder *folder,
                        const gchar *path,
-                       gint *messages, gint *recent, gint *unseen,
-                       guint32 *uid_validity)
+                       gint *messages, gint *recent,
+                       guint32 *uid_next, guint32 *uid_validity,
+                       gint *unseen)
 {
        gchar *real_path;
        gchar *real_path_;
@@ -1926,19 +2504,20 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder,
        GPtrArray *argbuf;
        gchar *str;
 
-       *messages = *recent = *unseen = *uid_validity = 0;
+       *messages = *recent = *uid_next = *uid_validity = *unseen = 0;
 
        argbuf = g_ptr_array_new();
 
        real_path = imap_get_real_path(folder, path);
        QUOTE_IF_REQUIRED(real_path_, real_path);
        imap_cmd_gen_send(SESSION(session)->sock, "STATUS %s "
-                         "(MESSAGES RECENT UNSEEN UIDVALIDITY)", real_path_);
+                         "(MESSAGES RECENT UIDNEXT UIDVALIDITY UNSEEN)",
+                         real_path_);
 
        ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
        if (ok != IMAP_SUCCESS) THROW(ok);
 
-       str = search_array_contain_str(argbuf, "STATUS");
+       str = search_array_str(argbuf, "STATUS");
        if (!str) THROW(IMAP_ERROR);
 
        str = strchr(str, '(');
@@ -1953,12 +2532,15 @@ static gint imap_status(IMAPSession *session, IMAPFolder *folder,
                } else if (!strncmp(str, "RECENT ", 7)) {
                        str += 7;
                        *recent = strtol(str, &str, 10);
-               } else if (!strncmp(str, "UNSEEN ", 7)) {
-                       str += 7;
-                       *unseen = strtol(str, &str, 10);
+               } else if (!strncmp(str, "UIDNEXT ", 8)) {
+                       str += 8;
+                       *uid_next = strtoul(str, &str, 10);
                } else if (!strncmp(str, "UIDVALIDITY ", 12)) {
                        str += 12;
                        *uid_validity = strtoul(str, &str, 10);
+               } else if (!strncmp(str, "UNSEEN ", 7)) {
+                       str += 7;
+                       *unseen = strtol(str, &str, 10);
                } else {
                        g_warning("invalid STATUS response: %s\n", str);
                        break;
@@ -2001,12 +2583,74 @@ static gint imap_cmd_logout(SockInfo *sock)
        return imap_cmd_ok(sock, 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)
+{
+       GPtrArray *argbuf;
+       gint r;
+
+       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_str(argbuf, "PREAUTH") != NULL;
+
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+       
+       return r;
+}
+
+static void imap_get_capability(Session *session)
+{
+       gchar *capstr;
+       GPtrArray *argbuf;
+
+       if (IMAP_SESSION(session)->capability != NULL)
+               return;
+
+       imap_cmd_gen_send(session->sock, "CAPABILITY");
+       
+       argbuf = g_ptr_array_new();
+
+       if (imap_cmd_ok(session->sock, argbuf) != IMAP_SUCCESS ||
+           ((capstr = search_array_str(argbuf, "CAPABILITY ")) == NULL)) {
+               ptr_array_free_strings(argbuf);
+               g_ptr_array_free(argbuf, TRUE);
+               return;
+       }
+       
+       capstr += strlen("CAPABILITY ");
+
+       IMAP_SESSION(session)->capability = g_strsplit(capstr, " ", 0);
+       
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+}
+
+static gboolean imap_has_capability(IMAPSession *session, const gchar *cap)
+{
+       gchar **p;
+       
+       for (p = session->capability; *p != NULL; ++p)
+               if (g_strcasecmp(*p, cap) == 0)
+                       return TRUE;
+
+       return FALSE;
+}
+
 static gint imap_cmd_noop(SockInfo *sock)
 {
        imap_cmd_gen_send(sock, "NOOP");
        return imap_cmd_ok(sock, NULL);
 }
 
+static gint imap_cmd_starttls(SockInfo *sock)
+{
+       imap_cmd_gen_send(sock, "STARTTLS");
+       return imap_cmd_ok(sock, NULL);
+}
+
 #define THROW(err) { ok = err; goto catch; }
 
 static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
@@ -2020,7 +2664,7 @@ static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
        imap_cmd_gen_send(sock, "NAMESPACE");
        if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW(ok);
 
-       str = search_array_contain_str(argbuf, "NAMESPACE");
+       str = search_array_str(argbuf, "NAMESPACE");
        if (!str) THROW(IMAP_ERROR);
 
        *ns_str = g_strdup(str);
@@ -2143,6 +2787,18 @@ static gint imap_cmd_create(SockInfo *sock, const gchar *folder)
        return imap_cmd_ok(sock, NULL);
 }
 
+static gint imap_cmd_rename(SockInfo *sock, 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_);
+
+       return imap_cmd_ok(sock, NULL);
+}
+
 static gint imap_cmd_delete(SockInfo *sock, const gchar *folder)
 {
        gchar *folder_;
@@ -2156,7 +2812,7 @@ static gint imap_cmd_delete(SockInfo *sock, const gchar *folder)
 static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
 {
        gint ok;
-       gchar buf[IMAPBUFSIZE];
+       gchar *buf;
        gchar *cur_pos;
        gchar size_str[32];
        glong size_num;
@@ -2165,30 +2821,51 @@ static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
 
        imap_cmd_gen_send(sock, "UID FETCH %d BODY[]", uid);
 
-       if (sock_gets(sock, buf, sizeof(buf)) < 0)
-               return IMAP_ERROR;
-       strretchomp(buf);
-       if (buf[0] != '*' || buf[1] != ' ')
-               return IMAP_ERROR;
-       log_print("IMAP4< %s\n", buf);
+       while ((ok = imap_cmd_gen_recv(sock, &buf))
+              == IMAP_SUCCESS) {
+               if (buf[0] != '*' || buf[1] != ' ') {
+                       g_free(buf);
+                       return IMAP_ERROR;
+               }
+               if (strstr(buf, "FETCH") != NULL)
+                       break;
+       }
+       if (ok != IMAP_SUCCESS)
+               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);
 
-       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(sock, size_num, filename) != 0) {
+               g_free(buf);
                return IMAP_ERROR;
+       }
 
-       if (imap_cmd_gen_recv(sock, buf, sizeof(buf)) != IMAP_SUCCESS)
+       if (imap_cmd_gen_recv(sock, &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;
+       }
 
+       g_free(buf);
        ok = imap_cmd_ok(sock, NULL);
 
        return ok;
@@ -2200,45 +2877,147 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
        gint ok;
        gint size;
        gchar *destfolder_;
+       gchar buf[BUFFSIZE], *imapbuf;
+       FILE *fp;
 
        g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
-       size = get_file_size(file);
+       size = get_file_size_as_crlf(file);
+       if ((fp = fopen(file, "rb")) == NULL) {
+               FILE_OP_ERROR(file, "fopen");
+               return -1;
+       }
        QUOTE_IF_REQUIRED(destfolder_, destfolder);
-       imap_cmd_gen_send(sock, "APPEND %s {%d}", destfolder_, size);
-       ok = imap_cmd_ok(sock, NULL);
-       if (ok != IMAP_SUCCESS) {
+       imap_cmd_gen_send(sock, "APPEND %s (\\Seen) {%d}", destfolder_, size);
+
+       ok = imap_cmd_gen_recv(sock, &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) {
+                       fclose(fp);
+                       sock_close(sock);
+                       return -1;
+               }
+       }
+
+       if (ferror(fp)) {
+               FILE_OP_ERROR(file, "fgets");
+               fclose(fp);
+               sock_close(sock);
                return -1;
        }
 
-       return ok;
+       sock_puts(sock, "");
+
+       fclose(fp);
+       return imap_cmd_ok(sock, NULL);
 }
 
-static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
+#if 0
+static void imap_uidplus_copy(IMAPSession *session, MsgInfo *msginfo,
+                               const gchar *destfolder, const gchar *okmsginfo)
+{
+       unsigned int olduid, newuid;
+       IMAPFlags iflags = 0;
+
+       if (okmsginfo == NULL)
+               return;
+
+       if (sscanf(okmsginfo, "%*u OK [COPYUID %*llu %u %u]", &olduid, &newuid) != 2)
+               return;
+
+       if (olduid != msginfo->msgnum)  /* this should NEVER happen */
+               return;
+
+       if (imap_select(session, IMAP_FOLDER(msginfo->folder->folder), destfolder,
+                       NULL, NULL, NULL, NULL) != IMAP_SUCCESS)
+               return;
+
+       if (msginfo->flags.perm_flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
+       if (msginfo->flags.perm_flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+       if (iflags)
+               imap_set_message_flags(session, newuid, newuid, iflags, TRUE);
+
+       if (msginfo->flags.perm_flags & MSG_UNREAD)
+               imap_set_message_flags(session, newuid, newuid, IMAP_FLAG_SEEN, FALSE);
+
+       imap_select(session, IMAP_FOLDER(msginfo->folder->folder), msginfo->folder->path,
+                   NULL, NULL, NULL, NULL);
+}
+#endif
+
+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_cmd_gen_send(SESSION(session)->sock, "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();
 
+       ok = imap_cmd_ok(SESSION(session)->sock, 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 %*llu %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)
 {
+       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);
+
+                       while(namelen && (elem->name[namelen - 1] == ' ' ||
+                               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_cmd_gen_send
-               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE ENVELOPE)",
-                first_uid, last_uid);
+               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE BODY.PEEK[HEADER.FIELDS (%s)])",
+                first_uid, last_uid,
+                header_fields->str);
 
        return IMAP_SUCCESS;
 }
@@ -2276,11 +3055,11 @@ static gint imap_cmd_expunge(SockInfo *sock)
 static gint imap_cmd_ok(SockInfo *sock, 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_cmd_gen_recv(sock, &buf))
               == IMAP_SUCCESS) {
                if (buf[0] == '*' && buf[1] == ' ') {
                        if (argbuf)
@@ -2294,10 +3073,14 @@ static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
                         !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;
 }
@@ -2325,14 +3108,14 @@ static void imap_cmd_gen_send(SockInfo *sock, const gchar *format, ...)
        sock_write(sock, buf, strlen(buf));
 }
 
-static gint imap_cmd_gen_recv(SockInfo *sock, gchar *buf, gint size)
+static gint imap_cmd_gen_recv(SockInfo *sock, gchar **buf)
 {
-       if (sock_gets(sock, buf, size) == -1)
+       if ((*buf = sock_getline(sock)) == NULL)
                return IMAP_SOCKET;
 
-       strretchomp(buf);
+       strretchomp(*buf);
 
-       log_print("IMAP4< %s\n", buf);
+       log_print("IMAP4< %s\n", *buf);
 
        return IMAP_SUCCESS;
 }
@@ -2379,7 +3162,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_contain_str(GPtrArray *array, gchar *str)
+static gchar *search_array_contain_str(GPtrArray *array, const gchar *str)
 {
        gint i;
 
@@ -2394,8 +3177,491 @@ static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
        return NULL;
 }
 
+static gchar *search_array_str(GPtrArray *array, const gchar *str)
+{
+       gint i;
+       gint len;
+
+       len = strlen(str);
+
+       for (i = 0; i < array->len; i++) {
+               gchar *tmp;
+
+               tmp = g_ptr_array_index(array, i);
+               if (!strncmp(tmp, str, len))
+                       return tmp;
+       }
+
+       return NULL;
+}
+
 static void imap_path_separator_subst(gchar *str, gchar separator)
 {
-       if (separator && separator != '/')
-               subst_char(str, '/', separator);
+       gchar *p;
+       gboolean in_escape = FALSE;
+
+       if (!separator || separator == '/') return;
+
+       for (p = str; *p != '\0'; p++) {
+               if (*p == '/' && !in_escape)
+                       *p = separator;
+               else if (*p == '&' && *(p + 1) != '-' && !in_escape)
+                       in_escape = TRUE;
+               else if (*p == '-' && in_escape)
+                       in_escape = FALSE;
+       }
+}
+
+static gchar *imap_modified_utf7_to_locale(const gchar *mutf7_str)
+{
+#if !HAVE_ICONV
+       return g_strdup(mutf7_str);
+#else
+       static iconv_t cd = (iconv_t)-1;
+       static gboolean iconv_ok = TRUE;
+       GString *norm_utf7;
+       gchar *norm_utf7_p;
+       size_t norm_utf7_len;
+       const gchar *p;
+       gchar *to_str, *to_p;
+       size_t to_len;
+       gboolean in_escape = FALSE;
+
+       if (!iconv_ok) return g_strdup(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",
+                                 conv_get_current_charset_str());
+                       iconv_ok = FALSE;
+                       return g_strdup(mutf7_str);
+               }
+       }
+
+       norm_utf7 = g_string_new(NULL);
+
+       for (p = mutf7_str; *p != '\0'; p++) {
+               /* replace: '&'  -> '+',
+                           "&-" -> '&',
+                           escaped ','  -> '/' */
+               if (!in_escape && *p == '&') {
+                       if (*(p + 1) != '-') {
+                               g_string_append_c(norm_utf7, '+');
+                               in_escape = TRUE;
+                       } else {
+                               g_string_append_c(norm_utf7, '&');
+                               p++;
+                       }
+               } else if (in_escape && *p == ',') {
+                       g_string_append_c(norm_utf7, '/');
+               } else if (in_escape && *p == '-') {
+                       g_string_append_c(norm_utf7, '-');
+                       in_escape = FALSE;
+               } else {
+                       g_string_append_c(norm_utf7, *p);
+               }
+       }
+
+       norm_utf7_p = norm_utf7->str;
+       norm_utf7_len = norm_utf7->len;
+       to_len = strlen(mutf7_str) * 5;
+       to_p = to_str = g_malloc(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);
+               g_free(to_str);
+               return g_strdup(mutf7_str);
+       }
+
+       /* second iconv() call for flushing */
+       iconv(cd, NULL, NULL, &to_p, &to_len);
+       g_string_free(norm_utf7, TRUE);
+       *to_p = '\0';
+
+       return to_str;
+#endif /* !HAVE_ICONV */
+}
+
+static gchar *imap_locale_to_modified_utf7(const gchar *from)
+{
+#if !HAVE_ICONV
+       return g_strdup(from);
+#else
+       static iconv_t cd = (iconv_t)-1;
+       static gboolean iconv_ok = TRUE;
+       gchar *norm_utf7, *norm_utf7_p;
+       size_t from_len, norm_utf7_len;
+       GString *to_str;
+       gchar *from_tmp, *to, *p;
+       gboolean in_escape = FALSE;
+
+       if (!iconv_ok) return g_strdup(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",
+                                 conv_get_current_charset_str());
+                       iconv_ok = FALSE;
+                       return g_strdup(from);
+               }
+       }
+
+       Xstrdup_a(from_tmp, from, return g_strdup(from));
+       from_len = strlen(from);
+       norm_utf7_len = from_len * 5;
+       Xalloca(norm_utf7, norm_utf7_len + 1, return g_strdup(from));
+       norm_utf7_p = norm_utf7;
+
+#define IS_PRINT(ch) (isprint(ch) && isascii(ch))
+
+       while (from_len > 0) {
+               if (IS_PRINT(*from_tmp)) {
+                       /* printable ascii char */
+                       *norm_utf7_p = *from_tmp;
+                       norm_utf7_p++;
+                       from_tmp++;
+                       from_len--;
+               } else {
+                       size_t mblen;
+
+                       /* unprintable char: convert to UTF-7 */
+                       for (mblen = 0;
+                            !IS_PRINT(from_tmp[mblen]) && mblen < from_len;
+                            mblen++)
+                               ;
+                       from_len -= 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",
+                                         conv_get_current_charset_str());
+                               return g_strdup(from);
+                       }
+
+                       /* second iconv() call for flushing */
+                       iconv(cd, NULL, NULL, &norm_utf7_p, &norm_utf7_len);
+               }
+       }
+
+#undef IS_PRINT
+
+       *norm_utf7_p = '\0';
+       to_str = g_string_new(NULL);
+       for (p = norm_utf7; p < norm_utf7_p; p++) {
+               /* replace: '&' -> "&-",
+                           '+' -> '&',
+                           escaped '/' -> ',' */
+               if (!in_escape && *p == '&') {
+                       g_string_append(to_str, "&-");
+               } else if (!in_escape && *p == '+') {
+                       g_string_append_c(to_str, '&');
+                       in_escape = TRUE;
+               } else if (in_escape && *p == '/') {
+                       g_string_append_c(to_str, ',');
+               } else if (in_escape && *p == '-') {
+                       in_escape = FALSE;
+                       g_string_append_c(to_str, '-');
+               } else {
+                       g_string_append_c(to_str, *p);
+               }
+       }
+
+       if (in_escape) {
+               in_escape = FALSE;
+               g_string_append_c(to_str, '-');
+       }
+
+       to = to_str->str;
+       g_string_free(to_str, FALSE);
+
+       return to;
+#endif /* !HAVE_ICONV */
+}
+
+static gboolean imap_rename_folder_func(GNode *node, gpointer data)
+{
+       FolderItem *item = node->data;
+       gchar **paths = data;
+       const gchar *oldpath = paths[0];
+       const gchar *newpath = paths[1];
+       gchar *base;
+       gchar *new_itempath;
+       gint oldpathlen;
+
+       oldpathlen = strlen(oldpath);
+       if (strncmp(oldpath, item->path, oldpathlen) != 0) {
+               g_warning("path doesn't match: %s, %s\n", oldpath, item->path);
+               return TRUE;
+       }
+
+       base = item->path + oldpathlen;
+       while (*base == G_DIR_SEPARATOR) base++;
+       if (*base == '\0')
+               new_itempath = g_strdup(newpath);
+       else
+               new_itempath = g_strconcat(newpath, G_DIR_SEPARATOR_S, base,
+                                          NULL);
+       g_free(item->path);
+       item->path = new_itempath;
+
+       return FALSE;
+}
+
+gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list)
+{
+       IMAPFolderItem *item = (IMAPFolderItem *)_item;
+       IMAPSession *session;
+       gint ok, i, lastuid_old, nummsgs = 0, exists, resent, unseen, uid_val;
+       GPtrArray *argbuf;
+       gchar *cmdbuf = NULL;
+       gchar *dir;
+
+       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->type == F_IMAP, -1);
+       g_return_val_if_fail(folder->account != NULL, -1);
+
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, -1);
+
+       ok = imap_select(session, IMAP_FOLDER(folder), item->item.path,
+                        &exists, &resent, &unseen, &uid_val);
+       if (ok != IMAP_SUCCESS)
+               return -1;
+
+       if (exists == 0)
+               return 0;
+
+       argbuf = g_ptr_array_new();
+       if(item->lastuid) {
+               cmdbuf = g_strdup_printf("UID FETCH %d:* (UID)", (item->lastuid + 1));
+       } else {
+               cmdbuf = g_strdup("UID SEARCH ALL");
+       }
+       imap_cmd_gen_send(SESSION(session)->sock, cmdbuf);
+       g_free(cmdbuf);
+       ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+       if (ok != IMAP_SUCCESS) {
+               ptr_array_free_strings(argbuf);
+               g_ptr_array_free(argbuf, TRUE);
+               return -1;
+       }
+
+       lastuid_old = item->lastuid;
+       *msgnum_list = g_slist_copy(item->uid_list);
+       debug_print("Got %d uids from cache\n", g_slist_length(item->uid_list));
+       for(i = 0; i < argbuf->len; i++) {
+               int ret, msgidx, msgnum;
+
+               if (!strncmp(g_ptr_array_index(argbuf, i), "SEARCH ", 7)) {
+                       gchar **p, **list = g_strsplit(g_ptr_array_index(argbuf, i) + 7, " ", 0);
+
+                       for (p = list; *p != NULL; ++p)
+                               if (sscanf(*p, "%d", &msgnum) == 1 && 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_strfreev(list);
+                               
+               } else if((ret = sscanf(g_ptr_array_index(argbuf, i),
+                               "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2 &&
+                               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;
+               }
+               
+       }
+
+       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);
+
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+
+       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 = procheader_parse_file(file, flags, FALSE, FALSE);
+       if (!msginfo) return NULL;
+
+       msginfo->folder = item;
+
+       return msginfo;
+}
+
+static int compare_uint(gconstpointer a, gconstpointer b)
+{
+       return a-b;
+}
+
+GSList *imap_get_msginfos(Folder *folder, FolderItem *item, GSList *msgnum_list)
+{
+       IMAPSession *session;
+       GSList *sorted_list, *elem, *ret = NULL;
+       gint ok, startnum, lastnum;
+
+       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;
+
+       sorted_list = g_slist_sort(g_slist_copy(msgnum_list), compare_uint);
+
+       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) {
+                       if (!(item->stype == F_QUEUE || item->stype == F_DRAFT)) {
+                               ret = g_slist_concat(ret,
+                                       imap_get_uncached_messages(
+                                               session, item, startnum, lastnum));
+                       } else {
+                               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);
+
+       return ret;
+}
+
+MsgInfo *imap_get_msginfo(Folder *folder, FolderItem *item, gint uid)
+{
+       IMAPSession *session;
+       MsgInfo *msginfo = NULL;
+       gint ok;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(item != 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)) {
+               GSList *list;
+
+               list = imap_get_uncached_messages(session, item, uid, uid);
+               if (list) {
+                       msginfo = (MsgInfo *)list->data;
+                       list->data = NULL;
+               }
+               procmsg_msg_list_free(list);
+       } else {
+               gchar *file;
+
+               file = imap_fetch_msg(folder, item, uid);
+               if (file != NULL) {
+                       msginfo = imap_parse_msg(file, item);
+                       if (msginfo != NULL)
+                               msginfo->msgnum = uid;
+                       g_free(file);
+               }
+       }
+       
+       return msginfo;
+}
+
+gboolean imap_check_msgnum_validity(Folder *folder, FolderItem *_item)
+{
+       IMAPSession *session;
+       IMAPFolderItem *item = (IMAPFolderItem *)_item;
+       gint ok, exists = 0, recent = 0, unseen = 0;
+       guint32 uid_next, uid_validity = 0;
+       
+       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);
+
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, FALSE);
+
+       ok = imap_status(session, IMAP_FOLDER(folder), item->item.path,
+                        &exists, &recent, &uid_next, &uid_validity, &unseen);
+       if (ok != IMAP_SUCCESS)
+               return FALSE;
+
+       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;
 }