68 files changed, 1025 insertions, 112 deletions
diff --git a/kmicromail/libetpan/generic/imapdriver.c b/kmicromail/libetpan/generic/imapdriver.c
index 0d63319..b3e5982 100644
--- a/kmicromail/libetpan/generic/imapdriver.c
+++ b/kmicromail/libetpan/generic/imapdriver.c
@@ -97,12 +97,14 @@ static int imapdriver_list_folders(mailsession * session, char * mb,
 static int imapdriver_lsub_folders(mailsession * session, char * mb,
                                   struct mail_list ** result);
 static int imapdriver_subscribe_folder(mailsession * session, char * mb);
 static int imapdriver_unsubscribe_folder(mailsession * session, char * mb);
 static int imapdriver_append_message(mailsession * session,
                                     char * message, size_t size);
+static int imapdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int imapdriver_copy_message(mailsession * session,
                                   uint32_t num, char * mb);
 static int imapdriver_get_messages_list(mailsession * session,
                                        struct mailmessage_list ** result);
@@ -154,12 +156,13 @@ static mailsession_driver local_imap_session_driver = {
  .sess_list_folders = imapdriver_list_folders,
  .sess_lsub_folders = imapdriver_lsub_folders,
  .sess_subscribe_folder = imapdriver_subscribe_folder,
  .sess_unsubscribe_folder = imapdriver_unsubscribe_folder,
  .sess_append_message = imapdriver_append_message,
+  .sess_append_message_flags = imapdriver_append_message_flags,
  .sess_copy_message = imapdriver_copy_message,
  .sess_move_message = NULL,
  .sess_get_messages_list = imapdriver_get_messages_list,
  .sess_get_envelopes_list = imapdriver_get_envelopes_list,
  .sess_remove_message = NULL,
@@ -768,12 +771,37 @@ static int imapdriver_append_message(mailsession * session,
      get_data(session)->imap_mailbox,
      message, size);
  
  return imap_error_to_mail_error(r);
 }
+static int imapdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  struct mailimap_flag_list * flag_list;
+  int r;
+  
+  if (flags != NULL) {
+    r = imap_flags_to_imap_flags(flags, &flag_list);
+    if (r != MAIL_NO_ERROR)
+      return r;
+  }
+  else {
+    flag_list = NULL;
+  }
+  
+  r = mailimap_append(get_imap_session(session),
+      get_data(session)->imap_mailbox,
+      flag_list, NULL, message, size);
+  
+  if (flag_list != NULL)
+    mailimap_flag_list_free(flag_list);
+  
+  return imap_error_to_mail_error(r);
+}
 static int imapdriver_copy_message(mailsession * session,
                                   uint32_t num, char * mb)
 {
  int r;
  struct mailimap_set * set;
  int res;
diff --git a/kmicromail/libetpan/generic/imapdriver_cached.c b/kmicromail/libetpan/generic/imapdriver_cached.c
index e6af8e8..04044ae 100644
--- a/kmicromail/libetpan/generic/imapdriver_cached.c
+++ b/kmicromail/libetpan/generic/imapdriver_cached.c
@@ -102,12 +102,14 @@ static int imapdriver_cached_lsub_folders(mailsession * session, char * mb,
 static int imapdriver_cached_subscribe_folder(mailsession * session,
                                              char * mb);
 static int imapdriver_cached_unsubscribe_folder(mailsession * session,
                                                char * mb);
 static int imapdriver_cached_append_message(mailsession * session,
                                            char * message, size_t size);
+static int imapdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int imapdriver_cached_copy_message(mailsession * session,
                                          uint32_t num, char * mb);
 static int imapdriver_cached_get_messages_list(mailsession * session,
                                                struct mailmessage_list **
                                                result);
@@ -162,12 +164,13 @@ static mailsession_driver local_imap_cached_session_driver = {
  .sess_list_folders = imapdriver_cached_list_folders,
  .sess_lsub_folders = imapdriver_cached_lsub_folders,
  .sess_subscribe_folder = imapdriver_cached_subscribe_folder,
  .sess_unsubscribe_folder = imapdriver_cached_unsubscribe_folder,
  .sess_append_message = imapdriver_cached_append_message,
+  .sess_append_message_flags = imapdriver_cached_append_message_flags,
  .sess_copy_message = imapdriver_cached_copy_message,
  .sess_move_message = NULL,
  .sess_get_messages_list = imapdriver_cached_get_messages_list,
  .sess_get_envelopes_list = imapdriver_cached_get_envelopes_list,
  .sess_remove_message = imapdriver_cached_remove_message,
@@ -773,12 +776,25 @@ static int imapdriver_cached_append_message(mailsession * session,
  
  check_for_uid_cache(session);
  
  return r;
 }
+static int imapdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  int r;
+  
+  r = mailsession_append_message_flags(get_ancestor(session),
+      message, size, flags);
+  
+  check_for_uid_cache(session);
+  
+  return r;
+}
 static int imapdriver_cached_copy_message(mailsession * session,
                                          uint32_t num, char * mb)
 {
  int r;
  r = mailsession_copy_message(get_ancestor(session), num, mb);
diff --git a/kmicromail/libetpan/generic/imapdriver_cached_message.c b/kmicromail/libetpan/generic/imapdriver_cached_message.c
index c0542a3..c4357a3 100644
--- a/kmicromail/libetpan/generic/imapdriver_cached_message.c
+++ b/kmicromail/libetpan/generic/imapdriver_cached_message.c
@@ -209,13 +209,13 @@ static void generate_key_from_mime_section(char * key, size_t size,
  return;
 free_str:
  mmap_string_free(gstr);
 free_section:
  mailmime_section_free(part);
- err:
+ err:;
 }
 static void generate_key_from_section(char * key, size_t size,
                                      mailmessage * msg_info,
                                      struct mailmime * mime, int type)
 {
diff --git a/kmicromail/libetpan/generic/imapdriver_tools.c b/kmicromail/libetpan/generic/imapdriver_tools.c
index 3d737f3..de4008f 100644
--- a/kmicromail/libetpan/generic/imapdriver_tools.c
+++ b/kmicromail/libetpan/generic/imapdriver_tools.c
@@ -3104,22 +3104,21 @@ static int imap_flags_to_flags(struct mailimap_msg_att_dynamic * att_dyn,
 free:
  mail_flags_free(flags);
 err:
  return MAIL_ERROR_MEMORY;
 }
-static int flags_to_imap_flags(struct mail_flags * flags,
+int imap_flags_to_imap_flags(struct mail_flags * flags,
-                               struct mailimap_store_att_flags ** result)
+    struct mailimap_flag_list ** result)
 {
  struct mailimap_flag * flag;
  struct mailimap_flag_list * flag_list;
-  struct mailimap_store_att_flags * att_flags;
  int res;
  clistiter * cur;
  int r;
-  
  flag_list = mailimap_flag_list_new_empty();
  if (flag_list == NULL) {
    res = MAIL_ERROR_MEMORY;
    goto err;
  }
@@ -3236,23 +3235,48 @@ static int flags_to_imap_flags(struct mail_flags * flags,
        mailimap_flag_free(flag);
        res = MAIL_ERROR_MEMORY;
        goto free_flag_list;
      }
    }
  }
+  
+  * result = flag_list;
+  
+  return MAIL_NO_ERROR;
+  
+ free_flag_list: 
+  mailimap_flag_list_free(flag_list);
+ err:
+  return res;
+}
+static int flags_to_imap_flags(struct mail_flags * flags,
+                               struct mailimap_store_att_flags ** result)
+{
+  struct mailimap_flag_list * flag_list;
+  struct mailimap_store_att_flags * att_flags;
+  int res;
+  int r;
+  
+  r = imap_flags_to_imap_flags(flags,
+      &flag_list);
+  if (r != MAIL_NO_ERROR) {
+    res = r;
+    goto err;
+  }
+  
  att_flags = mailimap_store_att_flags_new_set_flags_silent(flag_list);
  if (att_flags == NULL) {
    res = MAIL_ERROR_MEMORY;
    goto free_flag_list;
  }
+  
  * result = att_flags;
+  
  return MAIL_NO_ERROR;
+  
 free_flag_list: 
  mailimap_flag_list_free(flag_list);
 err:
  return res;
 }
diff --git a/kmicromail/libetpan/generic/imapdriver_tools.h b/kmicromail/libetpan/generic/imapdriver_tools.h
index 6582a31..59c993e 100644
--- a/kmicromail/libetpan/generic/imapdriver_tools.h
+++ b/kmicromail/libetpan/generic/imapdriver_tools.h
@@ -103,11 +103,14 @@ imapdriver_get_cached_envelope(struct mail_cache_db * cache_db,
 int
 imapdriver_write_cached_envelope(struct mail_cache_db * cache_db,
    MMAPString * mmapstr,
    mailsession * session, mailmessage * msg,
    struct mailimf_fields * fields);
+int imap_flags_to_imap_flags(struct mail_flags * flags,
+    struct mailimap_flag_list ** result);
 #ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/kmicromail/libetpan/generic/imapstorage.c b/kmicromail/libetpan/generic/imapstorage.c
index e8683d8..972b6dd 100644
--- a/kmicromail/libetpan/generic/imapstorage.c
+++ b/kmicromail/libetpan/generic/imapstorage.c
@@ -68,13 +68,13 @@ int imap_mailstorage_init(struct mailstorage * storage,
    int imap_connection_type, int imap_auth_type,
    char * imap_login, char * imap_password,
    int imap_cached, char * imap_cache_directory)
 {
  struct imap_mailstorage * imap_storage;
-  imap_storage = malloc(sizeof(struct imap_mailstorage));
+  imap_storage = malloc(sizeof(* imap_storage));
  if (imap_storage == NULL)
    goto err;
  imap_storage->imap_servername = strdup(imap_servername);
  if (imap_storage->imap_servername == NULL)
    goto free;
diff --git a/kmicromail/libetpan/generic/maildirdriver.c b/kmicromail/libetpan/generic/maildirdriver.c
index 7830ceb..5f21422 100644
--- a/kmicromail/libetpan/generic/maildirdriver.c
+++ b/kmicromail/libetpan/generic/maildirdriver.c
@@ -82,12 +82,15 @@ static int unseen_number(mailsession * session, char * mb,
 static int messages_number(mailsession * session, char * mb,
    uint32_t * result);
 static int append_message(mailsession * session,
    char * message, size_t size);
+static int append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int get_messages_list(mailsession * session,
    struct mailmessage_list ** result);
 static int get_envelopes_list(mailsession * session,
    struct mailmessage_list * env_list);
@@ -126,12 +129,13 @@ static mailsession_driver local_maildir_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = append_message,
+  .sess_append_message_flags = append_message_flags,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = get_messages_list,
  .sess_get_envelopes_list = get_envelopes_list,
  .sess_remove_message = NULL,
@@ -352,24 +356,71 @@ static int recent_number(mailsession * session, char * mb,
 /* messages operations */
 static int append_message(mailsession * session,
    char * message, size_t size)
 {
+#if 0
  struct maildir * md;
  int r;
  md = get_maildir_session(session);
  if (md == NULL)
    return MAIL_ERROR_BAD_STATE;
  
  r = maildir_message_add(md, message, size);
  if (r != MAILDIR_NO_ERROR)
    return maildirdriver_maildir_error_to_mail_error(r);
  
  return MAIL_NO_ERROR;
+#endif
+  
+  return append_message_flags(session, message, size, NULL);
+}
+static int append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  struct maildir * md;
+  int r;
+  char uid[PATH_MAX];
+  struct maildir_msg * md_msg;
+  chashdatum key;
+  chashdatum value;
+  uint32_t md_flags;
+  
+  md = get_maildir_session(session);
+  if (md == NULL)
+    return MAIL_ERROR_BAD_STATE;
+  
+  r = maildir_message_add_uid(md, message, size,
+      uid, sizeof(uid));
+  if (r != MAILDIR_NO_ERROR)
+    return maildirdriver_maildir_error_to_mail_error(r);
+  
+  if (flags == NULL)
+    goto exit;
+  
+  key.data = uid;
+  key.len = strlen(uid);
+  r = chash_get(md->mdir_msg_hash, &key, &value);
+  if (r < 0)
+    goto exit;
+  
+  md_msg = value.data;
+  
+  md_flags = maildirdriver_flags_to_maildir_flags(flags->fl_flags);
+  
+  r = maildir_message_change_flags(md, uid, md_flags);
+  if (r != MAILDIR_NO_ERROR)
+    goto exit;
+  
+  return MAIL_NO_ERROR;
+  
+ exit:
+  return MAIL_NO_ERROR;
 }
 static int get_messages_list(mailsession * session,
    struct mailmessage_list ** result)
 {
  struct maildir * md;
diff --git a/kmicromail/libetpan/generic/maildirdriver_cached.c b/kmicromail/libetpan/generic/maildirdriver_cached.c
index 503d1c9..8a5e206 100644
--- a/kmicromail/libetpan/generic/maildirdriver_cached.c
+++ b/kmicromail/libetpan/generic/maildirdriver_cached.c
@@ -83,12 +83,15 @@ static int unseen_number(mailsession * session, char * mb,
 static int messages_number(mailsession * session, char * mb,
    uint32_t * result);
 static int append_message(mailsession * session,
    char * message, size_t size);
+static int append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int get_messages_list(mailsession * session,
    struct mailmessage_list ** result);
 static int get_envelopes_list(mailsession * session,
    struct mailmessage_list * env_list);
@@ -130,12 +133,13 @@ static mailsession_driver local_maildir_cached_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = append_message,
+  .sess_append_message_flags = append_message_flags,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = get_messages_list,
  .sess_get_envelopes_list = get_envelopes_list,
  .sess_remove_message = NULL,
@@ -451,15 +455,89 @@ static int recent_number(mailsession * session, char * mb,
 }
 static int append_message(mailsession * session,
    char * message, size_t size)
 {
+#if 0
  return mailsession_append_message(get_ancestor(session), message, size);
+#endif
+  return append_message_flags(session, message, size, NULL);
 }
+static int append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  struct maildir * md;
+  int r;
+  char uid[PATH_MAX];
+  struct maildir_msg * md_msg;
+  chashdatum key;
+  chashdatum value;
+  uint32_t md_flags;
+  struct mail_cache_db * cache_db_flags;
+  char filename_flags[PATH_MAX];
+  MMAPString * mmapstr;
+  struct maildir_cached_session_state_data * data;
+  
+  md = get_maildir_session(session);
+  if (md == NULL)
+    return MAIL_ERROR_BAD_STATE;
+  
+  r = maildir_message_add_uid(md, message, size,
+      uid, sizeof(uid));
+  if (r != MAILDIR_NO_ERROR)
+    return maildirdriver_maildir_error_to_mail_error(r);
+  
+  if (flags == NULL)
+    goto exit;
+  
+  data = get_cached_data(session);
+  
+  snprintf(filename_flags, PATH_MAX, "%s%c%s%c%s",
+      data->md_flags_directory, MAIL_DIR_SEPARATOR, data->md_quoted_mb,
+      MAIL_DIR_SEPARATOR, FLAGS_NAME);
+  
+  r = mail_cache_db_open_lock(filename_flags, &cache_db_flags);
+  if (r < 0)
+    goto exit;
+  
+  mmapstr = mmap_string_new("");
+  if (mmapstr == NULL)
+    goto close_db_flags;
+  
+  r = write_cached_flags(cache_db_flags, mmapstr,
+      uid, flags);
+  
+  mmap_string_free(mmapstr);
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+  
+  if (r != MAIL_NO_ERROR)
+    goto exit;
+  
+  key.data = uid;
+  key.len = strlen(uid);
+  r = chash_get(md->mdir_msg_hash, &key, &value);
+  if (r < 0)
+    goto exit;
+  
+  md_msg = value.data;
+  
+  md_flags = maildirdriver_flags_to_maildir_flags(flags->fl_flags);
+  
+  r = maildir_message_change_flags(md, uid, md_flags);
+  if (r != MAILDIR_NO_ERROR)
+    goto exit;
+  
+  return MAIL_NO_ERROR;
+  
+ close_db_flags:
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+ exit:
+  return MAIL_NO_ERROR;
+}
 #define UID_NAME "uid.db"
 static int uid_clean_up(struct mail_cache_db * uid_db,
    struct mailmessage_list * env_list)
 {
diff --git a/kmicromail/libetpan/generic/maildirdriver_cached_message.c b/kmicromail/libetpan/generic/maildirdriver_cached_message.c
index 51866aa..34de351 100644
--- a/kmicromail/libetpan/generic/maildirdriver_cached_message.c
+++ b/kmicromail/libetpan/generic/maildirdriver_cached_message.c
@@ -36,21 +36,26 @@
 #include "maildirdriver_message.h"
 #include "mailmessage_tools.h"
 #include "maildirdriver.h"
 #include "maildir.h"
 #include "generic_cache.h"
+#include "mail_cache_db.h"
+#include "maildirdriver_tools.h"
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+static int get_flags(mailmessage * msg_info,
+    struct mail_flags ** result);
 static int prefetch(mailmessage * msg_info);
 static void prefetch_free(struct generic_message_t * msg);
 static int initialize(mailmessage * msg_info);
@@ -75,13 +80,13 @@ static mailmessage_driver local_maildir_cached_message_driver = {
  .msg_fetch_section = mailmessage_generic_fetch_section,
  .msg_fetch_section_header = mailmessage_generic_fetch_section_header,
  .msg_fetch_section_mime = mailmessage_generic_fetch_section_mime,
  .msg_fetch_section_body = mailmessage_generic_fetch_section_body,
  .msg_fetch_envelope = mailmessage_generic_fetch_envelope,
-  .msg_get_flags = NULL,
+  .msg_get_flags = get_flags,
 };
 mailmessage_driver * maildir_cached_message_driver =
 &local_maildir_cached_message_driver;
 struct maildir_msg_data {
@@ -243,6 +248,87 @@ static void check(mailmessage * msg_info)
    r = mail_flags_store_set(get_session_ancestor_data(msg_info)->md_flags_store, msg_info);
    
    r = mail_flags_store_set(get_cached_session_data(msg_info)->md_flags_store, msg_info);
    /* ignore errors */
  }
 }
+#define FLAGS_NAME "flags.db"
+static int get_flags(mailmessage * msg_info,
+    struct mail_flags ** result)
+{
+  struct mail_cache_db * cache_db_flags;
+  chashdatum key;
+  chashdatum value;
+  struct maildir * md;
+  struct mail_flags * flags;
+  struct maildir_cached_session_state_data * data;
+  struct maildir_msg * md_msg;
+  int r;
+  uint32_t driver_flags;
+  char filename_flags[PATH_MAX];
+  char keyname[PATH_MAX];
+  MMAPString * mmapstr;
+  
+  if (msg_info->msg_flags != NULL) {
+    * result = msg_info->msg_flags;
+    return MAIL_NO_ERROR;
+  }
+  
+  data = get_cached_session_data(msg_info);
+  flags = mail_flags_store_get(data->md_flags_store,
+      msg_info->msg_index);
+  if (flags != NULL) {
+    msg_info->msg_flags = flags;
+    * result = msg_info->msg_flags;
+    return MAIL_NO_ERROR;
+  }
+  
+  snprintf(filename_flags, PATH_MAX, "%s%c%s%c%s",
+      data->md_flags_directory, MAIL_DIR_SEPARATOR, data->md_quoted_mb,
+      MAIL_DIR_SEPARATOR, FLAGS_NAME);
+  
+  r = mail_cache_db_open_lock(filename_flags, &cache_db_flags);
+  if (r < 0)
+    return MAIL_ERROR_FILE;
+  
+  snprintf(keyname, PATH_MAX, "%s-flags", msg_info->msg_uid);
+  
+  mmapstr = mmap_string_new("");
+  if (mmapstr == NULL) {
+    mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+    return MAIL_ERROR_MEMORY;
+  }
+  
+  r = generic_cache_flags_read(cache_db_flags, mmapstr, keyname, &flags);
+  mmap_string_free(mmapstr);
+  
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+  
+  if (r != MAIL_NO_ERROR) {
+    flags = mail_flags_new_empty();
+    if (flags == NULL)
+      return MAIL_ERROR_MEMORY;
+  }
+  
+  md = get_maildir_session(msg_info);
+  if (md == NULL)
+    return MAIL_ERROR_BAD_STATE;
+  
+  key.data = msg_info->msg_uid;
+  key.len = strlen(msg_info->msg_uid);
+  r = chash_get(md->mdir_msg_hash, &key, &value);
+  if (r < 0)
+    return MAIL_ERROR_MSG_NOT_FOUND;
+  
+  md_msg = value.data;
+  
+  driver_flags = maildirdriver_maildir_flags_to_flags(md_msg->msg_flags);
+  
+  flags->fl_flags = driver_flags;
+  msg_info->msg_flags = flags;
+  
+  * result = msg_info->msg_flags;
+  
+  return MAIL_NO_ERROR;
+}
diff --git a/kmicromail/libetpan/generic/maildirdriver_message.c b/kmicromail/libetpan/generic/maildirdriver_message.c
index 7cf9dd1..613fc39 100644
--- a/kmicromail/libetpan/generic/maildirdriver_message.c
+++ b/kmicromail/libetpan/generic/maildirdriver_message.c
@@ -31,12 +31,13 @@
 /*
 * $Id$
 */
 #include "maildirdriver_message.h"
+#include "maildirdriver_tools.h"
 #include "mailmessage_tools.h"
 #include "maildirdriver.h"
 #include "maildir.h"
 #include "generic_cache.h"
@@ -45,12 +46,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdlib.h>
+static int get_flags(mailmessage * msg_info,
+    struct mail_flags ** result);
 static int prefetch(mailmessage * msg_info);
 static void prefetch_free(struct generic_message_t * msg);
 static int initialize(mailmessage * msg_info);
@@ -75,13 +79,13 @@ static mailmessage_driver local_maildir_message_driver = {
  .msg_fetch_section = mailmessage_generic_fetch_section,
  .msg_fetch_section_header = mailmessage_generic_fetch_section_header,
  .msg_fetch_section_mime = mailmessage_generic_fetch_section_mime,
  .msg_fetch_section_body = mailmessage_generic_fetch_section_body,
  .msg_fetch_envelope = mailmessage_generic_fetch_envelope,
-  .msg_get_flags = NULL,
+  .msg_get_flags = get_flags,
 };
 mailmessage_driver * maildir_message_driver = &local_maildir_message_driver;
 struct maildir_msg_data {
  int fd;
@@ -194,6 +198,58 @@ static void check(mailmessage * msg_info)
  if (msg_info->msg_flags != NULL) {
    r = mail_flags_store_set(get_session_data(msg_info)->md_flags_store,
        msg_info);
    /* ignore errors */
  }
 }
+static int get_flags(mailmessage * msg_info,
+    struct mail_flags ** result)
+{
+  chashdatum key;
+  chashdatum value;
+  struct maildir * md;
+  struct mail_flags * flags;
+  struct maildir_session_state_data * data;
+  struct maildir_msg * md_msg;
+  int r;
+  uint32_t driver_flags;
+  clist * ext;
+  
+  if (msg_info->msg_flags != NULL) {
+    * result = msg_info->msg_flags;
+    return MAIL_NO_ERROR;
+  }
+  
+  data = get_session_data(msg_info);
+  flags = mail_flags_store_get(data->md_flags_store,
+      msg_info->msg_index);
+  if (flags != NULL) {
+    msg_info->msg_flags = flags;
+    * result = msg_info->msg_flags;
+    return MAIL_NO_ERROR;
+  }
+  
+  md = get_maildir_session(msg_info);
+  if (md == NULL)
+    return MAIL_ERROR_BAD_STATE;
+  
+  key.data = msg_info->msg_uid;
+  key.len = strlen(msg_info->msg_uid);
+  r = chash_get(md->mdir_msg_hash, &key, &value);
+  if (r < 0)
+    return MAIL_ERROR_MSG_NOT_FOUND;
+  
+  md_msg = value.data;
+  
+  driver_flags = maildirdriver_maildir_flags_to_flags(md_msg->msg_flags);
+  
+  ext = clist_new();
+  if (ext == NULL)
+    return MAIL_ERROR_MEMORY;
+  
+  msg_info->msg_flags = mail_flags_new(driver_flags, ext);
+  
+  * result = msg_info->msg_flags;
+  
+  return MAIL_NO_ERROR;
+}
diff --git a/kmicromail/libetpan/generic/maildirstorage.c b/kmicromail/libetpan/generic/maildirstorage.c
index 7e6b461..e37f591 100644
--- a/kmicromail/libetpan/generic/maildirstorage.c
+++ b/kmicromail/libetpan/generic/maildirstorage.c
@@ -30,12 +30,13 @@
 */
 /*
 * $Id$
 */
+#include "maildirstorage.h"
 #include "mailstorage.h"
 #include "mail.h"
 #include "mailmessage.h"
 #include "maildirdriver.h"
 #include "maildirdriver_cached.h"
@@ -62,13 +63,13 @@ static mailstorage_driver maildir_mailstorage_driver = {
 int maildir_mailstorage_init(struct mailstorage * storage,
    char * md_pathname, int md_cached,
    char * md_cache_directory, char * md_flags_directory)
 {
  struct maildir_mailstorage * maildir_storage;
-  maildir_storage = malloc(sizeof(struct maildir_mailstorage));
+  maildir_storage = malloc(sizeof(* maildir_storage));
  if (maildir_storage == NULL)
    goto err;
  maildir_storage->md_pathname = strdup(md_pathname);
  if (maildir_storage->md_pathname == NULL)
    goto free;
diff --git a/kmicromail/libetpan/generic/maildirstorage.h b/kmicromail/libetpan/generic/maildirstorage.h
index d17ea2c..73d7b20 100644
--- a/kmicromail/libetpan/generic/maildirstorage.h
+++ b/kmicromail/libetpan/generic/maildirstorage.h
@@ -41,13 +41,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
-  maildir_mailstorage_init is the constructor for a mbox storage.
+  maildir_mailstorage_init is the constructor for a maildir storage.
  @param storage this is the storage to initialize.
  
  @param pathname is the directory that contains the mailbox.
  
  @param cached if this value is != 0, a persistant cache will be
diff --git a/kmicromail/libetpan/generic/maildriver.c b/kmicromail/libetpan/generic/maildriver.c
index 01e3e34..1fc478a 100644
--- a/kmicromail/libetpan/generic/maildriver.c
+++ b/kmicromail/libetpan/generic/maildriver.c
@@ -279,12 +279,22 @@ int mailsession_append_message(mailsession * session,
  if (session->sess_driver->sess_append_message == NULL)
    return MAIL_ERROR_NOT_IMPLEMENTED;
  return session->sess_driver->sess_append_message(session, message, size);
 }
+int mailsession_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  if (session->sess_driver->sess_append_message_flags == NULL)
+    return MAIL_ERROR_NOT_IMPLEMENTED;
+  return session->sess_driver->sess_append_message_flags(session,
+      message, size, flags);
+}
 int mailsession_copy_message(mailsession * session,
                             uint32_t num, char * mb)
 {
  if (session->sess_driver->sess_copy_message == NULL)
    return MAIL_ERROR_NOT_IMPLEMENTED;
diff --git a/kmicromail/libetpan/generic/maildriver.h b/kmicromail/libetpan/generic/maildriver.h
index 7da9aea..c773190 100644
--- a/kmicromail/libetpan/generic/maildriver.h
+++ b/kmicromail/libetpan/generic/maildriver.h
@@ -397,12 +397,15 @@ int mailsession_unsubscribe_folder(mailsession * session, char * mb);
    on error
 */
 int mailsession_append_message(mailsession * session,
                               char * message, size_t size);
+int mailsession_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 /*
  NOTE: some drivers does not implement this
  mailsession_copy_message copies a message whose number is given to
  a given mailbox. The mailbox must be accessible from the same session.
diff --git a/kmicromail/libetpan/generic/maildriver_types.h b/kmicromail/libetpan/generic/maildriver_types.h
index 3ff9440..9eab4d6 100644
--- a/kmicromail/libetpan/generic/maildriver_types.h
+++ b/kmicromail/libetpan/generic/maildriver_types.h
@@ -504,12 +504,14 @@ struct mailsession_driver {
  int (* sess_unsubscribe_folder)(mailsession * session, char * mb);
  /* messages operations */
  int (* sess_append_message)(mailsession * session,
      char * message, size_t size);
+  int (* sess_append_message_flags)(mailsession * session,
+      char * message, size_t size, struct mail_flags * flags);
  int (* sess_copy_message)(mailsession * session,
      uint32_t num, char * mb);
  int (* sess_move_message)(mailsession * session,
      uint32_t num, char * mb);
  int (* sess_get_message)(mailsession * session,
diff --git a/kmicromail/libetpan/generic/mailfolder.c b/kmicromail/libetpan/generic/mailfolder.c
index 2ddc37d..89ba891 100644
--- a/kmicromail/libetpan/generic/mailfolder.c
+++ b/kmicromail/libetpan/generic/mailfolder.c
@@ -29,12 +29,19 @@ int mailfolder_status(struct mailfolder * folder,
 int mailfolder_append_message(struct mailfolder * folder,
    char * message, size_t size)
 {
  return mailsession_append_message(folder->fld_session, message, size);
 }
+int mailfolder_append_message_flags(struct mailfolder * folder,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return mailsession_append_message_flags(folder->fld_session, message,
+      size, flags);
+}
 int mailfolder_get_messages_list(struct mailfolder * folder,
    struct mailmessage_list ** result)
 {
  int r;
  struct mailmessage_list * msg_list;
  unsigned int i;
diff --git a/kmicromail/libetpan/generic/mailfolder.h b/kmicromail/libetpan/generic/mailfolder.h
index 3ecad23..ff53470 100644
--- a/kmicromail/libetpan/generic/mailfolder.h
+++ b/kmicromail/libetpan/generic/mailfolder.h
@@ -14,12 +14,15 @@ int mailfolder_status(struct mailfolder * folder,
    uint32_t * result_messages, uint32_t * result_recent,
    uint32_t * result_unseen);
 int mailfolder_append_message(struct mailfolder * folder,
    char * message, size_t size);
+int mailfolder_append_message_flags(struct mailfolder * folder,
+    char * message, size_t size, struct mail_flags * flags);
 int mailfolder_get_messages_list(struct mailfolder * folder,
    struct mailmessage_list ** result);
 int mailfolder_get_envelopes_list(struct mailfolder * folder,
    struct mailmessage_list * result);
diff --git a/kmicromail/libetpan/generic/mailstorage.c b/kmicromail/libetpan/generic/mailstorage.c
index 25e561e..dc91744 100644
--- a/kmicromail/libetpan/generic/mailstorage.c
+++ b/kmicromail/libetpan/generic/mailstorage.c
@@ -320,12 +320,19 @@ void mailstorage_disconnect(struct mailstorage * storage)
  r = mailsession_logout(storage->sto_session);
  mailsession_free(storage->sto_session);
  storage->sto_session = NULL;
 }
+int mailstorage_noop(struct mailstorage * storage)
+{
+  return mailsession_noop(storage->sto_session);
+}
 static int mailstorage_get_folder(struct mailstorage * storage,
    char * pathname, mailsession ** result)
 {
  if (storage->sto_driver->sto_get_folder_session == NULL)
    return MAIL_ERROR_NOT_IMPLEMENTED;
diff --git a/kmicromail/libetpan/generic/mailstorage.h b/kmicromail/libetpan/generic/mailstorage.h
index d56aef1..4c57883 100644
--- a/kmicromail/libetpan/generic/mailstorage.h
+++ b/kmicromail/libetpan/generic/mailstorage.h
@@ -68,12 +68,14 @@ void mailstorage_free(struct mailstorage * storage);
 */
 int mailstorage_connect(struct mailstorage * storage);
 void mailstorage_disconnect(struct mailstorage * storage);
+int mailstorage_noop(struct mailstorage * storage);
 /* folder */
 struct mailfolder * mailfolder_new(struct mailstorage * fld_storage,
    char * fld_pathname, char * fld_virtual_name);
@@ -85,13 +87,12 @@ int mailfolder_add_child(struct mailfolder * parent,
 int mailfolder_detach_parent(struct mailfolder * folder);
 int mailfolder_connect(struct mailfolder * folder);
 void mailfolder_disconnect(struct mailfolder * folder);
 #ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/kmicromail/libetpan/generic/mboxdriver.c b/kmicromail/libetpan/generic/mboxdriver.c
index fa3e2ea..c19a668 100644
--- a/kmicromail/libetpan/generic/mboxdriver.c
+++ b/kmicromail/libetpan/generic/mboxdriver.c
@@ -74,12 +74,15 @@ static int mboxdriver_status_folder(mailsession * session, char * mb,
 static int mboxdriver_messages_number(mailsession * session, char * mb,
                                      uint32_t * result);
 static int mboxdriver_append_message(mailsession * session,
                                     char * message, size_t size);
+static int mboxdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int mboxdriver_get_messages_list(mailsession * session,
                                        struct mailmessage_list ** result);
 static int
 mboxdriver_get_envelopes_list(mailsession * session,
                              struct mailmessage_list * env_list);
@@ -123,12 +126,13 @@ static mailsession_driver local_mbox_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = mboxdriver_append_message,
+  .sess_append_message_flags = mboxdriver_append_message_flags,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = mboxdriver_get_messages_list,
  .sess_get_envelopes_list = mboxdriver_get_envelopes_list,
  .sess_remove_message = mboxdriver_remove_message,
@@ -341,12 +345,18 @@ static int mboxdriver_append_message(mailsession * session,
    return MAIL_ERROR_DISKSPACE;
  default:
    return mboxdriver_mbox_error_to_mail_error(r);
  }
 }
+static int mboxdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return mboxdriver_append_message(session, message, size);
+}
 static int mboxdriver_get_messages_list(mailsession * session,
                                        struct mailmessage_list ** result)
 {
  struct mailmbox_folder * folder;
  int res;
diff --git a/kmicromail/libetpan/generic/mboxdriver_cached.c b/kmicromail/libetpan/generic/mboxdriver_cached.c
index 07871fa..3af7fb9 100644
--- a/kmicromail/libetpan/generic/mboxdriver_cached.c
+++ b/kmicromail/libetpan/generic/mboxdriver_cached.c
@@ -83,12 +83,15 @@ static int mboxdriver_cached_recent_number(mailsession * session, char * mb,
 static int mboxdriver_cached_unseen_number(mailsession * session, char * mb,
                                           uint32_t * result);
 static int mboxdriver_cached_append_message(mailsession * session,
                                            char * message, size_t size);
+static int mboxdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int
 mboxdriver_cached_get_messages_list(mailsession * session,
                                    struct mailmessage_list ** result);
 static int
 mboxdriver_cached_get_envelopes_list(mailsession * session,
@@ -134,12 +137,14 @@ static mailsession_driver local_mbox_cached_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = mboxdriver_cached_append_message,
+  .sess_append_message_flags = mboxdriver_cached_append_message_flags,
+  
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = mboxdriver_cached_get_messages_list,
  .sess_get_envelopes_list = mboxdriver_cached_get_envelopes_list,
  .sess_remove_message = mboxdriver_cached_remove_message,
@@ -903,13 +908,90 @@ static int mboxdriver_cached_unseen_number(mailsession * session, char * mb,
 /* messages operations */
 static int mboxdriver_cached_append_message(mailsession * session,
                                            char * message, size_t size)
 {
-  return mailsession_append_message(get_ancestor(session), message, size);
+  return mboxdriver_cached_append_message_flags(session,
+      message, size, NULL);
+}
+static int mboxdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  int r;
+  struct mailmbox_folder * folder;
+  struct mbox_cached_session_state_data * data;
+  unsigned int uid;
+  struct mailmbox_msg_info * msg_info;
+  chashdatum key;
+  chashdatum value;
+  struct mail_cache_db * cache_db_flags;
+  char filename_flags[PATH_MAX];
+  MMAPString * mmapstr;
+  char keyname[PATH_MAX];
+  
+  folder = get_mbox_session(session);
+  if (folder == NULL)
+    return MAIL_ERROR_APPEND;
+  
+  r = mailmbox_append_message_uid(folder, message, size, &uid);
+  
+  switch (r) {
+  case MAILMBOX_ERROR_FILE:
+    return MAIL_ERROR_DISKSPACE;
+  case MAILMBOX_NO_ERROR:
+    break;
+  default:
+    return mboxdriver_mbox_error_to_mail_error(r);
+  }
+  
+  /* could store in flags store instead */
+  
+  if (flags == NULL)
+    goto exit;
+  
+  key.data = &uid;
+  key.len = sizeof(uid); 
+  r = chash_get(folder->mb_hash, &key, &value);
+  if (r < 0)
+    goto exit;
+  
+  msg_info = value.data;
+  
+  data = get_cached_data(session);
+  
+  snprintf(filename_flags, PATH_MAX, "%s%c%s%c%s",
+      data->mbox_flags_directory, MAIL_DIR_SEPARATOR, data->mbox_quoted_mb,
+      MAIL_DIR_SEPARATOR, FLAGS_NAME);
+  
+  r = mail_cache_db_open_lock(filename_flags, &cache_db_flags);
+  if (r < 0)
+    goto exit;
+  
+  mmapstr = mmap_string_new("");
+  if (mmapstr == NULL)
+    goto close_db_flags;
+  
+  snprintf(keyname, PATH_MAX, "%u-%lu", uid,
+      (unsigned long) msg_info->msg_body_len);
+  
+  r = mboxdriver_write_cached_flags(cache_db_flags, mmapstr, keyname, flags);
+  
+  mmap_string_free(mmapstr);
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+  
+  if (r != MAIL_NO_ERROR)
+    goto exit;
+  
+  return MAIL_NO_ERROR;
+  
+ close_db_flags:
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+ exit:
+  return MAIL_NO_ERROR;
 }
 static int
 mboxdriver_cached_get_messages_list(mailsession * session,
                                    struct mailmessage_list ** result)
 {
@@ -957,13 +1039,14 @@ get_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
    res = MAIL_ERROR_MSG_NOT_FOUND;
    goto err;
  }
  
  info = data.data;
  
-  snprintf(keyname, PATH_MAX, "%u-%u-envelope", num, info->msg_body_len);
+  snprintf(keyname, PATH_MAX, "%u-%lu-envelope", num,
+      (unsigned long) info->msg_body_len);
  r = generic_cache_fields_read(cache_db, mmapstr, keyname, &fields);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
@@ -1003,13 +1086,14 @@ write_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
    res = MAIL_ERROR_MSG_NOT_FOUND;
    goto err;
  }
  
  info = data.data;
  
-  snprintf(keyname, PATH_MAX, "%u-%u-envelope", num, info->msg_body_len);
+  snprintf(keyname, PATH_MAX, "%u-%lu-envelope", num,
+      (unsigned long) info->msg_body_len);
  r = generic_cache_fields_write(cache_db, mmapstr, keyname, fields);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
diff --git a/kmicromail/libetpan/generic/mboxdriver_cached_message.c b/kmicromail/libetpan/generic/mboxdriver_cached_message.c
index 6d92b22..828396b 100644
--- a/kmicromail/libetpan/generic/mboxdriver_cached_message.c
+++ b/kmicromail/libetpan/generic/mboxdriver_cached_message.c
@@ -179,13 +179,14 @@ static int mbox_initialize(mailmessage * msg_info)
    res = MAIL_ERROR_MSG_NOT_FOUND;
    goto err;
  }
  
  info = (struct mailmbox_msg_info *) data.data;
  
-  snprintf(static_uid, PATH_MAX, "%u-%u", msg_info->msg_index, info->msg_body_len);
+  snprintf(static_uid, PATH_MAX, "%u-%lu",
+      msg_info->msg_index, (unsigned long) info->msg_body_len);
  uid = strdup(static_uid);
  if (uid == NULL) {
    res = MAIL_ERROR_MEMORY;
    goto err;
  }
  
diff --git a/kmicromail/libetpan/generic/mboxdriver_message.c b/kmicromail/libetpan/generic/mboxdriver_message.c
index da9a65d..6922625 100644
--- a/kmicromail/libetpan/generic/mboxdriver_message.c
+++ b/kmicromail/libetpan/generic/mboxdriver_message.c
@@ -30,13 +30,13 @@
 */
 /*
 * $Id$
 */
-#include "mhdriver_message.h"
+#include "mboxdriver_message.h"
 #include "mailmessage_tools.h"
 #include "mboxdriver_tools.h"
 #include "mboxdriver.h"
 #include "mailmbox.h"
@@ -153,14 +153,14 @@ static int mbox_initialize(mailmessage * msg_info)
    res = MAIL_ERROR_MSG_NOT_FOUND;
    goto err;
  }
  
  info = data.data;
  
-  snprintf(static_uid, PATH_MAX, "%u-%u",
+  snprintf(static_uid, PATH_MAX, "%u-%lu",
-      msg_info->msg_index, info->msg_body_len);
+      msg_info->msg_index, (unsigned long) info->msg_body_len);
  uid = strdup(static_uid);
  if (uid == NULL) {
    res = MAIL_ERROR_MEMORY;
    goto err;
  }
  
diff --git a/kmicromail/libetpan/generic/mboxdriver_tools.c b/kmicromail/libetpan/generic/mboxdriver_tools.c
index 1e27798..252a20b 100644
--- a/kmicromail/libetpan/generic/mboxdriver_tools.c
+++ b/kmicromail/libetpan/generic/mboxdriver_tools.c
@@ -214,13 +214,14 @@ mboxdriver_get_cached_flags(struct mail_cache_db * cache_db,
    res = MAIL_ERROR_MSG_NOT_FOUND;
    goto err;
  }
  
  info = data.data;
-  snprintf(keyname, PATH_MAX, "%u-%u-flags", num, info->msg_body_len);
+  snprintf(keyname, PATH_MAX, "%u-%lu-flags", num,
+      (unsigned long) info->msg_body_len);
  r = generic_cache_flags_read(cache_db, mmapstr, keyname, &flags);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
diff --git a/kmicromail/libetpan/generic/mboxstorage.c b/kmicromail/libetpan/generic/mboxstorage.c
index 0a7dc93..4b55b2b 100644
--- a/kmicromail/libetpan/generic/mboxstorage.c
+++ b/kmicromail/libetpan/generic/mboxstorage.c
@@ -62,13 +62,13 @@ static mailstorage_driver mbox_mailstorage_driver = {
 int mbox_mailstorage_init(struct mailstorage * storage,
    char * mbox_pathname, int mbox_cached,
    char * mbox_cache_directory, char * mbox_flags_directory)
 {
  struct mbox_mailstorage * mbox_storage;
-  mbox_storage = malloc(sizeof(struct mbox_mailstorage));
+  mbox_storage = malloc(sizeof(* mbox_storage));
  if (mbox_storage == NULL)
    goto err;
  mbox_storage->mbox_pathname = strdup(mbox_pathname);
  if (mbox_storage->mbox_pathname == NULL)
    goto free;
diff --git a/kmicromail/libetpan/generic/mhdriver.c b/kmicromail/libetpan/generic/mhdriver.c
index af38d27..05a6a4f 100644
--- a/kmicromail/libetpan/generic/mhdriver.c
+++ b/kmicromail/libetpan/generic/mhdriver.c
@@ -86,12 +86,14 @@ static int mhdriver_lsub_folders(mailsession * session, char * mb,
 static int mhdriver_subscribe_folder(mailsession * session, char * mb);
 static int mhdriver_unsubscribe_folder(mailsession * session, char * mb);
 static int mhdriver_append_message(mailsession * session,
                                   char * message, size_t size);
+static int mhdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int mhdriver_copy_message(mailsession * session,
                                 uint32_t num, char * mb);
 static int mhdriver_remove_message(mailsession * session, uint32_t num);
 static int mhdriver_move_message(mailsession * session,
@@ -136,13 +138,14 @@ static mailsession_driver local_mh_session_driver = {
  .sess_unseen_number = mhdriver_messages_number,
  .sess_list_folders = mhdriver_list_folders,
  .sess_lsub_folders = mhdriver_lsub_folders,
  .sess_subscribe_folder = mhdriver_subscribe_folder,
  .sess_unsubscribe_folder = mhdriver_unsubscribe_folder,
-  .sess_append_message = mhdriver_append_message,
+  .sess_append_message = mhdriver_append_message, 
+  .sess_append_message_flags = mhdriver_append_message_flags,
  .sess_copy_message = mhdriver_copy_message,
  .sess_move_message = mhdriver_move_message,
  .sess_get_messages_list = mhdriver_get_messages_list,
  .sess_get_envelopes_list = maildriver_generic_get_envelopes_list,
  .sess_remove_message = mhdriver_remove_message,
@@ -681,12 +684,18 @@ static int mhdriver_append_message(mailsession * session,
  default:
    return mhdriver_mh_error_to_mail_error(r);
  }
 }
+static int mhdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return mhdriver_append_message(session, message, size);
+}
 static int mhdriver_copy_message(mailsession * session,
                                 uint32_t num, char * mb)
 {
  int fd;
  int r;
  struct mailmh_folder * folder;
diff --git a/kmicromail/libetpan/generic/mhdriver_cached.c b/kmicromail/libetpan/generic/mhdriver_cached.c
index 5c35089..04aa523 100644
--- a/kmicromail/libetpan/generic/mhdriver_cached.c
+++ b/kmicromail/libetpan/generic/mhdriver_cached.c
@@ -105,12 +105,14 @@ static int mhdriver_cached_subscribe_folder(mailsession * session, char * mb);
 static int mhdriver_cached_unsubscribe_folder(mailsession * session,
                                              char * mb);
 static int mhdriver_cached_append_message(mailsession * session,
                                          char * message, size_t size);
+static int mhdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int mhdriver_cached_copy_message(mailsession * session,
                                        uint32_t num, char * mb);
 static int mhdriver_cached_remove_message(mailsession * session,
                                          uint32_t num);
@@ -162,12 +164,13 @@ static mailsession_driver local_mh_cached_session_driver = {
  .sess_list_folders = mhdriver_cached_list_folders,
  .sess_lsub_folders = mhdriver_cached_lsub_folders,
  .sess_subscribe_folder = mhdriver_cached_subscribe_folder,
  .sess_unsubscribe_folder = mhdriver_cached_unsubscribe_folder,
  .sess_append_message = mhdriver_cached_append_message,
+  .sess_append_message_flags = mhdriver_cached_append_message_flags,
  .sess_copy_message = mhdriver_cached_copy_message,
  .sess_move_message = mhdriver_cached_move_message,
  .sess_get_messages_list = mhdriver_cached_get_messages_list,
  .sess_get_envelopes_list = mhdriver_cached_get_envelopes_list,
  .sess_remove_message = mhdriver_cached_remove_message,
@@ -880,13 +883,91 @@ static int mhdriver_cached_unsubscribe_folder(mailsession * session,
 /* messages operations */
 static int mhdriver_cached_append_message(mailsession * session,
                                          char * message, size_t size)
 {
-  return mailsession_append_message(get_ancestor(session), message, size);
+  return mhdriver_cached_append_message_flags(session,
+      message, size, NULL);
+}
+static int mhdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{ 
+  int r;
+  struct mailmh_folder * folder;
+  struct mailmh_msg_info * msg_info;
+  chashdatum key;
+  chashdatum value;
+  uint32_t uid;
+  struct mh_cached_session_state_data * data;
+  char filename_flags[PATH_MAX];
+  struct mail_cache_db * cache_db_flags;
+  MMAPString * mmapstr;
+  char keyname[PATH_MAX];
+  
+  folder = get_mh_cur_folder(session);
+  if (folder == NULL)
+    return MAIL_ERROR_BAD_STATE;
+  
+  r = mailmh_folder_add_message_uid(folder,
+      message, size, &uid);
+  
+  switch (r) {
+  case MAILMH_ERROR_FILE:
+    return MAIL_ERROR_DISKSPACE;
+    
+  case MAILMH_NO_ERROR:
+    break;
+    
+  default:
+    return mhdriver_mh_error_to_mail_error(r);
+  }
+  
+  if (flags == NULL)
+    goto exit;
+  
+  key.data = &uid;
+  key.len = sizeof(uid);
+  r = chash_get(folder->fl_msgs_hash, &key, &value);
+  if (r < 0)
+    return MAIL_ERROR_CACHE_MISS;
+  
+  msg_info = value.data;
+  
+  data = get_cached_data(session);
+  
+  snprintf(filename_flags, PATH_MAX, "%s/%s/%s",
+      data->mh_flags_directory, data->mh_quoted_mb, FLAGS_NAME);
+  
+  r = mail_cache_db_open_lock(filename_flags, &cache_db_flags);
+  if (r < 0)
+    goto exit;
+  
+  mmapstr = mmap_string_new("");
+  if (mmapstr == NULL)
+    goto close_db_flags;
+  
+  snprintf(keyname, PATH_MAX, "%u-%lu-%lu-flags",
+      uid, (unsigned long) msg_info->msg_mtime,
+      (unsigned long) msg_info->msg_size);
+  
+  r = mhdriver_write_cached_flags(cache_db_flags, mmapstr, keyname, flags);
+  
+  mmap_string_free(mmapstr);
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+  
+  if (r != MAIL_NO_ERROR)
+    goto exit;
+  
+  return MAIL_NO_ERROR;
+  
+ close_db_flags:
+  mail_cache_db_close_unlock(filename_flags, cache_db_flags);
+ exit:
+  return MAIL_NO_ERROR;
 }
 static int mhdriver_cached_copy_message(mailsession * session,
                                        uint32_t num, char * mb)
 {
  return mailsession_copy_message(get_ancestor(session), num, mb);
@@ -950,14 +1031,15 @@ get_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
  key.len = sizeof(num);
  r = chash_get(folder->fl_msgs_hash, &key, &data);
  if (r < 0)
    return MAIL_ERROR_CACHE_MISS;
  msg_info = data.data;
  
-  snprintf(keyname, PATH_MAX, "%u-%u-%u-envelope",
+  snprintf(keyname, PATH_MAX, "%u-%lu-%lu-envelope",
-           num, (uint32_t) msg_info->msg_mtime, msg_info->msg_size);
+           num, (unsigned long) msg_info->msg_mtime,
+      (unsigned long) msg_info->msg_size);
  r = generic_cache_fields_read(cache_db, mmapstr, keyname, &fields);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
@@ -995,14 +1077,15 @@ write_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
  key.len = sizeof(num);
  r = chash_get(folder->fl_msgs_hash, &key, &data);
  if (r < 0)
    return MAIL_ERROR_CACHE_MISS;
  msg_info = data.data;
-  snprintf(keyname, PATH_MAX, "%u-%u-%u-envelope",
+  snprintf(keyname, PATH_MAX, "%u-%lu-%lu-envelope",
-           num, (uint32_t) msg_info->msg_mtime, msg_info->msg_size);
+           num, (unsigned long) msg_info->msg_mtime,
+      (unsigned long) msg_info->msg_size);
  r = generic_cache_fields_write(cache_db, mmapstr, keyname, fields);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
diff --git a/kmicromail/libetpan/generic/mhdriver_cached_message.c b/kmicromail/libetpan/generic/mhdriver_cached_message.c
index f716fb9..f69868d 100644
--- a/kmicromail/libetpan/generic/mhdriver_cached_message.c
+++ b/kmicromail/libetpan/generic/mhdriver_cached_message.c
@@ -176,14 +176,14 @@ static int mh_initialize(mailmessage * msg_info)
  r = chash_get(folder->fl_msgs_hash, &key, &data);
  if (r < 0)
    return MAIL_ERROR_INVAL;
  
  mh_msg_info = data.data;
-  snprintf(static_uid, PATH_MAX, "%u-%lu-%u", msg_info->msg_index,
+  snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
-           mh_msg_info->msg_mtime, mh_msg_info->msg_size);
+           mh_msg_info->msg_mtime, (unsigned long) mh_msg_info->msg_size);
  uid = strdup(static_uid);
  if (uid == NULL)
    return MAIL_ERROR_MEMORY;
  r = mailmessage_generic_initialize(msg_info);
  if (r != MAIL_NO_ERROR) {
diff --git a/kmicromail/libetpan/generic/mhdriver_message.c b/kmicromail/libetpan/generic/mhdriver_message.c
index 2c023e7..aafd2d9 100644
--- a/kmicromail/libetpan/generic/mhdriver_message.c
+++ b/kmicromail/libetpan/generic/mhdriver_message.c
@@ -141,14 +141,15 @@ static int mh_initialize(mailmessage * msg_info)
  r = chash_get(get_mh_cur_folder(msg_info)->fl_msgs_hash, &key, &value);
  if (r < 0)
    return MAIL_ERROR_INVAL;
  
  mh_msg_info = value.data;
  
-  snprintf(static_uid, PATH_MAX, "%u-%lu-%u", msg_info->msg_index,
+  snprintf(static_uid, PATH_MAX, "%u-%lu-%lu", msg_info->msg_index,
-           mh_msg_info->msg_mtime, mh_msg_info->msg_size);
+           (unsigned long) mh_msg_info->msg_mtime,
+      (unsigned long) mh_msg_info->msg_size);
  uid = strdup(static_uid);
  if (uid == NULL)
    return MAIL_ERROR_MEMORY;
  r = mailmessage_generic_initialize(msg_info);
  if (r != MAIL_NO_ERROR) {
diff --git a/kmicromail/libetpan/generic/mhdriver_tools.c b/kmicromail/libetpan/generic/mhdriver_tools.c
index cb863fa..c15bb6d 100644
--- a/kmicromail/libetpan/generic/mhdriver_tools.c
+++ b/kmicromail/libetpan/generic/mhdriver_tools.c
@@ -366,14 +366,15 @@ mhdriver_get_cached_flags(struct mail_cache_db * cache_db,
  key.len = sizeof(num);
  r = chash_get(folder->fl_msgs_hash, &key, &data);
  if (r < 0)
    return MAIL_ERROR_CACHE_MISS;
  msg_info = data.data;
  
-  snprintf(keyname, PATH_MAX, "%u-%u-%u-flags",
+  snprintf(keyname, PATH_MAX, "%u-%lu-%lu-flags",
-           num, (uint32_t) msg_info->msg_mtime, msg_info->msg_size);
+           num, (unsigned long) msg_info->msg_mtime,
+      (unsigned long) msg_info->msg_size);
  r = generic_cache_flags_read(cache_db, mmapstr, keyname, &flags);
  if (r != MAIL_NO_ERROR) {
    res = r;
    goto err;
  }
diff --git a/kmicromail/libetpan/generic/mhstorage.c b/kmicromail/libetpan/generic/mhstorage.c
index 32fc26b..715b961 100644
--- a/kmicromail/libetpan/generic/mhstorage.c
+++ b/kmicromail/libetpan/generic/mhstorage.c
@@ -59,13 +59,13 @@ static mailstorage_driver mh_mailstorage_driver = {
 int mh_mailstorage_init(struct mailstorage * storage,
    char * mh_pathname, int mh_cached,
    char * mh_cache_directory, char * mh_flags_directory)
 {
  struct mh_mailstorage * mh_storage;
-  mh_storage = malloc(sizeof(struct mh_mailstorage));
+  mh_storage = malloc(sizeof(* mh_storage));
  if (mh_storage == NULL)
    goto err;
  mh_storage->mh_pathname = strdup(mh_pathname);
  if (mh_storage->mh_pathname == NULL)
    goto free;
diff --git a/kmicromail/libetpan/generic/nntpdriver.c b/kmicromail/libetpan/generic/nntpdriver.c
index fde5f1a..1b65838 100644
--- a/kmicromail/libetpan/generic/nntpdriver.c
+++ b/kmicromail/libetpan/generic/nntpdriver.c
@@ -66,12 +66,15 @@ static int nntpdriver_status_folder(mailsession * session, char * mb,
 static int nntpdriver_messages_number(mailsession * session, char * mb,
                                      uint32_t * result);
 static int nntpdriver_append_message(mailsession * session,
                                     char * message, size_t size);
+static int nntpdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int
 nntpdriver_get_envelopes_list(mailsession * session,
                              struct mailmessage_list * env_list);
 static int nntpdriver_get_messages_list(mailsession * session,
@@ -126,12 +129,13 @@ static mailsession_driver local_nntp_session_driver = {
  .sess_list_folders = nntpdriver_list_folders,
  .sess_lsub_folders = nntpdriver_lsub_folders,
  .sess_subscribe_folder = nntpdriver_subscribe_folder,
  .sess_unsubscribe_folder = nntpdriver_unsubscribe_folder,
  .sess_append_message = nntpdriver_append_message,
+  .sess_append_message_flags = nntpdriver_append_message_flags,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = nntpdriver_get_messages_list,
  .sess_get_envelopes_list = nntpdriver_get_envelopes_list,
  .sess_remove_message = NULL,
@@ -627,12 +631,18 @@ static int nntpdriver_append_message(mailsession * session,
      return nntpdriver_nntp_error_to_mail_error(r);
    }
  }
  while (1);
 }
+static int nntpdriver_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return nntpdriver_append_message(session, message, size);
+}
 static int xover_resp_to_fields(struct newsnntp_xover_resp_item * item,
                                struct mailimf_fields ** result);
 static int
diff --git a/kmicromail/libetpan/generic/nntpdriver_cached.c b/kmicromail/libetpan/generic/nntpdriver_cached.c
index 1f8a8af..0343a65 100644
--- a/kmicromail/libetpan/generic/nntpdriver_cached.c
+++ b/kmicromail/libetpan/generic/nntpdriver_cached.c
@@ -93,12 +93,15 @@ static int nntpdriver_cached_recent_number(mailsession * session, char * mb,
 static int nntpdriver_cached_unseen_number(mailsession * session, char * mb,
                                           uint32_t * result);
 static int nntpdriver_cached_append_message(mailsession * session,
                                            char * message, size_t size);
+static int nntpdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 static int
 nntpdriver_cached_get_envelopes_list(mailsession * session,
                                     struct mailmessage_list * env_list);
 static int
@@ -156,12 +159,13 @@ static mailsession_driver local_nntp_cached_session_driver = {
  .sess_list_folders = nntpdriver_cached_list_folders,
  .sess_lsub_folders = nntpdriver_cached_lsub_folders,
  .sess_subscribe_folder = nntpdriver_cached_subscribe_folder,
  .sess_unsubscribe_folder = nntpdriver_cached_unsubscribe_folder,
  .sess_append_message = nntpdriver_cached_append_message,
+  .sess_append_message_flags = nntpdriver_cached_append_message_flags,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = nntpdriver_cached_get_messages_list,
  .sess_get_envelopes_list = nntpdriver_cached_get_envelopes_list,
  .sess_remove_message = NULL,
@@ -628,12 +632,18 @@ static int nntpdriver_cached_unsubscribe_folder(mailsession * session,
 static int nntpdriver_cached_append_message(mailsession * session,
                                            char * message, size_t size)
 {
  return mailsession_append_message(get_ancestor(session), message, size);
 }
+static int nntpdriver_cached_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags)
+{
+  return nntpdriver_cached_append_message(session, message, size);
+}
 static int
 get_cached_envelope(struct mail_cache_db * cache_db, MMAPString * mmapstr,
    mailsession * session, uint32_t num,
    struct mailimf_fields ** result)
diff --git a/kmicromail/libetpan/generic/nntpstorage.c b/kmicromail/libetpan/generic/nntpstorage.c
index 5ba333b..89974cd 100644
--- a/kmicromail/libetpan/generic/nntpstorage.c
+++ b/kmicromail/libetpan/generic/nntpstorage.c
@@ -68,13 +68,13 @@ int nntp_mailstorage_init(struct mailstorage * storage,
    char * nn_login, char * nn_password,
    int nn_cached, char * nn_cache_directory, char * nn_flags_directory)
 {
  struct nntp_mailstorage * nntp_storage;
  int res;
  
-  nntp_storage = malloc(sizeof(struct nntp_mailstorage));
+  nntp_storage = malloc(sizeof(* nntp_storage));
  if (nntp_storage == NULL) {
    res = MAIL_ERROR_MEMORY;
    goto err;
  }
  nntp_storage->nntp_servername = strdup(nn_servername);
diff --git a/kmicromail/libetpan/generic/pop3driver.c b/kmicromail/libetpan/generic/pop3driver.c
index 20b0fc2..375879e 100644
--- a/kmicromail/libetpan/generic/pop3driver.c
+++ b/kmicromail/libetpan/generic/pop3driver.c
@@ -106,12 +106,13 @@ static mailsession_driver local_pop3_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = NULL,
+  .sess_append_message_flags = NULL,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = pop3driver_get_messages_list,
  .sess_get_envelopes_list = maildriver_generic_get_envelopes_list,
  .sess_remove_message = pop3driver_remove_message,
diff --git a/kmicromail/libetpan/generic/pop3driver_cached.c b/kmicromail/libetpan/generic/pop3driver_cached.c
index 6f97303..24f624b 100644
--- a/kmicromail/libetpan/generic/pop3driver_cached.c
+++ b/kmicromail/libetpan/generic/pop3driver_cached.c
@@ -107,12 +107,15 @@ static int
 pop3driver_cached_get_envelopes_list(mailsession * session,
    struct mailmessage_list * env_list);
 static int pop3driver_cached_get_message(mailsession * session,
    uint32_t num, mailmessage ** result);
+static int pop3driver_cached_get_message_by_uid(mailsession * session,
+    const char * uid, mailmessage ** result);
 static mailsession_driver local_pop3_cached_session_driver = {
  .sess_name = "pop3-cached",
  .sess_initialize = pop3driver_cached_initialize,
  .sess_uninitialize = pop3driver_cached_uninitialize,
@@ -140,24 +143,25 @@ static mailsession_driver local_pop3_cached_session_driver = {
  .sess_list_folders = NULL,
  .sess_lsub_folders = NULL,
  .sess_subscribe_folder = NULL,
  .sess_unsubscribe_folder = NULL,
  .sess_append_message = NULL,
+  .sess_append_message_flags = NULL,
  .sess_copy_message = NULL,
  .sess_move_message = NULL,
  .sess_get_messages_list = pop3driver_cached_get_messages_list,
  .sess_get_envelopes_list = pop3driver_cached_get_envelopes_list,
  .sess_remove_message = pop3driver_cached_remove_message,
 #if 0
  .sess_search_messages = maildriver_generic_search_messages,
 #endif
  .sess_get_message = pop3driver_cached_get_message,
-  .sess_get_message_by_uid = NULL,
+  .sess_get_message_by_uid = pop3driver_cached_get_message_by_uid,
 };
 mailsession_driver * pop3_cached_session_driver =
 &local_pop3_cached_session_driver;
 #define ENV_NAME "env.db"
@@ -852,6 +856,44 @@ static int pop3driver_cached_get_message(mailsession * session,
  }
  * result = msg_info;
  return MAIL_NO_ERROR;
 }
+static int pop3driver_cached_get_message_by_uid(mailsession * session,
+                                  const char * uid, mailmessage ** result)
+{
+  mailpop3 * pop3;
+  struct mailpop3_msg_info * msg_info;
+  int found;
+  unsigned int i;
+  
+  if (uid == NULL)
+    return MAIL_ERROR_INVAL;
+  
+  pop3 = get_pop3_session(session);
+  
+  found = 0;
+  
+  /* iterate all messages and look for uid */
+  for(i = 0 ; i < carray_count(pop3->pop3_msg_tab) ; i++) {
+    msg_info = carray_get(pop3->pop3_msg_tab, i);
+    
+    if (msg_info == NULL)
+      continue;
+    
+    if (msg_info->msg_deleted)
+      continue;
+    
+    /* uid found, stop looking */
+    if (strcmp(msg_info->msg_uidl, uid) == 0) {
+      found = 1;
+      break;
+    }
+  }
+  
+  if (!found)
+    return MAIL_ERROR_MSG_NOT_FOUND;
+  
+  return pop3driver_cached_get_message(session, msg_info->msg_index, result);
+}
diff --git a/kmicromail/libetpan/generic/pop3driver_message.c b/kmicromail/libetpan/generic/pop3driver_message.c
index 77bd94c..357bb2e 100644
--- a/kmicromail/libetpan/generic/pop3driver_message.c
+++ b/kmicromail/libetpan/generic/pop3driver_message.c
@@ -36,12 +36,14 @@
 #include "pop3driver_message.h"
 #include "mailmessage_tools.h"
 #include "pop3driver_tools.h"
 #include "pop3driver.h"
 #include "mailpop3.h"
+#include <stdlib.h>
+#include <string.h>
 static int pop3_prefetch(mailmessage * msg_info);
 static void pop3_prefetch_free(struct generic_message_t * msg);
 static int pop3_initialize(mailmessage * msg_info);
@@ -77,12 +79,24 @@ static mailmessage_driver local_pop3_message_driver = {
  .msg_get_flags = NULL,
 };
 mailmessage_driver * pop3_message_driver = &local_pop3_message_driver;
+static inline struct pop3_session_state_data *
+get_data(mailsession * session)
+{
+  return session->sess_data;
+}
+static mailpop3 * get_pop3_session(mailsession * session)
+{
+  return get_data(session)->pop3_session;
+}
 static int pop3_prefetch(mailmessage * msg_info)
 {
  char * msg_content;
  size_t msg_length;
  struct generic_message_t * msg;
@@ -110,20 +124,40 @@ static void pop3_prefetch_free(struct generic_message_t * msg)
 }
 static int pop3_initialize(mailmessage * msg_info)
 {
  struct generic_message_t * msg;
  int r;
+  char * uid;
+  struct mailpop3_msg_info * info;
+  mailpop3 * pop3;
+  pop3 = get_pop3_session(msg_info->msg_session);
+  
+  r = mailpop3_get_msg_info(pop3, msg_info->msg_index, &info);
+  switch (r) {
+  case MAILPOP3_NO_ERROR:
+    break;
+  default:
+    return pop3driver_pop3_error_to_mail_error(r);
+  }
+  uid = strdup(info->msg_uidl);
+  if (uid == NULL)
+    return MAIL_ERROR_MEMORY;
  
  r = mailmessage_generic_initialize(msg_info);
-  if (r != MAIL_NO_ERROR)
+  if (r != MAIL_NO_ERROR) {
+    free(uid);
    return r;
+  }
  msg = msg_info->msg_data;
  msg->msg_prefetch = pop3_prefetch;
  msg->msg_prefetch_free = pop3_prefetch_free;
+  msg_info->msg_uid = uid;
  return MAIL_NO_ERROR;
 }
     
 static int pop3_fetch_header(mailmessage * msg_info,
diff --git a/kmicromail/libetpan/generic/pop3storage.c b/kmicromail/libetpan/generic/pop3storage.c
index 8e7a94e..375aeaf 100644
--- a/kmicromail/libetpan/generic/pop3storage.c
+++ b/kmicromail/libetpan/generic/pop3storage.c
@@ -65,13 +65,13 @@ int pop3_mailstorage_init(struct mailstorage * storage,
    int pop3_connection_type, int pop3_auth_type,
    char * pop3_login, char * pop3_password,
    int pop3_cached, char * pop3_cache_directory, char * pop3_flags_directory)
 {
  struct pop3_mailstorage * pop3_storage;
-  pop3_storage = malloc(sizeof(struct pop3_mailstorage));
+  pop3_storage = malloc(sizeof(* pop3_storage));
  if (pop3_storage == NULL)
    goto err;
  
  pop3_storage->pop3_servername = strdup(pop3_servername);
  if (pop3_storage->pop3_servername == NULL)
    goto free;
diff --git a/kmicromail/libetpan/imap/mailimap.c b/kmicromail/libetpan/imap/mailimap.c
index c8fbfee..76d9454 100644
--- a/kmicromail/libetpan/imap/mailimap.c
+++ b/kmicromail/libetpan/imap/mailimap.c
@@ -1904,13 +1904,13 @@ int mailimap_unsubscribe(mailimap * session, const char * mb)
    return MAILIMAP_ERROR_BAD_STATE;
  r = send_current_tag(session);
  if (r != MAILIMAP_NO_ERROR)
    return r;
-  r = mailimap_subscribe_send(session->imap_stream, mb);
+  r = mailimap_unsubscribe_send(session->imap_stream, mb);
  if (r != MAILIMAP_NO_ERROR)
    return r;
  r = mailimap_crlf_send(session->imap_stream);
  if (r != MAILIMAP_NO_ERROR)
    return r;
diff --git a/kmicromail/libetpan/imap/mailimap_keywords.c b/kmicromail/libetpan/imap/mailimap_keywords.c
index b277aed..4ec156e 100644
--- a/kmicromail/libetpan/imap/mailimap_keywords.c
+++ b/kmicromail/libetpan/imap/mailimap_keywords.c
@@ -50,13 +50,13 @@ struct mailimap_token_value {
 int mailimap_token_case_insensitive_parse(mailstream * fd,
                                          MMAPString * buffer,
                                          size_t * index,
                                          const char * token)
 {
  int len;
-  int cur_token;
+  size_t cur_token;
  int r;
  cur_token = * index;
  len = strlen(token);
 #ifdef UNSTRICT_SYNTAX
diff --git a/kmicromail/libetpan/imf/mailimf.c b/kmicromail/libetpan/imf/mailimf.c
index 84d81a1..e0164b8 100644
--- a/kmicromail/libetpan/imf/mailimf.c
+++ b/kmicromail/libetpan/imf/mailimf.c
@@ -45,13 +45,13 @@
   to the extent needed to determine if Return-path headers are present.
   SMTP servers making final delivery MAY remove Return-path headers
   before adding their own.
 */
 #include <ctype.h>
-#include <mmapstring.h>
+#include "mmapstring.h"
 #include <stdlib.h>
 #include <string.h>
 #ifndef TRUE
 #define TRUE 1
 #endif
diff --git a/kmicromail/libetpan/include/libetpan/libetpan.h b/kmicromail/libetpan/include/libetpan/libetpan.h
index 3b4a107..fe5637d 100644
--- a/kmicromail/libetpan/include/libetpan/libetpan.h
+++ b/kmicromail/libetpan/include/libetpan/libetpan.h
@@ -41,12 +41,13 @@
 extern "C" {
 #endif
 #include <libetpan/libetpan_version.h>
 #include <libetpan/maildriver.h>
 #include <libetpan/mailmessage.h>
+#include <libetpan/mailfolder.h>
 #include <libetpan/mailstorage.h>
 #include <libetpan/mailthread.h>
 #include <libetpan/mailsmtp.h>
 #include <libetpan/charconv.h>
 /* mbox driver */
@@ -88,17 +89,28 @@ extern "C" {
 #include <libetpan/maildirdriver.h>
 #include <libetpan/maildirdriver_message.h>
 #include <libetpan/maildirdriver_cached.h>
 #include <libetpan/maildirdriver_cached_message.h>
 #include <libetpan/maildirstorage.h>
+/* db driver */
+#include <libetpan/dbdriver.h>
+#include <libetpan/dbdriver_message.h>
+#include <libetpan/dbstorage.h>
 /* message which content is given by a MIME structure */
 #include <libetpan/mime_message_driver.h>
 /* message which content given by a string */
 #include <libetpan/data_message_driver.h>
+/* engine */
+#include <libetpan/mailprivacy.h>
+#include <libetpan/mailengine.h>
+#include <libetpan/mailprivacy_gnupg.h>
+#include <libetpan/mailprivacy_smime.h>
 #ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/kmicromail/libetpan/include/libetpan/maildir.h b/kmicromail/libetpan/include/libetpan/maildir.h
index b782484..268dda1 100644
--- a/kmicromail/libetpan/include/libetpan/maildir.h
+++ b/kmicromail/libetpan/include/libetpan/maildir.h
@@ -42,15 +42,22 @@
 struct maildir * maildir_new(const char * path);
 void maildir_free(struct maildir * md);
 int maildir_update(struct maildir * md);
+int maildir_message_add_uid(struct maildir * md,
+    const char * message, size_t size,
+    char * uid, size_t max_uid_len);
 int maildir_message_add(struct maildir * md,
    const char * message, size_t size);
+int maildir_message_add_file_uid(struct maildir * md, int fd,
+    char * uid, size_t max_uid_len);
 int maildir_message_add_file(struct maildir * md, int fd);
 char * maildir_message_get(struct maildir * md, const char * uid);
 int maildir_message_remove(struct maildir * md, const char * uid);
diff --git a/kmicromail/libetpan/include/libetpan/maildirstorage.h b/kmicromail/libetpan/include/libetpan/maildirstorage.h
index d17ea2c..73d7b20 100644
--- a/kmicromail/libetpan/include/libetpan/maildirstorage.h
+++ b/kmicromail/libetpan/include/libetpan/maildirstorage.h
@@ -41,13 +41,13 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
-  maildir_mailstorage_init is the constructor for a mbox storage.
+  maildir_mailstorage_init is the constructor for a maildir storage.
  @param storage this is the storage to initialize.
  
  @param pathname is the directory that contains the mailbox.
  
  @param cached if this value is != 0, a persistant cache will be
diff --git a/kmicromail/libetpan/include/libetpan/maildriver.h b/kmicromail/libetpan/include/libetpan/maildriver.h
index 7da9aea..c773190 100644
--- a/kmicromail/libetpan/include/libetpan/maildriver.h
+++ b/kmicromail/libetpan/include/libetpan/maildriver.h
@@ -397,12 +397,15 @@ int mailsession_unsubscribe_folder(mailsession * session, char * mb);
    on error
 */
 int mailsession_append_message(mailsession * session,
                               char * message, size_t size);
+int mailsession_append_message_flags(mailsession * session,
+    char * message, size_t size, struct mail_flags * flags);
 /*
  NOTE: some drivers does not implement this
  mailsession_copy_message copies a message whose number is given to
  a given mailbox. The mailbox must be accessible from the same session.
diff --git a/kmicromail/libetpan/include/libetpan/maildriver_types.h b/kmicromail/libetpan/include/libetpan/maildriver_types.h
index 3ff9440..9eab4d6 100644
--- a/kmicromail/libetpan/include/libetpan/maildriver_types.h
+++ b/kmicromail/libetpan/include/libetpan/maildriver_types.h
@@ -504,12 +504,14 @@ struct mailsession_driver {
  int (* sess_unsubscribe_folder)(mailsession * session, char * mb);
  /* messages operations */
  int (* sess_append_message)(mailsession * session,
      char * message, size_t size);
+  int (* sess_append_message_flags)(mailsession * session,
+      char * message, size_t size, struct mail_flags * flags);
  int (* sess_copy_message)(mailsession * session,
      uint32_t num, char * mb);
  int (* sess_move_message)(mailsession * session,
      uint32_t num, char * mb);
  int (* sess_get_message)(mailsession * session,
diff --git a/kmicromail/libetpan/include/libetpan/mailfolder.h b/kmicromail/libetpan/include/libetpan/mailfolder.h
index 3ecad23..ff53470 100644
--- a/kmicromail/libetpan/include/libetpan/mailfolder.h
+++ b/kmicromail/libetpan/include/libetpan/mailfolder.h
@@ -14,12 +14,15 @@ int mailfolder_status(struct mailfolder * folder,
    uint32_t * result_messages, uint32_t * result_recent,
    uint32_t * result_unseen);
 int mailfolder_append_message(struct mailfolder * folder,
    char * message, size_t size);
+int mailfolder_append_message_flags(struct mailfolder * folder,
+    char * message, size_t size, struct mail_flags * flags);
 int mailfolder_get_messages_list(struct mailfolder * folder,
    struct mailmessage_list ** result);
 int mailfolder_get_envelopes_list(struct mailfolder * folder,
    struct mailmessage_list * result);
diff --git a/kmicromail/libetpan/include/libetpan/mailmbox.h b/kmicromail/libetpan/include/libetpan/mailmbox.h
index 8be086c..0427f1f 100644
--- a/kmicromail/libetpan/include/libetpan/mailmbox.h
+++ b/kmicromail/libetpan/include/libetpan/mailmbox.h
@@ -48,12 +48,16 @@ mailmbox_append_message_list(struct mailmbox_folder * folder,
                             carray * append_tab);
 int
 mailmbox_append_message(struct mailmbox_folder * folder,
                        const char * data, size_t len);
+int
+mailmbox_append_message_uid(struct mailmbox_folder * folder,
+    const char * data, size_t len, unsigned int * puid);
 int mailmbox_fetch_msg(struct mailmbox_folder * folder,
                       uint32_t num, char ** result,
                       size_t * result_len);
 int mailmbox_fetch_msg_headers(struct mailmbox_folder * folder,
                               uint32_t num, char ** result,
diff --git a/kmicromail/libetpan/include/libetpan/mailmbox_types.h b/kmicromail/libetpan/include/libetpan/mailmbox_types.h
index dd6758c..bd6ee30 100644
--- a/kmicromail/libetpan/include/libetpan/mailmbox_types.h
+++ b/kmicromail/libetpan/include/libetpan/mailmbox_types.h
@@ -125,12 +125,13 @@ mailmbox_msg_info_new(size_t msg_start, size_t msg_start_len,
 void mailmbox_msg_info_free(struct mailmbox_msg_info * info);
 struct mailmbox_append_info {
  const char * ai_message;
  size_t ai_size;
+  unsigned int ai_uid;
 };
 struct mailmbox_append_info *
 mailmbox_append_info_new(const char * ai_message, size_t ai_size);
 void mailmbox_append_info_free(struct mailmbox_append_info * info);
diff --git a/kmicromail/libetpan/include/libetpan/mailmh.h b/kmicromail/libetpan/include/libetpan/mailmh.h
index 40432cb..00199b8 100644
--- a/kmicromail/libetpan/include/libetpan/mailmh.h
+++ b/kmicromail/libetpan/include/libetpan/mailmh.h
@@ -116,15 +116,22 @@ int mailmh_folder_get_message_filename(struct mailmh_folder * folder,
 int mailmh_folder_get_message_fd(struct mailmh_folder * folder,
                                 uint32_t index, int flags, int * result);
 int mailmh_folder_get_message_size(struct mailmh_folder * folder,
                                   uint32_t index, size_t * result);
+int mailmh_folder_add_message_uid(struct mailmh_folder * folder,
+    const char * message, size_t size,
+    uint32_t * pindex);
 int mailmh_folder_add_message(struct mailmh_folder * folder,
                              const char * message, size_t size);
+int mailmh_folder_add_message_file_uid(struct mailmh_folder * folder,
+    int fd, uint32_t * pindex);
 int mailmh_folder_add_message_file(struct mailmh_folder * folder,
                                   int fd);
 int mailmh_folder_remove_message(struct mailmh_folder * folder,
                                 uint32_t index);
diff --git a/kmicromail/libetpan/include/libetpan/mailstorage.h b/kmicromail/libetpan/include/libetpan/mailstorage.h
index d56aef1..4c57883 100644
--- a/kmicromail/libetpan/include/libetpan/mailstorage.h
+++ b/kmicromail/libetpan/include/libetpan/mailstorage.h
@@ -68,12 +68,14 @@ void mailstorage_free(struct mailstorage * storage);
 */
 int mailstorage_connect(struct mailstorage * storage);
 void mailstorage_disconnect(struct mailstorage * storage);
+int mailstorage_noop(struct mailstorage * storage);
 /* folder */
 struct mailfolder * mailfolder_new(struct mailstorage * fld_storage,
    char * fld_pathname, char * fld_virtual_name);
@@ -85,13 +87,12 @@ int mailfolder_add_child(struct mailfolder * parent,
 int mailfolder_detach_parent(struct mailfolder * folder);
 int mailfolder_connect(struct mailfolder * folder);
 void mailfolder_disconnect(struct mailfolder * folder);
 #ifdef __cplusplus
 }
 #endif
 #endif
diff --git a/kmicromail/libetpan/maildir/maildir.c b/kmicromail/libetpan/maildir/maildir.c
index 320ef81..0e038b1 100644
--- a/kmicromail/libetpan/maildir/maildir.c
+++ b/kmicromail/libetpan/maildir/maildir.c
@@ -427,14 +427,15 @@ static char * libetpan_basename(char * filename)
    return p + 1;
 }
 #else
 #define libetpan_basename(a) basename(a)
 #endif
-int maildir_message_add(struct maildir * md,
+int maildir_message_add_uid(struct maildir * md,
-    const char * message, size_t size)
+    const char * message, size_t size,
+    char * uid, size_t max_uid_len)
 {
  char path_new[PATH_MAX];
  char tmpname[PATH_MAX];
  int fd;
  int r;
  char * mapping;
@@ -450,13 +451,14 @@ int maildir_message_add(struct maildir * md,
    res = r;
    goto err;
  }
  /* write to tmp/ with a classic temporary file */
-  snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX", md->mdir_path);
+  snprintf(tmpname, sizeof(tmpname), "%s/tmp/etpan-maildir-XXXXXX",
+      md->mdir_path);
  fd = mkstemp(tmpname);
  if (fd < 0) {
    res = MAILDIR_ERROR_FILE;
    goto err;
  }
  
@@ -518,13 +520,16 @@ int maildir_message_add(struct maildir * md,
  r = add_message(md, delivery_new_basename, 1);
  if (r != MAILDIR_NO_ERROR) {
    unlink(delivery_new_name);
    res = MAILDIR_ERROR_FILE;
    goto unlink_tmp;
  }
+  
+  if (uid != NULL)
+    strncpy(uid, delivery_new_basename, max_uid_len);
+  
  unlink(delivery_tmp_name);
  free(delivery_tmp_name);
  
  return MAILDIR_NO_ERROR;
  
 unlink_tmp:
@@ -536,32 +541,46 @@ int maildir_message_add(struct maildir * md,
 unlink:
  unlink(tmpname);
 err:
  return res;
 }
-int maildir_message_add_file(struct maildir * md, int fd)
+int maildir_message_add(struct maildir * md,
+    const char * message, size_t size)
+{
+  return maildir_message_add_uid(md, message, size,
+      NULL, 0);
+}
+int maildir_message_add_file_uid(struct maildir * md, int fd,
+    char * uid, size_t max_uid_len)
 {
  char * message;
  struct stat buf;
  int r;
  
  if (fstat(fd, &buf) == -1)
    return MAILDIR_ERROR_FILE;
  
  message = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
  if (message == MAP_FAILED)
    return MAILDIR_ERROR_FILE;
  
-  r = maildir_message_add(md, message, buf.st_size);
+  r = maildir_message_add_uid(md, message, buf.st_size, uid, max_uid_len);
  
  munmap(message, buf.st_size);
+  
  return r;
 }
+int maildir_message_add_file(struct maildir * md, int fd)
+{
+  return maildir_message_add_file_uid(md, fd,
+      NULL, 0);
+}
 char * maildir_message_get(struct maildir * md, const char * uid)
 {
  chashdatum key;
  chashdatum value;
  char filename[PATH_MAX];
  char * dup_filename;
diff --git a/kmicromail/libetpan/maildir/maildir.h b/kmicromail/libetpan/maildir/maildir.h
index b782484..268dda1 100644
--- a/kmicromail/libetpan/maildir/maildir.h
+++ b/kmicromail/libetpan/maildir/maildir.h
@@ -42,15 +42,22 @@
 struct maildir * maildir_new(const char * path);
 void maildir_free(struct maildir * md);
 int maildir_update(struct maildir * md);
+int maildir_message_add_uid(struct maildir * md,
+    const char * message, size_t size,
+    char * uid, size_t max_uid_len);
 int maildir_message_add(struct maildir * md,
    const char * message, size_t size);
+int maildir_message_add_file_uid(struct maildir * md, int fd,
+    char * uid, size_t max_uid_len);
 int maildir_message_add_file(struct maildir * md, int fd);
 char * maildir_message_get(struct maildir * md, const char * uid);
 int maildir_message_remove(struct maildir * md, const char * uid);
diff --git a/kmicromail/libetpan/mbox/mailmbox.c b/kmicromail/libetpan/mbox/mailmbox.c
index 280c313..b3fce02 100644
--- a/kmicromail/libetpan/mbox/mailmbox.c
+++ b/kmicromail/libetpan/mbox/mailmbox.c
@@ -194,12 +194,15 @@ void mailmbox_timestamp(struct mailmbox_folder * folder)
 int mailmbox_open(struct mailmbox_folder * folder)
 {
  int fd;
  int read_only;
+  fd = -1;
+  read_only = TRUE;
  if (!folder->mb_read_only) {
    read_only = FALSE;
    fd = open(folder->mb_filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
  }
  if (folder->mb_read_only || (fd < 0)) {
@@ -614,12 +617,14 @@ mailmbox_append_message_list_no_lock(struct mailmbox_folder * folder,
    info = carray_get(append_tab, i);
    extra_size += from_size;
    extra_size += get_fixed_message_size(info->ai_message, info->ai_size,
        folder->mb_max_uid + i + 1,
        folder->mb_no_uid);
    extra_size += 2; /* CR LF */
+    
+    info->ai_uid = folder->mb_max_uid + i + 1;
  }
  left = folder->mb_mapping_size;
  crlf_count = 0;
  while (left >= 1) {
    if (folder->mb_mapping[left - 1] == '\n') {
@@ -741,14 +746,14 @@ mailmbox_append_message_list(struct mailmbox_folder * folder,
  mailmbox_write_unlock(folder);
 err:
  return res;
 }
 int
-mailmbox_append_message(struct mailmbox_folder * folder,
+mailmbox_append_message_uid(struct mailmbox_folder * folder,
-                        const char * data, size_t len)
+    const char * data, size_t len, unsigned int * puid)
 {
  carray * tab;
  struct mailmbox_append_info * append_info;
  int res;
  int r;
@@ -768,13 +773,16 @@ mailmbox_append_message(struct mailmbox_folder * folder,
  if (r < 0) {
    res = MAILMBOX_ERROR_MEMORY;
    goto free_append_info;
  }
  r = mailmbox_append_message_list(folder, tab);
+  
+  if (puid != NULL)
+    * puid = append_info->ai_uid;
+  
  mailmbox_append_info_free(append_info);
  carray_free(tab);
  return r;
 free_append_info:
@@ -782,12 +790,19 @@ mailmbox_append_message(struct mailmbox_folder * folder,
 free_list:
  carray_free(tab);
 err:
  return res;
 }
+int
+mailmbox_append_message(struct mailmbox_folder * folder,
+    const char * data, size_t len)
+{
+  return mailmbox_append_message_uid(folder, data, len, NULL);
+}
 /* ********************************************************************** */
 int mailmbox_fetch_msg_no_lock(struct mailmbox_folder * folder,
                               uint32_t num, char ** result,
                               size_t * result_len)
 {
diff --git a/kmicromail/libetpan/mbox/mailmbox.h b/kmicromail/libetpan/mbox/mailmbox.h
index 8be086c..0427f1f 100644
--- a/kmicromail/libetpan/mbox/mailmbox.h
+++ b/kmicromail/libetpan/mbox/mailmbox.h
@@ -48,12 +48,16 @@ mailmbox_append_message_list(struct mailmbox_folder * folder,
                             carray * append_tab);
 int
 mailmbox_append_message(struct mailmbox_folder * folder,
                        const char * data, size_t len);
+int
+mailmbox_append_message_uid(struct mailmbox_folder * folder,
+    const char * data, size_t len, unsigned int * puid);
 int mailmbox_fetch_msg(struct mailmbox_folder * folder,
                       uint32_t num, char ** result,
                       size_t * result_len);
 int mailmbox_fetch_msg_headers(struct mailmbox_folder * folder,
                               uint32_t num, char ** result,
diff --git a/kmicromail/libetpan/mbox/mailmbox_types.c b/kmicromail/libetpan/mbox/mailmbox_types.c
index 1986182..4e3e521 100644
--- a/kmicromail/libetpan/mbox/mailmbox_types.c
+++ b/kmicromail/libetpan/mbox/mailmbox_types.c
@@ -175,13 +175,14 @@ mailmbox_append_info_new(const char * ai_message, size_t ai_size)
  info = malloc(sizeof(* info));
  if (info == NULL)
    return NULL;
  info->ai_message = ai_message;
  info->ai_size = ai_size;
+  info->ai_uid = 0;
+  
  return info;
 }
 void mailmbox_append_info_free(struct mailmbox_append_info * info)
 {
  free(info);
diff --git a/kmicromail/libetpan/mbox/mailmbox_types.h b/kmicromail/libetpan/mbox/mailmbox_types.h
index dd6758c..bd6ee30 100644
--- a/kmicromail/libetpan/mbox/mailmbox_types.h
+++ b/kmicromail/libetpan/mbox/mailmbox_types.h
@@ -125,12 +125,13 @@ mailmbox_msg_info_new(size_t msg_start, size_t msg_start_len,
 void mailmbox_msg_info_free(struct mailmbox_msg_info * info);
 struct mailmbox_append_info {
  const char * ai_message;
  size_t ai_size;
+  unsigned int ai_uid;
 };
 struct mailmbox_append_info *
 mailmbox_append_info_new(const char * ai_message, size_t ai_size);
 void mailmbox_append_info_free(struct mailmbox_append_info * info);
diff --git a/kmicromail/libetpan/mh/mailmh.c b/kmicromail/libetpan/mh/mailmh.c
index d6ff950..119f217 100644
--- a/kmicromail/libetpan/mh/mailmh.c
+++ b/kmicromail/libetpan/mh/mailmh.c
@@ -720,14 +720,15 @@ int mailmh_folder_get_message_size(struct mailmh_folder * folder,
  * result = buf.st_size;
  return MAILMH_NO_ERROR;
 }
-int mailmh_folder_add_message(struct mailmh_folder * folder,
+int mailmh_folder_add_message_uid(struct mailmh_folder * folder,
-                              const char * message, size_t size)
+    const char * message, size_t size,
+    uint32_t * pindex)
 {
  char * tmpname;
  int fd;
  size_t namesize;
  size_t left;
  ssize_t res;
@@ -806,12 +807,15 @@ int mailmh_folder_add_message(struct mailmh_folder * folder,
 #endif
  key.data = &index;
  key.len = sizeof(index);
  data.data = msg_info;
  data.len = 0;
  
+  if (pindex != NULL)
+    * pindex = index;
+  
  r = chash_set(folder->fl_msgs_hash, &key, &data, NULL);
  if (r < 0) {
    carray_delete_fast(folder->fl_msgs_tab, msg_info->msg_array_index);
    mailmh_msg_info_free(msg_info);
    error = MAILMH_ERROR_MEMORY;
    goto err;
@@ -822,14 +826,20 @@ int mailmh_folder_add_message(struct mailmh_folder * folder,
 free:
  free(tmpname);
 err:
  return error;
 }
-int mailmh_folder_add_message_file(struct mailmh_folder * folder,
+int mailmh_folder_add_message(struct mailmh_folder * folder,
-                                   int fd)
+    const char * message, size_t size)
+{
+  return mailmh_folder_add_message_uid(folder, message, size, NULL);
+}
+int mailmh_folder_add_message_file_uid(struct mailmh_folder * folder,
+    int fd, uint32_t * pindex)
 {
  char * message;
  struct stat buf;
  int r;
 #if 0
@@ -842,19 +852,25 @@ int mailmh_folder_add_message_file(struct mailmh_folder * folder,
    return MAILMH_ERROR_FILE;
  message = mmap(NULL, buf.st_size, PROT_READ, MAP_PRIVATE, fd, 0);
  if (message == MAP_FAILED)
    return MAILMH_ERROR_FILE;
-  r = mailmh_folder_add_message(folder, message, buf.st_size);
+  r = mailmh_folder_add_message_uid(folder, message, buf.st_size, pindex);
+  
  munmap(message, buf.st_size);
  return r;
 }
+int mailmh_folder_add_message_file(struct mailmh_folder * folder,
+    int fd)
+{
+  return mailmh_folder_add_message_file_uid(folder, fd, NULL);
+}
 int mailmh_folder_remove_message(struct mailmh_folder * folder,
                                 uint32_t index)
 {
  char * filename;
  struct mailmh_msg_info * msg_info;
  int res;
diff --git a/kmicromail/libetpan/mh/mailmh.h b/kmicromail/libetpan/mh/mailmh.h
index 40432cb..00199b8 100644
--- a/kmicromail/libetpan/mh/mailmh.h
+++ b/kmicromail/libetpan/mh/mailmh.h
@@ -116,15 +116,22 @@ int mailmh_folder_get_message_filename(struct mailmh_folder * folder,
 int mailmh_folder_get_message_fd(struct mailmh_folder * folder,
                                 uint32_t index, int flags, int * result);
 int mailmh_folder_get_message_size(struct mailmh_folder * folder,
                                   uint32_t index, size_t * result);
+int mailmh_folder_add_message_uid(struct mailmh_folder * folder,
+    const char * message, size_t size,
+    uint32_t * pindex);
 int mailmh_folder_add_message(struct mailmh_folder * folder,
                              const char * message, size_t size);
+int mailmh_folder_add_message_file_uid(struct mailmh_folder * folder,
+    int fd, uint32_t * pindex);
 int mailmh_folder_add_message_file(struct mailmh_folder * folder,
                                   int fd);
 int mailmh_folder_remove_message(struct mailmh_folder * folder,
                                 uint32_t index);
diff --git a/kmicromail/libetpan/mime/mailmime_decode.c b/kmicromail/libetpan/mime/mailmime_decode.c
index 3025dcb..e48ec19 100644
--- a/kmicromail/libetpan/mime/mailmime_decode.c
+++ b/kmicromail/libetpan/mime/mailmime_decode.c
@@ -184,22 +184,32 @@ int mailmime_encoded_phrase_parse(const char * default_fromcode,
        type = TYPE_WORD;
        
        wordutf8 = NULL;
        r = charconv(tocode, default_fromcode, raw_word,
            strlen(raw_word), &wordutf8);
        
-        if (wordutf8 != NULL) {
+        switch (r) {
-          if (mmap_string_append(gphrase, wordutf8) == NULL) {
+        case MAIL_CHARCONV_ERROR_MEMORY:
-            free(wordutf8);
+          free(raw_word);
-            free(raw_word);
+          res = MAILIMF_ERROR_MEMORY;
-            res = MAILIMF_ERROR_MEMORY;
+          goto free;
-            goto free;
-          }
          
+        case MAIL_CHARCONV_ERROR_UNKNOWN_CHARSET:
+        case MAIL_CHARCONV_ERROR_CONV:
+          free(raw_word);
+          res = MAILIMF_ERROR_PARSE;
+          goto free;
+        }
+        
+        if (mmap_string_append(gphrase, wordutf8) == NULL) {
          free(wordutf8);
+          free(raw_word);
+          res = MAILIMF_ERROR_MEMORY;
+          goto free;
        }
+        
        free(raw_word);
        first = FALSE;
      }
      else if (r == MAILIMF_ERROR_PARSE) {
        break;
      }
diff --git a/kmicromail/libetpan/mime/mailmime_write.c b/kmicromail/libetpan/mime/mailmime_write.c
index 5c3b1f7..208e3ba 100644
--- a/kmicromail/libetpan/mime/mailmime_write.c
+++ b/kmicromail/libetpan/mime/mailmime_write.c
@@ -438,13 +438,13 @@ mailmime_disposition_param_write(FILE * f, int * col,
  case MAILMIME_DISPOSITION_PARM_READ_DATE:
    len = strlen("read-date=") + strlen(param->pa_data.pa_read_date);
    break;
  case MAILMIME_DISPOSITION_PARM_SIZE:
-    snprintf(sizestr, 20, "%u", param->pa_data.pa_size);
+    snprintf(sizestr, 20, "%lu", (unsigned long) param->pa_data.pa_size);
    len = strlen("size=") + strlen(sizestr);
    break;
  case MAILMIME_DISPOSITION_PARM_PARAMETER:
    len = strlen(param->pa_data.pa_parameter->pa_name) + 1 +
      strlen(param->pa_data.pa_parameter->pa_value);
diff --git a/kmicromail/libetpan/smtp/mailsmtp.c b/kmicromail/libetpan/smtp/mailsmtp.c
index b3be432..3ab1d11 100644
--- a/kmicromail/libetpan/smtp/mailsmtp.c
+++ b/kmicromail/libetpan/smtp/mailsmtp.c
@@ -189,12 +189,14 @@ int mailsmtp_helo(mailsmtp * session)
  if (r == -1)
    return MAILSMTP_ERROR_STREAM;
  r = read_response(session);
  
  switch (r) {
  case 250:
+    session->esmtp = 0;
+    session->auth = MAILSMTP_AUTH_NOT_CHECKED;
    return MAILSMTP_NO_ERROR;
    
  case 504:
    return MAILSMTP_ERROR_NOT_IMPLEMENTED;
  case 550:
diff --git a/kmicromail/libetpan/smtp/mailsmtp_helper.c b/kmicromail/libetpan/smtp/mailsmtp_helper.c
index 32d6564..7995377 100644
--- a/kmicromail/libetpan/smtp/mailsmtp_helper.c
+++ b/kmicromail/libetpan/smtp/mailsmtp_helper.c
@@ -38,25 +38,21 @@
 #include <stdlib.h>
 #include "mail.h"
 int mailsmtp_init(mailsmtp * session)
 {
  int r;
-  session->esmtp = 0;
  r = mailesmtp_ehlo(session);
-  if (r == MAILSMTP_NO_ERROR) {
+  if (r == MAILSMTP_NO_ERROR)
-      // session->esmtp = TRUE;
    return MAILSMTP_NO_ERROR;
-  }
  r = mailsmtp_helo(session);
- /*  if (r == MAILSMTP_NO_ERROR) { */
+  if (r == MAILSMTP_NO_ERROR)
-/*     session->esmtp = FALSE; */
+    return MAILSMTP_NO_ERROR;
-/*     return MAILSMTP_NO_ERROR; */
-/*   } */
  return r;
 }
diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index 3998abd..3b0ca1f 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -4,12 +4,14 @@
 #include "pop3wrapper.h"
 #include "nntpwrapper.h"
 #include "mhwrapper.h"
 #include "mailtypes.h"
+#include <qprogressbar.h>
+#include <qapplication.h>
 #include <kdecore/kstandarddirs.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <stdlib.h>
 #include <libetpan/mailmime_content.h>
@@ -137,39 +139,87 @@ QString AbstractMail::draftFolder()
 /* temporary - will be removed when implemented in all classes */
 void AbstractMail::deleteMails(const QString &,const QValueList<Opie::Core::OSmartPointer<RecMail> > &)
 {
 }
 void AbstractMail::deleteMailList(const QValueList<RecMailP>&target)
 {
-    qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
+    //qDebug("AbstractMail::deleteMailList:: Please reimplement! ");
+    // this is currently re-implemented in pop3wrapper and imapwrapper
+    int iii = 0;
+    int count = target.count(); 
+    QProgressBar bar( count,0 );
+    bar.setCaption (("Removing mails - close to abort!") );
+    int w = 300;
+    if ( QApplication::desktop()->width() < 320 )
+        w = 220;
+    int h = bar.sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    bar.show();
+    int modulo = (count/10)+1;
+    int incCounter = 0;
+    while (iii < count ) {  
+        if ( ! bar.isVisible() )
+            return ;  
+        if ( incCounter % modulo == 0 )
+            bar.setProgress( incCounter );
+        ++incCounter;
+        qApp->processEvents();
+        RecMailP mail = (*target.at( iii ));
+        deleteMail(mail);
+        ++iii;
+    }
 }
 void AbstractMail::mvcpAllMails(const FolderP&fromFolder,
    const QString&targetFolder,AbstractMail*targetWrapper,bool moveit, int maxSizeInKb)
 {
 QValueList<RecMailP> t;
 listMessages(fromFolder->getName(),t, maxSizeInKb);
 mvcpMailList( t,targetFolder,targetWrapper,moveit);
 }
 void AbstractMail::mvcpMailList(const QValueList<RecMailP>& t,
                                const QString&targetFolder,AbstractMail*targetWrapper,bool moveit)
 {
-   
    encodedString*st = 0;
    int iii = 0;
    int count = t.count();
+    if ( count == 0 )
+        return;
+    QProgressBar bar( count,0 );
+    bar.setCaption (("Copying mails - close to abort!") );
+    int w = 300;
+    if ( QApplication::desktop()->width() < 320 )
+        w = 220;
+    int h = bar.sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    bar.show();
+    int modulo = (count/10)+1;
+    int incCounter = 0;
    while (iii < count ) {
+        if ( ! bar.isVisible() )
+            return ;  
+        if ( incCounter % modulo == 0 )
+            bar.setProgress( incCounter );
+        ++incCounter;
+        bar.raise();
+        qApp->processEvents();
+        //qDebug("copy ");
        RecMailP r = (*t.at( iii ));
        st = fetchRawBody(r);
        if (st) {
            targetWrapper->storeMessage(st->Content(),st->Length(),targetFolder);
            delete st;
        }
        ++iii;
-    }
+    } 
+    bar.hide();
    if (moveit) {
        deleteMailList( t );
        //deleteAllMail(fromFolder);
    }
 }
diff --git a/kmicromail/libmailwrapper/imapwrapper.cpp b/kmicromail/libmailwrapper/imapwrapper.cpp
index bb8bbfc..11d3343 100644
--- a/kmicromail/libmailwrapper/imapwrapper.cpp
+++ b/kmicromail/libmailwrapper/imapwrapper.cpp
@@ -3,12 +3,13 @@
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qapplication.h>
 #include "imapwrapper.h"
 #include "mailtypes.h"
 #include "logindialog.h"
+#include <qprogressbar.h>
 using namespace Opie::Core;
 IMAPwrapper::IMAPwrapper( IMAPaccount *a )
    : AbstractMail()
 {
    account = a;
@@ -868,27 +869,49 @@ void IMAPwrapper::fillBodyFields(RecPartP&target_part,mailimap_body_fields*which
    }
    target_part->setEncoding(encoding);
    target_part->setSize(which->bd_size);
 }
 void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
 {
+    //#if 0
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
    int err;
    login();
+    //#endif
    if (!m_imap) {
        return;
    }
    int iii = 0;
    int count = target.count();
-    qDebug("imap remove count %d ", count);
+    // qDebug("imap remove count %d ", count); 
+    QProgressBar bar( count,0 );
+    bar.setCaption (("Removing mails - close to abort!") );
+    int w = 300;
+    if ( QApplication::desktop()->width() < 320 )
+        w = 220;
+    int h = bar.sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    bar.show();
+    int modulo = (count/10)+1;
+    int incCounter = 0;
+  
    while (iii < count ) {
-        qDebug("IMAP remove %d ", iii);
+        if ( ! bar.isVisible() )
+            return ;  
+        if ( incCounter % modulo == 0 )
+            bar.setProgress( incCounter );
+        ++incCounter;
+        qApp->processEvents();
        RecMailP mail = (*target.at( iii ));
+        //#if 0
+        //qDebug("IMAP remove %d %d ", iii, mail->getNumber() );
        err = selectMbox(mail->getMbox());
        if ( err != MAILIMAP_NO_ERROR ) {
            return;
        }
        flist = mailimap_flag_list_new_empty();
        mailimap_flag_list_add(flist,mailimap_flag_new_deleted());
@@ -902,18 +925,25 @@ void IMAPwrapper::deleteMailList(const QValueList<RecMailP>&target)
            // odebug << "error deleting mail: " << m_imap->imap_response << "" << oendl; 
            return;
        }
        // odebug << "deleting mail: " << m_imap->imap_response << "" << oendl; 
        /* should we realy do that at this moment? */
   
+        // err = mailimap_expunge(m_imap);
+        //if (err != MAILIMAP_NO_ERROR) {
+        //    Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
+        // }
+        //#endif
+        //deleteMail( mail);
+        ++iii;
+    }
+    //qDebug("Deleting imap mails... ");
        err = mailimap_expunge(m_imap);
        if (err != MAILIMAP_NO_ERROR) {
-            Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
+            Global::statusMessage(tr("Error deleting mails: %s").arg(m_imap->imap_response));
        }
-        ++iii;
-    }
 }
 void IMAPwrapper::deleteMail(const RecMailP&mail)
 {
    mailimap_flag_list*flist;
    mailimap_set *set;
    mailimap_store_att_flags * store_flags;
@@ -942,13 +972,13 @@ void IMAPwrapper::deleteMail(const RecMailP&mail)
    /* should we realy do that at this moment? */
  
    err = mailimap_expunge(m_imap);
    if (err != MAILIMAP_NO_ERROR) {
        Global::statusMessage(tr("error deleting mail: %s").arg(m_imap->imap_response));
    }
-    qDebug("IMAPwrapper::deleteMail ");
+    //qDebug("IMAPwrapper::deleteMail 2");
    
 }
 void IMAPwrapper::answeredMail(const RecMailP&mail)
 {
    mailimap_flag_list*flist;
@@ -1186,13 +1216,13 @@ void IMAPwrapper::mvcpAllMails(const FolderP&fromFolder,
    }
    int last = m_imap->imap_selection_info->sel_exists;
    set = mailimap_set_new_interval( 1, last );
    err = mailimap_copy(m_imap,set,targetFolder.latin1());
    mailimap_set_free( set );
    if ( err != MAILIMAP_NO_ERROR ) {
-        QString error_msg = tr("error copy mails: %1").arg(m_imap->imap_response);
+        QString error_msg = tr("Error copy mails: %1").arg(m_imap->imap_response);
        Global::statusMessage(error_msg);
        // odebug << error_msg << oendl; 
        return;
    }
    if (moveit) {
        deleteAllMail(fromFolder);
diff --git a/kmicromail/libmailwrapper/pop3wrapper.cpp b/kmicromail/libmailwrapper/pop3wrapper.cpp
index 7a84b30..0e6612c 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.cpp
+++ b/kmicromail/libmailwrapper/pop3wrapper.cpp
@@ -5,12 +5,14 @@
 #include "logindialog.h"
 #include <libetpan/libetpan.h>
 #include <qpe/global.h>
 #include <qfile.h>
+#include <qprogressbar.h>
+#include <qapplication.h>
 /* we don't fetch messages larger than 5 MB */
 #define HARD_MSG_SIZE_LIMIT 5242880
 using namespace Opie::Core;
 POP3wrapper::POP3wrapper( POP3account *a )
@@ -190,24 +192,43 @@ QValueList<Opie::Core::OSmartPointer<Folder> >* POP3wrapper::listFolders() {
    QValueList<Opie::Core::OSmartPointer<Folder> >* folders = new QValueList<FolderP>();
    FolderP inb=new Folder("INBOX","/");
    folders->append(inb);
    return folders;
 }
-void POP3wrapper::deleteMailList(QValueList<RecMailP>&target)
+void POP3wrapper::deleteMailList(const QValueList<RecMailP>&target)
 {
    login();
    if (!m_pop3)
        return;
    int iii = 0;
-    int count = target.count();
+    int count = target.count(); 
-    while (iii < count ) {
+    QProgressBar bar( count,0 );
+    bar.setCaption (("Removing mails - close to abort!") );
+    int w = 300;
+    if ( QApplication::desktop()->width() < 320 )
+        w = 220;
+    int h = bar.sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    bar.show();
+    int modulo = (count/10)+1;
+    int incCounter = 0;
+    while (iii < count ) {  
+        if ( ! bar.isVisible() )
+            return ;  
+        if ( incCounter % modulo == 0 )
+            bar.setProgress( incCounter );
+        ++incCounter;
+        qApp->processEvents();
+        //qDebug("delete ");
        RecMailP mail = (*target.at( iii ));
        int err = mailsession_remove_message(m_pop3->sto_session,mail->getNumber());
        if (err != MAIL_NO_ERROR) {
-            Global::statusMessage(tr("error deleting mail"));
+            Global::statusMessage(tr("Error deleting mail"));
        }
        ++iii;
    }
 }
 void POP3wrapper::deleteMail(const RecMailP&mail) {
    login();
@@ -230,13 +251,31 @@ int POP3wrapper::deleteAllMail(const FolderP&) {
    uint32_t result = 0;
    int err = mailsession_messages_number(m_pop3->sto_session,NULL,&result);
    if (err != MAIL_NO_ERROR) {
        Global::statusMessage(tr("Error getting folder info"));
        return 0;
    }
+    QProgressBar bar( result,0 );
+    bar.setCaption (("Deleting mails - close to abort!") );
+    int w = 300;
+    if ( QApplication::desktop()->width() < 320 )
+        w = 220;
+    int h = bar.sizeHint().height() ;
+    int dw = QApplication::desktop()->width();
+    int dh = QApplication::desktop()->height();
+    bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+    bar.show();
+    int modulo = (result/10)+1;
+    int incCounter = 0;
    for (unsigned int i = 0; i < result; ++i) {
+        if ( ! bar.isVisible() )
+            return 0;  
+        if ( incCounter % modulo == 0 )
+            bar.setProgress( incCounter );
+        ++incCounter;
+        qApp->processEvents();
        err = mailsession_remove_message(m_pop3->sto_session,i+1);
        if (err != MAIL_NO_ERROR) {
            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
            res=0;
        }
        break;
diff --git a/kmicromail/libmailwrapper/pop3wrapper.h b/kmicromail/libmailwrapper/pop3wrapper.h
index ee754a4..7c70942 100644
--- a/kmicromail/libmailwrapper/pop3wrapper.h
+++ b/kmicromail/libmailwrapper/pop3wrapper.h
@@ -21,14 +21,14 @@ public:
    virtual void listMessages(const QString & mailbox, QValueList<Opie::Core::OSmartPointer<RecMail> > &target, int maxSizeInKb = 0 );
    virtual QValueList<Opie::Core::OSmartPointer<Folder> >* listFolders();
    /* mailbox will be ignored */
    virtual void statusFolder(folderStat&target_stat,const QString & mailbox="INBOX");
    virtual void deleteMail(const RecMailP&mail);
+    virtual void deleteMailList(const QValueList<RecMailP>&target);
    virtual void answeredMail(const RecMailP&mail);
-    virtual void deleteMailList(QValueList<RecMailP>&target);
    virtual int deleteAllMail(const Opie::Core::OSmartPointer<Folder>&);
    virtual RecBodyP fetchBody( const RecMailP &mail );
    virtual encodedString* fetchRawBody(const RecMailP&mail);
    virtual void logout();
    virtual MAILLIB::ATYPE getType()const;
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 3fbdcec..251f15a 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -15,13 +15,13 @@
 #include <qpe/qpeapplication.h>
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 /* OPIE */
 //#include <qpe/resource.h>
-#include <qpe/qpeapplication.h>
+//#include <qpe/qpeapplication.h>
 /* QT */
 using namespace Opie::Core;
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
@@ -234,26 +234,33 @@ void OpieMail::slotDeleteMail()
        mail->Wrapper()->deleteMail( mail );
        folderView->refreshCurrent();
    }
 }
 void OpieMail::slotDeleteAllMail()
 {
-    if (!mailView->currentItem()) return;
-    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
+    QValueList<RecMailP> t;
    if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
-    {
+        {
-        MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
+            MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
-        while ( item ) {
+            while ( item ) {
-            if ( item->isSelected() ) {
+                if ( item->isSelected() ) {
-                RecMailP mail = item->data();
+                    t.append( item->data() );
-                mail->Wrapper()->deleteMail( mail );
+                }
+                item = (MailListViewItem*)item->nextSibling();
            }
-            item = (MailListViewItem*)item->nextSibling();
        }
-        folderView->refreshCurrent();
+    else
-    }
+        return;
+    if ( t.count() == 0 )
+        return;
+    RecMailP mail = t.first();
+    mail->Wrapper()->deleteMailList(t);
+    folderView->refreshCurrent();
 }
 void OpieMail::clearSelection()
 {
    mailView->clearSelection();
  
 }
@@ -273,16 +280,16 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 //            m->insertItem(tr("Copy this posting"),this,SLOT(slotMoveCopyMail()));
        } else {
            if (folderView->currentisDraft()) {
                m->insertItem(tr("Edit this mail"),this,SLOT(reEditMail()));
            }
            m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
-            m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
+            m->insertItem(tr("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
            m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
            m->insertSeparator();
-            m->insertItem(tr("Copy/Move all selected mail"),this,SLOT(slotMoveCopyAllMail()));
+            m->insertItem(tr("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
            m->insertItem(tr("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
            m->insertItem(tr("Clear selection"),this,SLOT(clearSelection()));
        }
        m->setFocus();
        m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
        delete m;
@@ -347,33 +354,36 @@ void OpieMail::slotMoveCopyMail()
    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
    {
        QMessageBox::critical(0,tr("Error creating new Folder"),
                              tr("<center>Error while creating<br>new folder - breaking.</center>"));
        return;
    }
+    sels.hide();
+    qApp->processEvents();
+    // qDebug("hiding sels ");
    mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
    folderView->refreshCurrent();
 }
 void OpieMail::slotMoveCopyAllMail()
 {
    if (!mailView->currentItem()) return;
    QValueList<RecMailP> t;
-    if ( QMessageBox::warning(this, tr("Copy/Move all selected mails"), tr("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
+    // if ( QMessageBox::warning(this, tr("Move/Copy all selected mails"), tr("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
        MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
        while ( item ) {
            if ( item->isSelected() ) {
                t.append( item->data() );
            }
            item = (MailListViewItem*)item->nextSibling();
        }
    }
-    else
+    // else
-        return;
+    //  return;
    if ( t.count() == 0 )
        return;
    RecMailP mail = t.first();
    AbstractMail*targetMail = 0;
    QString targetFolder = "";
    Selectstore sels;
@@ -389,12 +399,15 @@ void OpieMail::slotMoveCopyAllMail()
    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
    {
        QMessageBox::critical(0,tr("Error creating new Folder"),
                              tr("<center>Error while creating<br>new folder - breaking.</center>"));
        return;
    }
+    sels.hide();
+    qApp->processEvents();
+    //qDebug("hiding sels ");
    mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
    folderView->refreshCurrent();
 }
 void OpieMail::reEditMail()
 {