sync with sylpheed 0.7.2cvs17
[claws.git] / src / mh.c
index 8f136bce70c3f5a5ed8ce2a5275604230a760351..f2bb0fb41101dff66b03081f37eefdfe82bfaf4e 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,6 +26,8 @@
 #include <glib.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
 #include <errno.h>
 
 #undef MEASURE_TIME
 #include "procheader.h"
 #include "utils.h"
 
+static void    mh_folder_init                  (Folder         *folder,
+                                                const gchar    *name,
+                                                const gchar    *path);
+
 static GSList  *mh_get_uncached_msgs           (GHashTable     *msg_table,
                                                 FolderItem     *item);
 static MsgInfo *mh_parse_msg                   (const gchar    *file,
                                                 FolderItem     *item);
-static void    mh_scan_tree_recursive          (FolderItem     *item);
+static void    mh_scan_tree_recursive          (FolderItem     *item, 
+                                                GHashTable *pptable);
 
 static gboolean mh_rename_folder_func          (GNode          *node,
                                                 gpointer        data);
 
 
+Folder *mh_folder_new(const gchar *name, const gchar *path)
+{
+       Folder *folder;
+
+       folder = (Folder *)g_new0(MHFolder, 1);
+       mh_folder_init(folder, name, path);
+
+       return folder;
+}
+
+void mh_folder_destroy(MHFolder *folder)
+{
+       folder_local_folder_destroy(LOCAL_FOLDER(folder));
+}
+
+static void mh_folder_init(Folder *folder, const gchar *name, const gchar *path)
+{
+       folder_local_folder_init(folder, name, path);
+
+       folder->type = F_MH;
+
+       folder->get_msg_list        = mh_get_msg_list;
+       folder->fetch_msg           = mh_fetch_msg;
+       folder->add_msg             = mh_add_msg;
+       folder->move_msg            = mh_move_msg;
+       folder->move_msgs_with_dest = mh_move_msgs_with_dest;
+       folder->copy_msg            = mh_copy_msg;
+       folder->copy_msgs_with_dest = mh_copy_msgs_with_dest;
+       folder->remove_msg          = mh_remove_msg;
+       folder->remove_all_msg      = mh_remove_all_msg;
+       folder->is_msg_changed      = mh_is_msg_changed;
+       folder->scan                = mh_scan_folder;
+       folder->scan_tree           = mh_scan_tree;
+       folder->create_tree         = mh_create_tree;
+       folder->create_folder       = mh_create_folder;
+       folder->rename_folder       = mh_rename_folder;
+       folder->remove_folder       = mh_remove_folder;
+}
+
 GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
 {
        GSList *mlist;
@@ -70,11 +116,14 @@ GSList *mh_get_msg_list(Folder *folder, FolderItem *item, gboolean use_cache)
        if (stat(path, &s) < 0) {
                FILE_OP_ERROR(path, "stat");
        } else {
-               if (item->mtime == s.st_mtime) {
+               time_t mtime;
+
+               mtime = MAX(s.st_mtime, s.st_ctime);
+               if (item->mtime == mtime) {
                        debug_print("Folder is not modified.\n");
                        scan_new = FALSE;
                } else
-                       item->mtime = s.st_mtime;
+                       item->mtime = mtime;
        }
        g_free(path);
 
@@ -128,9 +177,51 @@ gchar *mh_fetch_msg(Folder *folder, FolderItem *item, gint num)
        return file;
 }
 
-gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file)
+gchar *mh_get_newmsg_filename(FolderItem *dest)
 {
+       gchar *destfile;
        gchar *destpath;
+       gboolean found = FALSE;
+
+       destpath = folder_item_get_path(dest);
+       g_return_val_if_fail(destpath != NULL, NULL);
+       if (!is_dir_exist(destpath))
+               make_dir_hier(destpath);
+
+       do {
+               destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
+                                          dest->last_num + 1);
+               if(is_file_exist(destfile)) {
+                       dest->last_num++;
+                       g_free(destfile);
+               } else {
+                       found = TRUE;
+               }
+       } while(!found);
+       g_free(destpath);
+
+       return destfile;
+}
+
+#define SET_DEST_MSG_FLAGS(fp, dest, msginfo) \
+{ \
+       MsgInfo newmsginfo; \
+ \
+       newmsginfo.msgnum = dest->last_num; \
+       newmsginfo.flags = msginfo->flags; \
+       if (dest->stype == F_OUTBOX || \
+           dest->stype == F_QUEUE  || \
+           dest->stype == F_DRAFT  || \
+           dest->stype == F_TRASH) \
+               MSG_UNSET_PERM_FLAGS(newmsginfo.flags, \
+                                    MSG_NEW|MSG_UNREAD|MSG_DELETED); \
+ \
+       procmsg_write_flags(&newmsginfo, fp); \
+}
+
+gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file,
+               gboolean remove_source)
+{
        gchar *destfile;
 
        g_return_val_if_fail(dest != NULL, -1);
@@ -141,14 +232,21 @@ gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file)
                if (dest->last_num < 0) return -1;
        }
 
-       destpath = folder_item_get_path(dest);
-       g_return_val_if_fail(destpath != NULL, -1);
-       destfile = g_strdup_printf("%s%c%d", destpath, G_DIR_SEPARATOR,
-                                  dest->last_num + 1);
-       if (copy_file(file, destfile) < 0) {
-               g_warning(_("can't copy message %s to %s\n"), file, destfile);
-               g_free(destfile);
-               return -1;
+       destfile = mh_get_newmsg_filename(dest);
+       if(!destfile) return -1;
+
+       if (link(file, destfile) < 0) {
+               if (copy_file(file, destfile) < 0) {
+                       g_warning(_("can't copy message %s to %s\n"),
+                                 file, destfile);
+                       g_free(destfile);
+                       return -1;
+               }
+       }
+
+       if (remove_source) {
+               if (unlink(file) < 0)
+                       FILE_OP_ERROR(file, "unlink");
        }
 
        g_free(destfile);
@@ -156,12 +254,14 @@ gint mh_add_msg(Folder *folder, FolderItem *dest, const gchar *file)
        return dest->last_num;
 }
 
-gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
+static gint mh_do_move(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 {
        gchar *destdir;
        gchar *srcfile;
        gchar *destfile;
        FILE *fp;
+       gint filemode = 0;
+       PrefsFolderItem *prefs;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
@@ -176,67 +276,105 @@ gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
                if (dest->last_num < 0) return -1;
        }
 
+       prefs = dest->prefs;
+
        destdir = folder_item_get_path(dest);
-       if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
-               g_warning(_("Can't open mark file.\n"));
 
        debug_print(_("Moving message %s%c%d to %s ...\n"),
                    msginfo->folder->path, G_DIR_SEPARATOR,
                    msginfo->msgnum, dest->path);
-       srcfile = procmsg_get_message_file_path(msginfo);
-       destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
-                                  dest->last_num + 1);
-       g_free(destdir);
+       srcfile = procmsg_get_message_file(msginfo);
+
+       destfile = mh_get_newmsg_filename(dest);
+       if(!destfile) return -1;
 
-       if (is_file_exist(destfile)) {
-               g_warning(_("%s already exists."), destfile);
+
+       if (move_file(srcfile, destfile) < 0) {
                g_free(srcfile);
                g_free(destfile);
-               if (fp) fclose(fp);
+               g_free(destdir);
                return -1;
        }
 
-       if (rename(srcfile, destfile) < 0) {
-               if (EXDEV == errno) {
-                       if (copy_file(srcfile, destfile) < 0) {
-                               g_free(srcfile);
-                               g_free(destfile);
-                               return -1;
-                       }
-                       unlink(srcfile);
-               } else {
-                       FILE_OP_ERROR(srcfile, "rename");
-                       g_free(srcfile);
-                       g_free(destfile);
-                       if (fp) fclose(fp);
-                       return -1;
-               }
+       if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+               if (chmod(destfile, prefs->folder_chmod) < 0)
+                       FILE_OP_ERROR(destfile, "chmod");
+
+               /* for mark file */
+               filemode = prefs->folder_chmod;
+               if (filemode & S_IRGRP) filemode |= S_IWGRP;
+               if (filemode & S_IROTH) filemode |= S_IWOTH;
        }
 
        g_free(srcfile);
        g_free(destfile);
        dest->last_num++;
 
-       if (fp) {
-               MsgInfo newmsginfo;
-
-               newmsginfo.msgnum = dest->last_num;
-               newmsginfo.flags = msginfo->flags;
-               if (dest->stype == F_OUTBOX ||
-                   dest->stype == F_QUEUE  ||
-                   dest->stype == F_DRAFT  ||
-                   dest->stype == F_TRASH)
-                       MSG_UNSET_FLAGS(newmsginfo.flags,
-                                       MSG_NEW|MSG_UNREAD|MSG_DELETED);
+       if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
+               g_warning(_("Can't open mark file.\n"));
+       else {
+               SET_DEST_MSG_FLAGS(fp, dest, msginfo);
+               if (filemode) {
+#if HAVE_FCHMOD
+                       fchmod(fileno(fp), filemode);
+#else
+                       gchar *markfile;
+
+                       markfile = folder_item_get_mark_file(dest);
+                       if (markfile) {
+                               chmod(markfile, filemode);
+                               g_free(markfile);
+                       }
+#endif
+               }
 
-               procmsg_write_flags(&newmsginfo, fp);
                fclose(fp);
        }
+       g_free(destdir);
 
        return dest->last_num;
 }
 
-gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
+gint mh_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
+{
+       gchar *srcfile;
+       gint ret = 0;
+       g_return_val_if_fail(folder != NULL, -1);
+       g_return_val_if_fail(dest != NULL, -1);
+       g_return_val_if_fail(msginfo != NULL, -1);
+       g_return_val_if_fail(msginfo->folder != NULL, -1);
+       if (folder == msginfo->folder->folder)
+               return mh_do_move(folder, dest, msginfo);
+       srcfile = procmsg_get_message_file(msginfo);
+       if (!srcfile) return -1;
+       ret = mh_add_msg(folder, dest, srcfile, FALSE);
+       g_free(srcfile);
+       if (ret != -1) {
+               gchar *destdir;
+               FILE *fp;
+               destdir = folder_item_get_path(dest);
+               if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
+                       g_warning(_("Can't open mark file.\n"));
+               else {
+                       SET_DEST_MSG_FLAGS(fp, dest, msginfo);
+                       fclose(fp);
+               }
+               g_free(destdir);
+               ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
+       }
+       return ret;
+}
+
+static gint mh_do_move_msgs_with_dest(Folder *folder, FolderItem *dest,
+                                     GSList *msglist)
 {
        gchar *destdir;
        gchar *srcfile;
@@ -244,6 +382,7 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
        FILE *fp;
        GSList *cur;
        MsgInfo *msginfo;
+       PrefsFolderItem *prefs;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msglist != NULL, -1);
@@ -253,6 +392,8 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                if (dest->last_num < 0) return -1;
        }
 
+       prefs = dest->prefs;
+
        destdir = folder_item_get_path(dest);
        if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
                g_warning(_("Can't open mark file.\n"));
@@ -268,50 +409,22 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, dest->path);
 
-               srcfile = procmsg_get_message_file_path(msginfo);
-               destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
-                                          dest->last_num + 1);
+               srcfile = procmsg_get_message_file(msginfo);
+               destfile = mh_get_newmsg_filename(dest);
+               if(!destfile) return -1;
 
-               if (is_file_exist(destfile)) {
-                       g_warning(_("%s already exists."), destfile);
+               if (move_file(srcfile, destfile) < 0) {
                        g_free(srcfile);
                        g_free(destfile);
                        break;
                }
 
-               if (rename(srcfile, destfile) < 0) {
-                       if (EXDEV == errno) {
-                               if (copy_file(srcfile, destfile) < 0) {
-                                       g_free(srcfile);
-                                       g_free(destfile);
-                                       break;
-                               }
-                               unlink(srcfile);
-                       } else {
-                               FILE_OP_ERROR(srcfile, "rename");
-                               g_free(srcfile);
-                               g_free(destfile);
-                               break;
-                       }
-               }
-
                g_free(srcfile);
                g_free(destfile);
                dest->last_num++;
 
                if (fp) {
-                       MsgInfo newmsginfo;
-
-                       newmsginfo.msgnum = dest->last_num;
-                       newmsginfo.flags = msginfo->flags;
-                       if (dest->stype == F_OUTBOX ||
-                           dest->stype == F_QUEUE  ||
-                           dest->stype == F_DRAFT  ||
-                           dest->stype == F_TRASH)
-                               MSG_UNSET_FLAGS(newmsginfo.flags,
-                                               MSG_NEW|MSG_UNREAD|MSG_DELETED);
-
-                       procmsg_write_flags(&newmsginfo, fp);
+                       SET_DEST_MSG_FLAGS(fp, dest, msginfo);
                }
        }
 
@@ -321,12 +434,33 @@ gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
        return dest->last_num;
 }
 
+gint mh_move_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
+{
+       MsgInfo *msginfo;
+       GSList *cur;
+       gint ret = 0;
+
+       msginfo = (MsgInfo *)msglist->data;
+       if (folder == msginfo->folder->folder)
+               return mh_do_move_msgs_with_dest(folder, dest, msglist);
+
+       for (cur = msglist; cur != NULL; cur = cur->next) {
+               msginfo = (MsgInfo *)cur->data;
+               ret = mh_move_msg(folder, dest, msginfo);
+               if (ret == -1) break;
+       }
+
+       return ret;
+}
+
 gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
 {
        gchar *destdir;
        gchar *srcfile;
        gchar *destfile;
        FILE *fp;
+       gint filemode = 0;
+       PrefsFolderItem *prefs;
 
        g_return_val_if_fail(dest != NULL, -1);
        g_return_val_if_fail(msginfo != NULL, -1);
@@ -341,38 +475,96 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
                if (dest->last_num < 0) return -1;
        }
 
+       prefs = dest->prefs;
+
        destdir = folder_item_get_path(dest);
-       if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
-               g_warning(_("Can't open mark file.\n"));
+       if (!is_dir_exist(destdir))
+               make_dir_hier(destdir);
 
        debug_print(_("Copying message %s%c%d to %s ...\n"),
                    msginfo->folder->path, G_DIR_SEPARATOR,
                    msginfo->msgnum, dest->path);
-       srcfile = procmsg_get_message_file_path(msginfo);
-       destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
-                                  dest->last_num + 1);
-       g_free(destdir);
-
-       if (is_file_exist(destfile)) {
-               g_warning(_("%s already exists."), destfile);
+       srcfile = procmsg_get_message_file(msginfo);
+       destfile = mh_get_newmsg_filename(dest);
+       if(!destfile) {
                g_free(srcfile);
-               g_free(destfile);
                if (fp) fclose(fp);
                return -1;
        }
+       
+       dest->op_count--;
 
        if (copy_file(srcfile, destfile) < 0) {
                FILE_OP_ERROR(srcfile, "copy");
                g_free(srcfile);
                g_free(destfile);
-               if (fp) fclose(fp);
+               g_free(destdir);
                return -1;
        }
 
+       if (prefs && prefs->enable_folder_chmod && prefs->folder_chmod) {
+               if (chmod(destfile, prefs->folder_chmod) < 0)
+                       FILE_OP_ERROR(destfile, "chmod");
+
+               /* for mark file */
+               filemode = prefs->folder_chmod;
+               if (filemode & S_IRGRP) filemode |= S_IWGRP;
+               if (filemode & S_IROTH) filemode |= S_IWOTH;
+       }
+
        g_free(srcfile);
        g_free(destfile);
        dest->last_num++;
 
+       if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
+               g_warning(_("Can't open mark file.\n"));
+       else {
+               SET_DEST_MSG_FLAGS(fp, dest, msginfo);
+
+               if (filemode) {
+#if HAVE_FCHMOD
+                       fchmod(fileno(fp), filemode);
+#else
+                       gchar *markfile;
+
+                       markfile = folder_item_get_mark_file(dest);
+                       if (markfile) {
+                               chmod(markfile, filemode);
+                               g_free(markfile);
+                       }
+#endif
+               }
+
+               fclose(fp);
+       }
+       g_free(destdir);
+
+       return dest->last_num;
+}
+
+/*
+gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
+{
+       Folder * src_folder;
+       gchar * filename;
+       gint num;
+       gchar * destdir;
+       FILE * fp;
+
+       src_folder = msginfo->folder->folder;
+       
+       g_return_val_if_fail(src_folder->fetch_msg != NULL, -1);
+       
+       filename = src_folder->fetch_msg(src_folder,
+                                        msginfo->folder,
+                                        msginfo->msgnum);
+       if (filename == NULL)
+               return -1;
+
+       num = folder->add_msg(folder, dest, filename, FALSE);
+
+       destdir = folder_item_get_path(dest);
+
        if (fp) {
                MsgInfo newmsginfo;
 
@@ -384,12 +576,14 @@ gint mh_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
                    dest->stype == F_TRASH)
                        MSG_UNSET_FLAGS(newmsginfo.flags,
                                        MSG_NEW|MSG_UNREAD|MSG_DELETED);
+
                procmsg_write_flags(&newmsginfo, fp);
                fclose(fp);
        }
-
-       return dest->last_num;
+       
+       return num;
 }
+*/
 
 gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
 {
@@ -409,6 +603,9 @@ gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
        }
 
        destdir = folder_item_get_path(dest);
+       if (!is_dir_exist(destdir))
+               make_dir_hier(destdir);
+
        if ((fp = procmsg_open_mark_file(destdir, TRUE)) == NULL)
                g_warning(_("Can't open mark file.\n"));
 
@@ -423,14 +620,10 @@ gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                            msginfo->folder->path, G_DIR_SEPARATOR,
                            msginfo->msgnum, dest->path);
 
-               srcfile = procmsg_get_message_file_path(msginfo);
-               destfile = g_strdup_printf("%s%c%d", destdir, G_DIR_SEPARATOR,
-                                          dest->last_num + 1);
-
-               if (is_file_exist(destfile)) {
-                       g_warning(_("%s already exists."), destfile);
+               srcfile = procmsg_get_message_file(msginfo);
+               destfile = mh_get_newmsg_filename(dest);
+               if(!destfile) {
                        g_free(srcfile);
-                       g_free(destfile);
                        break;
                }
 
@@ -446,17 +639,7 @@ gint mh_copy_msgs_with_dest(Folder *folder, FolderItem *dest, GSList *msglist)
                dest->last_num++;
 
                if (fp) {
-                       MsgInfo newmsginfo;
-
-                       newmsginfo.msgnum = dest->last_num;
-                       newmsginfo.flags = msginfo->flags;
-                       if (dest->stype == F_OUTBOX ||
-                           dest->stype == F_QUEUE  ||
-                           dest->stype == F_DRAFT  ||
-                           dest->stype == F_TRASH)
-                               MSG_UNSET_FLAGS(newmsginfo.flags,
-                                               MSG_NEW|MSG_UNREAD|MSG_DELETED);
-                       procmsg_write_flags(&newmsginfo, fp);
+                       SET_DEST_MSG_FLAGS(fp, dest, msginfo);
                }
        }
 
@@ -488,32 +671,16 @@ gint mh_remove_msg(Folder *folder, FolderItem *item, gint num)
 gint mh_remove_all_msg(Folder *folder, FolderItem *item)
 {
        gchar *path;
-       DIR *dp;
-       struct dirent *d;
+       gint val;
 
        g_return_val_if_fail(item != NULL, -1);
 
        path = folder_item_get_path(item);
        g_return_val_if_fail(path != NULL, -1);
-       if (change_dir(path) < 0) {
-               g_free(path);
-               return -1;
-       }
+       val = remove_all_numbered_files(path);
        g_free(path);
 
-       if ((dp = opendir(".")) == NULL) {
-               FILE_OP_ERROR(item->path, "opendir");
-               return -1;
-       }
-
-       while ((d = readdir(dp)) != NULL) {
-               if (to_number(d->d_name) < 0) continue;
-               if (unlink(d->d_name) < 0)
-                       FILE_OP_ERROR(d->d_name, "unlink");
-       }
-
-       closedir(dp);
-       return 0;
+       return val;
 }
 
 gboolean mh_is_msg_changed(Folder *folder, FolderItem *item, MsgInfo *msginfo)
@@ -540,6 +707,8 @@ void mh_scan_folder(Folder *folder, FolderItem *item)
 
        g_return_if_fail(item != NULL);
 
+       debug_print("mh_scan_folder(): Scanning %s ...\n", item->path);
+
        path = folder_item_get_path(item);
        g_return_if_fail(path != NULL);
        if (change_dir(path) < 0) {
@@ -571,9 +740,9 @@ void mh_scan_folder(Folder *folder, FolderItem *item)
        if (n_msg == 0)
                item->new = item->unread = item->total = 0;
        else {
-               gint new, unread, total;
+               gint new, unread, total, min, max;
 
-               procmsg_get_mark_sum(".", &new, &unread, &total);
+               procmsg_get_mark_sum(".", &new, &unread, &total, &min, &max, 0);
                if (n_msg > total) {
                        new += n_msg - total;
                        unread += n_msg - total;
@@ -591,9 +760,12 @@ void mh_scan_tree(Folder *folder)
 {
        FolderItem *item;
        gchar *rootpath;
+       GHashTable *pptable;
 
        g_return_if_fail(folder != NULL);
 
+       pptable = folder_persist_prefs_new(folder);
+
        folder_tree_destroy(folder);
        item = folder_item_new(folder->name, NULL);
        item->folder = folder;
@@ -606,7 +778,9 @@ void mh_scan_tree(Folder *folder)
        }
        g_free(rootpath);
 
-       mh_scan_tree_recursive(item);
+       mh_scan_tree_recursive(item, pptable);
+       
+       folder_persist_prefs_free(pptable);
 }
 
 #define MAKE_DIR_IF_NOT_EXIST(dir) \
@@ -659,6 +833,9 @@ FolderItem *mh_create_folder(Folder *folder, FolderItem *parent,
        g_return_val_if_fail(name != NULL, NULL);
 
        path = folder_item_get_path(parent);
+       if (!is_dir_exist(path))
+               make_dir_hier(path);
+
        fullpath = g_strconcat(path, G_DIR_SEPARATOR_S, name, NULL);
        g_free(path);
 
@@ -698,6 +875,9 @@ gint mh_rename_folder(Folder *folder, FolderItem *item, const gchar *name)
        g_return_val_if_fail(name != NULL, -1);
 
        oldpath = folder_item_get_path(item);
+       if (!is_dir_exist(oldpath))
+               make_dir_hier(oldpath);
+
        dirname = g_dirname(oldpath);
        newpath = g_strconcat(dirname, G_DIR_SEPARATOR_S, name, NULL);
        g_free(dirname);
@@ -856,18 +1036,21 @@ static MsgInfo *mh_parse_msg(const gchar *file, FolderItem *item)
 {
        struct stat s;
        MsgInfo *msginfo;
-       MsgFlags flags = MSG_NEW|MSG_UNREAD;
+       MsgFlags flags;
+
+       flags.perm_flags = MSG_NEW|MSG_UNREAD;
+       flags.tmp_flags = 0;
 
        g_return_val_if_fail(item != NULL, NULL);
        g_return_val_if_fail(file != NULL, NULL);
 
        if (item->stype == F_QUEUE) {
-               MSG_SET_FLAGS(flags, MSG_QUEUED);
+               MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
        } else if (item->stype == F_DRAFT) {
-               MSG_SET_FLAGS(flags, MSG_DRAFT);
+               MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
        }
 
-       msginfo = procheader_parse(file, flags, FALSE);
+       msginfo = procheader_parse(file, flags, FALSE, FALSE);
        if (!msginfo) return NULL;
 
        msginfo->msgnum = atoi(file);
@@ -909,7 +1092,7 @@ static gboolean mh_is_maildir(const gchar *path)
               mh_is_maildir_one(path, "tmp");
 }
 
-static void mh_scan_tree_recursive(FolderItem *item)
+static void mh_scan_tree_recursive(FolderItem *item, GHashTable *pptable)
 {
        DIR *dp;
        struct dirent *d;
@@ -959,24 +1142,25 @@ static void mh_scan_tree_recursive(FolderItem *item)
                        new_item = folder_item_new(d->d_name, entry);
                        folder_item_append(item, new_item);
                        if (!item->path) {
-                               if (!strcmp(d->d_name, "inbox")) {
+                               if (!strcmp(d->d_name, INBOX_DIR)) {
                                        new_item->stype = F_INBOX;
                                        item->folder->inbox = new_item;
-                               } else if (!strcmp(d->d_name, "outbox")) {
+                               } else if (!strcmp(d->d_name, OUTBOX_DIR)) {
                                        new_item->stype = F_OUTBOX;
                                        item->folder->outbox = new_item;
-                               } else if (!strcmp(d->d_name, "draft")) {
+                               } else if (!strcmp(d->d_name, DRAFT_DIR)) {
                                        new_item->stype = F_DRAFT;
                                        item->folder->draft = new_item;
-                               } else if (!strcmp(d->d_name, "queue")) {
+                               } else if (!strcmp(d->d_name, QUEUE_DIR)) {
                                        new_item->stype = F_QUEUE;
                                        item->folder->queue = new_item;
-                               } else if (!strcmp(d->d_name, "trash")) {
+                               } else if (!strcmp(d->d_name, TRASH_DIR)) {
                                        new_item->stype = F_TRASH;
                                        item->folder->trash = new_item;
                                }
                        }
-                       mh_scan_tree_recursive(new_item);
+                       folder_item_restore_persist_prefs(new_item, pptable);
+                       mh_scan_tree_recursive(new_item, pptable);
                } else if (to_number(d->d_name) != -1) n_msg++;
 
                g_free(entry);
@@ -985,9 +1169,10 @@ static void mh_scan_tree_recursive(FolderItem *item)
        closedir(dp);
 
        if (item->path) {
-               gint new, unread, total;
+               gint new, unread, total, min, max;
 
-               procmsg_get_mark_sum(item->path, &new, &unread, &total);
+               procmsg_get_mark_sum(item->path, &new, &unread, &total,
+                                    &min, &max, 0);
                if (n_msg > total) {
                        new += n_msg - total;
                        unread += n_msg - total;