* src/imap.c
[claws.git] / src / imap.c
index 76319b792d494a5adc7ecfb32eb2f15be373fc43..ee764c852a165e665dc9fd618bfa169b1a71da58 100644 (file)
@@ -112,16 +112,26 @@ static void imap_delete_all_cached_messages       (FolderItem     *item);
 #if USE_SSL
 static SockInfo *imap_open             (const gchar    *server,
                                         gushort         port,
-                                        gboolean        use_ssl);
+                                        SSLType         ssl_type);
 #else
 static SockInfo *imap_open             (const gchar    *server,
                                         gushort         port);
 #endif
 
+#if USE_SSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+                                 const gchar *tunnelcmd,
+                                 SSLType ssl_type);
+#else
 static SockInfo *imap_open_tunnel(const gchar *server,
                                  const gchar *tunnelcmd);
+#endif
 
+#if USE_SSL
+static SockInfo *imap_init_sock(SockInfo *sock, SSLType         ssl_type);
+#else
 static SockInfo *imap_init_sock(SockInfo *sock);
+#endif
 
 static gint imap_set_message_flags     (IMAPSession    *session,
                                         guint32         first_uid,
@@ -161,18 +171,9 @@ static gchar *imap_parse_atom              (SockInfo       *sock,
                                         gchar          *dest,
                                         gint            dest_len,
                                         GString        *str);
-static gchar *imap_parse_one_address   (SockInfo       *sock,
-                                        gchar          *start,
-                                        gchar          *out_from_str,
-                                        gchar          *out_fromname_str,
-                                        GString        *str);
-static gchar *imap_parse_address       (SockInfo       *sock,
-                                        gchar          *start,
-                                        gchar         **out_from_str,
-                                        gchar         **out_fromname_str,
-                                        GString        *str);
 static MsgFlags imap_parse_flags       (const gchar    *flag_str);
 static MsgInfo *imap_parse_envelope    (SockInfo       *sock,
+                                        FolderItem     *item,
                                         GString        *line_str);
 static gint imap_greeting              (SockInfo *sock,
                                         gboolean *is_preauth);
@@ -183,6 +184,7 @@ static gint imap_cmd_login  (SockInfo       *sock,
                                 const gchar    *pass);
 static gint imap_cmd_logout    (SockInfo       *sock);
 static gint imap_cmd_noop      (SockInfo       *sock);
+static gint imap_cmd_starttls  (SockInfo       *sock);
 static gint imap_cmd_namespace (SockInfo       *sock,
                                 gchar         **ns_str);
 static gint imap_cmd_list      (SockInfo       *sock,
@@ -268,6 +270,11 @@ static gchar *imap_locale_to_modified_utf7 (const gchar    *from);
 
 static gboolean imap_rename_folder_func                (GNode          *node,
                                                 gpointer        data);
+GSList *imap_get_num_list                      (Folder         *folder,
+                                                FolderItem     *item);
+MsgInfo *imap_fetch_msginfo                    (Folder         *folder,
+                                                FolderItem     *item,
+                                                gint            num);
 
 
 Folder *imap_folder_new(const gchar *name, const gchar *path)
@@ -292,7 +299,9 @@ static void imap_folder_init(Folder *folder, const gchar *name,
 
        folder->type = F_IMAP;
 
+/*
        folder->get_msg_list        = imap_get_msg_list;
+*/
        folder->fetch_msg           = imap_fetch_msg;
        folder->add_msg             = imap_add_msg;
        folder->move_msg            = imap_move_msg;
@@ -302,12 +311,17 @@ static void imap_folder_init(Folder *folder, const gchar *name,
        folder->remove_msg          = imap_remove_msg;
        folder->remove_all_msg      = imap_remove_all_msg;
        folder->is_msg_changed      = imap_is_msg_changed;
+/*
        folder->scan                = imap_scan_folder;
+*/
        folder->scan_tree           = imap_scan_tree;
        folder->create_tree         = imap_create_tree;
        folder->create_folder       = imap_create_folder;
        folder->rename_folder       = imap_rename_folder;
        folder->remove_folder       = imap_remove_folder;
+
+       folder->get_num_list        = imap_get_num_list;
+       folder->fetch_msginfo       = imap_fetch_msginfo;
 }
 
 static IMAPSession *imap_session_get(Folder *folder)
@@ -321,7 +335,8 @@ static IMAPSession *imap_session_get(Folder *folder)
 
 #if USE_SSL
        port = folder->account->set_imapport ? folder->account->imapport
-               : folder->account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
+               : folder->account->ssl_imap == SSL_TUNNEL
+               ? IMAPS_PORT : IMAP4_PORT;
 #else
        port = folder->account->set_imapport ? folder->account->imapport
                : IMAP4_PORT;
@@ -381,11 +396,11 @@ Session *imap_session_new(const PrefsAccount *account)
 
 #ifdef USE_SSL
        /* FIXME: IMAP over SSL only... */ 
-       gboolean use_ssl;
+       SSLType ssl_type;
 
        port = account->set_imapport ? account->imapport
                : account->ssl_imap ? IMAPS_PORT : IMAP4_PORT;
-       use_ssl = account->ssl_imap ? TRUE : FALSE;     
+       ssl_type = account->ssl_imap ? TRUE : FALSE;    
 #else
        port = account->set_imapport ? account->imapport
                : IMAP4_PORT;
@@ -393,8 +408,14 @@ Session *imap_session_new(const PrefsAccount *account)
 
        if (account->set_tunnelcmd) {
                log_message(_("creating tunneled IMAP4 connection\n"));
+#if USE_SSL
+               if ((imap_sock = imap_open_tunnel(account->recv_server, 
+                                                 account->tunnelcmd,
+                                                 ssl_type)) == NULL)
+#else
                if ((imap_sock = imap_open_tunnel(account->recv_server, 
                                                  account->tunnelcmd)) == NULL)
+#endif
                        return NULL;
        } else {
                g_return_val_if_fail(account->recv_server != NULL, NULL);
@@ -404,7 +425,7 @@ Session *imap_session_new(const PrefsAccount *account)
                
 #if USE_SSL
                if ((imap_sock = imap_open(account->recv_server, port,
-                                          use_ssl)) == NULL)
+                                          ssl_type)) == NULL)
 #else
                if ((imap_sock = imap_open(account->recv_server, port)) == NULL)
 #endif
@@ -661,6 +682,8 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
 {
        gchar *destdir;
        IMAPSession *session;
+       gint messages, recent, unseen;
+       guint32 uid_next, uid_validity;
        gint ok;
 
        g_return_val_if_fail(folder != NULL, -1);
@@ -676,6 +699,14 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
                return -1;
        }
 
+       ok = imap_status(session, IMAP_FOLDER(folder), dest->path,
+                        &messages, &recent, &uid_next, &uid_validity, &unseen);
+       statusbar_pop_all();
+       if (ok != IMAP_SUCCESS) {
+               g_warning(_("can't copy message\n"));
+               return -1;
+       }
+
        destdir = imap_get_real_path(IMAP_FOLDER(folder), dest->path);
 
        if (remove_source)
@@ -699,7 +730,7 @@ static gint imap_do_copy(Folder *folder, FolderItem *dest, MsgInfo *msginfo,
        statusbar_pop_all();
 
        if (ok == IMAP_SUCCESS)
-               return 0;
+               return uid_next;
        else
                return -1;
 }
@@ -781,9 +812,12 @@ gint imap_move_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        ret = imap_add_msg(folder, dest, srcfile, FALSE);
        g_free(srcfile);
 
-       if (ret == 0)
-               ret = folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
-
+       if (ret != -1) {
+               if(folder_item_remove_msg(msginfo->folder, msginfo->msgnum)) {
+                       ret = -1;
+               }
+       }
+               
        return ret;
 }
 
@@ -805,7 +839,7 @@ gint imap_move_msgs_with_dest(Folder *folder, FolderItem *dest,
        for (cur = msglist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                ret = imap_move_msg(folder, dest, msginfo);
-               if (ret != 0) break;
+               if (ret == -1) break;
        }
 
        return ret;
@@ -853,7 +887,7 @@ gint imap_copy_msgs_with_dest(Folder *folder, FolderItem *dest,
        for (cur = msglist; cur != NULL; cur = cur->next) {
                msginfo = (MsgInfo *)cur->data;
                ret = imap_copy_msg(folder, dest, msginfo);
-               if (ret != 0) break;
+               if (ret == -1) break;
        }
 
        return ret;
@@ -1502,12 +1536,12 @@ static GSList *imap_get_uncached_messages(IMAPSession *session,
                        g_free(tmp);
                        continue;
                }
-               /* log_print("IMAP4< %s\n", tmp); */
-               debug_print("IMAP4< %s\n", tmp);
+               log_print("IMAP4< %s\n", tmp);
                g_string_assign(str, tmp);
                g_free(tmp);
 
-               msginfo = imap_parse_envelope(SESSION(session)->sock, str);
+               msginfo = imap_parse_envelope
+                       (SESSION(session)->sock, item, str);
                if (!msginfo) {
                        log_warning(_("can't parse envelope: %s\n"), str->str);
                        continue;
@@ -1544,7 +1578,7 @@ static GSList *imap_delete_cached_messages(GSList *mlist, FolderItem *item,
        g_return_val_if_fail(item->folder != NULL, mlist);
        g_return_val_if_fail(item->folder->type == F_IMAP, mlist);
 
-       debug_print(_("Deleting cached messages %d - %d ... "),
+       debug_print(_("Deleting cached messages %u - %u ... "),
                    first_uid, last_uid);
 
        dir = folder_item_get_path(item);
@@ -1586,9 +1620,14 @@ static void imap_delete_all_cached_messages(FolderItem *item)
        debug_print(_("done.\n"));
 }
 
-
+#if USE_SSL
+static SockInfo *imap_open_tunnel(const gchar *server,
+                          const gchar *tunnelcmd,
+                          SSLType ssl_type)
+#else
 static SockInfo *imap_open_tunnel(const gchar *server,
                           const gchar *tunnelcmd)
+#endif
 {
        SockInfo *sock;
 
@@ -1596,14 +1635,17 @@ static SockInfo *imap_open_tunnel(const gchar *server,
                log_warning(_("Can't establish IMAP4 session with: %s\n"),
                            server);
                return NULL;
-
+#if USE_SSL
+       return imap_init_sock(sock, ssl_type);
+#else
        return imap_init_sock(sock);
+#endif
 }
 
 
 #if USE_SSL
 static SockInfo *imap_open(const gchar *server, gushort port,
-                          gboolean use_ssl)
+                          SSLType ssl_type)
 #else
 static SockInfo *imap_open(const gchar *server, gushort port)
 #endif
@@ -1617,24 +1659,44 @@ static SockInfo *imap_open(const gchar *server, gushort port)
        }
 
 #if USE_SSL
-       if (use_ssl && !ssl_init_socket(sock)) {
+       if (ssl_type == SSL_TUNNEL && !ssl_init_socket(sock)) {
                log_warning(_("Can't establish IMAP4 session with: %s:%d\n"),
                            server, port);
                sock_close(sock);
                return NULL;
        }
-#endif
-
+       return imap_init_sock(sock, ssl_type);
+#else
        return imap_init_sock(sock);
+#endif
 }
 
-
+#if USE_SSL
+static SockInfo *imap_init_sock(SockInfo *sock, SSLType ssl_type)
+#else
 static SockInfo *imap_init_sock(SockInfo *sock)
+#endif
 {
        imap_cmd_count = 0;
+#if USE_SSL
+       if (ssl_type == SSL_STARTTLS) {
+               gint ok;
+
+               ok = imap_cmd_starttls(sock);
+               if (ok != IMAP_SUCCESS) {
+                       log_warning(_("Can't start TLS session.\n"));
+                       sock_close(sock);
+                       return NULL;
+               }
+               if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
+                       sock_close(sock);
+                       return NULL;
+               }
+       }
+#endif
 
        if (imap_cmd_noop(sock) != IMAP_SUCCESS) {
-               log_warning(_("Can't establish IMAP4 session\n"));
+               log_warning(_("Can't establish IMAP4 session.\n"));
                sock_close(sock);
                return NULL;
        }
@@ -1852,98 +1914,66 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
        return cur_pos;
 }
 
-static gchar *imap_parse_one_address(SockInfo *sock, gchar *start,
-                                    gchar *out_from_str,
-                                    gchar *out_fromname_str,
-                                    GString *str)
+static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
+                             GString *str)
 {
-       gchar buf[IMAPBUFSIZE];
-       gchar *userid;
-       gchar *domain;
-       gchar *cur_pos = start;
-
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       conv_unmime_header(out_fromname_str, IMAPBUFSIZE, buf, NULL);
-
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
+       gchar *nextline;
+       gchar buf[32];
+       gint len;
+       gint block_len = 0;
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       Xstrdup_a(userid, buf, return cur_pos + 1);
+       *headers = NULL;
 
-       cur_pos = imap_parse_atom(sock, cur_pos, buf, sizeof(buf), str);
-       Xstrdup_a(domain, buf, return cur_pos + 1);
+       g_return_val_if_fail(str != NULL, cur_pos);
 
-       if (out_fromname_str[0] != '\0') {
-               g_snprintf(out_from_str, IMAPBUFSIZE, "\"%s\" <%s@%s>",
-                          out_fromname_str, userid, domain);
-       } else {
-               g_snprintf(out_from_str, IMAPBUFSIZE, "%s@%s",
-                          userid, domain);
-               strcpy(out_fromname_str, out_from_str);
-       }
+       while (isspace(*cur_pos)) cur_pos++;
 
-       while (*cur_pos == ' ') cur_pos++;
-       g_return_val_if_fail(*cur_pos == ')', NULL);
+       g_return_val_if_fail(*cur_pos == '{', cur_pos);
 
-       return cur_pos + 1;
-}
+       cur_pos = strchr_cpy(cur_pos + 1, '}', buf, sizeof(buf));
+       len = atoi(buf);
 
-static gchar *imap_parse_address(SockInfo *sock, gchar *start,
-                                gchar **out_from_str,
-                                gchar **out_fromname_str,
-                                GString *str)
-{
-       gchar buf[IMAPBUFSIZE];
-       gchar name_buf[IMAPBUFSIZE];
-       gchar *cur_pos = start;
-       GString *addr_str;
+       g_string_truncate(str, 0);
+       cur_pos = str->str;
 
-       if (out_from_str)     *out_from_str     = NULL;
-       if (out_fromname_str) *out_fromname_str = NULL;
-       buf[0] = name_buf[0] = '\0';
+       do {
+               if ((nextline = sock_getline(sock)) == NULL)
+                       return cur_pos;
+               block_len += strlen(nextline);
+               g_string_append(str, nextline);
+               cur_pos = str->str;
+               strretchomp(nextline);
+               /* debug_print("IMAP4< %s\n", nextline); */
+               g_free(nextline);
+       } while (block_len < len);
 
-       if (!strncmp(cur_pos, "NIL", 3)) {
-               if (out_from_str)     *out_from_str     = g_strdup("");
-               if (out_fromname_str) *out_fromname_str = g_strdup("");
-               return cur_pos + 3;
-       }
+       debug_print("IMAP4< [contents of RFC822.HEADER]\n");
 
-       g_return_val_if_fail(*cur_pos == '(', NULL);
-       cur_pos++;
+       *headers = g_strndup(cur_pos, len);
+       cur_pos += len;
 
-       addr_str = g_string_new(NULL);
+       while (isspace(*cur_pos)) cur_pos++;
+       while (*cur_pos == '\0') {
+               if ((nextline = sock_getline(sock)) == NULL)
+                       return cur_pos;
+               g_string_assign(str, nextline);
+               cur_pos = str->str;
+               strretchomp(nextline);
+               debug_print("IMAP4< %s\n", nextline);
+               g_free(nextline);
 
-       for (;;) {
-               gchar ch = *cur_pos++;
-               if (ch == ')') break;
-               if (ch == '(') {
-                       cur_pos = imap_parse_one_address
-                               (sock, cur_pos, buf, name_buf, str);
-                       if (!cur_pos) {
-                               g_string_free(addr_str, TRUE);
-                               return NULL;
-                       }
-                       if (addr_str->str[0] != '\0')
-                               g_string_append(addr_str, ", ");
-                       g_string_append(addr_str, buf);
-               }
+               while (isspace(*cur_pos)) cur_pos++;
        }
 
-       if (out_from_str)     *out_from_str     = g_strdup(addr_str->str);
-       if (out_fromname_str) *out_fromname_str = g_strdup(name_buf);
-
-       g_string_free(addr_str, TRUE);
-
        return cur_pos;
 }
 
 static MsgFlags imap_parse_flags(const gchar *flag_str)  
 {
        const gchar *p = flag_str;
-       MsgFlags flags;
+       MsgFlags flags = {0, 0};
 
        flags.perm_flags = MSG_UNREAD;
-       flags.tmp_flags  = MSG_IMAP;
 
        while ((p = strchr(p, '\\')) != NULL) {
                p++;
@@ -1964,38 +1994,38 @@ static MsgFlags imap_parse_flags(const gchar *flag_str)
        return flags;
 }
 
-static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
+static MsgInfo *imap_parse_envelope(SockInfo *sock, FolderItem *item,
+                                   GString *line_str)
 {
-       MsgInfo *msginfo;
        gchar buf[IMAPBUFSIZE];
-       gchar tmp[IMAPBUFSIZE];
+       MsgInfo *msginfo = NULL;
        gchar *cur_pos;
        gint msgnum;
        guint32 uid = 0;
        size_t size = 0;
-       gchar *date = NULL;
-       time_t date_t = 0;
-       gchar *subject = NULL;
-       gchar *tmp_from;
-       gchar *tmp_fromname;
-       gchar *from = NULL;
-       gchar *fromname = NULL;
-       gchar *tmp_to;
-       gchar *to = NULL;
-       gchar *inreplyto = NULL;
-       gchar *msgid = NULL;
-       MsgFlags flags = {0, 0};
+       MsgFlags flags = {0, 0}, imap_flags = {0, 0};
 
        g_return_val_if_fail(line_str != NULL, NULL);
        g_return_val_if_fail(line_str->str[0] == '*' &&
                             line_str->str[1] == ' ', NULL);
 
+       MSG_SET_TMP_FLAGS(flags, MSG_IMAP);
+       if (item->stype == F_QUEUE) {
+               MSG_SET_TMP_FLAGS(flags, MSG_QUEUED);
+       } else if (item->stype == F_DRAFT) {
+               MSG_SET_TMP_FLAGS(flags, MSG_DRAFT);
+       }
+
        cur_pos = line_str->str + 2;
 
-#define PARSE_ONE_ELEMENT(ch) \
-{ \
-       cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf)); \
-       g_return_val_if_fail(cur_pos != NULL, NULL); \
+#define PARSE_ONE_ELEMENT(ch)                                  \
+{                                                              \
+       cur_pos = strchr_cpy(cur_pos, ch, buf, sizeof(buf));    \
+       if (cur_pos == NULL) {                                  \
+               g_warning("cur_pos == NULL\n");                 \
+               procmsg_msginfo_free(msginfo);                  \
+               return NULL;                                    \
+       }                                                       \
 }
 
        PARSE_ONE_ELEMENT(' ');
@@ -2015,114 +2045,37 @@ static MsgInfo *imap_parse_envelope(SockInfo *sock, GString *line_str)
                        uid = strtoul(cur_pos, &cur_pos, 10);
                } else if (!strncmp(cur_pos, "FLAGS ", 6)) {
                        cur_pos += 6;
-                       g_return_val_if_fail(*cur_pos == '(', NULL);
+                       if (*cur_pos != '(') {
+                               g_warning("*cur_pos != '('\n");
+                               procmsg_msginfo_free(msginfo);
+                               return NULL;
+                       }
                        cur_pos++;
                        PARSE_ONE_ELEMENT(')');
-                       flags = imap_parse_flags(buf);
+                       imap_flags = imap_parse_flags(buf);
                } else if (!strncmp(cur_pos, "RFC822.SIZE ", 12)) {
                        cur_pos += 12;
                        size = strtol(cur_pos, &cur_pos, 10);
-               } else if (!strncmp(cur_pos, "ENVELOPE ", 9)) {
-                       cur_pos += 9;
-                       g_return_val_if_fail(*cur_pos == '(', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos + 1, buf, sizeof(buf), line_str);
-                       if (buf[0] != '\0') {
-                               Xstrdup_a(date, buf, return NULL);
-                               date_t = procheader_date_parse(NULL, date, 0);
-                       }
-
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       if (buf[0] != '\0') {
-                               conv_unmime_header(tmp, sizeof(tmp), buf, NULL);
-                               Xstrdup_a(subject, tmp, return NULL);
-                       }
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_address(sock, cur_pos + 1,
-                                                    &tmp_from, &tmp_fromname,
-                                                    line_str);
-                       g_return_val_if_fail(cur_pos != NULL, NULL);
-                       if (tmp_from && *tmp_from != '\0')
-                               Xstrdup_a(from, tmp_from,
-                                         {g_free(tmp_from);
-                                          g_free(tmp_fromname);
-                                          return NULL;});
-                       if (tmp_fromname && *tmp_fromname != '\0')
-                               Xstrdup_a(fromname, tmp_fromname,
-                                         {g_free(tmp_from);
-                                          g_free(tmp_fromname);
-                                          return NULL;});
-                       g_free(tmp_from);
-                       g_free(tmp_fromname);
-
-#define SKIP_ONE_ELEMENT() \
-{ \
-       g_return_val_if_fail(*cur_pos == ' ', NULL); \
-       cur_pos = imap_parse_address(sock, cur_pos + 1, NULL, NULL, \
-                                    line_str); \
-       g_return_val_if_fail(cur_pos != NULL, NULL); \
-}
-
-                       /* skip sender and reply-to */
-                       SKIP_ONE_ELEMENT();
-                       SKIP_ONE_ELEMENT();
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_address(sock, cur_pos + 1,
-                                                    &tmp_to, NULL, line_str);
-                       g_return_val_if_fail(cur_pos != NULL, NULL);
-                       Xstrdup_a(to, tmp_to, {g_free(tmp_to); return NULL;});
-                       g_free(tmp_to);
-
-                       /* skip Cc and Bcc */
-                       SKIP_ONE_ELEMENT();
-                       SKIP_ONE_ELEMENT();
-
-#undef SKIP_ONE_ELEMENT
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       g_return_val_if_fail(cur_pos != NULL, NULL);
-                       if (buf[0] != '\0') {
-                               eliminate_parenthesis(buf, '(', ')');
-                               extract_parenthesis(buf, '<', '>');
-                               remove_space(buf);
-                               Xstrdup_a(inreplyto, buf, return NULL);
-                       }
-
-                       g_return_val_if_fail(*cur_pos == ' ', NULL);
-                       cur_pos = imap_parse_atom
-                               (sock, cur_pos, buf, sizeof(buf), line_str);
-                       g_return_val_if_fail(cur_pos != NULL, NULL);
-                       if (buf[0] != '\0') {
-                               extract_parenthesis(buf, '<', '>');
-                               remove_space(buf);
-                               Xstrdup_a(msgid, buf, return NULL);
-                       }
-
-                       g_return_val_if_fail(*cur_pos == ')', NULL);
-                       cur_pos++;
+               } else if (!strncmp(cur_pos, "RFC822.HEADER ", 14)) {
+                       gchar *headers;
+
+                       cur_pos += 14;
+                       cur_pos = imap_get_header(sock, cur_pos, &headers,
+                                                 line_str);
+                       msginfo = procheader_parse_str(headers, flags, FALSE, FALSE);
+                       g_free(headers);
                } else {
                        g_warning("invalid FETCH response: %s\n", cur_pos);
                        break;
                }
        }
 
-       msginfo = g_new0(MsgInfo, 1);
-       msginfo->msgnum = uid;
-       msginfo->size = size;
-       msginfo->date = g_strdup(date);
-       msginfo->date_t = date_t;
-       msginfo->subject = g_strdup(subject);
-       msginfo->from = g_strdup(from);
-       msginfo->fromname = g_strdup(fromname);
-       msginfo->to = g_strdup(to);
-       msginfo->inreplyto = g_strdup(inreplyto);
-       msginfo->msgid = g_strdup(msgid);
-       msginfo->flags = flags;
+       if (msginfo) {
+               msginfo->msgnum = uid;
+               msginfo->size = size;
+               msginfo->flags.tmp_flags |= imap_flags.tmp_flags;
+               msginfo->flags.perm_flags = imap_flags.perm_flags;
+       }
 
        return msginfo;
 }
@@ -2399,6 +2352,12 @@ static gint imap_cmd_noop(SockInfo *sock)
        return imap_cmd_ok(sock, NULL);
 }
 
+static gint imap_cmd_starttls(SockInfo *sock)
+{
+       imap_cmd_gen_send(sock, "STARTTLS");
+       return imap_cmd_ok(sock, NULL);
+}
+
 #define THROW(err) { ok = err; goto catch; }
 
 static gint imap_cmd_namespace(SockInfo *sock, gchar **ns_str)
@@ -2673,7 +2632,7 @@ static gint imap_cmd_copy(SockInfo *sock, guint32 uid, const gchar *destfolder)
 gint imap_cmd_envelope(SockInfo *sock, guint32 first_uid, guint32 last_uid)
 {
        imap_cmd_gen_send
-               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE ENVELOPE)",
+               (sock, "UID FETCH %d:%d (UID FLAGS RFC822.SIZE RFC822.HEADER)",
                 first_uid, last_uid);
 
        return IMAP_SUCCESS;
@@ -3078,3 +3037,104 @@ static gboolean imap_rename_folder_func(GNode *node, gpointer data)
 
        return FALSE;
 }
+
+GSList *imap_get_num_list(Folder *folder, FolderItem *item)
+{
+       IMAPSession *session;
+       GSList *msgnum_list = NULL;
+       gint i;
+       gint ok, exists = 0, recent = 0, unseen = 0;
+       guint32 uid_validity = 0;
+       GPtrArray *argbuf;
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->path != NULL, NULL);
+       g_return_val_if_fail(folder->type == F_IMAP, NULL);
+       g_return_val_if_fail(folder->account != NULL, NULL);
+
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       if (ok != IMAP_SUCCESS)
+               return NULL;
+
+       argbuf = g_ptr_array_new();
+       imap_cmd_gen_send(SESSION(session)->sock, "FETCH 1:* (UID)");
+       ok = imap_cmd_ok(SESSION(session)->sock, argbuf);
+       if (ok != IMAP_SUCCESS) {
+               ptr_array_free_strings(argbuf);
+               g_ptr_array_free(argbuf, TRUE);
+               return NULL;
+       }
+
+       for(i = 0; i < argbuf->len; i++) {
+               int ret, msgidx, msgnum;
+       
+               if((ret = sscanf(g_ptr_array_index(argbuf, i), "%d FETCH (UID %d)", &msgidx, &msgnum)) == 2) {
+                       msgnum_list = g_slist_prepend(msgnum_list, GINT_TO_POINTER(msgnum));
+               }
+       }
+       
+       return msgnum_list;
+}
+
+MsgInfo *imap_fetch_msginfo(Folder *folder, FolderItem *item, gint num)
+{
+       gchar *tmp;
+       IMAPSession *session;
+       GString *str;
+       MsgInfo *msginfo;
+       gint ok, exists = 0, recent = 0, unseen = 0;
+       guint32 uid_validity = 0;
+       
+       g_return_val_if_fail(folder != NULL, NULL);
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->folder != NULL, NULL);
+       g_return_val_if_fail(item->folder->type == F_IMAP, NULL);
+
+       session = imap_session_get(folder);
+       g_return_val_if_fail(session != NULL, NULL);
+
+       ok = imap_select(session, IMAP_FOLDER(folder), item->path,
+                        &exists, &recent, &unseen, &uid_validity);
+       if (ok != IMAP_SUCCESS)
+               return NULL;
+       
+       if (imap_cmd_envelope(SESSION(session)->sock, num, num)
+           != IMAP_SUCCESS) {
+               log_warning(_("can't get envelope\n"));
+               return NULL;
+       }
+
+       str = g_string_new(NULL);
+
+       if ((tmp = sock_getline(SESSION(session)->sock)) == NULL) {
+               log_warning(_("error occurred while getting envelope.\n"));
+               g_string_free(str, TRUE);
+               return NULL;
+       }
+       strretchomp(tmp);
+       log_print("IMAP4< %s\n", tmp);
+       g_string_assign(str, tmp);
+       g_free(tmp);
+
+       msginfo = imap_parse_envelope(SESSION(session)->sock, item, str);
+       if (!msginfo) {
+               log_warning(_("can't parse envelope: %s\n"), str->str);
+       }
+
+       tmp = NULL;
+       do {
+               g_free(tmp);
+               tmp = sock_getline(SESSION(session)->sock);
+       } while (!(tmp == NULL || tmp[0] != '*' || tmp[1] != ' '));
+       
+       msginfo->folder = item;
+
+       g_string_free(str, TRUE);
+       
+       return msginfo;
+}