2006-06-19 [colin] 2.3.0cvs24
[claws.git] / src / imap.c
index c428a0b9d3ca8e755fe3d28251e74320fc35bd20..8cc02a9293abb1ef0645d4483b59621bc5ebb9ad 100644 (file)
@@ -30,6 +30,7 @@
 #include "imap.h"
 #include "imap_gtk.h"
 #include "inc.h"
+#include "xml.h"
 
 #ifdef HAVE_LIBETPAN
 
@@ -168,6 +169,9 @@ struct _IMAPFolderItem
        GHashTable *flags_unset_table;
 };
 
+static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item);
+static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag);
+
 static void imap_folder_init           (Folder         *folder,
                                         const gchar    *name,
                                         const gchar    *path);
@@ -436,6 +440,10 @@ FolderClass *imap_get_class(void)
                imap_class.close = imap_close;
                imap_class.get_num_list = imap_get_num_list;
                imap_class.scan_required = imap_scan_required;
+               imap_class.set_xml = folder_set_xml;
+               imap_class.get_xml = folder_get_xml;
+               imap_class.item_set_xml = imap_item_set_xml;
+               imap_class.item_get_xml = imap_item_get_xml;
 
                /* Message functions */
                imap_class.get_msginfo = imap_get_msginfo;
@@ -475,16 +483,9 @@ static Folder *imap_folder_new(const gchar *name, const gchar *path)
 
 static void imap_folder_destroy(Folder *folder)
 {
-       gchar *dir;
-
        while (imap_folder_get_refcnt(folder) > 0)
                gtk_main_iteration();
        
-       dir = imap_folder_get_path(folder);
-       if (is_dir_exist(dir))
-               remove_dir_recursive(dir);
-       g_free(dir);
-
        folder_remote_folder_destroy(REMOTE_FOLDER(folder));
        imap_done(folder);
 }
@@ -522,7 +523,6 @@ static gboolean imap_reset_uid_lists_func(GNode *node, gpointer data)
        IMAPFolderItem *item = (IMAPFolderItem *)node->data;
        
        item->lastuid = 0;
-       item->uid_next = 0;
        g_slist_free(item->uid_list);
        item->uid_list = NULL;
        
@@ -584,6 +584,9 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
        imap_get_capabilities(session);
 
        switch(type) {
+       case IMAP_AUTH_ANON:
+               ok = imap_cmd_login(session, user, pass, "ANONYMOUS");
+               break;
        case IMAP_AUTH_CRAM_MD5:
                ok = imap_cmd_login(session, user, pass, "CRAM-MD5");
                break;
@@ -592,8 +595,10 @@ static gint imap_auth(IMAPSession *session, const gchar *user, const gchar *pass
                break;
        default:
                debug_print("capabilities:\n"
+                               "\t ANONYMOUS %d\n"
                                "\t CRAM-MD5 %d\n"
                                "\t LOGIN %d\n", 
+                       imap_has_capability(session, "ANONYMOUS"),
                        imap_has_capability(session, "CRAM-MD5"),
                        imap_has_capability(session, "LOGIN"));
                if (imap_has_capability(session, "CRAM-MD5"))
@@ -676,12 +681,16 @@ static IMAPSession *imap_session_get(Folder *folder)
 {
        RemoteFolder *rfolder = REMOTE_FOLDER(folder);
        IMAPSession *session = NULL;
+       static time_t last_failure = 0;
 
        g_return_val_if_fail(folder != NULL, NULL);
        g_return_val_if_fail(FOLDER_CLASS(folder) == &imap_class, NULL);
        g_return_val_if_fail(folder->account != NULL, NULL);
        
-       if (prefs_common.work_offline && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the IMAP server."))) {
                return NULL;
        }
 
@@ -694,10 +703,14 @@ static IMAPSession *imap_session_get(Folder *folder)
                } */
        } else {
                imap_reset_uid_lists(folder);
+               if (time(NULL) - last_failure <= 2)
+                       return NULL;
                session = imap_session_new(folder, folder->account);
        }
-       if(session == NULL)
+       if(session == NULL) {
+               last_failure = time(NULL);
                return NULL;
+       }
 
        /* Make sure session is authenticated */
        if (!IMAP_SESSION(session)->authenticated)
@@ -706,6 +719,7 @@ static IMAPSession *imap_session_get(Folder *folder)
        if (!IMAP_SESSION(session)->authenticated) {
                session_destroy(SESSION(session));
                rfolder->session = NULL;
+               last_failure = time(NULL);
                return NULL;
        }
 
@@ -754,10 +768,9 @@ static IMAPSession *imap_session_new(Folder * folder,
                          "Do you want to continue connecting to this "
                          "server? The communication would not be "
                          "secure."),
-                         _("Con_tinue connecting"), 
-                         GTK_STOCK_CANCEL, NULL,
-                         FALSE, NULL, ALERT_WARNING,
-                         G_ALERTALTERNATE) != G_ALERTDEFAULT)
+                         GTK_STOCK_CANCEL, _("Con_tinue connecting"), 
+                         NULL, FALSE, NULL, ALERT_WARNING,
+                         G_ALERTDEFAULT) != G_ALERTALTERNATE)
                        return NULL;
        }
        port = account->set_imapport ? account->imapport
@@ -854,13 +867,15 @@ static void imap_session_authenticate(IMAPSession *session,
        g_return_if_fail(account->userid != NULL);
 
        pass = account->passwd;
-       if (!pass) {
+       if (!pass && account->imap_auth_type != IMAP_AUTH_ANON) {
                gchar *tmp_pass;
                tmp_pass = input_dialog_query_password(account->recv_server, account->userid);
                if (!tmp_pass)
-                       tmp_pass = g_strdup(""); /* allow empty password */
+                       return;
                Xstrdup_a(pass, tmp_pass, {g_free(tmp_pass); return;});
                g_free(tmp_pass);
+       } else if (account->imap_auth_type == IMAP_AUTH_ANON) {
+               pass = "";
        }
        statusbar_print_all(_("Connecting to IMAP4 server %s...\n"),
                                account->recv_server);
@@ -932,7 +947,7 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
                make_dir_hier(path);
        filename = g_strconcat(path, G_DIR_SEPARATOR_S, itos(uid), NULL);
        g_free(path);
-
+       debug_print("trying to fetch cached %s\n", filename);
        if (is_file_exist(filename)) {
                /* see whether the local file represents the whole message
                 * or not. As the IMAP server reports size with \r chars,
@@ -943,14 +958,19 @@ static gchar *imap_fetch_msg_full(Folder *folder, FolderItem *item, gint uid,
 
                if (cached)
                        debug_print("message %d has been already %scached (%d/%d).\n", uid,
-                               have_size == cached->size ? "fully ":"",
+                               have_size >= cached->size ? "fully ":"",
                                have_size, (int)cached->size);
                
-               if (cached && (cached->size == have_size || !body)) {
+               if (cached && (cached->size <= have_size || !body)) {
                        procmsg_msginfo_free(cached);
                        procmsg_msginfo_free(msginfo);
                        file_strip_crs(filename);
                        return filename;
+               } else if (!cached) {
+                       debug_print("message not cached, considering file complete\n");
+                       procmsg_msginfo_free(msginfo);
+                       file_strip_crs(filename);
+                       return filename;
                } else {
                        procmsg_msginfo_free(cached);
                        procmsg_msginfo_free(msginfo);
@@ -1039,7 +1059,6 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
                IMAPFlags iflags = 0;
                guint32 new_uid = 0;
                gchar *real_file = NULL;
-               gboolean file_is_tmp = FALSE;
                fileinfo = (MsgFileInfo *)cur->data;
 
                statusbar_progress_all(curnum, total, 1);
@@ -1054,28 +1073,6 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
                                iflags |= IMAP_FLAG_SEEN;
                }
                
-               if (fileinfo->flags) {
-                       if ((MSG_IS_QUEUED(*fileinfo->flags) 
-                            || MSG_IS_DRAFT(*fileinfo->flags))
-                       && !folder_has_parent_of_type(dest, F_QUEUE)
-                       && !folder_has_parent_of_type(dest, F_DRAFT)) {
-                               real_file = get_tmp_file();
-                               file_is_tmp = TRUE;
-                               if (procmsg_remove_special_headers(
-                                               fileinfo->file, 
-                                               real_file) !=0) {
-                                       g_free(real_file);
-                                       g_free(destdir);
-                                       unlock_session();
-                                       return -1;
-                               }
-                       }  else if (!(MSG_IS_QUEUED(*fileinfo->flags) 
-                                     || MSG_IS_DRAFT(*fileinfo->flags))
-                                   && (folder_has_parent_of_type(dest, F_QUEUE)
-                                   || folder_has_parent_of_type(dest, F_DRAFT))) {
-                               return -1;
-                       } 
-               }
                if (real_file == NULL)
                        real_file = g_strdup(fileinfo->file);
                
@@ -1090,14 +1087,30 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
 
                if (ok != IMAP_SUCCESS) {
                        g_warning("can't append message %s\n", real_file);
-                       if (file_is_tmp)
-                               g_unlink(real_file);
                        g_free(real_file);
                        g_free(destdir);
                        unlock_session();
                        statusbar_progress_all(0,0,0);
                        statusbar_pop_all();
                        return -1;
+               } else {
+                       debug_print("appended new message as %d\n", new_uid);
+                       /* put the local file in the imapcache, so that we don't
+                        * have to fetch it back later. */
+                       if (new_uid > 0) {
+                               gchar *cache_path = folder_item_get_path(dest);
+                               if (!is_dir_exist(cache_path))
+                                       make_dir_hier(cache_path);
+                               if (is_dir_exist(cache_path)) {
+                                       gchar *cache_file = g_strconcat(
+                                               cache_path, G_DIR_SEPARATOR_S, 
+                                               itos(new_uid), NULL);
+                                       copy_file(real_file, cache_file, TRUE);
+                                       debug_print("copied to cache: %s\n", cache_file);
+                                       g_free(cache_file);
+                               }
+                               g_free(cache_path);
+                       }
                }
 
                if (relation != NULL)
@@ -1107,10 +1120,9 @@ static gint imap_add_msgs(Folder *folder, FolderItem *dest, GSList *file_list,
                if (new_uid == 0) {
                        new_uid = dest->last_num+1;
                }
-               if (last_uid < new_uid)
+               if (last_uid < new_uid) {
                        last_uid = new_uid;
-               if (file_is_tmp)
-                       g_unlink(real_file);
+               }
 
                g_free(real_file);
        }
@@ -1156,6 +1168,27 @@ static gint imap_do_copy_msgs(Folder *folder, FolderItem *dest,
                return -1;
        }
 
+       if (src->folder != dest->folder) {
+               GSList *infolist = NULL, *cur;
+               int res = -1;
+               for (cur = msglist; cur; cur = cur->next) {
+                       msginfo = (MsgInfo *)cur->data;
+                       MsgFileInfo *fileinfo = g_new0(MsgFileInfo, 1);
+                       fileinfo->file = procmsg_get_message_file(msginfo);
+                       fileinfo->flags = &(msginfo->flags);
+                       infolist = g_slist_prepend(infolist, fileinfo);
+               }
+               infolist = g_slist_reverse(infolist);
+               res = folder_item_add_msgs(dest, infolist, FALSE);
+               for (cur = infolist; cur; cur = cur->next) {
+                       MsgFileInfo *info = (MsgFileInfo *)cur->data;
+                       g_free(info->file);
+                       g_free(info);
+               }
+               g_slist_free(infolist);
+               return res;
+       } 
+
        ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
                         NULL, NULL, NULL, NULL, FALSE);
        if (ok != IMAP_SUCCESS) {
@@ -1238,7 +1271,6 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
                    MsgInfoList *msglist, GRelation *relation)
 {
        MsgInfo *msginfo;
-       GSList *file_list;
        gint ret;
 
        g_return_val_if_fail(folder != NULL, -1);
@@ -1248,30 +1280,7 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
        msginfo = (MsgInfo *)msglist->data;
        g_return_val_if_fail(msginfo->folder != NULL, -1);
 
-       /* if from/to are the same "type" (with or without extra headers),
-        * copy them via imap */
-       if (folder == msginfo->folder->folder &&
-           !folder_has_parent_of_type(msginfo->folder, F_DRAFT) &&
-           !folder_has_parent_of_type(msginfo->folder, F_QUEUE) &&
-           !folder_has_parent_of_type(dest, F_DRAFT) &&
-           !folder_has_parent_of_type(dest, F_QUEUE)) {
-               ret = imap_do_copy_msgs(folder, dest, msglist, relation);
-               return ret;
-       } else if (folder == msginfo->folder->folder &&
-           (folder_has_parent_of_type(msginfo->folder, F_DRAFT) ||
-            folder_has_parent_of_type(msginfo->folder, F_QUEUE)) && 
-           (folder_has_parent_of_type(dest, F_DRAFT) ||
-            folder_has_parent_of_type(dest, F_QUEUE))) {
-               ret = imap_do_copy_msgs(folder, dest, msglist, relation);
-               return ret;
-       }
-       /* else reupload them */
-       file_list = procmsg_get_message_file_list(msglist);
-       g_return_val_if_fail(file_list != NULL, -1);
-
-       ret = imap_add_msgs(folder, dest, file_list, relation);
-       procmsg_message_file_list_free(file_list);
-
+       ret = imap_do_copy_msgs(folder, dest, msglist, relation);
        return ret;
 }
 
@@ -1279,7 +1288,7 @@ static gint imap_copy_msgs(Folder *folder, FolderItem *dest,
 static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest, 
                                MsgInfoList *msglist, GRelation *relation)
 {
-       gchar *destdir;
+       gchar *destdir, *dir;
        GSList *numlist = NULL, *cur;
        MsgInfo *msginfo;
        IMAPSession *session;
@@ -1308,8 +1317,9 @@ static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
        for (cur = msglist; cur; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                if (!MSG_IS_DELETED(msginfo->flags))
-                       numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+                       numlist = g_slist_prepend(numlist, GINT_TO_POINTER(msginfo->msgnum));
        }
+       numlist = g_slist_reverse(numlist);
 
        uid_mapping = g_relation_new(2);
        g_relation_index(uid_mapping, 0, g_direct_hash, g_direct_equal);
@@ -1329,6 +1339,15 @@ static gint imap_do_remove_msgs(Folder *folder, FolderItem *dest,
                return ok;
        }
        
+       dir = folder_item_get_path(msginfo->folder);
+       if (is_dir_exist(dir)) {
+               for (cur = msglist; cur; cur = cur->next) {
+                       msginfo = (MsgInfo *)cur->data;
+                       remove_numbered_files(dir, msginfo->msgnum, msginfo->msgnum);
+               }
+       }
+       g_free(dir);
+
        g_relation_destroy(uid_mapping);
        g_slist_free(numlist);
 
@@ -2033,6 +2052,8 @@ static void *imap_get_uncached_messages_thread(void *data)
                if (r != MAILIMAP_NO_ERROR)
                        continue;
                
+               session_set_access_time(SESSION(session));
+
                count = 0;
                for(i = 0 ; i < carray_count(env_list) ; i ++) {
                        struct imap_fetch_env_info * info;
@@ -2116,7 +2137,10 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                data->numlist = newlist;
                data->cur += count;
                
-               if (prefs_common.work_offline && !inc_offline_should_override()) {
+               if (prefs_common.work_offline && 
+                   !inc_offline_should_override(
+                       _("Sylpheed-Claws needs network access in order "
+                         "to access the IMAP server."))) {
                        g_free(data);
                        return NULL;
                }
@@ -2197,11 +2221,31 @@ static IMAPNameSpace *imap_find_namespace(IMAPFolder *folder,
        return NULL;
 }
 
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+       Folder *folder = NULL;
+       IMAPFolder *imap_folder = NULL;
+       if (!item)
+               return '/';
+       folder = item->folder;
+       
+       if (!folder)
+               return '/';
+       
+       imap_folder = IMAP_FOLDER(folder);
+       
+       if (!imap_folder)
+               return '/';
+       
+       return imap_get_path_separator(imap_folder, item->path);
+}
 
 static gchar imap_get_path_separator(IMAPFolder *folder, const gchar *path)
 {
        IMAPNameSpace *namespace;
        gchar separator = '/';
+       IMAPSession *session = imap_session_get(FOLDER(folder));
+       g_return_val_if_fail(session != NULL, '/');
 
        if (folder->last_seen_separator == 0) {
                clist * lep_list;
@@ -2413,50 +2457,6 @@ static void imap_free_capabilities(IMAPSession *session)
 
 /* low-level IMAP4rev1 commands */
 
-#if 0
-static gint imap_cmd_authenticate(IMAPSession *session, const gchar *user,
-                                 const gchar *pass, IMAPAuthType type)
-{
-       gchar *auth_type;
-       gint ok;
-       gchar *buf = NULL;
-       gchar *challenge;
-       gint challenge_len;
-       gchar hexdigest[33];
-       gchar *response;
-       gchar *response64;
-
-       auth_type = "CRAM-MD5";
-
-       imap_gen_send(session, "AUTHENTICATE %s", auth_type);
-       ok = imap_gen_recv(session, &buf);
-       if (ok != IMAP_SUCCESS || buf[0] != '+' || buf[1] != ' ') {
-               g_free(buf);
-               return IMAP_ERROR;
-       }
-
-       challenge = g_malloc(strlen(buf + 2) + 1);
-       challenge_len = base64_decode(challenge, buf + 2, -1);
-       challenge[challenge_len] = '\0';
-       g_free(buf);
-
-       md5_hex_hmac(hexdigest, challenge, challenge_len, pass, strlen(pass));
-       g_free(challenge);
-
-       response = g_strdup_printf("%s %s", user, hexdigest);
-       response64 = g_malloc((strlen(response) + 3) * 2 + 1);
-       base64_encode(response64, response, strlen(response));
-       g_free(response);
-
-       sock_puts(SESSION(session)->sock, response64);
-       ok = imap_cmd_ok(session, NULL);
-       if (ok != IMAP_SUCCESS)
-               log_warning(_("IMAP4 authentication failed.\n"));
-
-       return ok;
-}
-#endif
-
 static gint imap_cmd_login(IMAPSession *session,
                           const gchar *user, const gchar *pass,
                           const gchar *type)
@@ -2470,10 +2470,12 @@ static gint imap_cmd_login(IMAPSession *session,
                        type);
        r = imap_threaded_login(session->folder, user, pass, type);
        if (r != MAILIMAP_NO_ERROR) {
-               log_error("IMAP4< Error logging in to %s\n",
+               log_print("IMAP4< Error logging in to %s\n",
                                SESSION(session)->server);
                ok = IMAP_ERROR;
        } else {
+               log_print("IMAP4< Login to %s successful\n",
+                               SESSION(session)->server);
                ok = IMAP_SUCCESS;
        }
        return ok;
@@ -2507,7 +2509,8 @@ static gint imap_cmd_starttls(IMAPSession *session)
 {
        int r;
        
-       r = imap_threaded_starttls(session->folder);
+       r = imap_threaded_starttls(session->folder, 
+               SESSION(session)->server, SESSION(session)->port);
        if (r != MAILIMAP_NO_ERROR) {
                debug_print("starttls err %d\n", r);
                return IMAP_ERROR;
@@ -2634,7 +2637,10 @@ static gint imap_cmd_fetch(IMAPSession *session, guint32 uid,
        data->headers = headers;
        data->body = body;
 
-       if (prefs_common.work_offline && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the IMAP server."))) {
                g_free(data);
                return -1;
        }
@@ -2657,10 +2663,8 @@ static gint imap_cmd_append(IMAPSession *session, const gchar *destfolder,
 
        flag_list = imap_flag_to_lep(flags);
        r = imap_threaded_append(session->folder, destfolder,
-                        file, flag_list);
+                        file, flag_list, new_uid);
        mailimap_flag_list_free(flag_list);
-       if (new_uid != NULL)
-               *new_uid = 0;
 
        if (r != MAILIMAP_NO_ERROR) {
                debug_print("append err %d\n", r);
@@ -2717,7 +2721,10 @@ static gint imap_cmd_expunge(IMAPSession *session)
 {
        int r;
        
-       if (prefs_common.work_offline && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the IMAP server."))) {
                return -1;
        }
 
@@ -3052,7 +3059,10 @@ static gint get_list_of_uids(IMAPSession *session, Folder *folder, IMAPFolderIte
        data->item = item;
        data->msgnum_list = msgnum_list;
        data->session = session;
-       if (prefs_common.work_offline && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the IMAP server."))) {
                g_free(data);
                return -1;
        }
@@ -3067,7 +3077,7 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
 {
        IMAPFolderItem *item = (IMAPFolderItem *)_item;
        IMAPSession *session;
-       gint ok, nummsgs = 0, exists, uid_val, uid_next;
+       gint ok, nummsgs = 0, exists, uid_val, uid_next = 0;
        GSList *uidlist = NULL;
        gchar *dir;
        gboolean selected_folder;
@@ -3083,8 +3093,15 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
        session = imap_session_get(folder);
        g_return_val_if_fail(session != NULL, -1);
        lock_session();
-       statusbar_print_all("Scanning %s...\n", FOLDER_ITEM(item)->path 
-                               ? FOLDER_ITEM(item)->path:"");
+
+       if (FOLDER_ITEM(item)->path) 
+               statusbar_print_all(_("Scanning folder %s%c%s ..."),
+                                     FOLDER_ITEM(item)->folder->name, 
+                                     G_DIR_SEPARATOR,
+                                     FOLDER_ITEM(item)->path);
+       else
+               statusbar_print_all(_("Scanning folder %s ..."),
+                                     FOLDER_ITEM(item)->folder->name);
 
        selected_folder = (session->mbox != NULL) &&
                          (!strcmp(session->mbox, item->item.path));
@@ -3101,6 +3118,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                }
                exists = session->exists;
 
+               uid_next = item->c_uid_next;
+               uid_val = item->c_uid_validity;
                *old_uids_valid = TRUE;
        } else {
                if (item->use_cache && time(NULL) - item->use_cache < 2) {
@@ -3126,7 +3145,8 @@ gint imap_get_num_list(Folder *folder, FolderItem *_item, GSList **msgnum_list,
                else {
                        *old_uids_valid = FALSE;
 
-                       debug_print("Freeing imap uid cache\n");
+                       debug_print("Freeing imap uid cache (%d != %d)\n",
+                                       item->item.mtime, uid_val);
                        item->lastuid = 0;
                        g_slist_free(item->uid_list);
                        item->uid_list = NULL;
@@ -3263,13 +3283,14 @@ GSList *imap_get_msginfos(Folder *folder, FolderItem *item,
                        imap_get_uncached_messages(session, item,
                                                   msgnum_list));
        } else {
-               MsgNumberList *sorted_list, *elem;
+               MsgNumberList *sorted_list, *elem, *llast = NULL;
                gint startnum, lastnum;
 
                sorted_list = g_slist_sort(g_slist_copy(msgnum_list), g_int_compare);
 
                startnum = lastnum = GPOINTER_TO_INT(sorted_list->data);
 
+               llast = g_slist_last(ret);
                for (elem = sorted_list;; elem = g_slist_next(elem)) {
                        guint num = 0;
 
@@ -3286,10 +3307,16 @@ GSList *imap_get_msginfos(Folder *folder, FolderItem *item,
                                                MsgInfo *msginfo = imap_parse_msg(file, item);
                                                if (msginfo != NULL) {
                                                        msginfo->msgnum = i;
-                                                       ret = g_slist_append(ret, msginfo);
+                                                       if (llast == NULL)
+                                                               llast = ret = g_slist_append(ret, msginfo);
+                                                       else {
+                                                               llast = g_slist_append(llast, msginfo);
+                                                               llast = llast->next;
+                                                       }
                                                }
                                                g_free(file);
                                        }
+                                       session_set_access_time(SESSION(session));
                                }
 
                                if (elem == NULL)
@@ -3376,7 +3403,8 @@ gboolean imap_scan_required(Folder *folder, FolderItem *_item)
                item->item.last_num = uid_next - 1;
                debug_print("uidnext %d, item->uid_next %d, exists %d, item->item.total_msgs %d\n", 
                        uid_next, item->uid_next, exists, item->item.total_msgs);
-               if ((uid_next != item->uid_next) || (exists != item->item.total_msgs)) {
+               if ((uid_next != item->uid_next) || (exists != item->item.total_msgs)
+                   || unseen != item->item.unread_msgs || uid_val != item->item.mtime) {
                        unlock_session();
                        return TRUE;
                }
@@ -3404,12 +3432,6 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
        if (!session) {
                return;
        }
-       lock_session();
-       if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
-           NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
-               unlock_session();
-               return;
-       }
 
        if (!MSG_IS_MARKED(msginfo->flags) &&  (newflags & MSG_MARKED))
                flags_set |= IMAP_FLAG_FLAGGED;
@@ -3431,6 +3453,19 @@ void imap_change_flags(Folder *folder, FolderItem *item, MsgInfo *msginfo, MsgPe
        if ( MSG_IS_DELETED(msginfo->flags) && !(newflags & MSG_DELETED))
                flags_unset |= IMAP_FLAG_DELETED;
 
+       if (!flags_set && !flags_unset) {
+               /* the changed flags were not translatable to IMAP-speak.
+                * like MSG_POSTFILTERED, so just apply. */
+               msginfo->flags.perm_flags = newflags;
+               return;
+       }
+
+       lock_session();
+       if ((ok = imap_select(session, IMAP_FOLDER(folder), msginfo->folder->path,
+           NULL, NULL, NULL, NULL, FALSE)) != IMAP_SUCCESS) {
+               unlock_session();
+               return;
+       }
        numlist.next = NULL;
        numlist.data = GINT_TO_POINTER(msginfo->msgnum);
 
@@ -3654,12 +3689,12 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                imapset = cur->data;
                if (reverse_seen) {
                        r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_SEEN,
-                                                imapset, &lep_uidlist);
+                                                full_search ? NULL:imapset, &lep_uidlist);
                }
                else {
                        r = imap_threaded_search(folder,
                                                 IMAP_SEARCH_TYPE_UNSEEN,
-                                                imapset, &lep_uidlist);
+                                                full_search ? NULL:imapset, &lep_uidlist);
                }
                if (r == MAILIMAP_NO_ERROR) {
                        GSList * uidlist;
@@ -3670,37 +3705,39 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                        unseen = g_slist_concat(unseen, uidlist);
                }
                
-               r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
-                                        imapset, &lep_uidlist);
-               if (r == MAILIMAP_NO_ERROR) {
-                       GSList * uidlist;
-                       
-                       uidlist = imap_uid_list_from_lep(lep_uidlist);
-                       mailimap_search_result_free(lep_uidlist);
-                       
-                       answered = g_slist_concat(answered, uidlist);
-               }
-
                r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_FLAGGED,
-                                        imapset, &lep_uidlist);
+                                        full_search ? NULL:imapset, &lep_uidlist);
                if (r == MAILIMAP_NO_ERROR) {
                        GSList * uidlist;
-                       
+
                        uidlist = imap_uid_list_from_lep(lep_uidlist);
                        mailimap_search_result_free(lep_uidlist);
-                       
+
                        flagged = g_slist_concat(flagged, uidlist);
                }
-               
-               r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
-                                        imapset, &lep_uidlist);
-               if (r == MAILIMAP_NO_ERROR) {
-                       GSList * uidlist;
-                       
-                       uidlist = imap_uid_list_from_lep(lep_uidlist);
-                       mailimap_search_result_free(lep_uidlist);
-                       
-                       deleted = g_slist_concat(deleted, uidlist);
+
+               if (item->opened || item->processing_pending || item == folder->inbox) {
+                       r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_ANSWERED,
+                                                full_search ? NULL:imapset, &lep_uidlist);
+                       if (r == MAILIMAP_NO_ERROR) {
+                               GSList * uidlist;
+
+                               uidlist = imap_uid_list_from_lep(lep_uidlist);
+                               mailimap_search_result_free(lep_uidlist);
+
+                               answered = g_slist_concat(answered, uidlist);
+                       }
+
+                       r = imap_threaded_search(folder, IMAP_SEARCH_TYPE_DELETED,
+                                                full_search ? NULL:imapset, &lep_uidlist);
+                       if (r == MAILIMAP_NO_ERROR) {
+                               GSList * uidlist;
+
+                               uidlist = imap_uid_list_from_lep(lep_uidlist);
+                               mailimap_search_result_free(lep_uidlist);
+
+                               deleted = g_slist_concat(deleted, uidlist);
+                       }
                }
        }
 
@@ -3717,7 +3754,11 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                msginfo = (MsgInfo *) elem->data;
                flags = msginfo->flags.perm_flags;
                wasnew = (flags & MSG_NEW);
-               flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_MARKED);
+               if (item->opened || item->processing_pending || item == folder->inbox) {
+                       flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW) | MSG_REPLIED | MSG_MARKED);
+               } else {
+                       flags &= ~((reverse_seen ? 0 : MSG_UNREAD | MSG_NEW | MSG_MARKED));
+               }
                if (reverse_seen)
                        flags |= MSG_UNREAD | (wasnew ? MSG_NEW : 0);
                if (gslist_find_next_num(&p_unseen, msginfo->msgnum) == msginfo->msgnum) {
@@ -3727,18 +3768,22 @@ static /*gint*/ void *imap_get_flags_thread(void *data)
                                flags &= ~(MSG_UNREAD | MSG_NEW);
                        }
                }
-               if (gslist_find_next_num(&p_answered, msginfo->msgnum) == msginfo->msgnum)
-                       flags |= MSG_REPLIED;
-               else
-                       flags &= ~MSG_REPLIED;
+               
                if (gslist_find_next_num(&p_flagged, msginfo->msgnum) == msginfo->msgnum)
                        flags |= MSG_MARKED;
                else
                        flags &= ~MSG_MARKED;
-               if (gslist_find_next_num(&p_deleted, msginfo->msgnum) == msginfo->msgnum)
-                       flags |= MSG_DELETED;
-               else
-                       flags &= ~MSG_DELETED;
+
+               if (item->opened || item->processing_pending || item == folder->inbox) {
+                       if (gslist_find_next_num(&p_answered, msginfo->msgnum) == msginfo->msgnum)
+                               flags |= MSG_REPLIED;
+                       else
+                               flags &= ~MSG_REPLIED;
+                       if (gslist_find_next_num(&p_deleted, msginfo->msgnum) == msginfo->msgnum)
+                               flags |= MSG_DELETED;
+                       else
+                               flags &= ~MSG_DELETED;
+               }
                g_relation_insert(msgflags, msginfo, GINT_TO_POINTER(flags));
        }
 
@@ -3769,14 +3814,17 @@ static gint imap_get_flags(Folder *folder, FolderItem *item,
 
        GSList *tmp = NULL, *cur;
        
-       if (prefs_common.work_offline && !inc_offline_should_override()) {
+       if (prefs_common.work_offline && 
+           !inc_offline_should_override(
+               _("Sylpheed-Claws needs network access in order "
+                 "to access the IMAP server."))) {
                g_free(data);
                return -1;
        }
 
        tmp = folder_item_get_msg_list(item);
 
-       if (g_slist_length(tmp) == g_slist_length(msginfo_list))
+       if (g_slist_length(tmp) <= g_slist_length(msginfo_list))
                data->full_search = TRUE;
        
        for (cur = tmp; cur; cur = cur->next)
@@ -3916,9 +3964,7 @@ static GSList * imap_list_from_lep(IMAPFolder * folder,
                                   clist * list, const gchar * real_path, gboolean all)
 {
        clistiter * iter;
-       GSList * item_list;
-       
-       item_list = NULL;
+       GSList * item_list = NULL, *llast = NULL;
        
        for(iter = clist_begin(list) ; iter != NULL ;
            iter = clist_next(iter)) {
@@ -3977,8 +4023,12 @@ static GSList * imap_list_from_lep(IMAPFolder * folder,
                    ((flags & ETPAN_IMAP_MB_NOSELECT) != 0))
                        new_item->no_select = TRUE;
                
-               item_list = g_slist_append(item_list, new_item);
-               
+               if (item_list == NULL)
+                       llast = item_list = g_slist_append(item_list, new_item);
+               else {
+                       llast = g_slist_append(llast, new_item);
+                       llast = llast->next;
+               }
                debug_print("folder '%s' found.\n", loc_path);
                g_free(base);
                g_free(loc_path);
@@ -3994,7 +4044,7 @@ static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist)
 {
        GSList *sorted_list, *cur;
        guint first, last, next;
-       GSList *ret_list = NULL;
+       GSList *ret_list = NULL, *llast = NULL;
        unsigned int count;
        struct mailimap_set * current_set;
        unsigned int item_count;
@@ -4033,8 +4083,13 @@ static GSList * imap_get_lep_set_from_numlist(MsgNumberList *numlist)
                        first = next;
                        
                        if (count >= IMAP_SET_MAX_COUNT) {
-                               ret_list = g_slist_append(ret_list,
+                               if (ret_list == NULL)
+                                       llast = ret_list = g_slist_append(ret_list,
                                                          current_set);
+                               else {
+                                       llast = g_slist_append(llast, current_set);
+                                       llast = llast->next;
+                               }
                                current_set = mailimap_set_new_empty();
                                count = 0;
                                item_count = 0;
@@ -4061,8 +4116,9 @@ static GSList * imap_get_lep_set_from_msglist(MsgInfoList *msglist)
        for (cur = msglist; cur != NULL; cur = g_slist_next(cur)) {
                MsgInfo *msginfo = (MsgInfo *) cur->data;
 
-               numlist = g_slist_append(numlist, GINT_TO_POINTER(msginfo->msgnum));
+               numlist = g_slist_prepend(numlist, GINT_TO_POINTER(msginfo->msgnum));
        }
+       numlist = g_slist_reverse(numlist);
        seq_list = imap_get_lep_set_from_numlist(numlist);
        g_slist_free(numlist);
 
@@ -4081,9 +4137,10 @@ static GSList * imap_uid_list_from_lep(clist * list)
                uint32_t * puid;
                
                puid = clist_content(iter);
-               result = g_slist_append(result, GINT_TO_POINTER(* puid));
+               result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
        }
        
+       result = g_slist_reverse(result);
        return result;
 }
 
@@ -4098,9 +4155,9 @@ static GSList * imap_uid_list_from_lep_tab(carray * list)
                uint32_t * puid;
                
                puid = carray_get(list, i);
-               result = g_slist_append(result, GINT_TO_POINTER(* puid));
+               result = g_slist_prepend(result, GINT_TO_POINTER(* puid));
        }
-       
+       result = g_slist_reverse(result);
        return result;
 }
 
@@ -4193,6 +4250,9 @@ void imap_folder_unref(Folder *folder)
 
 static FolderClass imap_class;
 
+static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item);
+static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag);
+
 static Folder  *imap_folder_new        (const gchar    *name,
                                         const gchar    *path)
 {
@@ -4215,6 +4275,11 @@ static gint      imap_rename_folder      (Folder         *folder,
        return -1;
 }
 
+gchar imap_get_path_separator_for_item(FolderItem *item)
+{
+       return '/';
+}
+
 FolderClass *imap_get_class(void)
 {
        if (imap_class.idstr == NULL) {
@@ -4226,6 +4291,11 @@ FolderClass *imap_get_class(void)
                imap_class.create_tree = imap_create_tree;
                imap_class.create_folder = imap_create_folder;
                imap_class.rename_folder = imap_rename_folder;
+
+               imap_class.set_xml = folder_set_xml;
+               imap_class.get_xml = folder_get_xml;
+               imap_class.item_set_xml = imap_item_set_xml;
+               imap_class.item_get_xml = imap_item_get_xml;
                /* nothing implemented */
        }
 
@@ -4237,3 +4307,35 @@ void imap_synchronise(FolderItem *item)
 {
        imap_gtk_synchronise(item);
 }
+
+static void imap_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
+{
+#ifdef HAVE_LIBETPAN
+       GList *cur;
+#endif
+       folder_item_set_xml(folder, item, tag);
+       
+#ifdef HAVE_LIBETPAN
+       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
+               XMLAttr *attr = (XMLAttr *) cur->data;
+
+               if (!attr || !attr->name || !attr->value) continue;
+               if (!strcmp(attr->name, "uidnext"))
+                       IMAP_FOLDER_ITEM(item)->uid_next = atoi(attr->value);
+       }
+#endif
+}
+
+static XMLTag *imap_item_get_xml(Folder *folder, FolderItem *item)
+{
+       XMLTag *tag;
+
+       tag = folder_item_get_xml(folder, item);
+
+#ifdef HAVE_LIBETPAN
+       xml_tag_add_attr(tag, xml_attr_new_int("uidnext", 
+                       IMAP_FOLDER_ITEM(item)->uid_next));
+
+#endif
+       return tag;
+}