quick fix for martin's omission of a account specific setting. imap over ssh tunnel...
[claws.git] / src / imap.c
index f3a981a32fcea80d6878d5c2ea8b0904a8b4d2bf..68f5dc58e96bede209cfea8d3cb52cf22530a8bd 100644 (file)
@@ -21,6 +21,8 @@
 #  include "config.h"
 #endif
 
+#include "defs.h"
+
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <ctype.h>
+#include <time.h>
 
 #include "intl.h"
+#include "prefs_account.h"
 #include "imap.h"
 #include "socket.h"
+#include "ssl.h"
 #include "recv.h"
 #include "procmsg.h"
 #include "procheader.h"
 #include "folder.h"
 #include "statusbar.h"
-#include "prefs_account.h"
 #include "codeconv.h"
 #include "utils.h"
+#include "inputdialog.h"
 
 #define IMAP4_PORT     143
+#if USE_SSL
+#define IMAPS_PORT     993
+#endif
+
+#define QUOTE_IF_REQUIRED(out, str) \
+{ \
+       if (*str != '"' && strchr(str, ' ')) { \
+               gchar *__tmp; \
+               gint len; \
+ \
+               len = strlen(str) + 3; \
+               Xalloca(__tmp, len, return IMAP_ERROR); \
+               g_snprintf(__tmp, len, "\"%s\"", str); \
+               out = __tmp; \
+       } else { \
+               Xstrdup_a(out, str, return IMAP_ERROR); \
+       } \
+}
 
 static GList *session_list = NULL;
 
 static gint imap_cmd_count = 0;
 
-static IMAPSession *imap_session_connect_if_not        (Folder         *folder);
+static IMAPSession *imap_session_get   (Folder         *folder);
+static gchar *imap_query_password      (const gchar    *server,
+                                        const gchar    *user);
+
+static gint imap_scan_tree_recursive   (IMAPSession    *session,
+                                        FolderItem     *item,
+                                        IMAPNameSpace  *namespace);
+static GSList *imap_parse_list         (IMAPSession    *session,
+                                        const gchar    *path);
+static gint imap_create_trash          (Folder         *folder);
 
 static gint imap_do_copy               (Folder         *folder,
                                         FolderItem     *dest,
@@ -60,45 +92,78 @@ static gint imap_do_copy_msgs_with_dest     (Folder         *folder,
 
 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 SockInfo *imap_open_tunnel(const gchar *server,
+                                 const gchar *tunnelcmd);
 
-static gint imap_set_article_flags     (IMAPSession    *session,
-                                        gint            first,
-                                        gint            last,
+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 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,
+                                        gint           *unseen,
+                                        guint32        *uid_validity);
 
 static void imap_parse_namespace               (IMAPSession    *session,
                                                 IMAPFolder     *folder);
 static IMAPNameSpace *imap_find_namespace      (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,
-                                        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 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,
@@ -108,38 +173,52 @@ 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_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);
 
@@ -156,27 +235,58 @@ 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 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_parse_namespace(IMAP_SESSION(rfolder->session),
-                                    IMAP_FOLDER(folder));
+                       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);
        }
@@ -184,47 +294,106 @@ 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_parse_namespace(IMAP_SESSION(rfolder->session),
-                                    IMAP_FOLDER(folder));
+                       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)
+static gchar *imap_query_password(const gchar *server, const gchar *user)
+{
+       gchar *message;
+       gchar *pass;
+
+       message = g_strdup_printf(_("Input password for %s on %s:"),
+                                 user, server);
+       pass = input_dialog_with_invisible(_("Input password"), message, NULL);
+       g_free(message);
+
+       return 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 = imap_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);
@@ -252,21 +421,22 @@ void imap_session_destroy_all(void)
        }
 }
 
+#define THROW goto catch
+
 GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 {
        GSList *mlist = NULL;
        IMAPSession *session;
-       IMAPNameSpace *namespace;
-       gchar *path;
-       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);
@@ -276,75 +446,78 @@ GSList *imap_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
                return mlist;
        }
 
-       last_uid = item->mtime;
-
-       Xstrdup_a(path, item->path, return mlist);
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), path);
-       if (namespace && namespace->separator)
-               imap_path_separator_subst(path, namespace->separator);
-
-       ok = imap_cmd_select(SESSION(session)->sock, 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;
@@ -353,29 +526,30 @@ 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);
+       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;
        }
@@ -393,15 +567,10 @@ gint imap_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(file != NULL, -1);
 
-       session = imap_session_connect_if_not(folder);
+       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_cmd_append(SESSION(session)->sock, dest->path, file);
        if (ok != IMAP_SUCCESS) {
                g_warning(_("can't append message %s\n"), file);
@@ -421,7 +590,6 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
 {
        gchar *destdir;
        IMAPSession *session;
-       IMAPNameSpace *namespace;
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
@@ -429,7 +597,7 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
        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) {
@@ -437,10 +605,7 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
                return -1;
        }
 
-       Xstrdup_a(destdir, dest->path, return -1);
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), destdir);
-       if (namespace && namespace->separator)
-               imap_path_separator_subst(destdir, namespace->separator);
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        if (remove_source)
                debug_print(_("Moving message %s%c%d to %s ...\n"),
@@ -454,12 +619,14 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
        ok = imap_cmd_copy(SESSION(session)->sock, msginfo->msgnum, destdir);
 
        if (ok == IMAP_SUCCESS && remove_source) {
-               imap_set_article_flags(session, msginfo->msgnum, msginfo->msgnum,
+               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);
        }
 
+       g_free(destdir);
        statusbar_pop_all();
+
        return ok;
 }
 
@@ -471,20 +638,16 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
        GSList *cur;
        MsgInfo *msginfo;
        IMAPSession *session;
-       IMAPNameSpace *namespace;
        gint ok;
 
        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);
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), destdir);
-       if (namespace && namespace->separator)
-               imap_path_separator_subst(destdir, namespace->separator);
+       destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        for (cur = msglist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
@@ -507,16 +670,18 @@ static gint imap_do_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
                                   destdir);
 
                if (ok == IMAP_SUCCESS && remove_source) {
-                       imap_set_article_flags
+                       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);
 
+       g_free(destdir);
        statusbar_pop_all();
+
        return IMAP_SUCCESS;
 }
 
@@ -542,41 +707,32 @@ gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
        return imap_do_copy_msgs_with_dest(folder, dest, msglist, FALSE);
 }
 
-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;
-       IMAPNameSpace *namespace;
-       gchar *path;
 
        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;
 
-       Xstrdup_a(path, item->path, return -1);
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), path);
-       if (namespace && namespace->separator)
-               imap_path_separator_subst(path, namespace->separator);
-
-       ok = imap_cmd_select(SESSION(session)->sock, path,
-                            &exists, &recent, &unseen, &uid);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
        statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't select folder: %s\n"), item->path);
+       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;
        }
 
@@ -593,35 +749,27 @@ 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;
-       IMAPNameSpace *namespace;
-       gchar *path;
 
        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;
 
-       Xstrdup_a(path, item->path, return -1);
-       namespace = imap_find_namespace(IMAP_FOLDER(folder), path);
-       if (namespace && namespace->separator)
-               imap_path_separator_subst(path, namespace->separator);
-
-       ok = imap_cmd_select(SESSION(session)->sock, path,
-                            &exists, &recent, &unseen, &uid);
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
        statusbar_pop_all();
-       if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't select folder: %s\n"), item->path);
+       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);
@@ -640,28 +788,304 @@ gint imap_remove_all_msg(Folder *folder, FolderItem *item)
 
 void imap_scan_folder(Folder *folder, FolderItem *item)
 {
+       IMAPSession *session;
+       gint messages, recent, unseen;
+       guint32 uid_validity;
+       gint ok;
+
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(item != NULL);
+
+       session = imap_session_get(folder);
+       if (!session) return;
+
+       ok = imap_status(session, IMAP_FOLDER(folder), item->path,
+                        &messages, &recent, &unseen, &uid_validity);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS) return;
+
+       item->new = recent;
+       item->unread = unseen;
+       item->total = messages;
+       /* item->mtime = uid_validity; */
+}
+
+void imap_scan_tree(Folder *folder)
+{
+       IMAPFolder *imapfolder = IMAP_FOLDER(folder);
+       FolderItem *item, *inbox;
+       IMAPSession *session;
+       IMAPNameSpace *namespace = NULL;
+       gchar *root_folder = NULL;
+
+       g_return_if_fail(folder != NULL);
+       g_return_if_fail(folder->account != NULL);
+
+       session = imap_session_get(folder);
+       if (!session) return;
+
+       if (imapfolder->namespace && imapfolder->namespace->data)
+               namespace = (IMAPNameSpace *)imapfolder->namespace->data;
+
+       if (folder->account->imap_dir && *folder->account->imap_dir) {
+               gchar *imap_dir;
+               Xstrdup_a(imap_dir, folder->account->imap_dir, return);
+               strtailchomp(imap_dir, '/');
+               root_folder = g_strconcat
+                       (namespace && namespace->name ? namespace->name : "",
+                        imap_dir, NULL);
+               if (namespace && namespace->separator)
+                       subst_char(root_folder, namespace->separator, '/');
+       }
+
+       if (root_folder)
+               debug_print("IMAP root directory: %s\n", root_folder);
+
+       folder_tree_destroy(folder);
+       item = folder_item_new(folder->name, root_folder);
+       item->folder = folder;
+       folder->node = g_node_new(item);
+       g_free(root_folder);
+
+       imap_scan_tree_recursive(session, item, namespace);
+
+       if (!folder->inbox) {
+               inbox = folder_item_new("INBOX", "INBOX");
+               inbox->stype = F_INBOX;
+               folder_item_append(item, inbox);
+               folder->inbox = inbox;
+       }
+       if (!folder->trash)
+               imap_create_trash(folder);
+}
+
+static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item,
+                                    IMAPNameSpace *namespace)
+{
+       IMAPFolder *imapfolder;
+       FolderItem *new_item;
+       GSList *item_list, *cur;
+       gchar *real_path;
+       gchar *wildcard_path;
+       gchar separator = '/';
+       gchar wildcard[3];
+
+       g_return_val_if_fail(item != NULL, -1);
+       g_return_val_if_fail(item->folder != NULL, -1);
+       g_return_val_if_fail(item->no_sub == FALSE, -1);
+
+       imapfolder = IMAP_FOLDER(item->folder);
+
+       if (namespace && namespace->separator)
+               separator = namespace->separator;
+
+       if (item->folder->ui_func)
+               item->folder->ui_func(item->folder, item,
+                                     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(namespace && namespace->name
+                                    ? namespace->name : "");
+       }
+
+       Xstrcat_a(wildcard_path, real_path, wildcard,
+                 {g_free(real_path); return IMAP_ERROR;});
+       QUOTE_IF_REQUIRED(wildcard_path, wildcard_path);
+
+       imap_cmd_gen_send(SESSION(session)->sock, "LIST \"\" %s",
+                         wildcard_path);
+
+       strtailchomp(real_path, separator);
+       item_list = imap_parse_list(session, real_path);
+       g_free(real_path);
+
+       for (cur = item_list; cur != NULL; cur = cur->next) {
+               new_item = cur->data;
+               if (!strcmp(new_item->path, "INBOX")) {
+                       if (!item->folder->inbox) {
+                               new_item->stype = F_INBOX;
+                               item->folder->inbox = new_item;
+                       } else {
+                               folder_item_destroy(new_item);
+                               continue;
+                       }
+               } else if (!item->parent && !item->folder->trash) {
+                       if (!strcasecmp(g_basename(new_item->path), "Trash")) {
+                               new_item->stype = F_TRASH;
+                               item->folder->trash = new_item;
+                       }
+               }
+               folder_item_append(item, new_item);
+               if (new_item->no_select == FALSE)
+                       imap_scan_folder(new_item->folder, new_item);
+               if (new_item->no_sub == FALSE)
+                       imap_scan_tree_recursive(session, new_item, namespace);
+       }
+
+       return IMAP_SUCCESS;
+}
+
+static GSList *imap_parse_list(IMAPSession *session, const gchar *path)
+{
+       gchar buf[IMAPBUFSIZE];
+       gchar flags[256];
+       gchar separator[16];
+       gchar *p;
+       gchar *name;
+       GSList *item_list = NULL;
+       GString *str;
+       FolderItem *new_item;
+
+       debug_print("getting list of %s ...\n", *path ? path : "\"\"");
+
+       str = g_string_new(NULL);
+
+       for (;;) {
+               if (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) <= 0) {
+                       log_warning(_("error occured while getting LIST.\n"));
+                       break;
+               }
+               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, path)) continue;
+
+               if (separator[0] != '\0')
+                       subst_char(buf, separator[0], '/');
+               name = g_basename(buf);
+               if (name[0] == '.') continue;
+
+               new_item = folder_item_new(name, buf);
+               if (strcasestr(flags, "\\Noinferiors") != NULL)
+                       new_item->no_sub = TRUE;
+               if (strcasestr(flags, "\\Noselect") != NULL)
+                       new_item->no_select = TRUE;
+
+               item_list = g_slist_append(item_list, new_item);
+
+               debug_print("folder %s has been added.\n", buf);
+       }
+
+       g_string_free(str, TRUE);
+       statusbar_pop_all();
+
+       return item_list;
 }
 
 gint imap_create_tree(Folder *folder)
 {
        FolderItem *item;
-       FolderItem *new_item;
 
        g_return_val_if_fail(folder != NULL, -1);
        g_return_val_if_fail(folder->node != NULL, -1);
        g_return_val_if_fail(folder->node->data != NULL, -1);
+       g_return_val_if_fail(folder->account != NULL, -1);
+
+       imap_scan_tree(folder);
 
        item = FOLDER_ITEM(folder->node->data);
 
-       new_item = folder_item_new("INBOX", "INBOX");
-       new_item->stype = F_INBOX;
-       folder_item_append(item, new_item);
-       folder->inbox = new_item;
+       if (!folder->inbox) {
+               FolderItem *inbox;
+
+               inbox = folder_item_new("INBOX", "INBOX");
+               inbox->stype = F_INBOX;
+               folder_item_append(item, inbox);
+               folder->inbox = inbox;
+       }
+       if (!folder->trash)
+               imap_create_trash(folder);
+
+       return 0;
+}
+
+static gint imap_create_trash(Folder *folder)
+{
+       IMAPFolder *imapfolder = IMAP_FOLDER(folder);
+       FolderItem *item;
+       FolderItem *new_item;
+       gchar *trash_path;
+       gchar *imap_dir = "";
+
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(folder->node != NULL, -1);
+       g_return_val_if_fail(folder->node->data != NULL, -1);
+       g_return_val_if_fail(folder->account != NULL, -1);
+
+       if (folder->account->imap_dir && *folder->account->imap_dir) {
+               gchar *tmpdir;
+
+               Xstrdup_a(tmpdir, folder->account->imap_dir, return -1);
+               strtailchomp(tmpdir, '/');
+               Xalloca(imap_dir, strlen(tmpdir) + 2, return -1);
+               g_snprintf(imap_dir, strlen(tmpdir) + 2, "%s%c", tmpdir, '/');
+       }
+
+       if (imapfolder->namespace && imapfolder->namespace->data) {
+               IMAPNameSpace *namespace =
+                       (IMAPNameSpace *)imapfolder->namespace->data;
+
+               if (*namespace->name != '\0') {
+                       gchar *name;
+
+                       Xstrdup_a(name, namespace->name, return -1);
+                       subst_char(name, namespace->separator, '/');
+                       trash_path = g_strconcat(name, imap_dir, "Trash", NULL);
+               } else
+                       trash_path = g_strconcat(imap_dir, "Trash", NULL);
+       } else
+               trash_path = g_strconcat(imap_dir, "Trash", NULL);
+
+       item = FOLDER_ITEM(folder->node->data);
+       new_item = imap_create_folder(folder, item, trash_path);
 
-       new_item = imap_create_folder(folder, item, "trash");
        if (!new_item) {
-               new_item = folder_item_new("Trash", "trash");
+               gchar *path;
+
+               new_item = folder_item_new("Trash", trash_path);
                folder_item_append(item, new_item);
+
+               path = folder_item_get_path(new_item);
+               if (!is_dir_exist(path))
+                       make_dir_hier(path);
+               g_free(path);
        } else {
                g_free(new_item->name);
                new_item->name = g_strdup("Trash");
@@ -669,6 +1093,8 @@ gint imap_create_tree(Folder *folder)
        new_item->stype = F_TRASH;
        folder->trash = new_item;
 
+       g_free(trash_path);
+
        return 0;
 }
 
@@ -680,19 +1106,28 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        IMAPNameSpace *namespace;
        FolderItem *new_item;
        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_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return NULL;
 
        if (parent->path)
-               dirpath = g_strconcat(parent->path, G_DIR_SEPARATOR_S, name,
-                                     NULL);
-       else
+               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);
 
        Xstrdup_a(imappath, dirpath, {g_free(dirpath); return NULL;});
@@ -701,14 +1136,37 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        if (namespace && namespace->separator) {
                imap_path_separator_subst(imappath, namespace->separator);
                imap_path_separator_subst(new_name, namespace->separator);
-               strtailchomp(dirpath, namespace->separator);
                strtailchomp(new_name, namespace->separator);
        }
+       strtailchomp(dirpath, '/');
 
        if (strcmp(name, "INBOX") != 0) {
-               ok = imap_cmd_status(SESSION(session)->sock, imappath,
-                                    "MESSAGES");
+               GPtrArray *argbuf;
+               gint i;
+               gboolean exist = FALSE;
+
+               argbuf = g_ptr_array_new();
+               ok = imap_cmd_list(SESSION(session)->sock, NULL, imappath,
+                                  argbuf);
+               statusbar_pop_all();
                if (ok != IMAP_SUCCESS) {
+                       log_warning(_("can't create mailbox: LIST failed\n"));
+                       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, imappath);
                        statusbar_pop_all();
                        if (ok != IMAP_SUCCESS) {
@@ -717,13 +1175,17 @@ FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
                                return NULL;
                        }
                }
-               statusbar_pop_all();
        }
 
        new_item = folder_item_new(new_name, dirpath);
        folder_item_append(parent, new_item);
        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;
 }
 
@@ -731,21 +1193,36 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
 {
        gint ok;
        IMAPSession *session;
+       gchar *path;
+       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_connect_if_not(folder);
+       session = imap_session_get(folder);
        if (!session) return -1;
 
-       ok = imap_cmd_delete(SESSION(session)->sock, item->path);
+       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);
        folder_item_remove(item);
 
        return 0;
@@ -753,36 +1230,46 @@ gint imap_remove_folder(Folder *folder, FolderItem *item)
 
 static GSList *imap_get_uncached_messages(IMAPSession *session,
                                          FolderItem *item,
-                                         gint first, gint last)
+                                         guint32 first_uid, guint32 last_uid)
 {
-       gchar buf[IMAPBUFSIZE];
+       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 <= last, NULL);
+       g_return_val_if_fail(first_uid <= last_uid, NULL);
 
-       if (imap_cmd_envelope(SESSION(session)->sock, first, last)
+       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 (sock_gets(SESSION(session)->sock, buf, sizeof(buf)) < 0) {
+               if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
                        log_warning(_("error occurred while getting envelope.\n"));
+                       g_string_free(str, TRUE);
                        return newlist;
                }
-               strretchomp(buf);
-               if (buf[0] != '*' || buf[1] != ' ') break;
+               strretchomp(tmp);
+               log_print("IMAP4< %s\n", tmp);
+               if (tmp[0] != '*' || tmp[1] != ' ') {
+                       g_free(tmp);
+                       break;
+               }
+               g_string_assign(str, tmp);
+               g_free(tmp);
 
-               msginfo = imap_parse_envelope(SESSION(session)->sock, buf);
+               msginfo = imap_parse_envelope(SESSION(session)->sock, str);
                if (!msginfo) {
-                       log_warning(_("can't parse envelope: %s\n"), buf);
+                       log_warning(_("can't parse envelope: %s\n"), str->str);
                        continue;
                }
 
@@ -796,29 +1283,35 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                }
        }
 
+       g_string_free(str, TRUE);
+
        return newlist;
 }
 
-static GSList *imap_delete_cached_messages(GSList *mlist,
-                                          gint first, gint last)
+static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
+                                          guint32 first_uid, guint32 last_uid)
 {
        GSList *cur, *next;
        MsgInfo *msginfo;
-       gchar *cache_file;
+       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 <= msginfo->msgnum &&
-                   msginfo->msgnum <= last) {
-                       debug_print(_("deleting message %d...\n"),
-                                   msginfo->msgnum);
-
-                       cache_file = procmsg_get_message_file_path(msginfo);
-                       if (is_file_exist(cache_file)) unlink(cache_file);
-                       g_free(cache_file);
-
+               if (msginfo != NULL && first_uid <= msginfo->msgnum &&
+                   msginfo->msgnum <= last_uid) {
                        procmsg_msginfo_free(msginfo);
                        mlist = g_slist_remove(mlist, msginfo);
                }
@@ -826,6 +1319,8 @@ static GSList *imap_delete_cached_messages(GSList *mlist,
                cur = next;
        }
 
+       debug_print(_("done.\n"));
+
        return mlist;
 }
 
@@ -837,7 +1332,7 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        g_return_if_fail(item->folder != NULL);
        g_return_if_fail(item->folder->type == F_IMAP);
 
-       debug_print(_("\tDeleting all cached messages... "));
+       debug_print(_("Deleting all cached messages... "));
 
        dir = folder_item_get_path(item);
        remove_all_numbered_files(dir);
@@ -846,7 +1341,25 @@ 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)
+               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;
 
@@ -856,16 +1369,25 @@ static SockInfo *imap_open(const gchar *server, gushort port, gchar *buf)
                return NULL;
        }
 
-       imap_cmd_count = 0;
-
-       if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
+#if USE_SSL
+       if (use_ssl && !ssl_init_socket(sock)) {
                sock_close(sock);
                return NULL;
        }
+#endif
+
+       return imap_init_sock(sock);
+}
+
 
+static SockInfo *imap_init_sock(SockInfo *sock)
+{
+       imap_cmd_count = 0;
        return sock;
 }
 
+
+
 #define THROW goto catch
 
 static void imap_parse_namespace(IMAPSession *session, IMAPFolder *folder)
@@ -946,6 +1468,7 @@ static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
 {
        IMAPNameSpace *namespace = NULL;
        GList *ns_list;
+       gchar *name;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(path != NULL, NULL);
@@ -954,18 +1477,40 @@ static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
 
        for (; ns_list != NULL; ns_list = ns_list->next) {
                IMAPNameSpace *tmp_ns = ns_list->data;
-               if (strncmp(path, tmp_ns->name, strlen(tmp_ns->name)) == 0)
+
+               Xstrdup_a(name, tmp_ns->name, return namespace);
+               if (tmp_ns->separator && tmp_ns->separator != '/')
+                       subst_char(name, tmp_ns->separator, '/');
+               if (strncmp(path, name, strlen(name)) == 0)
                        namespace = tmp_ns;
        }
 
        return namespace;
 }
 
-static gchar *imap_parse_atom(SockInfo *sock, gchar *src, gchar *dest,
-                             gchar *orig_buf)
+static gchar *imap_get_real_path(IMAPFolder *folder, const gchar *path)
+{
+       gchar *real_path;
+       IMAPNameSpace *namespace;
+
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(path != NULL, NULL);
+
+       real_path = g_strdup(path);
+       namespace = imap_find_namespace(folder, path);
+       if (namespace && namespace->separator)
+               imap_path_separator_subst(real_path, namespace->separator);
+
+       return real_path;
+}
+
+static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
+                             gchar *dest, gint dest_len, GString *str)
 {
        gchar *cur_pos = src;
 
+       g_return_val_if_fail(str != NULL, cur_pos);
+
        while (*cur_pos == ' ') cur_pos++;
 
        if (!strncmp(cur_pos, "NIL", 3)) {
@@ -974,24 +1519,26 @@ 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;
+               gchar *nextline;
 
                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)
+               if ((nextline = sock_getline(sock)) == NULL)
                        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;
+               strretchomp(nextline);
+               log_print("IMAP4< %s\n", nextline);
+               g_string_assign(str, nextline);
+
+               len = MIN(len, strlen(nextline));
+               memcpy(dest, nextline, MIN(len, dest_len - 1));
+               dest[MIN(len, dest_len - 1)] = '\0';
+               cur_pos = str->str + len;
        }
 
        return cur_pos;
@@ -1000,35 +1547,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);
+       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       conv_unmime_header(out_fromname_str, IMAPBUFSIZE, 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, 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;
 }
@@ -1036,12 +1583,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;
@@ -1056,67 +1603,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_SET_PERM_FLAGS(flags, MSG_NEW|MSG_UNREAD);
+               } 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;
@@ -1126,14 +1676,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) \
 { \
@@ -1147,87 +1696,104 @@ 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);
-
-       PARSE_ONE_ELEMENT(' ');
-       size = atoi(buf);
+       g_return_val_if_fail(*cur_pos == '(', NULL);
+       cur_pos++;
 
-       PARSE_ONE_ELEMENT(' ');
-       g_return_val_if_fail(!strcmp(buf, "ENVELOPE"), NULL);
+       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);
+                       Xstrdup_a(date, buf, return NULL);
+                       date_t = procheader_date_parse(NULL, date, 0);
+
+                       cur_pos = imap_parse_atom
+                               (sock, cur_pos, buf, sizeof(buf), line_str);
+                       if (buf[0] != '\0') {
+                               conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
+                               Xstrdup_a(subject, tmp, return NULL);
+                       }
 
-       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);
+                       Xstrdup_a(from, tmp_from,
+                                 {g_free(tmp_from); g_free(tmp_fromname);
+                                  return NULL;});
+                       Xstrdup_a(fromname, tmp_fromname,
+                                 {g_free(tmp_from); g_free(tmp_fromname);
+                                  return NULL;});
+                       g_free(tmp_from);
+                       g_free(tmp_fromname);
 
 #define SKIP_ONE_ELEMENT() \
 { \
        g_return_val_if_fail(*cur_pos == ' ', NULL); \
-       cur_pos = imap_parse_address(sock, cur_pos + 1, \
-                                    NULL, NULL, line_str); \
+       cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
+                                    line_str); \
 }
 
-       /* 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);
+                       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);
+                       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);
+                       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;
@@ -1242,9 +1808,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)
 {
@@ -1264,21 +1896,136 @@ 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;
+
+       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);
+       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, gint *unseen,
+                       guint32 *uid_validity)
+{
+       gchar *real_path;
+       gchar *real_path_;
+       gint ok;
+       GPtrArray *argbuf;
+       gchar *str;
+
+       *messages = *recent = *unseen = *uid_validity = 0;
+
+       argbuf = g_ptr_array_new();
+
+       real_path = imap_get_real_path(folder, path);
+       QUOTE_IF_REQUIRED(real_path_, real_path);
+       imap_cmd_gen_send(SESSION(session)->sock, "STATUS %s "
+                         "(MESSAGES RECENT UNSEEN UIDVALIDITY)", real_path_);
+
+       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, "UNSEEN ", 7)) {
+                       str += 7;
+                       *unseen = strtol(str, &str, 10);
+               } else if (!strncmp(str, "UIDVALIDITY ", 12)) {
+                       str += 12;
+                       *uid_validity = strtoul(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"));
@@ -1292,6 +2039,21 @@ 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");
@@ -1311,7 +2073,7 @@ static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
        imap_cmd_gen_send(sock, "NAMESPACE");
        if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS) THROW(ok);
 
-       str = search_array_contain_str(argbuf, "NAMESPACE");
+       str = search_array_str(argbuf, "NAMESPACE");
        if (!str) THROW(IMAP_ERROR);
 
        *ns_str = g_strdup(str);
@@ -1325,80 +2087,126 @@ catch:
 
 #undef THROW
 
-static gint imap_cmd_select(SockInfo *sock, const gchar *folder,
-                           gint *exists, gint *recent, gint *unseen,
-                           gulong *uid)
+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 *select_cmd;
+       gchar *folder_;
 
-       *exists = *recent = *unseen = *uid = 0;
+       *exists = *recent = *unseen = *uid_validity = 0;
        argbuf = g_ptr_array_new();
 
-       imap_cmd_gen_send(sock, "SELECT \"%s\"", folder);
-       if ((ok = imap_cmd_ok(sock, argbuf)) != IMAP_SUCCESS)
-               goto bail;
+       if (examine)
+               select_cmd = "EXAMINE";
+       else
+               select_cmd = "SELECT";
+
+       QUOTE_IF_REQUIRED(folder_, folder);
+       imap_cmd_gen_send(sock, "%s %s", select_cmd, folder_);
+
+       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_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];
@@ -1408,7 +2216,7 @@ 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;
@@ -1444,55 +2252,61 @@ static gint imap_cmd_append(SockInfo *sock, const gchar *destfolder,
 {
        gint ok;
        gint size;
+       gchar *destfolder_;
 
        g_return_val_if_fail(file != NULL, IMAP_ERROR);
 
        size = get_file_size(file);
-       imap_cmd_gen_send(sock, "APPEND %s {%d}", destfolder, size);
+       QUOTE_IF_REQUIRED(destfolder_, destfolder);
+       imap_cmd_gen_send(sock, "APPEND %s {%d}", destfolder_, size);
        ok = imap_cmd_ok(sock, NULL);
        if (ok != IMAP_SUCCESS) {
-               log_warning(_("can't append %s to %s\n"), file, destfolder);
+               log_warning(_("can't append %s to %s\n"), file, destfolder_);
                return -1;
        }
 
        return ok;
 }
 
-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;
        }
 
@@ -1512,6 +2326,7 @@ static gint imap_cmd_expunge(SockInfo *sock)
        return IMAP_SUCCESS;
 }
 
+
 static gint imap_cmd_ok(SockInfo *sock, GPtrArray *argbuf)
 {
        gint ok;
@@ -1523,7 +2338,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;
                }
 
@@ -1556,7 +2371,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);
@@ -1585,7 +2400,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));
@@ -1594,6 +2409,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;
@@ -1609,8 +2464,26 @@ static gchar *search_array_contain_str(GPtrArray *array, gchar *str)
        return NULL;
 }
 
+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)
 {
-       if (separator != '/')
+       if (separator && separator != '/')
                subst_char(str, '/', separator);
 }