sync with sylpheed 0.6.0cvs4
[claws.git] / src / compose.c
index 051022d7d98cdaf7234b0515df733c3790b51c35..a56c70e3382ab00687dba903c36d1a422af87499 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2001 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #include "gtkshruler.h"
 #include "folder.h"
 #include "addr_compl.h"
+#include "template_select.h"
 
 #if USE_GPGME
 #  include "rfc2015.h"
 #endif
 
+#include "quote_fmt.h"
+
 typedef enum
 {
        COL_MIMETYPE = 0,
@@ -141,7 +144,9 @@ static gchar *compose_quote_parse_fmt               (Compose        *compose,
 static void compose_reply_set_entry            (Compose        *compose,
                                                 MsgInfo        *msginfo,
                                                 gboolean        to_all,
-                                                gboolean        to_author);
+                                                gboolean        to_sender,
+                                                gboolean
+                                                followup_and_reply_to);
 static void compose_reedit_set_entry           (Compose        *compose,
                                                 MsgInfo        *msginfo);
 static void compose_insert_sig                 (Compose        *compose);
@@ -150,6 +155,10 @@ static void compose_insert_file                    (Compose        *compose,
 static void compose_attach_append              (Compose        *compose,
                                                 const gchar    *file,
                                                 ContentType     cnttype);
+static void compose_attach_append_with_type(Compose *compose,
+                                           const gchar *file,
+                                           const gchar *type,
+                                           ContentType cnttype);
 static void compose_wrap_line                  (Compose        *compose);
 static void compose_set_title                  (Compose        *compose);
 
@@ -162,6 +171,7 @@ static gint compose_write_body_to_file              (Compose        *compose,
                                                 const gchar    *file);
 static gint compose_save_to_outbox             (Compose        *compose,
                                                 const gchar    *file);
+static gint compose_remove_reedit_target       (Compose        *compose);
 static gint compose_queue                      (Compose        *compose,
                                                 const gchar    *file);
 static void compose_write_attach               (Compose        *compose,
@@ -233,7 +243,12 @@ static void toolbar_linewrap_cb            (GtkWidget      *widget,
                                         gpointer        data);
 static void toolbar_address_cb         (GtkWidget      *widget,
                                         gpointer        data);
+static void template_select_cb         (gpointer        daat,
+                                        guint           action,
+                                        GtkWidget      *widget);
 
+
+static void select_account(Compose * compose, PrefsAccount * ac);
 static void account_activated          (GtkMenuItem    *menuitem,
                                         gpointer        data);
 
@@ -369,6 +384,20 @@ static void followupto_activated   (GtkWidget      *widget,
 static void compose_attach_parts(Compose * compose,
                                 MsgInfo * msginfo);
 
+static gchar *compose_quote_fmt                (Compose        *compose,
+                                        MsgInfo        *msginfo,
+                                        const gchar    *fmt,
+                                        const gchar    * qmark);
+
+static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
+                                 gboolean to_all,
+                                 gboolean ignore_replyto,
+                                 gboolean followup_and_reply_to);
+
+Compose * compose_generic_new (PrefsAccount    *account,
+                              const gchar      *to,
+                              FolderItem       *item);
+
 static GtkItemFactoryEntry compose_popup_entries[] =
 {
        {N_("/_Add..."),        NULL, compose_attach_cb, 0, NULL},
@@ -425,6 +454,7 @@ static GtkItemFactoryEntry compose_entries[] =
        {N_("/_Tool"),                  NULL, NULL,     0, "<Branch>"},
        {N_("/_Tool/Show _ruler"),      NULL, compose_toggle_ruler_cb,  0, "<ToggleItem>"},
        {N_("/_Tool/_Address book"),    "<alt>A",       compose_address_cb, 0, NULL},
+       {N_("/_Tool/_Templates ..."),   NULL, template_select_cb, 0, NULL},
        {N_("/_Help"),                  NULL, NULL,     0, "<LastBranch>"},
        {N_("/_Help/_About"),           NULL,           about_show,     0, NULL}
 };
@@ -436,10 +466,20 @@ static GtkTargetEntry compose_mime_types[] =
 
 Compose * compose_new(PrefsAccount *account)
 {
-       return compose_new_with_recipient(account, NULL);
+       return compose_generic_new(account, NULL, NULL);
 }
 
 Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
+{
+       return compose_generic_new(account, to, NULL);
+}
+
+Compose * compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+{
+       return compose_generic_new(account, NULL, item);
+}
+
+Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem *item)
 {
        Compose *compose;
 
@@ -448,6 +488,7 @@ Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
 
        compose = compose_create(account);
        compose->mode = COMPOSE_NEW;
+       compose->replyinfo = NULL;
 
        if (prefs_common.auto_sig)
                compose_insert_sig(compose);
@@ -458,10 +499,26 @@ Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
                if (to) {
                        compose_entry_append(compose, to, COMPOSE_TO);
                        gtk_widget_grab_focus(compose->subject_entry);
+               } else {
+                       if(item && item->prefs->enable_default_to) {
+                               compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
+                       } else {
+                               gtk_widget_grab_focus(compose->to_entry);
+                       }
+               }
+               if(item && item->prefs->request_return_receipt) {
+                       GtkItemFactory *ifactory;
+               
+                       ifactory = gtk_item_factory_from_widget(compose->menubar);
+                       menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+               }
+       } else {
+               if (to) {
+                       compose_entry_append(compose, to, COMPOSE_NEWSGROUPS);
+                       gtk_widget_grab_focus(compose->subject_entry);
                } else
-                       gtk_widget_grab_focus(compose->to_entry);
-       } else
-               gtk_widget_grab_focus(compose->newsgroups_entry);
+                       gtk_widget_grab_focus(compose->newsgroups_entry);
+       }
 
        return compose;
 }
@@ -474,8 +531,49 @@ msginfo->folder->folder->change_flags(msginfo->folder->folder, \
                                      msginfo); \
 }
 
+/*
+Compose * compose_new_followup_and_replyto(PrefsAccount *account,
+                                          const gchar *followupto, gchar * to)
+{
+       Compose *compose;
+
+       if (!account) account = cur_account;
+       g_return_val_if_fail(account != NULL, NULL);
+       g_return_val_if_fail(account->protocol != A_NNTP, NULL);
+
+       compose = compose_create(account);
+       compose->mode = COMPOSE_NEW;
+
+       if (prefs_common.auto_sig)
+               compose_insert_sig(compose);
+       gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
+       gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+
+       compose_entry_append(compose, to, COMPOSE_TO);
+       compose_entry_append(compose, followupto, COMPOSE_NEWSGROUPS);
+       gtk_widget_grab_focus(compose->subject_entry);
+
+       return compose;
+}
+*/
+
 void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
-                  gboolean to_author)
+                  gboolean ignore_replyto)
+{
+       compose_generic_reply(msginfo, quote, to_all, ignore_replyto, FALSE);
+}
+
+void compose_followup_and_reply_to(MsgInfo *msginfo, gboolean quote,
+                                  gboolean to_all,
+                                  gboolean ignore_replyto)
+{
+       compose_generic_reply(msginfo, quote, to_all, ignore_replyto, TRUE);
+}
+
+static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
+                                 gboolean to_all,
+                                 gboolean ignore_replyto,
+                                 gboolean followup_and_reply_to)
 {
        Compose *compose;
        PrefsAccount *account;
@@ -486,29 +584,60 @@ void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
        g_return_if_fail(msginfo->folder != NULL);
 
        account = msginfo->folder->folder->account;
+       if (!account && msginfo->to && prefs_common.reply_account_autosel) {
+               gchar *to;
+               Xstrdup_a(to, msginfo->to, return);
+               extract_address(to);
+               account = account_find_from_address(to);
+       }
+        if(!account&& prefs_common.reply_account_autosel) {
+                       gchar cc[BUFFSIZE];
+               if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+                       extract_address(cc);
+                       account = account_find_from_address(cc);
+                }        
+       }
+
        if (!account) account = cur_account;
        g_return_if_fail(account != NULL);
 
-       if (to_author && account->protocol == A_NNTP) {
+       if (ignore_replyto && account->protocol == A_NNTP &&
+           !followup_and_reply_to) {
                reply_account =
-                       account_find_mail_from_address(account->address);
+                       account_find_from_address(account->address);
                if (!reply_account)
                        reply_account = compose_current_mail_account();
                if (!reply_account)
                        return;
        } else
                reply_account = account;
-
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_FORWARDED);
-       MSG_SET_FLAGS(msginfo->flags, MSG_REPLIED);
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
 
        CHANGE_FLAGS(msginfo);
 
        compose = compose_create(reply_account);
        compose->mode = COMPOSE_REPLY;
+       compose->replyinfo = msginfo;
+
+
+       if (followup_and_reply_to) {
+               gtk_widget_show(compose->to_hbox);
+               gtk_widget_show(compose->to_entry);
+               gtk_table_set_row_spacing(GTK_TABLE(compose->table), 1, 4);
+               compose->use_to = TRUE;
+       }
+
+       if(msginfo->folder && msginfo->folder->prefs->request_return_receipt) {
+               GtkItemFactory *ifactory;
+       
+               ifactory = gtk_item_factory_from_widget(compose->menubar);
+               menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
+       }
 
        if (compose_parse_header(compose, msginfo) < 0) return;
-       compose_reply_set_entry(compose, msginfo, to_all, to_author);
+       compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
+                               followup_and_reply_to);
 
        text = GTK_STEXT(compose->text);
        gtk_stext_freeze(text);
@@ -520,11 +649,27 @@ void compose_reply(MsgInfo *msginfo, gboolean quote, gboolean to_all,
                if ((fp = procmime_get_text_part(msginfo)) == NULL)
                        g_warning(_("Can't get text part\n"));
                else {
+                       gchar * qmark;
+
+                       if (prefs_common.quotemark && *prefs_common.quotemark)
+                               qmark = prefs_common.quotemark;
+                       else
+                               qmark = "> ";
+
+                       quote_str = compose_quote_fmt(compose, msginfo,
+                                                     prefs_common.quotefmt,
+                                                     qmark);
+
+                       /*
                        quote_str = compose_quote_parse_fmt
                                (compose, msginfo, prefs_common.quotefmt);
-                       gtk_stext_insert(text, NULL, NULL, NULL, quote_str, -1);
-                       g_free(quote_str);
-                       compose_quote_file(compose, msginfo, fp);
+                       */
+
+                       if (quote_str != NULL)
+                               gtk_stext_insert(text, NULL, NULL, NULL,
+                                                quote_str, -1);
+                       /*                      g_free(quote_str); */
+                       /* compose_quote_file(compose, msginfo, fp); */
                        fclose(fp);
                }
        }
@@ -549,12 +694,23 @@ static gchar *procmime_get_file_name(MimeInfo *mimeinfo)
        base = mimeinfo->filename ? mimeinfo->filename
                : mimeinfo->name ? mimeinfo->name : NULL;
 
-       if (MIME_TEXT_HTML == mimeinfo->mime_type && base == NULL)
-               base = "mimetmp.html";
+       if (MIME_TEXT_HTML == mimeinfo->mime_type && base == NULL){
+               filename = g_strdup_printf("%s%smimetmp%i.html",
+                                          get_mime_tmp_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          mimeinfo);
+               return filename;
+       }
        else {
-               base = base ? base : "mimetmp";
+               base = base ? base : "";
                base = g_basename(base);
-               if (*base == '\0') base = "mimetmp";
+               if (*base == '\0') {
+                       filename = g_strdup_printf("%s%smimetmp%i",
+                                                  get_mime_tmp_dir(),
+                                                  G_DIR_SEPARATOR_S,
+                                                  mimeinfo);
+                       return filename;
+               }
        }
 
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
@@ -605,7 +761,7 @@ static void compose_attach_parts(Compose * compose,
 
                if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
                    rfc2015_is_encrypted(mimeinfo)) {
-                       MSG_SET_FLAGS(msginfo->flags, MSG_ENCRYPTED);
+                       MSG_SET_TMP_FLAGS(msginfo->flags, MSG_ENCRYPTED);
                }
                if (MSG_IS_ENCRYPTED(msginfo->flags) &&
                    !msginfo->plaintext_file  &&
@@ -627,6 +783,8 @@ static void compose_attach_parts(Compose * compose,
 
        fclose(fp);
        if (!mimeinfo) return;
+       if (mimeinfo->mime_type == MIME_TEXT)
+               return;
 
        if ((fp = procmsg_open_message(msginfo)) == NULL) return;
 
@@ -700,8 +858,9 @@ static void compose_attach_parts(Compose * compose,
                {
                        filename = mime_extract_file(source, mimeinfo);
 
-                       compose_attach_append(compose, filename,
-                                             mimeinfo->mime_type);
+                       compose_attach_append_with_type(compose, filename,
+                                                       mimeinfo->content_type,
+                                                       mimeinfo->mime_type);
 
                        g_free(filename);
                }
@@ -710,8 +869,9 @@ static void compose_attach_parts(Compose * compose,
                {
                        filename = mime_extract_file(source, mimeinfo->sub);
 
-                       compose_attach_append(compose, filename,
-                                             mimeinfo->sub->mime_type);
+                       compose_attach_append_with_type(compose, filename,
+                                                       mimeinfo->content_type,
+                                                       mimeinfo->sub->mime_type);
 
                        g_free(filename);
                }
@@ -723,8 +883,9 @@ static void compose_attach_parts(Compose * compose,
                while (child) {
                        filename = mime_extract_file(source, child);
 
-                       compose_attach_append(compose, filename,
-                                             child->mime_type);
+                       compose_attach_append_with_type(compose, filename,
+                                                       child->content_type,
+                                                       child->mime_type);
 
                        g_free(filename);
 
@@ -757,15 +918,33 @@ Compose * compose_forward(PrefsAccount * account, MsgInfo *msginfo,
        g_return_val_if_fail(msginfo != NULL, NULL);
        g_return_val_if_fail(msginfo->folder != NULL, NULL);
 
-       if (account == NULL) {
+       account = msginfo->folder->folder->account;
+        if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+               gchar *to;
+               Xstrdup_a(to, msginfo->to, return);
+               extract_address(to);
+               account = account_find_from_address(to);
+       }
+
+        if(!account&& prefs_common.forward_account_autosel) {
+                       gchar cc[BUFFSIZE];
+               if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+                       extract_address(cc);
+                       account = account_find_from_address(cc);
+                }
+       }
+
+        if (account == NULL) {
+               account = cur_account;
+               /*
                account = msginfo->folder->folder->account;
                if (!account) account = cur_account;
+               */
        }
        g_return_val_if_fail(account != NULL, NULL);
 
-       MSG_UNSET_FLAGS(msginfo->flags, MSG_REPLIED);
-       MSG_SET_FLAGS(msginfo->flags, MSG_FORWARDED);
-
+       MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
+       MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
        CHANGE_FLAGS(msginfo);
 
        compose = compose_create(account);
@@ -792,25 +971,31 @@ Compose * compose_forward(PrefsAccount * account, MsgInfo *msginfo,
 
                g_free(msgfile);
        } else {
+               FILE *fp;
+               gchar *quote_str;
+
                if ((fp = procmime_get_text_part(msginfo)) == NULL)
                        g_warning(_("Can't get text part\n"));
                else {
-                       /* insert header */
-                       gtk_stext_insert(text, NULL, NULL, NULL,
-                                       _("\n\nBegin forwarded message:\n\n"), -1);
-                       INSERT_FW_HEADER(date,       "Date: ");
-                       INSERT_FW_HEADER(from,       "From: ");
-                       INSERT_FW_HEADER(to,         "To: ");
-                       INSERT_FW_HEADER(newsgroups, "Newsgroups: ");
-                       INSERT_FW_HEADER(subject,    "Subject: ");
-                       gtk_stext_insert(text, NULL, NULL, NULL, "\n\n", 2);
-
-                       /* forward body */
-                       while (fgets(buf, sizeof(buf), fp) != NULL)
+                       gchar * qmark;
+
+                       if (prefs_common.fw_quotemark &&
+                           *prefs_common.fw_quotemark)
+                               qmark = prefs_common.fw_quotemark;
+                       else
+                               qmark = "> ";
+
+                       quote_str = compose_quote_fmt(compose, msginfo,
+                                                     prefs_common.fw_quotefmt,
+                                                     qmark);
+
+                       if (quote_str != NULL)
                                gtk_stext_insert(text, NULL, NULL, NULL,
-                                               buf, -1);
+                                                quote_str, -1);
+
                        fclose(fp);
                }
+
                compose_attach_parts(compose, msginfo);
        }
 
@@ -830,6 +1015,60 @@ Compose * compose_forward(PrefsAccount * account, MsgInfo *msginfo,
 
 #undef INSERT_FW_HEADER
 
+Compose * compose_forward_multiple(PrefsAccount * account, 
+                         GSList *msginfo_list) 
+{
+       Compose *compose;
+       GtkSText *text;
+       GSList *msginfo;
+       gchar *msgfile;
+
+       g_return_val_if_fail(msginfo_list != NULL, NULL);
+       
+       for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
+               if ( ((MsgInfo *)msginfo->data)->folder == NULL )
+                       return NULL;
+       }
+
+       if (account == NULL) {
+               account = cur_account;
+               /*
+               account = msginfo->folder->folder->account;
+               if (!account) account = cur_account;
+               */
+       }
+       g_return_val_if_fail(account != NULL, NULL);
+
+       compose = compose_create(account);
+       compose->mode = COMPOSE_FORWARD;
+
+       text = GTK_STEXT(compose->text);
+       gtk_stext_freeze(text);
+
+       for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
+               msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
+               if (!is_file_exist(msgfile))
+                       g_warning(_("%s: file not exist\n"), msgfile);
+               else
+                       compose_attach_append(compose, msgfile,
+                               MIME_MESSAGE_RFC822);
+               g_free(msgfile);
+       }
+
+       if (prefs_common.auto_sig)
+               compose_insert_sig(compose);
+       gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
+       gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+
+       gtk_stext_thaw(text);
+       if (account->protocol != A_NNTP)
+               gtk_widget_grab_focus(compose->to_entry);
+       else
+               gtk_widget_grab_focus(compose->newsgroups_entry);
+
+       return compose;
+}
+
 void compose_reedit(MsgInfo *msginfo)
 {
        Compose *compose;
@@ -841,12 +1080,21 @@ void compose_reedit(MsgInfo *msginfo)
        g_return_if_fail(msginfo != NULL);
        g_return_if_fail(msginfo->folder != NULL);
 
-       account = msginfo->folder->folder->account;
-       if (!account) account = cur_account;
+        account = msginfo->folder->folder->account;
+
+        if(!account&& prefs_common.reedit_account_autosel) {
+                       gchar from[BUFFSIZE];
+               if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
+                       extract_address(from);
+                       account = account_find_from_address(from);
+                }
+       }
+        if (!account) account = cur_account;
        g_return_if_fail(account != NULL);
 
        compose = compose_create(account);
-       compose->mode = COMPOSE_REEDIT_DRAFT;
+       compose->mode = COMPOSE_REEDIT;
+
        compose->targetinfo = procmsg_msginfo_copy(msginfo);
 
        if (compose_parse_header(compose, msginfo) < 0) return;
@@ -942,7 +1190,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                hentry[H_CC].body = NULL;
        }
        if (hentry[H_REFERENCES].body != NULL) {
-               if (compose->mode == COMPOSE_REEDIT_DRAFT)
+               if (compose->mode == COMPOSE_REEDIT)
                        compose->references = hentry[H_REFERENCES].body;
                else {
                        compose->references = compose_parse_references
@@ -952,7 +1200,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                hentry[H_REFERENCES].body = NULL;
        }
        if (hentry[H_BCC].body != NULL) {
-               if (compose->mode == COMPOSE_REEDIT_DRAFT) {
+               if (compose->mode == COMPOSE_REEDIT) {
                        conv_unmime_header_overwrite(hentry[H_BCC].body);
                        compose->bcc = hentry[H_BCC].body;
                } else
@@ -969,9 +1217,9 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
                hentry[H_FOLLOWUP_TO].body = NULL;
        }
 
-       if (compose->mode == COMPOSE_REEDIT_DRAFT && msginfo->inreplyto)
+       if (compose->mode == COMPOSE_REEDIT && msginfo->inreplyto)
                compose->inreplyto = g_strdup(msginfo->inreplyto);
-       else if (compose->mode != COMPOSE_REEDIT_DRAFT &&
+       else if (compose->mode != COMPOSE_REEDIT &&
                 msginfo->msgid && *msginfo->msgid) {
                compose->inreplyto = g_strdup(msginfo->msgid);
 
@@ -1041,6 +1289,7 @@ static gchar *compose_parse_references(const gchar *ref, const gchar *msgid)
        return new_ref_str;
 }
 
+/*
 static void compose_quote_file(Compose *compose, MsgInfo *msginfo, FILE *fp)
 {
        GtkSText *text = GTK_STEXT(compose->text);
@@ -1055,7 +1304,7 @@ static void compose_quote_file(Compose *compose, MsgInfo *msginfo, FILE *fp)
        gint str_len;
        gint ch_len;
 
-       /* if (prefs_common.enable_color) qcolor = &quote_color; */
+       // if (prefs_common.enable_color) qcolor = &quote_color;
        if (prefs_common.quotemark && *prefs_common.quotemark)
                qmark = prefs_common.quotemark;
        else
@@ -1141,7 +1390,9 @@ static void compose_quote_file(Compose *compose, MsgInfo *msginfo, FILE *fp)
 
        g_free(quote_str);
 }
+*/
 
+/*
 static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
                                      const gchar *fmt)
 {
@@ -1185,7 +1436,7 @@ static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
                                str = msginfo->from;
                                sp++;
                                break;
-                       case 'I':       /* initial */
+                       case 'I':
                                if (!msginfo->fromname) {sp++; break;}
                                p = msginfo->fromname;
                                tmp[0] = tmp[1] = tmp[2] = '\0';
@@ -1228,6 +1479,10 @@ static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
                                str = msginfo->to;
                                sp++;
                                break;
+                       case 'c':
+                               str = msginfo->cc;
+                               sp++;
+                               break;
                        case 'i':
                                if (!msginfo->msgid) {sp++; break;}
                                Xalloca(str, strlen(msginfo->msgid) + 3,
@@ -1296,9 +1551,11 @@ static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
 
        return ext_str;
 }
+*/
 
 static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
-                                   gboolean to_all, gboolean to_author)
+                                   gboolean to_all, gboolean ignore_replyto,
+                                   gboolean followup_and_reply_to)
 {
        GSList *cc_list;
        GSList *cur;
@@ -1308,9 +1565,9 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        g_return_if_fail(compose->account != NULL);
        g_return_if_fail(msginfo != NULL);
 
-       if (compose->account->protocol != A_NNTP)
+       if ((compose->account->protocol != A_NNTP) || followup_and_reply_to)
                gtk_entry_set_text(GTK_ENTRY(compose->to_entry),
-                                  ( (compose->replyto && !to_author
+                                  ( (compose->replyto && !ignore_replyto
                                     ? compose->replyto
                                     : msginfo->from ? msginfo->from : ""));
        if (compose->account->protocol == A_NNTP)
@@ -1413,6 +1670,49 @@ static void compose_reedit_set_entry(Compose *compose, MsgInfo *msginfo)
 
 #undef SET_ENTRY
 
+static void compose_exec_sig(Compose *compose, gchar *sigfile)
+{
+       FILE *tmpfp;
+       pid_t thepid;
+       gchar *sigtext;
+       FILE  *sigprg;
+       gchar  *buf;
+       size_t buf_len = 128;
+       if (strlen(sigfile) < 2)
+         return;
+       sigprg = popen(sigfile+1, "r");
+       if (sigprg) {
+
+               buf = g_malloc(buf_len);
+
+               if (!buf) {
+                       gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+                       "Unable to insert signature (malloc failed)\n", -1);
+
+                       pclose(sigprg);
+                       return;
+               }
+
+               while (!feof(sigprg)) {
+                       bzero(buf, buf_len);
+                       fread(buf, buf_len-1, 1, sigprg);
+                       gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, buf, -1);
+               }
+
+               g_free(buf);
+               pclose(sigprg);
+       }
+       else
+       {
+               gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+               "Can't exec file: ", -1);
+               gtk_stext_insert(GTK_STEXT(compose->text), NULL, NULL, NULL, \
+               sigfile+1, -1);
+       }
+}
+
 static void compose_insert_sig(Compose *compose)
 {
        gchar *sigfile;
@@ -1424,7 +1724,7 @@ static void compose_insert_sig(Compose *compose)
                                      DEFAULT_SIGNATURE, NULL);
        }
 
-       if (!is_file_or_fifo_exist(sigfile)) {
+       if (!is_file_or_fifo_exist(sigfile) & (sigfile[0] != '|')) {
                g_free(sigfile);
                return;
        }
@@ -1437,7 +1737,14 @@ static void compose_insert_sig(Compose *compose)
                                "\n", 1);
        }
 
-       compose_insert_file(compose, sigfile);
+       if (sigfile[0] == '|')
+       {
+               compose_exec_sig(compose, sigfile);
+       }
+       else
+       {
+               compose_insert_file(compose, sigfile);
+       }
        g_free(sigfile);
 }
 
@@ -1464,6 +1771,73 @@ static void compose_insert_file(Compose *compose, const gchar *file)
        fclose(fp);
 }
 
+static void compose_attach_info(Compose * compose, AttachInfo * ainfo,
+                               ContentType cnttype)
+{
+       gchar *text[N_ATTACH_COLS];
+       gint row;
+
+       text[COL_MIMETYPE] = ainfo->content_type;
+       text[COL_SIZE] = to_human_readable(ainfo->size);
+       text[COL_NAME] = ainfo->name;
+
+       row = gtk_clist_append(GTK_CLIST(compose->attach_clist), text);
+       gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
+
+       if (cnttype != MIME_MESSAGE_RFC822)
+               compose_changed_cb(NULL, compose);
+}
+
+static void compose_attach_append_with_type(Compose *compose,
+                                           const gchar *file,
+                                           const gchar *type,
+                                           ContentType cnttype)
+{
+       AttachInfo *ainfo;
+       off_t size;
+
+       if (!is_file_exist(file)) {
+               g_warning(_("File %s doesn't exist\n"), file);
+               return;
+       }
+       if ((size = get_file_size(file)) < 0) {
+               g_warning(_("Can't get file size of %s\n"), file);
+               return;
+       }
+       if (size == 0) {
+               alertpanel_notice(_("File %s is empty\n"), file);
+               return;
+       }
+
+       if (!compose->use_attach) {
+               GtkItemFactory *ifactory;
+               GtkWidget *menuitem;
+
+               ifactory = gtk_item_factory_from_widget(compose->menubar);
+               menuitem = gtk_item_factory_get_item(ifactory,
+                                                    "/Message/Attach");
+               gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+                                              TRUE);
+       }
+
+       ainfo = g_new0(AttachInfo, 1);
+       ainfo->file = g_strdup(file);
+
+       if (cnttype == MIME_MESSAGE_RFC822) {
+               ainfo->encoding = ENC_7BIT;
+               ainfo->name = g_strdup_printf(_("Message: %s"),
+                                             g_basename(file));
+       } else {
+               ainfo->encoding = ENC_BASE64;
+               ainfo->name = g_strdup(g_basename(file));
+       }
+
+       ainfo->content_type = g_strdup(type);
+       ainfo->size = size;
+
+       compose_attach_info(compose, ainfo, cnttype);
+}
+
 static void compose_attach_append(Compose *compose, const gchar *file,
                                  ContentType cnttype)
 {
@@ -1514,15 +1888,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
        }
        ainfo->size = size;
 
-       text[COL_MIMETYPE] = ainfo->content_type;
-       text[COL_SIZE] = to_human_readable(size);
-       text[COL_NAME] = ainfo->name;
-
-       row = gtk_clist_append(GTK_CLIST(compose->attach_clist), text);
-       gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
-
-       if (cnttype != MIME_MESSAGE_RFC822)
-               compose_changed_cb(NULL, compose);
+       compose_attach_info(compose, ainfo, cnttype);
 }
 
 static void compose_wrap_line(Compose *compose)
@@ -1689,10 +2055,13 @@ gint compose_send(Compose *compose)
        if (compose->to_list) {
                PrefsAccount *ac;
 
+               /*
                if (compose->account->protocol != A_NNTP)
                        ac = compose->account;
                else if (compose->orig_account->protocol != A_NNTP)
                        ac = compose->orig_account;
+               else if (cur_account && cur_account->protocol != A_NNTP)
+                       ac = cur_account;
                else {
                        ac = compose_current_mail_account();
                        if (!ac) {
@@ -1701,6 +2070,9 @@ gint compose_send(Compose *compose)
                                return -1;
                        }
                }
+               */
+               ac = compose->account;
+
                ok = send_message(tmp, ac, compose->to_list);
                statusbar_pop_all();
        }
@@ -1740,6 +2112,13 @@ gint compose_send(Compose *compose)
                        }
                } else
                        alertpanel_error(_("Error occurred while sending the message."));
+       } else {
+               if (compose->mode == COMPOSE_REEDIT) {
+                       compose_remove_reedit_target(compose);
+                       if (compose->targetinfo)
+                               folderview_update_item
+                                       (compose->targetinfo->folder, TRUE);
+               }
        }
 
        /* save message to outbox */
@@ -1809,7 +2188,7 @@ static gint compose_write_to_file(Compose *compose, const gchar *file,
                (compose, fp, out_codeset, encoding, is_draft) < 0) {
                g_warning(_("can't write headers\n"));
                fclose(fp);
-               unlink(file);
+               /* unlink(file); */
                g_free(buf);
                return -1;
        }
@@ -1945,7 +2324,8 @@ static gint compose_save_to_outbox(Compose *compose, const gchar *file)
                MsgInfo newmsginfo;
 
                newmsginfo.msgnum = num;
-               newmsginfo.flags = 0;
+               newmsginfo.flags.perm_flags = 0;
+               newmsginfo.flags.tmp_flags = 0;
                procmsg_write_flags(&newmsginfo, fp);
                fclose(fp);
        }
@@ -1954,6 +2334,29 @@ static gint compose_save_to_outbox(Compose *compose, const gchar *file)
        return 0;
 }
 
+static gint compose_remove_reedit_target(Compose *compose)
+{
+       FolderItem *item;
+       MsgInfo *msginfo = compose->targetinfo;
+
+       g_return_val_if_fail(compose->mode == COMPOSE_REEDIT, -1);
+       if (!msginfo) return -1;
+
+       item = msginfo->folder;
+       g_return_val_if_fail(item != NULL, -1);
+
+       folder_item_scan(item);
+       if (procmsg_msg_exist(msginfo) &&
+           (item->stype == F_DRAFT || item->stype == F_QUEUE)) {
+               if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
+                       g_warning(_("can't remove the old message\n"));
+                       return -1;
+               }
+       }
+
+       return 0;
+}
+
 static gint compose_queue(Compose *compose, const gchar *file)
 {
        FolderItem *queue;
@@ -2014,6 +2417,8 @@ static gint compose_queue(Compose *compose, const gchar *file)
        for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
                fprintf(fp, ",<%s>", (gchar *)cur->data);
        fprintf(fp, "\n");
+       /* Sylpheed account ID */
+       fprintf(fp, "AID:%d\n", compose->account->account_id);
        fprintf(fp, "\n");
 
        while (fgets(buf, sizeof(buf), src_fp) != NULL) {
@@ -2036,6 +2441,7 @@ static gint compose_queue(Compose *compose, const gchar *file)
        }
 
        queue = folder_get_default_queue();
+
        folder_item_scan(queue);
        queue_path = folder_item_get_path(queue);
        if (!is_dir_exist(queue_path))
@@ -2049,13 +2455,22 @@ static gint compose_queue(Compose *compose, const gchar *file)
        }
        g_free(tmp);
 
+       if (compose->mode == COMPOSE_REEDIT) {
+               compose_remove_reedit_target(compose);
+               if (compose->targetinfo &&
+                   compose->targetinfo->folder != queue)
+                       folderview_update_item
+                               (compose->targetinfo->folder, TRUE);
+       }
+
        if ((fp = procmsg_open_mark_file(queue_path, TRUE)) == NULL)
                g_warning(_("can't open mark file\n"));
        else {
                MsgInfo newmsginfo;
 
                newmsginfo.msgnum = num;
-               newmsginfo.flags = 0;
+               newmsginfo.flags.perm_flags = 0;
+               newmsginfo.flags.tmp_flags = 0;
                procmsg_write_flags(&newmsginfo, fp);
                fclose(fp);
        }
@@ -2158,7 +2573,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                get_rfc822_date(buf, sizeof(buf));
                fprintf(fp, "Date: %s\n", buf);
        }
-       
+
        /* From */
        if (!IS_IN_CUSTOM_HEADER("From")) {
                if (compose->account->name && *compose->account->name) {
@@ -2193,7 +2608,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                        }
                }
        }
-       
+
        slist_free_strings(compose->newsgroup_list);
        g_slist_free(compose->newsgroup_list);
        compose->newsgroup_list = NULL;
@@ -2237,7 +2652,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                        }
                }
        }
-       
+
        /* Bcc */
        if (compose->use_bcc) {
                str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
@@ -2247,12 +2662,9 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                        if (*str != '\0') {
                                compose->to_list = address_list_append
                                        (compose->to_list, str);
-                               if (is_draft) {
-                                       compose_convert_header
-                                               (buf, sizeof(buf), str,
-                                                strlen("Bcc: "));
-                                       fprintf(fp, "Bcc: %s\n", buf);
-                               }
+                               compose_convert_header(buf, sizeof(buf), str,
+                                                      strlen("Bcc: "));
+                               fprintf(fp, "Bcc: %s\n", buf);
                        }
                }
        }
@@ -2367,7 +2779,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                                fprintf(fp, "%s: %s\n", chdr->name, buf);
                }
        }
-       
+
        /* MIME */
        fprintf(fp, "Mime-Version: 1.0\n");
        if (compose->use_attach) {
@@ -2559,6 +2971,8 @@ static Compose *compose_create(PrefsAccount *account)
                           GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
        gtk_widget_realize(window);
 
+       gtkut_widget_set_composer_icon(window);
+
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_container_add(GTK_CONTAINER(window), vbox);
 
@@ -2599,18 +3013,25 @@ static Compose *compose_create(PrefsAccount *account)
        /* header labels and entries */
        compose_add_entry_field(table, &to_hbox, &to_entry, &count,
                                "To:", TRUE); 
+       gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
        compose_add_entry_field(table, &newsgroups_hbox, &newsgroups_entry,
                                &count, "Newsgroups:", FALSE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 1, 4);
        compose_add_entry_field(table, &hbox, &subject_entry, &count,
                                "Subject:", FALSE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 2, 4);
        compose_add_entry_field(table, &cc_hbox, &cc_entry, &count,
                                "Cc:", TRUE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 3, 4);
        compose_add_entry_field(table, &bcc_hbox, &bcc_entry, &count,
                                "Bcc:", TRUE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 4, 4);
        compose_add_entry_field(table, &reply_hbox, &reply_entry, &count,
                                "Reply-To:", TRUE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 5, 4);
        compose_add_entry_field(table, &followup_hbox, &followup_entry, &count,
                                "Followup-To:", FALSE);
+       gtk_table_set_row_spacing(GTK_TABLE(table), 6, 4);
 
        gtk_table_set_col_spacings(GTK_TABLE(table), 4);
 
@@ -2709,9 +3130,12 @@ static Compose *compose_create(PrefsAccount *account)
                            (GTK_SCROLLED_WINDOW(scrolledwin)),
                            gtk_scrolled_window_get_vadjustment
                            (GTK_SCROLLED_WINDOW(scrolledwin)));
+       GTK_STEXT(text)->default_tab_width = 8;
        gtk_stext_set_editable(GTK_STEXT(text), TRUE);
-       gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
-       gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
+       if (prefs_common.smart_wrapping) {      
+               gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
+               gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
+       }               
 
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
@@ -2742,7 +3166,7 @@ static Compose *compose_create(PrefsAccount *account)
 
        style = gtk_widget_get_style(text);
 
-       /* workaround for the slow down of GtkSText when using Pixmap theme */
+       /* workaround for the slow down of GtkText when using Pixmap theme */
        if (style->engine) {
                GtkThemeEngine *engine;
 
@@ -2793,17 +3217,7 @@ static Compose *compose_create(PrefsAccount *account)
        menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
        menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
 
-       gtk_widget_hide(bcc_hbox);
-       gtk_widget_hide(bcc_entry);
-       gtk_widget_hide(reply_hbox);
-       gtk_widget_hide(reply_entry);
-       gtk_widget_hide(followup_hbox);
-       gtk_widget_hide(followup_entry);
-       gtk_widget_hide(ruler_hbox);
-       gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
-       gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
-       gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
-
+       /*
        if (account->protocol == A_NNTP) {
                gtk_widget_hide(to_hbox);
                gtk_widget_hide(to_entry);
@@ -2815,8 +3229,10 @@ static Compose *compose_create(PrefsAccount *account)
                gtk_widget_hide(newsgroups_hbox);
                gtk_widget_hide(newsgroups_entry);
                gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
+
                menu_set_sensitive(ifactory, "/Message/Followup to", FALSE);
        }
+       */
 
        switch (prefs_common.toolbar_style) {
        case TOOLBAR_NONE:
@@ -2890,13 +3306,6 @@ static Compose *compose_create(PrefsAccount *account)
        compose->msgid       = NULL;
        compose->boundary    = NULL;
 
-       compose->use_to         = FALSE;
-       compose->use_cc         = FALSE;
-       compose->use_bcc        = FALSE;
-       compose->use_replyto    = FALSE;
-       compose->use_followupto = FALSE;
-       compose->use_attach     = FALSE;
-
 #if USE_GPGME
        compose->use_signing    = FALSE;
        compose->use_encryption = FALSE;
@@ -2916,6 +3325,11 @@ static Compose *compose_create(PrefsAccount *account)
 
        compose_set_title(compose);
 
+       compose->use_bcc        = FALSE;
+       compose->use_replyto    = FALSE;
+       compose->use_followupto = FALSE;
+
+       /*
        if (account->protocol != A_NNTP) {
                menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
                gtk_check_menu_item_set_active
@@ -2926,13 +3340,17 @@ static Compose *compose_create(PrefsAccount *account)
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
                gtk_widget_set_sensitive(menuitem, FALSE);
        }
+       */
        if (account->set_autocc && account->auto_cc) {
+               compose->use_cc = TRUE;
                gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
                menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
                gtk_check_menu_item_set_active
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
        }
+
        if (account->set_autobcc) {
+               compose->use_bcc = TRUE;
                menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
                gtk_check_menu_item_set_active
                        (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
@@ -2941,6 +3359,7 @@ static Compose *compose_create(PrefsAccount *account)
                                           account->auto_bcc);
        }
        if (account->set_autoreplyto) {
+               compose->use_replyto = TRUE;
                menuitem = gtk_item_factory_get_item(ifactory,
                                                     "/Message/Reply to");
                gtk_check_menu_item_set_active
@@ -2967,16 +3386,43 @@ static Compose *compose_create(PrefsAccount *account)
 
        compose_list = g_list_append(compose_list, compose);
 
+       /*
+       compose->use_to         = FALSE;
+       compose->use_cc         = FALSE;
+       */
+       compose->use_attach     = FALSE;
+
+       if (!compose->use_bcc) {
+               gtk_widget_hide(bcc_hbox);
+               gtk_widget_hide(bcc_entry);
+               gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
+       }
+       if (!compose->use_replyto) {
+               gtk_widget_hide(reply_hbox);
+               gtk_widget_hide(reply_entry);
+               gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
+       }
+       if (!compose->use_followupto) {
+               gtk_widget_hide(followup_hbox);
+               gtk_widget_hide(followup_entry);
+               gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
+       }
+
+       if (!prefs_common.show_ruler)
+               gtk_widget_hide(ruler_hbox);
+
+       select_account(compose, account);
+
        return compose;
 }
 
 #include "pixmaps/stock_mail_send.xpm"
+#include "pixmaps/stock_mail_send_queue.xpm"
 #include "pixmaps/stock_mail.xpm"
 #include "pixmaps/stock_paste.xpm"
 #include "pixmaps/stock_mail_attach.xpm"
 #include "pixmaps/stock_mail_compose.xpm"
 #include "pixmaps/linewrap.xpm"
-//#include "pixmaps/tb_mail_queue_send.xpm"
 #include "pixmaps/tb_address_book.xpm"
 
 #define CREATE_TOOLBAR_ICON(xpm_d) \
@@ -3018,8 +3464,8 @@ static void compose_toolbar_create(Compose *compose, GtkWidget *container)
                                           "Send",
                                           icon_wid, toolbar_send_cb, compose);
 
-       CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
-       //CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm);
+       CREATE_TOOLBAR_ICON(stock_mail_send_queue_xpm);
+       /* CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm); */
        sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                                           _("Send later"),
                                           _("Put into queue folder and send later"),
@@ -3131,8 +3577,8 @@ static GtkWidget *compose_account_option_menu_create(Compose *compose)
 
                if (ac == compose->account) def_menu = num;
 
-               name = g_strdup_printf("%s <%s> (%s)",
-                                      ac->name, ac->address, ac->account_name);
+               name = g_strdup_printf("%s: %s <%s>",
+                                      ac->account_name, ac->name, ac->address);
                MENUITEM_ADD(menu, menuitem, name, ac);
                g_free(name);
                gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
@@ -3231,8 +3677,8 @@ static void compose_attach_property(Compose *compose)
        GtkCList *clist = GTK_CLIST(compose->attach_clist);
        AttachInfo *ainfo;
        gint row;
-       gboolean cancelled;
        GtkOptionMenu *optmenu;
+       static gboolean cancelled;
 
        if (!clist->selection) return;
        row = GPOINTER_TO_INT(clist->selection->data);
@@ -3267,7 +3713,8 @@ static void compose_attach_property(Compose *compose)
                GtkWidget *menu;
                GtkWidget *menuitem;
 
-               gtk_main();
+               cancelled = FALSE;
+                gtk_main();
 
                if (cancelled == TRUE) {
                        gtk_widget_hide(attach_prop.window);
@@ -3363,6 +3810,7 @@ static void compose_attach_property_create(gboolean *cancelled)
        GtkWidget *hbbox;
        GtkWidget *ok_btn;
        GtkWidget *cancel_btn;
+       GList     *mime_type_list, *strlist;
 
        debug_print("Creating attach_property window...\n");
 
@@ -3387,7 +3835,32 @@ static void compose_attach_property_create(gboolean *cancelled)
        gtk_table_set_row_spacings(GTK_TABLE(table), 8);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
-       SET_LABEL_AND_ENTRY(_("MIME type"), mimetype_entry, 0);
+       label = gtk_label_new(_("MIME type")); 
+       gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, (0 + 1), 
+                        GTK_FILL, 0, 0, 0); 
+       gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); 
+       mimetype_entry = gtk_combo_new(); 
+       gtk_table_attach(GTK_TABLE(table), mimetype_entry, 1, 2, 0, (0 + 1), 
+                        GTK_EXPAND|GTK_SHRINK|GTK_FILL, 0, 0, 0);
+                        
+       /* stuff with list */
+       mime_type_list = procmime_get_mime_type_list();
+       strlist = NULL;
+       for (; mime_type_list != NULL; mime_type_list = mime_type_list->next) {
+               MimeType *type = (MimeType *) mime_type_list->data;
+               strlist = g_list_append(strlist, 
+                               g_strdup_printf("%s/%s",
+                                       type->type, type->sub_type));
+       }
+       
+       gtk_combo_set_popdown_strings(GTK_COMBO(mimetype_entry), strlist);
+
+       for (mime_type_list = strlist; mime_type_list != NULL; 
+               mime_type_list = mime_type_list->next)
+               g_free(mime_type_list->data);
+       g_list_free(strlist);
+                        
+       mimetype_entry = GTK_COMBO(mimetype_entry)->entry;                       
 
        label = gtk_label_new(_("Encoding"));
        gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2,
@@ -3796,6 +4269,85 @@ static void toolbar_address_cb(GtkWidget *widget, gpointer data)
        compose_address_cb(data, 0, NULL);
 }
 
+static void select_account(Compose * compose, PrefsAccount * ac)
+{
+               compose->account = ac;
+               compose_set_title(compose);
+
+               if (ac->protocol == A_NNTP) {
+                       GtkItemFactory *ifactory;
+                       GtkWidget *menuitem;
+
+                       ifactory = gtk_item_factory_from_widget(compose->menubar);
+                       menu_set_sensitive(ifactory,
+                                          "/Message/Followup to", TRUE);
+
+                       gtk_widget_show(compose->newsgroups_hbox);
+                       gtk_widget_show(compose->newsgroups_entry);
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 1, 4);
+
+                       compose->use_to = FALSE;
+                       compose->use_cc = FALSE;
+
+                       menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
+                       gtk_check_menu_item_set_active
+                               (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+                       menu_set_sensitive(ifactory,
+                                          "/Message/To", TRUE);
+                       menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
+                       gtk_check_menu_item_set_active
+                               (GTK_CHECK_MENU_ITEM(menuitem), FALSE);
+
+                       gtk_widget_hide(compose->to_hbox);
+                       gtk_widget_hide(compose->to_entry);
+                       gtk_widget_hide(compose->cc_hbox);
+                       gtk_widget_hide(compose->cc_entry);
+
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 0, 0);
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 3, 0);
+               }
+               else {
+                       GtkItemFactory *ifactory;
+                       GtkWidget *menuitem;
+
+                       ifactory = gtk_item_factory_from_widget(compose->menubar);
+                       menu_set_sensitive(ifactory,
+                                          "/Message/Followup to", FALSE);
+
+                       gtk_entry_set_text(GTK_ENTRY(compose->newsgroups_entry), "");
+                       gtk_widget_hide(compose->newsgroups_hbox);
+                       gtk_widget_hide(compose->newsgroups_entry);
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 1, 0);
+
+                       compose->use_to = TRUE;
+                       compose->use_cc = TRUE;
+
+                       menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
+                       gtk_check_menu_item_set_active
+                               (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+                       menu_set_sensitive(ifactory,
+                                          "/Message/To", FALSE);
+                       menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
+                       gtk_check_menu_item_set_active
+                               (GTK_CHECK_MENU_ITEM(menuitem), TRUE);
+
+                       gtk_widget_show(compose->to_hbox);
+                       gtk_widget_show(compose->to_entry);
+                       gtk_widget_show(compose->cc_hbox);
+                       gtk_widget_show(compose->cc_entry);
+
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 0, 4);
+                       gtk_table_set_row_spacing(GTK_TABLE(compose->table),
+                                                 3, 4);
+               }
+               gtk_widget_queue_resize(compose->table_vbox);
+}
+
 static void account_activated(GtkMenuItem *menuitem, gpointer data)
 {
        Compose *compose = (Compose *)data;
@@ -3805,10 +4357,8 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
        ac = (PrefsAccount *)gtk_object_get_user_data(GTK_OBJECT(menuitem));
        g_return_if_fail(ac != NULL);
 
-       if (ac != compose->account) {
-               compose->account = ac;
-               compose_set_title(compose);
-       }
+       if (ac != compose->account)
+               select_account(compose, ac);
 }
 
 static void attach_selected(GtkCList *clist, gint row, gint column,
@@ -3914,15 +4464,8 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
        gchar *tmp;
 
        draft = folder_get_default_draft();
-       folder_item_scan(draft);
 
-       if (procmsg_msg_exist(compose->targetinfo) &&
-           compose->targetinfo->folder == draft) {
-               if (folder_item_remove_msg(draft,
-                                          compose->targetinfo->msgnum) < 0)
-                       g_warning(_("can't remove the old draft message\n"));
-       }
-       tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
+        tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
                              G_DIR_SEPARATOR, (gint)compose);
 
        if (compose_write_to_file(compose, tmp, TRUE) < 0) {
@@ -3930,15 +4473,24 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                return;
        }
 
+       folder_item_scan(draft);
        if (folder_item_add_msg(draft, tmp, TRUE) < 0) {
                unlink(tmp);
                g_free(tmp);
                return;
        }
-
        g_free(tmp);
 
-       //folderview_scan_folder_a(DRAFT_DIR, TRUE);
+       if (compose->mode == COMPOSE_REEDIT) {
+               compose_remove_reedit_target(compose);
+               if (compose->targetinfo &&
+                   compose->targetinfo->folder != draft)
+                       folderview_update_item(compose->targetinfo->folder,
+                                              TRUE);
+       }
+
+       folder_item_scan(draft);
+       folderview_update_item(draft, TRUE);
 
        gtk_widget_destroy(compose->window);
 }
@@ -3946,24 +4498,40 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
 static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
 {
        Compose *compose = (Compose *)data;
-       gchar *file;
+       GList *file_list;
+
+       file_list = filesel_select_multiple_files(_("Select file"), NULL);
 
-       file = filesel_select_file(_("Select file"), NULL);
+       if (file_list) {
+               GList *tmp;
 
-       if (file)
-               compose_attach_append(compose, file, MIME_UNKNOWN);
+               for ( tmp = file_list; tmp; tmp = tmp->next) {
+                       gchar *file = (gchar *) tmp->data;
+                       compose_attach_append(compose, file, MIME_UNKNOWN);
+                       g_free(file);
+               }
+               g_list_free(file_list);
+       }               
 }
 
 static void compose_insert_file_cb(gpointer data, guint action,
                                   GtkWidget *widget)
 {
        Compose *compose = (Compose *)data;
-       gchar *file;
+       GList *file_list;
+
+       file_list = filesel_select_multiple_files(_("Select file"), NULL);
 
-       file = filesel_select_file(_("Select file"), NULL);
+       if (file_list) {
+               GList *tmp;
 
-       if (file)
-               compose_insert_file(compose, file);
+               for ( tmp = file_list; tmp; tmp = tmp->next) {
+                       gchar *file = (gchar *) tmp->data;
+                       compose_insert_file(compose, file);
+                       g_free(file);
+               }
+               g_list_free(file_list);
+       }
 }
 
 static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
@@ -4374,3 +4942,98 @@ static void compose_toggle_return_receipt_cb(gpointer data, guint action,
        else
                compose->return_receipt = FALSE;
 }
+
+static gchar *compose_quote_fmt                (Compose        *compose,
+                                        MsgInfo        *msginfo,
+                                        const gchar    *fmt,
+                                        const gchar    *qmark)
+{
+       gchar * quote_str = NULL;
+
+       if (qmark != NULL) {
+               gchar * p;
+
+               quote_fmt_init(msginfo, NULL);
+               quote_fmt_scan_string(qmark);
+               quote_fmtparse();
+
+               p = quote_fmt_get_buffer();
+               if (p == NULL) {
+                       alertpanel_error
+                               (_("Quote mark format error."));
+               }
+               else {
+                       quote_str = alloca(strlen(p) + 1);
+                       strcpy(quote_str, p);
+               }
+       }
+
+       quote_fmt_init(msginfo, quote_str);
+       quote_fmt_scan_string(fmt);
+       quote_fmtparse();
+
+       if (quote_fmt_get_buffer() == NULL)
+               alertpanel_error
+                       (_("Message reply/forward format error."));
+
+       return quote_fmt_get_buffer();
+}
+
+static void template_apply_cb(gchar *s, gpointer data)
+{
+       Compose *compose = (Compose*)data;
+       GtkSText *text = GTK_STEXT(compose->text);
+       gchar *quote_str;
+       gchar *qmark;
+       gchar *parsed_text;
+       gchar *tmpl;
+       gchar *old_tmpl = s;
+
+       if(!s) return;
+       
+       if(compose->replyinfo == NULL) {
+               gtk_stext_freeze(text);
+               gtk_stext_set_point(text, 0);
+               gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+               gtk_stext_insert(text, NULL, NULL, NULL, s, -1);
+               gtk_stext_thaw(text);
+               g_free(old_tmpl);
+               return;
+       }
+
+       parsed_text = g_new(gchar, strlen(s)*2 + 1);
+       tmpl = parsed_text;
+       while(*s) {
+               if (*s == '\n') {
+                       *parsed_text++ = '\\';
+                       *parsed_text++ = 'n';
+                       s++;
+               } else {
+                       *parsed_text++ = *s++;
+               }
+       }
+       *parsed_text = '\0';
+
+       if (prefs_common.quotemark && *prefs_common.quotemark)
+               qmark = prefs_common.quotemark;
+       else
+               qmark = "> ";
+
+       quote_str = compose_quote_fmt(compose, compose->replyinfo, tmpl, qmark);
+       if (quote_str != NULL) {
+               gtk_stext_freeze(text);
+               gtk_stext_set_point(text, 0);
+               gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+               gtk_stext_insert(text, NULL, NULL, NULL, quote_str, -1);
+               gtk_stext_thaw(text);
+       }
+
+       g_free(old_tmpl);
+       g_free(tmpl);
+}
+
+static void template_select_cb(gpointer data, guint action,
+                              GtkWidget *widget)
+{
+       template_select(&template_apply_cb, data);
+}