sync with 0.7.6cvs4
[claws.git] / src / imap.c
index 1cc354025cd60ff7eee0c7fe7202e7f370c452c3..76319b792d494a5adc7ecfb32eb2f15be373fc43 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-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #  include "config.h"
 #endif
 
+#include "defs.h"
+
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <dirent.h>
 #include <unistd.h>
+#include <ctype.h>
+#include <time.h>
+#if HAVE_LIBJCONV
+#  include <jconv.h>
+#endif
 
 #include "intl.h"
 #include "imap.h"
 #include "socket.h"
+#include "ssl.h"
 #include "recv.h"
 #include "procmsg.h"
 #include "procheader.h"
 #include "prefs_account.h"
 #include "codeconv.h"
 #include "utils.h"
+#include "inputdialog.h"
 
 #define IMAP4_PORT     143
+#if USE_SSL
+#define IMAPS_PORT     993
+#endif
+
+#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);         \
+       }                                                       \
+}
 
 static GList *session_list = NULL;
 
 static gint imap_cmd_count = 0;
 
-static IMAPSession *imap_session_connect_if_not        (Folder         *folder);
+static void imap_folder_init           (Folder         *folder,
+                                        const gchar    *name,
+                                        const gchar    *path);
+
+static IMAPSession *imap_session_get   (Folder         *folder);
+
+static gint imap_scan_tree_recursive   (IMAPSession    *session,
+                                        FolderItem     *item);
+static GSList *imap_parse_list         (IMAPSession    *session,
+                                        const gchar    *real_path);
+
+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);
 static gint imap_do_copy_msgs_with_dest        (Folder         *folder,
-                                        FolderItem     *dest,
+                                        FolderItem     *dest, 
                                         GSList         *msglist,
                                         gboolean        remove_source);
 
 static GSList *imap_get_uncached_messages      (IMAPSession    *session,
                                                 FolderItem     *item,
-                                                gint            first,
-                                                gint            last);
+                                                guint32         first_uid,
+                                                guint32         last_uid);
 static GSList *imap_delete_cached_messages     (GSList         *mlist,
-                                                gint            first,
-                                                gint            last);
+                                                FolderItem     *item,
+                                                guint32         first_uid,
+                                                guint32         last_uid);
 static void imap_delete_all_cached_messages    (FolderItem     *item);
 
+#if USE_SSL
 static SockInfo *imap_open             (const gchar    *server,
                                         gushort         port,
-                                        gchar          *buf);
+                                        gboolean        use_ssl);
+#else
+static SockInfo *imap_open             (const gchar    *server,
+                                        gushort         port);
+#endif
 
-static gint imap_set_article_flags     (IMAPSession    *session,
-                                        gint            first,
-                                        gint            last,
+static SockInfo *imap_open_tunnel(const gchar *server,
+                                 const gchar *tunnelcmd);
+
+static SockInfo *imap_init_sock(SockInfo *sock);
+
+static gint imap_set_message_flags     (IMAPSession    *session,
+                                        guint32         first_uid,
+                                        guint32         last_uid,
                                         IMAPFlags       flag,
                                         gboolean        is_set);
-
-static gchar *imap_parse_atom          (SockInfo *sock,
-                                        gchar    *src,
-                                        gchar    *dest,
-                                        gchar    *orig_buf);
-static gchar *imap_parse_one_address   (SockInfo *sock,
-                                        gchar    *start,
-                                        gchar    *out_from_str,
-                                        gchar    *out_fromname_str,
-                                        gchar    *orig_buf);
-static gchar *imap_parse_address       (SockInfo *sock,
-                                        gchar    *start,
-                                        gchar   **out_from_str,
-                                        gchar   **out_fromname_str,
-                                        gchar    *orig_buf);
+static gint imap_select                        (IMAPSession    *session,
+                                        IMAPFolder     *folder,
+                                        const gchar    *path,
+                                        gint           *exists,
+                                        gint           *recent,
+                                        gint           *unseen,
+                                        guint32        *uid_validity);
+static gint imap_get_uid               (IMAPSession    *session,
+                                        gint            msgnum,
+                                        guint32        *uid);
+static gint imap_status                        (IMAPSession    *session,
+                                        IMAPFolder     *folder,
+                                        const gchar    *path,
+                                        gint           *messages,
+                                        gint           *recent,
+                                        guint32        *uid_next,
+                                        guint32        *uid_validity,
+                                        gint           *unseen);
+
+static void imap_parse_namespace               (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);
+
+static gchar *imap_parse_atom          (SockInfo       *sock,
+                                        gchar          *src,
+                                        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,
-                                        gchar    *line_str);
+static MsgInfo *imap_parse_envelope    (SockInfo       *sock,
+                                        GString        *line_str);
+static gint imap_greeting              (SockInfo *sock,
+                                        gboolean *is_preauth);
 
 /* low-level IMAP4rev1 commands */
 static gint imap_cmd_login     (SockInfo       *sock,
@@ -100,38 +183,57 @@ 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_namespace (SockInfo       *sock,
+                                gchar         **ns_str);
+static gint imap_cmd_list      (SockInfo       *sock,
+                                const gchar    *ref,
+                                const gchar    *mailbox,
+                                GPtrArray      *argbuf);
+static gint imap_cmd_do_select (SockInfo       *sock,
+                                const gchar    *folder,
+                                gboolean        examine,
+                                gint           *exists,
+                                gint           *recent,
+                                gint           *unseen,
+                                guint32        *uid_validity);
 static gint imap_cmd_select    (SockInfo       *sock,
                                 const gchar    *folder,
                                 gint           *exists,
                                 gint           *recent,
                                 gint           *unseen,
-                                gulong         *uid);
-static gint imap_cmd_status    (SockInfo       *sock,
+                                guint32        *uid_validity);
+static gint imap_cmd_examine   (SockInfo       *sock,
                                 const gchar    *folder,
-                                const gchar    *status);
+                                gint           *exists,
+                                gint           *recent,
+                                gint           *unseen,
+                                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,
-                                gint            first,
-                                gint            last);
+                                guint32         first_uid,
+                                guint32         last_uid);
 #if 0
 static gint imap_cmd_search    (SockInfo       *sock,
                                 GSList         *numlist);
 #endif
 static gint imap_cmd_fetch     (SockInfo       *sock,
-                                gint            num,
+                                guint32         uid,
                                 const gchar    *filename);
 static gint imap_cmd_append    (SockInfo       *sock,
                                 const gchar    *destfolder,
                                 const gchar    *file);
 static gint imap_cmd_copy      (SockInfo       *sock,
-                                gint            num,
+                                guint32         uid,
                                 const gchar    *destfolder);
 static gint imap_cmd_store     (SockInfo       *sock,
-                                gint            first,
-                                gint            last,
+                                guint32         first_uid,
+                                guint32         last_uid,
                                 gchar          *sub_cmd);
 static gint imap_cmd_expunge   (SockInfo       *sock);
 
@@ -144,29 +246,109 @@ static gint imap_cmd_gen_recv    (SockInfo       *sock,
                                 gint            size);
 
 /* misc utility functions */
-static gchar *strchr_cpy               (const gchar    *src,
-                                        gchar           ch,
-                                        gchar          *dest,
-                                        gint            len);
-static gchar *search_array_contain_str (GPtrArray      *array,
-                                        gchar          *str);
-static void imap_path_subst_slash_to_dot(gchar *str);
+static gchar *strchr_cpy                       (const gchar    *src,
+                                                gchar           ch,
+                                                gchar          *dest,
+                                                gint            len);
+static gchar *get_quoted                       (const gchar    *src,
+                                                gchar           ch,
+                                                gchar          *dest,
+                                                gint            len);
+static gchar *search_array_contain_str         (GPtrArray      *array,
+                                                gchar          *str);
+static gchar *search_array_str                 (GPtrArray      *array,
+                                                gchar          *str);
+static gchar *search_array_starts              (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);
+
+
+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(IMAPFolder *folder)
+{
+       folder_remote_folder_destroy(REMOTE_FOLDER(folder));
+}
 
+static void imap_folder_init(Folder *folder, const gchar *name,
+                            const gchar *path)
+{
+       folder_remote_folder_init(folder, name, path);
+
+       folder->type = F_IMAP;
+
+       folder->get_msg_list        = imap_get_msg_list;
+       folder->fetch_msg           = imap_fetch_msg;
+       folder->add_msg             = imap_add_msg;
+       folder->move_msg            = imap_move_msg;
+       folder->move_msgs_with_dest = imap_move_msgs_with_dest;
+       folder->copy_msg            = imap_copy_msg;
+       folder->copy_msgs_with_dest = imap_copy_msgs_with_dest;
+       folder->remove_msg          = imap_remove_msg;
+       folder->remove_all_msg      = imap_remove_all_msg;
+       folder->is_msg_changed      = imap_is_msg_changed;
+       folder->scan                = imap_scan_folder;
+       folder->scan_tree           = imap_scan_tree;
+       folder->create_tree         = imap_create_tree;
+       folder->create_folder       = imap_create_folder;
+       folder->rename_folder       = imap_rename_folder;
+       folder->remove_folder       = imap_remove_folder;
+}
 
-static IMAPSession *imap_session_connect_if_not(Folder *folder)
+static IMAPSession *imap_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
+       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
+       port = folder->account->set_imapport ? folder->account->imapport
+               : folder->account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+#else
+       port = folder->account->set_imapport ? folder->account->imapport
+               : IMAP4_PORT;
+#endif
+
        if (!rfolder->session) {
                rfolder->session =
-                       imap_session_new(folder->account->recv_server,
-                                        IMAP4_PORT,
-                                        folder->account->userid,
-                                        folder->account->passwd);
+                       imap_session_new(folder->account);
+               if (rfolder->session) {
+                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
+                                            IMAP_FOLDER(folder));
+                       rfolder->session->last_access_time = time(NULL);
+               }
+               statusbar_pop_all();
+               return IMAP_SESSION(rfolder->session);
+       }
+
+       /* 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) - rfolder->session->last_access_time < SESSION_TIMEOUT) {
+               rfolder->session->last_access_time = time(NULL);
                statusbar_pop_all();
                return IMAP_SESSION(rfolder->session);
        }
@@ -174,45 +356,93 @@ static IMAPSession *imap_session_connect_if_not(Folder *folder)
        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, IMAP4_PORT);
+                           folder->account->recv_server, port);
                session_destroy(rfolder->session);
                rfolder->session =
-                       imap_session_new(folder->account->recv_server,
-                                        IMAP4_PORT, folder->account->userid,
-                                        folder->account->passwd);
+                       imap_session_new(folder->account);
+               if (rfolder->session)
+                       imap_parse_namespace(IMAP_SESSION(rfolder->session),
+                                            IMAP_FOLDER(folder));
        }
 
+       if (rfolder->session)
+               rfolder->session->last_access_time = time(NULL);
        statusbar_pop_all();
        return IMAP_SESSION(rfolder->session);
 }
 
-Session *imap_session_new(const gchar *server, gushort port,
-                         const gchar *user, const gchar *pass)
+Session *imap_session_new(const PrefsAccount *account)
 {
-       gchar buf[IMAPBUFSIZE];
        IMAPSession *session;
        SockInfo *imap_sock;
+       gushort port;
+       gchar *pass;
+       gboolean is_preauth;
+
+#ifdef USE_SSL
+       /* FIXME: IMAP over SSL only... */ 
+       gboolean use_ssl;
+
+       port = account->set_imapport ? account->imapport
+               : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+       use_ssl = account->ssl_imap ? TRUE : FALSE;     
+#else
+       port = account->set_imapport ? account->imapport
+               : IMAP4_PORT;
+#endif
 
-       g_return_val_if_fail(server != NULL, NULL);
+       if (account->set_tunnelcmd) {
+               log_message(_("creating tunneled IMAP4 connection\n"));
+               if ((imap_sock = imap_open_tunnel(account->recv_server, 
+                                                 account->tunnelcmd)) == NULL)
+                       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_SSL
+               if ((imap_sock = imap_open(account->recv_server, port,
+                                          use_ssl)) == NULL)
+#else
+               if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
+#endif
+                       return NULL;
+       }
 
-       log_message(_("creating IMAP4 connection to %s:%d ...\n"),
-                   server, port);
+       /* Only need to log in if the connection was not PREAUTH */
+       imap_greeting(imap_sock, &is_preauth);
+       log_message("IMAP connection is %s-authenticated\n",
+                   (is_preauth) ? "pre" : "un");
+       if (!is_preauth) {
+               g_return_val_if_fail(account->userid != NULL, NULL);
+
+               pass = account->passwd;
+               if (!pass) {
+                       gchar *tmp_pass;
+                       tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
+                       if (!tmp_pass)
+                               return NULL;
+                       Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return NULL;});
+                       g_free(tmp_pass);
+               }
 
-       if ((imap_sock = imap_open(server, port, buf)) == NULL)
-               return NULL;
-       if (imap_cmd_login(imap_sock, user, pass) != IMAP_SUCCESS) {
-               imap_cmd_logout(imap_sock);
-               sock_close(imap_sock);
-               return NULL;
+               if (imap_cmd_login(imap_sock, account->userid, pass) != IMAP_SUCCESS) {
+                       imap_cmd_logout(imap_sock);
+                       sock_close(imap_sock);
+                       return NULL;
+               }
        }
 
        session = g_new(IMAPSession, 1);
-       SESSION(session)->type      = SESSION_IMAP;
-       SESSION(session)->server    = g_strdup(server);
-       SESSION(session)->sock      = imap_sock;
-       SESSION(session)->connected = TRUE;
-       SESSION(session)->phase     = SESSION_READY;
-       SESSION(session)->data      = NULL;
+       SESSION(session)->type             = SESSION_IMAP;
+       SESSION(session)->server           = g_strdup(account->recv_server);
+       SESSION(session)->sock             = imap_sock;
+       SESSION(session)->connected        = TRUE;
+       SESSION(session)->phase            = SESSION_READY;
+       SESSION(session)->last_access_time = time(NULL);
+       SESSION(session)->data             = NULL;
        session->mbox = NULL;
 
        session_list = g_list_append(session_list, session);
@@ -236,23 +466,26 @@ 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));
        }
 }
 
+#define THROW goto catch
+
 GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 {
        GSList *mlist = NULL;
        IMAPSession *session;
-       gint ok, exists = 0, recent = 0, unseen = 0, begin = 1;
-       gulong uid = 0, last_uid;
+       gint ok, exists = 0, recent = 0, unseen = 0;
+       guint32 uid_validity = 0;
+       guint32 first_uid = 0, last_uid = 0, begin;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(folder->type == F_IMAP, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
 
-       session = imap_session_connect_if_not(folder);
+       session = imap_session_get(folder);
 
        if (!session) {
                mlist = procmsg_read_cache(item, FALSE);
@@ -262,70 +495,78 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
                return mlist;
        }
 
-       last_uid = item->mtime;
-
-       ok = imap_cmd_select(SESSION(session)->sock, item->path,
-                            &exists, &recent, &unseen, &uid);
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't select folder: %s\n"), item->path);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       if (ok != IMAP_SUCCESS) THROW;
+       if (exists > 0) {
+               ok = imap_get_uid(session, 1, &first_uid);
+               if (ok != IMAP_SUCCESS) THROW;
+               if (1 != exists) {
+                       ok = imap_get_uid(session, exists, &last_uid);
+                       if (ok != IMAP_SUCCESS) THROW;
+               } else
+                       last_uid = first_uid;
+       } else {
+               imap_delete_all_cached_messages(item);
                statusbar_pop_all();
                return NULL;
        }
 
        if (use_cache) {
-               gint cache_last;
+               guint32 cache_last;
 
                mlist = procmsg_read_cache(item, FALSE);
                procmsg_set_flags(mlist, item);
                cache_last = procmsg_get_last_num_in_cache(mlist);
 
                /* calculating the range of envelope to get */
-               if (exists < cache_last) {
-                       /* some messages are deleted (get all) */
-                       begin = 1;
-               } else if (exists == cache_last) {
-                       if (last_uid != 0 && last_uid != uid) {
-                               /* some recent but deleted (get all) */
-                               begin = 1;
-                       } else {
-                               /* mailbox unchanged (get none)*/
-                               begin = -1;
-                       }
+               if (item->mtime != uid_validity) {
+                       /* mailbox is changed (get all) */
+                       begin = first_uid;
+               } else if (last_uid < cache_last) {
+                       /* mailbox is changed (get all) */
+                       begin = first_uid;
+               } else if (last_uid == cache_last) {
+                       /* mailbox unchanged (get none)*/
+                       begin = 0;
                } else {
-                       if (exists == cache_last + recent) {
-                               /* some recent */
-                               begin = cache_last + 1;
-                       } else {
-                               /* some recent but deleted (get all) */
-                               begin = 1;
-                       }
+                       begin = cache_last + 1;
                }
 
-               item->mtime = uid;
+               item->mtime = uid_validity;
+
+               if (first_uid > 0 && last_uid > 0) {
+                       mlist = imap_delete_cached_messages(mlist, item,
+                                                           0, first_uid - 1);
+                       mlist = imap_delete_cached_messages(mlist, item,
+                                                           last_uid + 1,
+                                                           UINT_MAX);
+               }
+               if (begin > 0)
+                       mlist = imap_delete_cached_messages(mlist, item,
+                                                           begin, UINT_MAX);
+       } else {
+               imap_delete_all_cached_messages(item);
+               begin = first_uid;
        }
 
-       if (1 < begin && begin <= exists) {
+       if (begin > 0 && begin <= last_uid) {
                GSList *newlist;
-
-               newlist = imap_get_uncached_messages
-                       (session, item, begin, exists);
-               imap_delete_cached_messages(mlist, begin, INT_MAX);
+               newlist = imap_get_uncached_messages(session, item,
+                                                    begin, last_uid);
                mlist = g_slist_concat(mlist, newlist);
-       } else if (begin == 1) {
-               if (begin <= exists)
-                       mlist = imap_get_uncached_messages
-                               (session, item, begin, exists);
-               imap_delete_all_cached_messages(item);
        }
 
-       item->last_num = exists;
+       item->last_num = last_uid;
 
+catch:
        statusbar_pop_all();
-
        return mlist;
 }
 
-gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint num)
+#undef THROW
+
+gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint uid)
 {
        gchar *path, *filename;
        IMAPSession *session;
@@ -334,29 +575,39 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint num)
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
 
-       session = imap_session_connect_if_not(folder);
-
        path = folder_item_get_path(item);
-       filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(num), NULL);
+       if (!is_dir_exist(path))
+               make_dir_hier(path);
+       filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
        g_free(path);
  
        if (is_file_exist(filename)) {
-               debug_print(_("message %d has been already cached.\n"), num);
+               debug_print(_("message %d has been already cached.\n"), uid);
                return filename;
        }
 
+       session = imap_session_get(folder);
        if (!session) {
                g_free(filename);
                return NULL;
        }
 
-       debug_print(_("getting message %d...\n"), num);
-       ok = imap_cmd_fetch(SESSION(session)->sock, num, filename);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        NULL, NULL, NULL, NULL);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS) {
+               g_warning(_("can't select mailbox %s\n"), item->path);
+               g_free(filename);
+               return NULL;
+       }
+
+       debug_print(_("getting message %d...\n"), uid);
+       ok = imap_cmd_fetch(SESSION(session)->sock, (guint32)uid, filename);
 
        statusbar_pop_all();
 
        if (ok != IMAP_SUCCESS) {
-               g_warning(_("can't fetch message %d\n"), num);
+               g_warning(_("can't fetch message %d\n"), uid);
                g_free(filename);
                return NULL;
        }
@@ -367,23 +618,31 @@ gchar *imap_fetch_msg(Folder *folder, FolderItem *item, gint num)
 gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
                  gboolean remove_source)
 {
+       gchar *destdir;
        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(dest != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
 
-       session = imap_session_connect_if_not(folder);
-       if (!session)
-               return -1;
+       session = imap_session_get(folder);
+       if (!session) return -1;
 
-       if (dest->last_num < 0) {
-               imap_scan_folder(folder, dest);
-               if (dest->last_num < 0) return -1;
+       ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
+                        &messages, &recent, &uid_next, &uid_validity, &unseen);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS) {
+               g_warning(_("can't append message %s\n"), file);
+               return -1;
        }
 
-       ok = imap_cmd_append(SESSION(session)->sock, dest->path, file);
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
+       ok = imap_cmd_append(SESSION(session)->sock, destdir, file);
+       g_free(destdir);
+
        if (ok != IMAP_SUCCESS) {
                g_warning(_("can't append message %s\n"), file);
                return -1;
@@ -394,7 +653,7 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
                        FILE_OP_ERROR(file, "unlink");
        }
 
-       return dest->last_num;
+       return uid_next;
 }
 
 static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
@@ -402,12 +661,14 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
 {
        gchar *destdir;
        IMAPSession *session;
+       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);
        g_return_val_if_fail(msginfo != NULL, -1);
 
-       session = imap_session_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return -1;
 
        if (msginfo->folder == dest) {
@@ -415,26 +676,35 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
                return -1;
        }
 
-       Xstrdup_a(destdir, dest->path, return -1);
-       /* imap_path_subst_slash_to_dot(destdir); */
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
-       debug_print(_("%s message %s%c%d to %s ...\n"),
-                   remove_source ? "Moving" : "Copying",
-                   msginfo->folder->path, G_DIR_SEPARATOR,
-                   msginfo->msgnum, destdir);
+       if (remove_source)
+               debug_print(_("Moving message %s%c%d to %s ...\n"),
+                           msginfo->folder->path, G_DIR_SEPARATOR,
+                           msginfo->msgnum, destdir);
+       else
+               debug_print(_("Copying message %s%c%d to %s ...\n"),
+                           msginfo->folder->path, G_DIR_SEPARATOR,
+                           msginfo->msgnum, destdir);
 
-       imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
+       ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
 
-       if (remove_source) {
-               imap_set_article_flags(session, msginfo->msgnum, msginfo->msgnum,
+       if (ok == IMAP_SUCCESS && remove_source) {
+               imap_set_message_flags(session, msginfo->msgnum, msginfo->msgnum,
                                       IMAP_FLAG_DELETED, TRUE);
-               imap_cmd_expunge(SESSION(session)->sock);
+               ok = imap_cmd_expunge(SESSION(session)->sock);
        }
 
-       return IMAP_SUCCESS;
+       g_free(destdir);
+       statusbar_pop_all();
+
+       if (ok == IMAP_SUCCESS)
+               return 0;
+       else
+               return -1;
 }
 
-static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
+static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest, 
                                        GSList *msglist,
                                        gboolean remove_source)
 {
@@ -442,16 +712,16 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
        GSList *cur;
        MsgInfo *msginfo;
        IMAPSession *session;
+       gint ok = IMAP_SUCCESS;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
 
-       session = imap_session_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return -1;
 
-       Xstrdup_a(destdir, dest->path, return -1);
-       /* imap_path_subst_slash_to_dot(destdir); */
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        for (cur = msglist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
@@ -461,79 +731,165 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
                        continue;
                }
 
-               debug_print(_("%s message %s%c%d to %s ...\n"),
-                           remove_source ? "Moving" : "Copying",
-                           msginfo->folder->path, G_DIR_SEPARATOR,
-                           msginfo->msgnum, destdir);
+               if (remove_source)
+                       debug_print(_("Moving message %s%c%d to %s ...\n"),
+                                   msginfo->folder->path, G_DIR_SEPARATOR,
+                                   msginfo->msgnum, destdir);
+               else
+                       debug_print(_("Copying message %s%c%d to %s ...\n"),
+                                   msginfo->folder->path, G_DIR_SEPARATOR,
+                                   msginfo->msgnum, destdir);
 
-               imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum,
-                             destdir);
+               ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum,
+                                  destdir);
 
-               if (remove_source) {
-                       imap_set_article_flags
+               if (ok == IMAP_SUCCESS && remove_source) {
+                       imap_set_message_flags
                                (session, msginfo->msgnum, msginfo->msgnum,
                                 IMAP_FLAG_DELETED, TRUE);
                }
        }
 
        if (remove_source)
-               imap_cmd_expunge(SESSION(session)->sock);
+               ok = imap_cmd_expunge(SESSION(session)->sock);
 
-       return IMAP_SUCCESS;
+       g_free(destdir);
+       statusbar_pop_all();
 
+       if (ok == IMAP_SUCCESS)
+               return 0;
+       else
+               return -1;
 }
 
 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 == 0)
+               ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+
+       return ret;
 }
 
-gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest,
+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 != 0) break;
+       }
+
+       return ret;
 }
 
 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;
 }
 
-gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
+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 != 0) break;
+       }
+
+       return ret;
 }
 
-gint imap_remove_msg(Folder *folder, FolderItem *item, gint num)
+gint imap_remove_msg(Folder *folder, FolderItem *item, gint uid)
 {
        gint exists, recent, unseen;
-       gulong uid;
+       guint32 uid_validity;
        gint ok;
        IMAPSession *session;
 
        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(num > 0 && num <= item->last_num, -1);
 
-       session = imap_session_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return -1;
 
-       ok = imap_cmd_select(SESSION(session)->sock, item->path,
-                            &exists, &recent, &unseen, &uid);
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't select folder: %s\n"), item->path);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS)
                return ok;
-       }
 
-       ok = imap_set_article_flags(IMAP_SESSION(REMOTE_FOLDER(folder)->session),
-                                   num, num, IMAP_FLAG_DELETED, TRUE);
+       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"), num);
+               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;
@@ -545,31 +901,35 @@ gint imap_remove_msg(Folder *folder, FolderItem *item, gint num)
 gint imap_remove_all_msg(Folder *folder, FolderItem *item)
 {
        gint exists, recent, unseen;
-       gulong uid;
+       guint32 uid_validity;
        gint ok;
        IMAPSession *session;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(item != NULL, -1);
 
-       session = imap_session_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return -1;
 
-       ok = imap_cmd_select(SESSION(session)->sock, item->path,
-                            &exists, &recent, &unseen, &uid);
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't select folder: %s\n"), item->path);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS)
                return ok;
-       }
+       if (exists == 0)
+               return IMAP_SUCCESS;
 
-       ok = imap_set_article_flags(session, 1, exists,
-                                   IMAP_FLAG_DELETED, TRUE);
+       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;
        }
 
        ok = imap_cmd_expunge(SESSION(session)->sock);
+       statusbar_pop_all();
        if (ok != IMAP_SUCCESS) {
                log_warning(_("can't expunge\n"));
                return ok;
@@ -578,169 +938,646 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
        return IMAP_SUCCESS;
 }
 
-void imap_scan_folder(Folder *folder, FolderItem *item)
+gboolean imap_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)
 {
+       /* TODO: properly implement this method */
+       return FALSE;
 }
 
-FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
-                              const gchar *name)
+gint imap_scan_folder(Folder *folder, FolderItem *item)
 {
-       gchar *dirpath, *imappath;
        IMAPSession *session;
-       FolderItem *new_item;
+       gint messages, recent, unseen;
+       guint32 uid_next, uid_validity;
        gint ok;
 
-       g_return_val_if_fail(folder != NULL, NULL);
-       g_return_val_if_fail(parent != NULL, NULL);
-       g_return_val_if_fail(name != NULL, NULL);
-
-       session = imap_session_connect_if_not(folder);
-       if (!session) return NULL;
-
-       if (parent->path)
-               dirpath = g_strconcat(parent->path, G_DIR_SEPARATOR_S, name,
-                                     NULL);
-       else
-               dirpath = g_strdup(name);
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
 
-       imappath = g_strdup(dirpath);
-       /* imap_path_subst_slash_to_dot(imappath); */
+       session = imap_session_get(folder);
+       if (!session) return -1;
 
-       if (strcmp(name, "INBOX") != 0) {
-               ok = imap_cmd_status(SESSION(session)->sock, imappath,
-                                    "MESSAGES");
-               if (ok != IMAP_SUCCESS) {
-                       ok = imap_cmd_create(SESSION(session)->sock, imappath);
-                       statusbar_pop_all();
-                       if (ok != IMAP_SUCCESS) {
-                               log_warning(_("can't create mailbox\n"));
-                               g_free(imappath);
-                               g_free(dirpath);
-                               return NULL;
-                       }
-               }
-               statusbar_pop_all();
-       }
+       ok = imap_status(session, IMAP_FOLDER(folder), item->path,
+                        &messages, &recent, &uid_next, &uid_validity, &unseen);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS) return -1;
 
-       new_item = folder_item_new(name, dirpath);
-       folder_item_append(parent, new_item);
-       g_free(imappath);
-       g_free(dirpath);
+       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 new_item;
+       return 0;
 }
 
-gint imap_remove_folder(Folder *folder, FolderItem *item)
+void imap_scan_tree(Folder *folder)
 {
-       gint ok;
+       FolderItem *item;
        IMAPSession *session;
+       gchar *root_folder = NULL;
 
-       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_if_fail(folder != NULL);
+       g_return_if_fail(folder->account != NULL);
 
-       session = imap_session_connect_if_not(folder);
-       if (!session) return -1;
+       session = imap_session_get(folder);
+       if (!session) return;
 
-       ok = imap_cmd_delete(SESSION(session)->sock, item->path);
-       statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't delete mailbox\n"));
-               return -1;
+       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_item_remove(item);
+       folder_tree_destroy(folder);
+       item = folder_item_new(folder->name, root_folder);
+       item->folder = folder;
+       folder->node = g_node_new(item);
 
-       return 0;
+       imap_scan_tree_recursive(session, item);
+
+       imap_create_missing_folders(folder);
 }
 
-static GSList *imap_get_uncached_messages(IMAPSession *session,
-                                         FolderItem *item,
-                                         gint first, gint last)
+static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
 {
-       gchar buf[IMAPBUFSIZE];
-       GSList *newlist = NULL;
-       GSList *llast = NULL;
-       MsgInfo *msginfo;
-
-       g_return_val_if_fail(session != NULL, NULL);
-       g_return_val_if_fail(item != NULL, NULL);
-       g_return_val_if_fail(item->folder != NULL, NULL);
-       g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
-       g_return_val_if_fail(first <= last, NULL);
+       Folder *folder;
+       IMAPFolder *imapfolder;
+       FolderItem *new_item;
+       GSList *item_list, *cur;
+       gchar *real_path;
+       gchar *wildcard_path;
+       gchar separator;
+       gchar wildcard[3];
 
-       if (imap_cmd_envelope(SESSION(session)->sock, first, last)
-           != IMAP_SUCCESS) {
-               log_warning(_("can't get envelope\n"));
-               return NULL;
+       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);
+
+       folder = FOLDER(item->folder);
+       imapfolder = IMAP_FOLDER(folder);
+
+       separator = imap_get_path_separator(imapfolder, item->path);
+
+       if (item->folder->ui_func)
+               item->folder->ui_func(folder, item, folder->ui_func_data);
+
+       if (item->path) {
+               wildcard[0] = separator;
+               wildcard[1] = '%';
+               wildcard[2] = '\0';
+               real_path = imap_get_real_path(imapfolder, item->path);
+       } else {
+               wildcard[0] = '%';
+               wildcard[1] = '\0';
+               real_path = g_strdup("");
        }
 
-       for (;;) {
-               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
-                       log_warning(_("error occurred while getting envelope.\n"));
-                       return newlist;
-               }
-               strretchomp(buf);
-               if (buf[0] != '*' || buf[1] != ' ') break;
+       Xstrcat_a(wildcard_path, real_path, wildcard,
+                 {g_free(real_path); return IMAP_ERROR;});
+       QUOTE_IF_REQUIRED(wildcard_path, wildcard_path);
 
-               msginfo = imap_parse_envelope(SESSION(session)->sock, buf);
-               if (!msginfo) {
-                       log_warning(_("can't parse envelope: %s\n"), buf);
-                       continue;
-               }
+       imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" %s",
+                         wildcard_path);
 
-               msginfo->folder = item;
+       strtailchomp(real_path, separator);
+       item_list = imap_parse_list(session, real_path);
+       g_free(real_path);
 
-               if (!newlist)
-                       llast = newlist = g_slist_append(newlist, msginfo);
-               else {
-                       llast = g_slist_append(llast, msginfo);
-                       llast = llast->next;
+       for (cur = item_list; cur != NULL; cur = cur->next) {
+               new_item = cur->data;
+               if (!strcmp(new_item->path, "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->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;
+                               folder->trash = new_item;
+                       }
                }
+               folder_item_append(item, new_item);
+               if (new_item->no_select == FALSE)
+                       imap_scan_folder(folder, new_item);
+               if (new_item->no_sub == FALSE)
+                       imap_scan_tree_recursive(session, new_item);
        }
 
-       return newlist;
+       return IMAP_SUCCESS;
 }
 
-static GSList *imap_delete_cached_messages(GSList *mlist,
-                                          gint first, gint last)
+static GSList *imap_parse_list(IMAPSession *session, const gchar *real_path)
 {
-       GSList *cur, *next;
-       MsgInfo *msginfo;
-       gchar *cache_file;
-
-       for (cur = mlist; cur != NULL; ) {
-               next = cur->next;
+       gchar buf[IMAPBUFSIZE];
+       gchar flags[256];
+       gchar separator[16];
+       gchar *p;
+       gchar *name;
+       gchar *loc_name, *loc_path;
+       GSList *item_list = NULL;
+       GString *str;
+       FolderItem *new_item;
 
-               msginfo = (MsgInfo *)cur->data;
-               if (msginfo != NULL && first <= msginfo->msgnum &&
-                   msginfo->msgnum <= last) {
-                       debug_print(_("deleting message %d...\n"),
-                                   msginfo->msgnum);
+       debug_print("getting list of %s ...\n",
+                   *real_path ? real_path : "\"\"");
 
-                       cache_file = procmsg_get_message_file_path(msginfo);
-                       if (is_file_exist(cache_file)) unlink(cache_file);
-                       g_free(cache_file);
+       str = g_string_new(NULL);
 
-                       procmsg_msginfo_free(msginfo);
-                       mlist = g_slist_remove(mlist, msginfo);
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) <= 0) {
+                       log_warning(_("error occured while getting LIST.\n"));
+                       break;
                }
-
-               cur = next;
+               strretchomp(buf);
+               if (buf[0] != '*' || buf[1] != ' ') {
+                       log_print("IMAP4< %s\n", buf);
+                       break;
+               }
+               debug_print("IMAP4< %s\n", buf);
+
+               g_string_assign(str, buf);
+               p = str->str + 2;
+               if (strncmp(p, "LIST ", 5) != 0) continue;
+               p += 5;
+
+               if (*p != '(') continue;
+               p++;
+               p = strchr_cpy(p, ')', flags, sizeof(flags));
+               if (!p) continue;
+               while (*p == ' ') p++;
+
+               p = strchr_cpy(p, ' ', separator, sizeof(separator));
+               if (!p) continue;
+               extract_quote(separator, '"');
+               if (!strcmp(separator, "NIL"))
+                       separator[0] = '\0';
+
+               buf[0] = '\0';
+               while (*p == ' ') p++;
+               if (*p == '{' || *p == '"')
+                       p = imap_parse_atom(SESSION(session)->sock, p,
+                                           buf, sizeof(buf), str);
+               else
+                       strncpy2(buf, p, sizeof(buf));
+               strtailchomp(buf, separator[0]);
+               if (buf[0] == '\0') continue;
+               if (!strcmp(buf, real_path)) continue;
+
+               if (separator[0] != '\0')
+                       subst_char(buf, separator[0], '/');
+               name = g_basename(buf);
+               if (name[0] == '.') continue;
+
+               loc_name = imap_modified_utf7_to_locale(name);
+               loc_path = imap_modified_utf7_to_locale(buf);
+               new_item = folder_item_new(loc_name, loc_path);
+               if (strcasestr(flags, "\\Noinferiors") != NULL)
+                       new_item->no_sub = TRUE;
+               if (strcmp(buf, "INBOX") != 0 &&
+                   strcasestr(flags, "\\Noselect") != NULL)
+                       new_item->no_select = TRUE;
+
+               item_list = g_slist_append(item_list, new_item);
+
+               debug_print("folder %s has been added.\n", loc_path);
+               g_free(loc_path);
+               g_free(loc_name);
        }
 
-       return mlist;
+       g_string_free(str, TRUE);
+       statusbar_pop_all();
+
+       return item_list;
 }
 
-static void imap_delete_all_cached_messages(FolderItem *item)
+gint imap_create_tree(Folder *folder)
 {
-       gchar *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);
 
-       g_return_if_fail(item != NULL);
-       g_return_if_fail(item->folder != NULL);
+       imap_scan_tree(folder);
+       imap_create_missing_folders(folder);
+
+       return 0;
+}
+
+static void imap_create_missing_folders(Folder *folder)
+{
+       g_return_if_fail(folder != NULL);
+
+       if (!folder->inbox)
+               folder->inbox = imap_create_special_folder
+                       (folder, F_INBOX, "INBOX");
+#if 0
+       if (!folder->outbox)
+               folder->outbox = imap_create_special_folder
+                       (folder, F_OUTBOX, "Sent");
+       if (!folder->draft)
+               folder->draft = imap_create_special_folder
+                       (folder, F_DRAFT, "Drafts");
+       if (!folder->queue)
+               folder->queue = imap_create_special_folder
+                       (folder, F_QUEUE, "Queue");
+#endif
+       if (!folder->trash)
+               folder->trash = imap_create_special_folder
+                       (folder, F_TRASH, "Trash");
+}
+
+static FolderItem *imap_create_special_folder(Folder *folder,
+                                             SpecialFolderItemType stype,
+                                             const gchar *name)
+{
+       FolderItem *item;
+       FolderItem *new_item;
+
+       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, name);
+
+       if (!new_item) {
+               g_warning(_("Can't create '%s'\n"), name);
+               if (!folder->inbox) return NULL;
+
+               new_item = imap_create_folder(folder, folder->inbox, name);
+               if (!new_item)
+                       g_warning(_("Can't create '%s' under INBOX\n"), name);
+               else
+                       new_item->stype = stype;
+       } else
+               new_item->stype = stype;
+
+       return new_item;
+}
+
+FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
+                              const gchar *name)
+{
+       gchar *dirpath, *imap_path;
+       IMAPSession *session;
+       FolderItem *new_item;
+       gchar separator;
+       gchar *new_name;
+       const gchar *p;
+       gint ok;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(folder->account != NULL, NULL);
+       g_return_val_if_fail(parent != NULL, NULL);
+       g_return_val_if_fail(name != NULL, NULL);
+
+       session = imap_session_get(folder);
+       if (!session) return NULL;
+
+       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);
+       else if (folder->account->imap_dir && *folder->account->imap_dir) {
+               gchar *imap_dir;
+
+               Xstrdup_a(imap_dir, folder->account->imap_dir, return NULL);
+               strtailchomp(imap_dir, '/');
+               dirpath = g_strconcat(imap_dir, "/", name, NULL);
+       } else
+               dirpath = g_strdup(name);
+
+       /* 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;
+               gint i;
+               gboolean exist = FALSE;
+
+               argbuf = g_ptr_array_new();
+               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);
+                       g_ptr_array_free(argbuf, TRUE);
+                       return NULL;
+               }
+
+               for (i = 0; i < argbuf->len; i++) {
+                       gchar *str;
+                       str = g_ptr_array_index(argbuf, i);
+                       if (!strncmp(str, "LIST ", 5)) {
+                               exist = TRUE;
+                               break;
+                       }
+               }
+               g_ptr_array_free(argbuf, TRUE);
+
+               if (!exist) {
+                       ok = imap_cmd_create(SESSION(session)->sock, imap_path);
+                       statusbar_pop_all();
+                       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);
+       folder_item_append(parent, new_item);
+       g_free(imap_path);
+       g_free(dirpath);
+
+       dirpath = folder_item_get_path(new_item);
+       if (!is_dir_exist(dirpath))
+               make_dir_hier(dirpath);
+       g_free(dirpath);
+
+       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);
+       statusbar_pop_all();
+       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);
+       statusbar_pop_all();
+       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;
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->path != NULL, -1);
+
+       session = imap_session_get(folder);
+       if (!session) return -1;
+
+       path = imap_get_real_path(IMAP_FOLDER(folder), item->path);
+
+       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);
+               return -1;
+       }
+
+       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;
+}
+
+static GSList *imap_get_uncached_messages(IMAPSession *session,
+                                         FolderItem *item,
+                                         guint32 first_uid, guint32 last_uid)
+{
+       gchar *tmp;
+       GSList *newlist = NULL;
+       GSList *llast = NULL;
+       GString *str;
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(session != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->folder != NULL, NULL);
+       g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
+       g_return_val_if_fail(first_uid <= last_uid, NULL);
+
+       if (imap_cmd_envelope(SESSION(session)->sock, first_uid, last_uid)
+           != IMAP_SUCCESS) {
+               log_warning(_("can't get envelope\n"));
+               return NULL;
+       }
+
+       str = g_string_new(NULL);
+
+       for (;;) {
+               if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
+                       log_warning(_("error occurred while getting envelope.\n"));
+                       g_string_free(str, TRUE);
+                       return newlist;
+               }
+               strretchomp(tmp);
+               if (tmp[0] != '*' || tmp[1] != ' ') {
+                       log_print("IMAP4< %s\n", tmp);
+                       g_free(tmp);
+                       break;
+               }
+               if (strstr(tmp, "FETCH") == NULL) {
+                       log_print("IMAP4< %s\n", tmp);
+                       g_free(tmp);
+                       continue;
+               }
+               /* log_print("IMAP4< %s\n", tmp); */
+               debug_print("IMAP4< %s\n", tmp);
+               g_string_assign(str, tmp);
+               g_free(tmp);
+
+               msginfo = imap_parse_envelope(SESSION(session)->sock, 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;
+
+               if (!newlist)
+                       llast = newlist = g_slist_append(newlist, msginfo);
+               else {
+                       llast = g_slist_append(llast, msginfo);
+                       llast = llast->next;
+               }
+       }
+
+       g_string_free(str, TRUE);
+
+       return newlist;
+}
+
+static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
+                                          guint32 first_uid, guint32 last_uid)
+{
+       GSList *cur, *next;
+       MsgInfo *msginfo;
+       gchar *dir;
+
+       g_return_val_if_fail(item != NULL, mlist);
+       g_return_val_if_fail(item->folder != NULL, mlist);
+       g_return_val_if_fail(item->folder->type == F_IMAP, mlist);
+
+       debug_print(_("Deleting cached messages %d - %d ... "),
+                   first_uid, last_uid);
+
+       dir = folder_item_get_path(item);
+       remove_numbered_files(dir, first_uid, last_uid);
+       g_free(dir);
+
+       for (cur = mlist; cur != NULL; ) {
+               next = cur->next;
+
+               msginfo = (MsgInfo *)cur->data;
+               if (msginfo != NULL && first_uid <= msginfo->msgnum &&
+                   msginfo->msgnum <= last_uid) {
+                       procmsg_msginfo_free(msginfo);
+                       mlist = g_slist_remove(mlist, msginfo);
+               }
+
+               cur = next;
+       }
+
+       debug_print(_("done.\n"));
+
+       return mlist;
+}
+
+static void imap_delete_all_cached_messages(FolderItem *item)
+{
+       gchar *dir;
+
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_IMAP);
 
-       debug_print(_("\tDeleting all cached messages... "));
+       debug_print(_("Deleting all cached messages... "));
 
        dir = folder_item_get_path(item);
        remove_all_numbered_files(dir);
@@ -749,7 +1586,27 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        debug_print(_("done.\n"));
 }
 
-static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
+
+static SockInfo *imap_open_tunnel(const gchar *server,
+                          const gchar *tunnelcmd)
+{
+       SockInfo *sock;
+
+       if ((sock = sock_connect_cmd(server, tunnelcmd)) == NULL)
+               log_warning(_("Can't establish IMAP4 session with: %s\n"),
+                           server);
+               return NULL;
+
+       return imap_init_sock(sock);
+}
+
+
+#if USE_SSL
+static SockInfo *imap_open(const gchar *server, gushort port,
+                          gboolean use_ssl)
+#else
+static SockInfo *imap_open(const gchar *server, gushort port)
+#endif
 {
        SockInfo *sock;
 
@@ -759,9 +1616,25 @@ static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
                return NULL;
        }
 
+#if USE_SSL
+       if (use_ssl && !ssl_init_socket(sock)) {
+               log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
+                           server, port);
+               sock_close(sock);
+               return NULL;
+       }
+#endif
+
+       return imap_init_sock(sock);
+}
+
+
+static SockInfo *imap_init_sock(SockInfo *sock)
+{
        imap_cmd_count = 0;
 
        if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
+               log_warning(_("Can't establish IMAP4 session\n"));
                sock_close(sock);
                return NULL;
        }
@@ -769,12 +1642,176 @@ static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
        return sock;
 }
 
-static gchar *imap_parse_atom(SockInfo *sock, gchar *src, gchar *dest,
-                             gchar *orig_buf)
+static GList *imap_parse_namespace_str(gchar *str)
+{
+       gchar *p = str;
+       gchar *name;
+       gchar *separator;
+       IMAPNameSpace *namespace;
+       GList *ns_list = NULL;
+
+       while (*p != '\0') {
+               /* parse ("#foo" "/") */
+
+               while (*p && *p != '(') p++;
+               if (*p == '\0') break;
+               p++;
+
+               while (*p && *p != '"') p++;
+               if (*p == '\0') break;
+               p++;
+               name = p;
+
+               while (*p && *p != '"') p++;
+               if (*p == '\0') break;
+               *p = '\0';
+               p++;
+
+               while (*p && isspace(*p)) p++;
+               if (*p == '\0') break;
+               if (strncmp(p, "NIL", 3) == 0)
+                       separator = NULL;
+               else if (*p == '"') {
+                       p++;
+                       separator = p;
+                       while (*p && *p != '"') p++;
+                       if (*p == '\0') break;
+                       *p = '\0';
+                       p++;
+               } else break;
+
+               while (*p && *p != ')') p++;
+               if (*p == '\0') break;
+               p++;
+
+               namespace = g_new(IMAPNameSpace, 1);
+               namespace->name = g_strdup(name);
+               namespace->separator = separator ? separator[0] : '\0';
+               ns_list = g_list_append(ns_list, namespace);
+       }
+
+       return ns_list;
+}
+
+static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
+{
+       gchar *ns_str;
+       gchar **str_array;
+
+       g_return_if_fail(session != NULL);
+       g_return_if_fail(folder != NULL);
+
+       if (folder->ns_personal != NULL ||
+           folder->ns_others   != NULL ||
+           folder->ns_shared   != NULL)
+               return;
+
+       if (imap_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[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);
+       return;
+}
+
+static IMAPNameSpace *imap_find_namespace_from_list(GList *ns_list,
+                                                   const gchar *path)
+{
+       IMAPNameSpace *namespace = NULL;
+       gchar *tmp_path, *name;
+
+       if (!path) path = "";
+
+       Xstrcat_a(tmp_path, path, "/", return NULL);
+
+       for (; ns_list != NULL; ns_list = ns_list->next) {
+               IMAPNameSpace *tmp_ns = ns_list->data;
+
+               Xstrdup_a(name, tmp_ns->name, return namespace);
+               if (tmp_ns->separator && tmp_ns->separator != '/')
+                       subst_char(name, tmp_ns->separator, '/');
+               if (strncmp(tmp_path, name, strlen(name)) == 0)
+                       namespace = tmp_ns;
+       }
+
+       return namespace;
+}
+
+static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
+                                         const gchar *path)
+{
+       IMAPNameSpace *namespace;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+
+       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)
+               separator = namespace->separator;
+
+       return separator;
+}
+
+static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
+{
+       gchar *real_path;
+       gchar separator;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(path != NULL, NULL);
+
+       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;
 
-       while (*cur_pos == ' ') cur_pos++;
+       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';
@@ -782,24 +1819,34 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src, gchar *dest,
        } else if (*cur_pos == '\"') {
                gchar *p;
 
-               p = strchr_cpy(cur_pos + 1, '\"', dest, IMAPBUFSIZE);
+               p = get_quoted(cur_pos, '\"', dest, dest_len);
                cur_pos = p ? p : cur_pos + 2;
        } else if (*cur_pos == '{') {
                gchar buf[32];
                gint len;
+               gint line_len = 0;
 
                cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
                len = atoi(buf);
 
-               g_return_val_if_fail(orig_buf != NULL, cur_pos);
-
-               if (sock_gets(sock, orig_buf, IMAPBUFSIZE) < 0)
-                       return cur_pos;
-               strretchomp(orig_buf);
-               log_print("IMAP4< %s\n", orig_buf);
-               memcpy(dest, orig_buf, len);
-               dest[len] = '\0';
-               cur_pos = orig_buf + len;
+               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 += len;
        }
 
        return cur_pos;
@@ -808,35 +1855,35 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src, gchar *dest,
 static gchar *imap_parse_one_address(SockInfo *sock, gchar *start,
                                     gchar *out_from_str,
                                     gchar *out_fromname_str,
-                                    gchar *orig_buf)
+                                    GString *str)
 {
        gchar buf[IMAPBUFSIZE];
+       gchar *userid;
+       gchar *domain;
        gchar *cur_pos = start;
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, orig_buf);
-       conv_unmime_header(out_fromname_str, 256, buf, NULL);
-
-       if (out_fromname_str[0] != '\0') {
-               strcat(out_from_str, "\"");
-               strcat(out_from_str, out_fromname_str);
-               strcat(out_from_str, "\"");
-       }
+       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       conv_unmime_header(out_fromname_str, IMAPBUFSIZE, buf, NULL);
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, orig_buf);
+       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
 
-       strcat(out_from_str, " <");
+       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       Xstrdup_a(userid, buf, return cur_pos + 1);
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, orig_buf);
-       strcat(out_from_str, buf);
+       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       Xstrdup_a(domain, buf, return cur_pos + 1);
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, orig_buf);
-       strcat(out_from_str, "@");
-       strcat(out_from_str, buf);
-       strcat(out_from_str, ">");
+       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);
+       }
 
        while (*cur_pos == ' ') cur_pos++;
-
-       g_return_val_if_fail(*cur_pos == ')', cur_pos + 1);
+       g_return_val_if_fail(*cur_pos == ')', NULL);
 
        return cur_pos + 1;
 }
@@ -844,12 +1891,12 @@ static gchar *imap_parse_one_address(SockInfo *sock, gchar *start,
 static gchar *imap_parse_address(SockInfo *sock, gchar *start,
                                 gchar **out_from_str,
                                 gchar **out_fromname_str,
-                                gchar *orig_buf)
+                                GString *str)
 {
        gchar buf[IMAPBUFSIZE];
        gchar name_buf[IMAPBUFSIZE];
        gchar *cur_pos = start;
-       gboolean first = TRUE;
+       GString *addr_str;
 
        if (out_from_str)     *out_from_str     = NULL;
        if (out_fromname_str) *out_fromname_str = NULL;
@@ -864,67 +1911,70 @@ static gchar *imap_parse_address(SockInfo *sock, gchar *start,
        g_return_val_if_fail(*cur_pos == '(', NULL);
        cur_pos++;
 
+       addr_str = g_string_new(NULL);
+
        for (;;) {
                gchar ch = *cur_pos++;
                if (ch == ')') break;
                if (ch == '(') {
-                       if (!first) strcat(buf, ", ");
-                       first = FALSE;
                        cur_pos = imap_parse_one_address
-                               (sock, cur_pos, buf, name_buf, orig_buf);
-                       if (!cur_pos) return NULL;
+                               (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);
                }
        }
 
-       if (out_from_str)     *out_from_str     = g_strdup(buf);
+       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)  
 {
-       gchar buf[32];
-       const gchar *cur_pos = flag_str;
-       const gchar *last_pos;
+       const gchar *p = flag_str;
        MsgFlags flags;
 
-       flags = 0;
-       MSG_SET_FLAGS(flags, MSG_UNREAD|MSG_IMAP);
-
-       while (cur_pos != NULL) {
-               cur_pos = strchr(cur_pos, '\\');
-               if (cur_pos == NULL) break;
-
-               last_pos = cur_pos + 1;
-               cur_pos = strchr_cpy(last_pos, ' ', buf, sizeof(buf));
-               if (cur_pos == NULL)
-                       strncpy2(buf, last_pos, sizeof(buf));
-
-               if (g_strcasecmp(buf, "Recent") == 0) {
-                       MSG_SET_FLAGS(flags, MSG_NEW|MSG_UNREAD);
-               } else if (g_strcasecmp(buf, "Seen") == 0) {
-                       MSG_UNSET_FLAGS(flags, MSG_NEW|MSG_UNREAD);
-               } else if (g_strcasecmp(buf, "Deleted") == 0) {
-                       MSG_SET_FLAGS(flags, MSG_DELETED);
-               } else if (g_strcasecmp(buf, "Flagged") == 0) {
-                       MSG_SET_FLAGS(flags, MSG_MARKED);
+       flags.perm_flags = MSG_UNREAD;
+       flags.tmp_flags  = MSG_IMAP;
+
+       while ((p = strchr(p, '\\')) != NULL) {
+               p++;
+
+               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) {
+                       MSG_SET_PERM_FLAGS(flags, MSG_DELETED);
+               } else if (g_strncasecmp(p, "Flagged", 7) == 0) {
+                       MSG_SET_PERM_FLAGS(flags, MSG_MARKED);
+               } else if (g_strncasecmp(p, "Answered", 8) == 0) {
+                       MSG_SET_PERM_FLAGS(flags, MSG_REPLIED);
                }
        }
 
        return flags;
 }
 
-static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
+static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
 {
        MsgInfo *msginfo;
        gchar buf[IMAPBUFSIZE];
        gchar tmp[IMAPBUFSIZE];
        gchar *cur_pos;
        gint msgnum;
-       size_t size;
+       guint32 uid = 0;
+       size_t size = 0;
        gchar *date = NULL;
-       time_t date_t;
+       time_t date_t = 0;
        gchar *subject = NULL;
        gchar *tmp_from;
        gchar *tmp_fromname;
@@ -934,14 +1984,13 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
        gchar *to = NULL;
        gchar *inreplyto = NULL;
        gchar *msgid = NULL;
-       MsgFlags flags;
-
-       log_print("IMAP4< %s\n", line_str);
+       MsgFlags flags = {0, 0};
 
        g_return_val_if_fail(line_str != NULL, NULL);
-       g_return_val_if_fail(line_str[0] == '*' && line_str[1] == ' ', NULL);
+       g_return_val_if_fail(line_str->str[0] == '*' &&
+                            line_str->str[1] == ' ', NULL);
 
-       cur_pos = line_str + 2;
+       cur_pos = line_str->str + 2;
 
 #define PARSE_ONE_ELEMENT(ch) \
 { \
@@ -955,87 +2004,115 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
        PARSE_ONE_ELEMENT(' ');
        g_return_val_if_fail(!strcmp(buf, "FETCH"), NULL);
 
-       PARSE_ONE_ELEMENT(' ');
-       g_return_val_if_fail(!strcmp(buf, "(FLAGS"), NULL);
-
-       PARSE_ONE_ELEMENT(')');
-       g_return_val_if_fail(*buf == '(', NULL);
-       flags = imap_parse_flags(buf + 1);
-
-       g_return_val_if_fail(*cur_pos == ' ', NULL);
-       g_return_val_if_fail
-               ((cur_pos = strchr_cpy(cur_pos + 1, ' ', buf, sizeof(buf))),
-                NULL);
-       g_return_val_if_fail(!strcmp(buf, "RFC822.SIZE"), NULL);
+       g_return_val_if_fail(*cur_pos == '(', NULL);
+       cur_pos++;
 
-       PARSE_ONE_ELEMENT(' ');
-       size = atoi(buf);
+       while (*cur_pos != '\0' && *cur_pos != ')') {
+               while (*cur_pos == ' ') cur_pos++;
+
+               if (!strncmp(cur_pos, "UID ", 4)) {
+                       cur_pos += 4;
+                       uid = strtoul(cur_pos, &cur_pos, 10);
+               } else if (!strncmp(cur_pos, "FLAGS ", 6)) {
+                       cur_pos += 6;
+                       g_return_val_if_fail(*cur_pos == '(', NULL);
+                       cur_pos++;
+                       PARSE_ONE_ELEMENT(')');
+                       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);
+                       if (buf[0] != '\0') {
+                               Xstrdup_a(date, buf, return NULL);
+                               date_t = procheader_date_parse(NULL, date, 0);
+                       }
 
-       PARSE_ONE_ELEMENT(' ');
-       g_return_val_if_fail(!strcmp(buf, "ENVELOPE"), NULL);
+                       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);
+                       }
 
-       g_return_val_if_fail(*cur_pos == '(', NULL);
-       cur_pos = imap_parse_atom(sock, cur_pos + 1, 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, line_str);
-       if (buf[0] != '\0') {
-               conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
-               Xstrdup_a(subject, tmp, return NULL);
-       }
-
-       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);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_address(sock, cur_pos + 1,
+                                                    &tmp_from, &tmp_fromname,
+                                                    line_str);
+                       g_return_val_if_fail(cur_pos != NULL, NULL);
+                       if (tmp_from && *tmp_from != '\0')
+                               Xstrdup_a(from, tmp_from,
+                                         {g_free(tmp_from);
+                                          g_free(tmp_fromname);
+                                          return NULL;});
+                       if (tmp_fromname && *tmp_fromname != '\0')
+                               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); \
+       cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
+                                    line_str); \
+       g_return_val_if_fail(cur_pos != NULL, NULL); \
 }
 
-       /* skip sender and reply-to */
-       SKIP_ONE_ELEMENT();
-       SKIP_ONE_ELEMENT();
+                       /* 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);
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_address(sock, cur_pos + 1,
+                                                    &tmp_to, NULL, line_str);
+                       g_return_val_if_fail(cur_pos != NULL, NULL);
+                       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();
+                       /* 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, line_str);
-       if (buf[0] != '\0') {
-               eliminate_parenthesis(buf, '(', ')');
-               extract_parenthesis(buf, '<', '>');
-               remove_space(buf);
-               Xstrdup_a(inreplyto, buf, return NULL);
-       }
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_atom
+                               (sock, cur_pos, buf, sizeof(buf), line_str);
+                       g_return_val_if_fail(cur_pos != NULL, NULL);
+                       if (buf[0] != '\0') {
+                               eliminate_parenthesis(buf, '(', ')');
+                               extract_parenthesis(buf, '<', '>');
+                               remove_space(buf);
+                               Xstrdup_a(inreplyto, buf, return NULL);
+                       }
+
+                       g_return_val_if_fail(*cur_pos == ' ', NULL);
+                       cur_pos = imap_parse_atom
+                               (sock, cur_pos, buf, sizeof(buf), line_str);
+                       g_return_val_if_fail(cur_pos != NULL, NULL);
+                       if (buf[0] != '\0') {
+                               extract_parenthesis(buf, '<', '>');
+                               remove_space(buf);
+                               Xstrdup_a(msgid, buf, return NULL);
+                       }
 
-       g_return_val_if_fail(*cur_pos == ' ', NULL);
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, line_str);
-       if (buf[0] != '\0') {
-               extract_parenthesis(buf, '<', '>');
-               remove_space(buf);
-               Xstrdup_a(msgid, buf, return NULL);
+                       g_return_val_if_fail(*cur_pos == ')', NULL);
+                       cur_pos++;
+               } else {
+                       g_warning("invalid FETCH response: %s\n", cur_pos);
+                       break;
+               }
        }
 
        msginfo = g_new0(MsgInfo, 1);
-       msginfo->msgnum = msgnum;
+       msginfo->msgnum = uid;
        msginfo->size = size;
        msginfo->date = g_strdup(date);
        msginfo->date_t = date_t;
@@ -1050,9 +2127,75 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, gchar *line_str)
        return msginfo;
 }
 
-static gint imap_set_article_flags(IMAPSession *session,
-                                  gint first,
-                                  gint last,
+gint imap_msg_set_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
+{
+       Folder *folder;
+       IMAPSession *session;
+       IMAPFlags iflags = 0;
+       gint ok = IMAP_SUCCESS;
+
+       g_return_val_if_fail(msginfo != NULL, -1);
+       g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
+       g_return_val_if_fail(msginfo->folder != NULL, -1);
+       g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
+
+       folder = msginfo->folder->folder;
+       g_return_val_if_fail(folder->type == F_IMAP, -1);
+
+       session = imap_session_get(folder);
+       if (!session) return -1;
+
+       if (flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
+       if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+       if (iflags) {
+               ok = imap_set_message_flags(session, msginfo->msgnum,
+                                           msginfo->msgnum, iflags, TRUE);
+               if (ok != IMAP_SUCCESS) return ok;
+       }
+
+       if (flags & MSG_UNREAD)
+               ok = imap_set_message_flags(session, msginfo->msgnum,
+                                           msginfo->msgnum, IMAP_FLAG_SEEN,
+                                           FALSE);
+       return ok;
+}
+
+gint imap_msg_unset_perm_flags(MsgInfo *msginfo, MsgPermFlags flags)
+{
+       Folder *folder;
+       IMAPSession *session;
+       IMAPFlags iflags = 0;
+       gint ok = IMAP_SUCCESS;
+
+       g_return_val_if_fail(msginfo != NULL, -1);
+       g_return_val_if_fail(MSG_IS_IMAP(msginfo->flags), -1);
+       g_return_val_if_fail(msginfo->folder != NULL, -1);
+       g_return_val_if_fail(msginfo->folder->folder != NULL, -1);
+
+       folder = msginfo->folder->folder;
+       g_return_val_if_fail(folder->type == F_IMAP, -1);
+
+       session = imap_session_get(folder);
+       if (!session) return -1;
+
+       if (flags & MSG_MARKED)  iflags |= IMAP_FLAG_FLAGGED;
+       if (flags & MSG_REPLIED) iflags |= IMAP_FLAG_ANSWERED;
+       if (iflags) {
+               ok = imap_set_message_flags(session, msginfo->msgnum,
+                                           msginfo->msgnum, iflags, FALSE);
+               if (ok != IMAP_SUCCESS) return ok;
+       }
+
+       if (flags & MSG_UNREAD)
+               ok = imap_set_message_flags(session, msginfo->msgnum,
+                                           msginfo->msgnum, IMAP_FLAG_SEEN,
+                                           TRUE);
+       return ok;
+}
+
+static gint imap_set_message_flags(IMAPSession *session,
+                                  guint32 first_uid,
+                                  guint32 last_uid,
                                   IMAPFlags flags,
                                   gboolean is_set)
 {
@@ -1072,20 +2215,156 @@ static gint imap_set_article_flags(IMAPSession *session,
 
        g_string_append_c(buf, ')');
 
-       ok = imap_cmd_store(SESSION(session)->sock, first, last, buf->str);
+       ok = imap_cmd_store(SESSION(session)->sock, first_uid, last_uid,
+                           buf->str);
        g_string_free(buf, TRUE);
 
        return ok;
 }
 
+static gint imap_select(IMAPSession *session, IMAPFolder *folder,
+                       const gchar *path,
+                       gint *exists, gint *recent, gint *unseen,
+                       guint32 *uid_validity)
+{
+       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;
+}
+
+#define THROW(err) { ok = err; goto catch; }
+
+static gint imap_get_uid(IMAPSession *session, gint msgnum, guint32 *uid)
+{
+       gint ok;
+       GPtrArray *argbuf;
+       gchar *str;
+       gint num;
+
+       *uid = 0;
+       argbuf = g_ptr_array_new();
+
+       imap_cmd_gen_send(SESSION(session)->sock, "FETCH %d (UID)", msgnum);
+       if ((ok = imap_cmd_ok(SESSION(session)->sock, argbuf)) != IMAP_SUCCESS)
+               THROW(ok);
+
+       str = search_array_contain_str(argbuf, "FETCH");
+       if (!str) THROW(IMAP_ERROR);
+
+       if (sscanf(str, "%d FETCH (UID %d)", &num, uid) != 2 ||
+           num != msgnum) {
+               g_warning("imap_get_uid(): invalid FETCH line.\n");
+               THROW(IMAP_ERROR);
+       }
+
+catch:
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+
+       return ok;
+}
+
+static gint imap_status(IMAPSession *session, IMAPFolder *folder,
+                       const gchar *path,
+                       gint *messages, gint *recent,
+                       guint32 *uid_next, guint32 *uid_validity,
+                       gint *unseen)
+{
+       gchar *real_path;
+       gchar *real_path_;
+       gint ok;
+       GPtrArray *argbuf;
+       gchar *str;
+
+       *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 UIDNEXT UIDVALIDITY UNSEEN)",
+                         real_path_);
+
+       ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+       if (ok != IMAP_SUCCESS) THROW(ok);
+
+       str = search_array_str(argbuf, "STATUS");
+       if (!str) THROW(IMAP_ERROR);
+
+       str = strchr(str, '(');
+       if (!str) THROW(IMAP_ERROR);
+       str++;
+       while (*str != '\0' && *str != ')') {
+               while (*str == ' ') str++;
+
+               if (!strncmp(str, "MESSAGES ", 9)) {
+                       str += 9;
+                       *messages = strtol(str, &str, 10);
+               } else if (!strncmp(str, "RECENT ", 7)) {
+                       str += 7;
+                       *recent = strtol(str, &str, 10);
+               } else if (!strncmp(str, "UIDNEXT ", 8)) {
+                       str += 8;
+                       *uid_next = strtoul(str, &str, 10);
+               } else if (!strncmp(str, "UIDVALIDITY ", 12)) {
+                       str += 12;
+                       *uid_validity = strtoul(str, &str, 10);
+               } else if (!strncmp(str, "UNSEEN ", 7)) {
+                       str += 7;
+                       *unseen = strtol(str, &str, 10);
+               } else {
+                       g_warning("invalid STATUS response: %s\n", str);
+                       break;
+               }
+       }
+
+catch:
+       g_free(real_path);
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+
+       return ok;
+}
+
+#undef THROW
 
 
+/* low-level IMAP4rev1 commands */
+
 static gint imap_cmd_login(SockInfo *sock,
                           const gchar *user, const gchar *pass)
 {
+       gchar *user_, *pass_;
        gint ok;
 
-       imap_cmd_gen_send(sock, "LOGIN \"%s\" %s", user, pass);
+       QUOTE_IF_REQUIRED(user_, user);
+       QUOTE_IF_REQUIRED(pass_, pass);
+       imap_cmd_gen_send(sock, "LOGIN %s %s", user_, pass_);
+
        ok = imap_cmd_ok(sock, NULL);
        if (ok != IMAP_SUCCESS)
                log_warning(_("IMAP4 login failed.\n"));
@@ -1099,90 +2378,186 @@ 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_starts(argbuf, "PREAUTH") != NULL;
+       
+       return r;
+}
+
 static gint imap_cmd_noop(SockInfo *sock)
 {
        imap_cmd_gen_send(sock, "NOOP");
        return imap_cmd_ok(sock, NULL);
 }
 
-static gint imap_cmd_select(SockInfo *sock, const gchar *folder,
-                           gint *exists, gint *recent, gint *unseen,
-                           gulong *uid)
+#define THROW(err) { ok = err; goto catch; }
+
+static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
+{
+       gint ok;
+       GPtrArray *argbuf;
+       gchar *str;
+
+       argbuf = g_ptr_array_new();
+
+       imap_cmd_gen_send(sock, "NAMESPACE");
+       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW(ok);
+
+       str = search_array_str(argbuf, "NAMESPACE");
+       if (!str) THROW(IMAP_ERROR);
+
+       *ns_str = g_strdup(str);
+
+catch:
+       ptr_array_free_strings(argbuf);
+       g_ptr_array_free(argbuf, TRUE);
+
+       return ok;
+}
+
+#undef THROW
+
+static gint imap_cmd_list(SockInfo *sock, const gchar *ref,
+                         const gchar *mailbox, GPtrArray *argbuf)
+{
+       gchar *ref_, *mailbox_;
+
+       if (!ref) ref = "\"\"";
+       if (!mailbox) mailbox = "\"\"";
+
+       QUOTE_IF_REQUIRED(ref_, ref);
+       QUOTE_IF_REQUIRED(mailbox_, mailbox);
+       imap_cmd_gen_send(sock, "LIST %s %s", ref_, mailbox_);
+
+       return imap_cmd_ok(sock, argbuf);
+}
+
+#define THROW goto catch
+
+static gint imap_cmd_do_select(SockInfo *sock, const gchar *folder,
+                              gboolean examine,
+                              gint *exists, gint *recent, gint *unseen,
+                              guint32 *uid_validity)
 {
        gint ok;
        gchar *resp_str;
        GPtrArray *argbuf;
-       gchar *imappath;
+       gchar *select_cmd;
+       gchar *folder_;
 
-       *exists = *recent = *unseen = *uid = 0;
+       *exists = *recent = *unseen = *uid_validity = 0;
        argbuf = g_ptr_array_new();
 
-       Xstrdup_a(imappath, folder, return -1);
-       /* imap_path_subst_slash_to_dot(imappath); */
+       if (examine)
+               select_cmd = "EXAMINE";
+       else
+               select_cmd = "SELECT";
+
+       QUOTE_IF_REQUIRED(folder_, folder);
+       imap_cmd_gen_send(sock, "%s %s", select_cmd, folder_);
 
-       imap_cmd_gen_send(sock, "SELECT \"%s\"", imappath);
-       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS)
-               goto bail;
+       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW;
 
        resp_str = search_array_contain_str(argbuf, "EXISTS");
        if (resp_str) {
                if (sscanf(resp_str,"%d EXISTS", exists) != 1) {
-                       g_warning("imap_select(): invalid EXISTS line.\n");
-                       goto bail;
+                       g_warning("imap_cmd_select(): invalid EXISTS line.\n");
+                       THROW;
                }
        }
 
        resp_str = search_array_contain_str(argbuf, "RECENT");
        if (resp_str) {
                if (sscanf(resp_str, "%d RECENT", recent) != 1) {
-                       g_warning("imap_select(): invalid RECENT line.\n");
-                       goto bail;
+                       g_warning("imap_cmd_select(): invalid RECENT line.\n");
+                       THROW;
                }
        }
 
        resp_str = search_array_contain_str(argbuf, "UIDVALIDITY");
        if (resp_str) {
-               if (sscanf(resp_str, "OK [UIDVALIDITY %lu] ", uid) != 1) {
-                       g_warning("imap_select(): invalid UIDVALIDITY line.\n");
-                       goto bail;
+               if (sscanf(resp_str, "OK [UIDVALIDITY %u] ", uid_validity)
+                   != 1) {
+                       g_warning("imap_cmd_select(): invalid UIDVALIDITY line.\n");
+                       THROW;
                }
        }
 
        resp_str = search_array_contain_str(argbuf, "UNSEEN");
        if (resp_str) {
                if (sscanf(resp_str, "OK [UNSEEN %d] ", unseen) != 1) {
-                       g_warning("imap_select(): invalid UNSEEN line.\n");
-                       goto bail;
+                       g_warning("imap_cmd_select(): invalid UNSEEN line.\n");
+                       THROW;
                }
        }
 
-bail:
+catch:
        ptr_array_free_strings(argbuf);
        g_ptr_array_free(argbuf, TRUE);
 
        return ok;
 }
 
-static gint imap_cmd_status(SockInfo *sock, const gchar *folder,
-                           const gchar *status)
+static gint imap_cmd_select(SockInfo *sock, const gchar *folder,
+                           gint *exists, gint *recent, gint *unseen,
+                           guint32 *uid_validity)
 {
-       imap_cmd_gen_send(sock, "STATUS \"%s\" (%s)", folder, status);
-       return imap_cmd_ok(sock, NULL);
+       return imap_cmd_do_select(sock, folder, FALSE,
+                                 exists, recent, unseen, uid_validity);
 }
 
+static gint imap_cmd_examine(SockInfo *sock, const gchar *folder,
+                            gint *exists, gint *recent, gint *unseen,
+                            guint32 *uid_validity)
+{
+       return imap_cmd_do_select(sock, folder, TRUE,
+                                 exists, recent, unseen, uid_validity);
+}
+
+#undef THROW
+
 static gint imap_cmd_create(SockInfo *sock, const gchar *folder)
 {
-       imap_cmd_gen_send(sock, "CREATE \"%s\"", folder);
+       gchar *folder_;
+
+       QUOTE_IF_REQUIRED(folder_, folder);
+       imap_cmd_gen_send(sock, "CREATE %s", 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)
 {
-       imap_cmd_gen_send(sock, "DELETE \"%s\"", folder);
+       gchar *folder_;
+
+       QUOTE_IF_REQUIRED(folder_, folder);
+       imap_cmd_gen_send(sock, "DELETE %s", folder_);
+
        return imap_cmd_ok(sock, NULL);
 }
 
-static gint imap_cmd_fetch(SockInfo *sock, gint num, const gchar *filename)
+static gint imap_cmd_fetch(SockInfo *sock, guint32 uid, const gchar *filename)
 {
        gint ok;
        gchar buf[IMAPBUFSIZE];
@@ -1192,14 +2567,17 @@ static gint imap_cmd_fetch(SockInfo *sock, gint num, const gchar *filename)
 
        g_return_val_if_fail(filename != NULL, IMAP_ERROR);
 
-       imap_cmd_gen_send(sock, "FETCH %d BODY[]", num);
+       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, sizeof(buf)))
+              == IMAP_SUCCESS) {
+               if (buf[0] != '*' || buf[1] != ' ')
+                       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);
@@ -1215,7 +2593,7 @@ static gint imap_cmd_fetch(SockInfo *sock, gint num, const gchar *filename)
        if (imap_cmd_gen_recv(sock, buf, sizeof(buf)) != IMAP_SUCCESS)
                return IMAP_ERROR;
 
-       if (buf[0] != ')')
+       if (buf[0] == '\0' || buf[strlen(buf) - 1] != ')')
                return IMAP_ERROR;
 
        ok = imap_cmd_ok(sock, NULL);
@@ -1228,54 +2606,90 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
 {
        gint ok;
        gint size;
+       gchar *destfolder_;
+       gchar buf[BUFFSIZE];
+       FILE *fp;
 
        g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
-       imap_cmd_gen_send(sock, "APPEND %s {%d}", destfolder, size);
-       ok = imap_cmd_ok(sock, NULL);
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't append %s to %s\n"), file, destfolder);
+       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 (\\Seen) {%d}", destfolder_, size);
 
-       return ok;
+       ok = imap_cmd_gen_recv(sock, buf, sizeof(buf));
+       if (ok != IMAP_SUCCESS || buf[0] != '+' || buf[1] != ' ') {
+               log_warning(_("can't append %s to %s\n"), file, destfolder_);
+               fclose(fp);
+               return IMAP_ERROR;
+       }
+
+       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;
+       }
+
+       sock_puts(sock, "");
+
+       fclose(fp);
+       return imap_cmd_ok(sock, NULL);
 }
 
-static gint imap_cmd_copy(SockInfo *sock, gint num, const gchar *destfolder)
+static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
 {
        gint ok;
+       gchar *destfolder_;
 
        g_return_val_if_fail(destfolder != NULL, IMAP_ERROR);
 
-       imap_cmd_gen_send(sock, "COPY %d %s", num, destfolder);
+       QUOTE_IF_REQUIRED(destfolder_, destfolder);
+       imap_cmd_gen_send(sock, "UID COPY %d %s", uid, destfolder_);
+
        ok = imap_cmd_ok(sock, NULL);
        if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't copy %d to %s\n"), num, destfolder);
+               log_warning(_("can't copy %d to %s\n"), uid, destfolder_);
                return -1;
        }
 
        return ok;
 }
 
-
-gint imap_cmd_envelope(SockInfo *sock, gint first, gint last)
+gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
 {
-       imap_cmd_gen_send(sock, "FETCH %d:%d (FLAGS RFC822.SIZE ENVELOPE)",
-                         first, last);
+       imap_cmd_gen_send
+               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE ENVELOPE)",
+                first_uid, last_uid);
 
        return IMAP_SUCCESS;
 }
 
-static gint imap_cmd_store(SockInfo *sock, gint first, gint last,
+static gint imap_cmd_store(SockInfo *sock, guint32 first_uid, guint32 last_uid,
                           gchar *sub_cmd)
 {
        gint ok;
 
-       imap_cmd_gen_send(sock, "STORE %d:%d %s", first, last, sub_cmd);
+       imap_cmd_gen_send(sock, "UID STORE %d:%d %s",
+                         first_uid, last_uid, sub_cmd);
 
        if ((ok = imap_cmd_ok(sock, NULL)) != IMAP_SUCCESS) {
                log_warning(_("error while imap command: STORE %d:%d %s\n"),
-                           first, last, sub_cmd);
+                           first_uid, last_uid, sub_cmd);
                return ok;
        }
 
@@ -1306,7 +2720,7 @@ static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
               == IMAP_SUCCESS) {
                if (buf[0] == '*' && buf[1] == ' ') {
                        if (argbuf)
-                               g_ptr_array_add(argbuf, g_strdup(&buf[2]));
+                               g_ptr_array_add(argbuf, g_strdup(buf + 2));
                        continue;
                }
 
@@ -1339,7 +2753,7 @@ static void imap_cmd_gen_send(SockInfo *sock, const gchar *format, ...)
 
        g_snprintf(buf, sizeof(buf), "%d %s\r\n", imap_cmd_count, tmp);
        if (!strncasecmp(tmp, "LOGIN ", 6) && (p = strchr(tmp + 6, ' '))) {
-               *(p + 1) = '\0';
+               *p = '\0';
                log_print("IMAP4> %d %s ********\n", imap_cmd_count, tmp);
        } else
                log_print("IMAP4> %d %s\n", imap_cmd_count, tmp);
@@ -1368,7 +2782,7 @@ static gchar *strchr_cpy(const gchar *src, gchar ch, gchar *dest, gint len)
 
        dest[0] = '\0';
        tmp = strchr(src, ch);
-       if (!tmp || tmp == src)
+       if (!tmp)
                return NULL;
 
        memcpy(dest, src, MIN(tmp - src, len - 1));
@@ -1377,6 +2791,46 @@ static gchar *strchr_cpy(const gchar *src, gchar ch, gchar *dest, gint len)
        return tmp + 1;
 }
 
+static gchar *get_quoted(const gchar *src, gchar ch, gchar *dest, gint len)
+{
+       const gchar *p = src;
+       gint n = 0;
+
+       g_return_val_if_fail(*p == ch, NULL);
+
+       *dest = '\0';
+       p++;
+
+       while (*p != '\0' && *p != ch) {
+               if (n < len - 1) {
+                       if (*p == '\\' && *(p + 1) != '\0')
+                               p++;
+                       *dest++ = *p++;
+               } else
+                       p++;
+               n++;
+       }
+
+       *dest = '\0';
+       return (gchar *)(*p == ch ? p + 1 : p);
+}
+
+static gchar *search_array_starts(GPtrArray *array, const gchar *str)
+{
+       gint i;
+       size_t len;
+
+       g_return_val_if_fail(str != NULL, NULL);
+       len = strlen(str);
+       for (i = 0; i < array->len; i++) {
+               gchar *tmp;
+               tmp = g_ptr_array_index(array, i);
+               if (strncmp(tmp, str, len) == 0)
+                       return tmp;
+       }
+       return NULL;
+}
+
 static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
 {
        gint i;
@@ -1392,7 +2846,235 @@ static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
        return NULL;
 }
 
-static void imap_path_subst_slash_to_dot(gchar *str)
+static gchar *search_array_str(GPtrArray *array, 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)
+{
+       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_LIBJCONV
+       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, &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_LIBJCONV */
+}
+
+static gchar *imap_locale_to_modified_utf7(const gchar *from)
+{
+#if !HAVE_LIBJCONV
+       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, &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
+}
+
+static gboolean imap_rename_folder_func(GNode *node, gpointer data)
 {
-       subst_char(str, '/', '.');
+       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;
 }