2006-02-24 [wwp] 2.0.0cvs81
[claws.git] / src / compose.c
index 5fab74c3eeff30c0efdca6f82a3c3504998303b9..71a2c0aaf75ef758231e89661b434d6b21137c08 100644 (file)
 #include "folder.h"
 #include "addr_compl.h"
 #include "quote_fmt.h"
-#include "template.h"
 #include "undo.h"
 #include "foldersel.h"
 #include "toolbar.h"
 #include "inc.h"
+#include "message_search.h"
+
 enum
 {
        COL_MIMETYPE = 0,
@@ -195,7 +196,8 @@ Compose *compose_generic_new                        (PrefsAccount   *account,
                                                 GList          *listAddress );
 
 static Compose *compose_create                 (PrefsAccount   *account,
-                                                ComposeMode     mode);
+                                                ComposeMode     mode,
+                                                gboolean batch);
 
 static GtkWidget *compose_account_option_menu_create
                                                (Compose        *compose);
@@ -271,10 +273,12 @@ static gint compose_remove_reedit_target  (Compose        *compose,
 void compose_remove_draft                      (Compose        *compose);
 static gint compose_queue                      (Compose        *compose,
                                                 gint           *msgnum,
-                                                FolderItem     **item);
+                                                FolderItem     **item,
+                                                gchar          **msgpath);
 static gint compose_queue_sub                  (Compose        *compose,
                                                 gint           *msgnum,
                                                 FolderItem     **item,
+                                                gchar          **msgpath,
                                                 gboolean       check_subject);
 static void compose_add_attachments            (Compose        *compose,
                                                 MimeInfo       *parent);
@@ -409,6 +413,9 @@ static void compose_changed_cb              (GtkTextBuffer  *textbuf,
 static void compose_wrap_cb            (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
+static void compose_find_cb            (gpointer        data,
+                                        guint           action,
+                                        GtkWidget      *widget);
 static void compose_toggle_autowrap_cb (gpointer        data,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -543,12 +550,12 @@ static GtkItemFactoryEntry compose_entries[] =
        {N_("/_Edit/Select _all"),      "<control>A", compose_allsel_cb, 0, NULL},
        {N_("/_Edit/A_dvanced"),        NULL, NULL, 0, "<Branch>"},
        {N_("/_Edit/A_dvanced/Move a character backward"),
-                                       "<control>B",
+                                       "<shift><control>B",
                                        compose_advanced_action_cb,
                                        COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
                                        NULL},
        {N_("/_Edit/A_dvanced/Move a character forward"),
-                                       "<control>F",
+                                       "<shift><control>F",
                                        compose_advanced_action_cb,
                                        COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
                                        NULL},
@@ -618,6 +625,9 @@ static GtkItemFactoryEntry compose_entries[] =
                                        COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
                                        NULL},
        {N_("/_Edit/---"),              NULL, NULL, 0, "<Separator>"},
+       {N_("/_Edit/_Find"),
+                                       "<control>F", compose_find_cb, 0, NULL},
+       {N_("/_Edit/---"),                      NULL, NULL, 0, "<Separator>"},
        {N_("/_Edit/_Wrap current paragraph"),
                                        "<control>L", compose_wrap_cb, 0, NULL},
        {N_("/_Edit/Wrap all long _lines"),
@@ -698,6 +708,12 @@ static GtkItemFactoryEntry compose_entries[] =
         ENC_ACTION(C_WINDOWS_1255)},
        {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
 
+       {N_("/_Options/Character _encoding/Arabic (ISO-8859-_6)"),
+        ENC_ACTION(C_ISO_8859_6)},
+       {N_("/_Options/Character _encoding/Arabic (Windows-1256)"),
+        ENC_ACTION(C_CP1256)},
+       {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
+
        {N_("/_Options/Character _encoding/Turkish (ISO-8859-_9)"),
         ENC_ACTION(C_ISO_8859_9)},
        {N_("/_Options/Character _encoding/---"), NULL, NULL, 0, "<Separator>"},
@@ -854,7 +870,7 @@ Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderI
        if (!account) account = cur_account;
        g_return_val_if_fail(account != NULL, NULL);
 
-       compose = compose_create(account, COMPOSE_NEW);
+       compose = compose_create(account, COMPOSE_NEW, FALSE);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        compose->replyinfo = NULL;
@@ -1061,7 +1077,7 @@ Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
        case COMPOSE_FORWARD_INLINE:
                /* check if we reply to more than one Message */
                if (list_len == 1) {
-                       compose = compose_forward(NULL, msginfo, FALSE, body, FALSE);
+                       compose = compose_forward(NULL, msginfo, FALSE, body, FALSE, FALSE);
                        break;
                } 
                /* more messages FALL THROUGH */
@@ -1069,7 +1085,7 @@ Compose *compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
                compose = compose_forward_multiple(NULL, msginfo_list);
                break;
        case COMPOSE_REDIRECT:
-               compose = compose_redirect(NULL, msginfo);
+               compose = compose_redirect(NULL, msginfo, FALSE);
                break;
        default:
                g_warning("compose_reply(): invalid Compose Mode: %d\n", mode);
@@ -1167,7 +1183,7 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, gboolean quote,
        } else
                reply_account = account;
 
-       compose = compose_create(account, COMPOSE_REPLY);
+       compose = compose_create(account, COMPOSE_REPLY, FALSE);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
 
        menu_set_active(ifactory, "/Options/Remove references", FALSE);
@@ -1258,7 +1274,8 @@ if (msginfo->var && *msginfo->var) { \
 
 Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                         gboolean as_attach, const gchar *body,
-                        gboolean no_extedit)
+                        gboolean no_extedit,
+                        gboolean batch)
 {
        Compose *compose;
        GtkTextView *textview;
@@ -1273,7 +1290,7 @@ Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
                                (msginfo)))
                account = cur_account;
 
-       compose = compose_create(account, COMPOSE_FORWARD);
+       compose = compose_create(account, COMPOSE_FORWARD, batch);
 
        compose->fwdinfo = procmsg_msginfo_get_full_info(msginfo);
        if (!compose->fwdinfo)
@@ -1401,7 +1418,7 @@ Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
                MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
        }
 
-       compose = compose_create(account, COMPOSE_FORWARD);
+       compose = compose_create(account, COMPOSE_FORWARD, FALSE);
 
        textview = GTK_TEXT_VIEW(compose->text);
        textbuf = gtk_text_view_get_buffer(textview);
@@ -1582,7 +1599,7 @@ void compose_reedit(MsgInfo *msginfo)
         if (!account) account = cur_account;
        g_return_if_fail(account != NULL);
 
-       compose = compose_create(account, COMPOSE_REEDIT);
+       compose = compose_create(account, COMPOSE_REEDIT, FALSE);
        if (privacy_system != NULL) {
                compose->privacy_system = privacy_system;
                compose_use_signing(compose, use_signing);
@@ -1669,7 +1686,8 @@ void compose_reedit(MsgInfo *msginfo)
        compose_set_title(compose);
 }
 
-Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
+Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo,
+                                                gboolean batch)
 {
        Compose *compose;
        gchar *filename;
@@ -1683,7 +1701,7 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
                                        prefs_common.reply_account_autosel);
        g_return_val_if_fail(account != NULL, NULL);
 
-       compose = compose_create(account, COMPOSE_REDIRECT);
+       compose = compose_create(account, COMPOSE_REDIRECT, batch);
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
        compose->replyinfo = NULL;
@@ -1737,13 +1755,20 @@ Compose *compose_redirect(PrefsAccount *account, MsgInfo *msginfo)
        menu_set_sensitive(ifactory, "/Tools/Show ruler", FALSE);
        menu_set_sensitive(ifactory, "/Tools/Actions", FALSE);
        
-       gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
+       if (compose->toolbar->draft_btn)
+               gtk_widget_set_sensitive(compose->toolbar->draft_btn, FALSE);
+       if (compose->toolbar->insert_btn)
+               gtk_widget_set_sensitive(compose->toolbar->insert_btn, FALSE);
+       if (compose->toolbar->attach_btn)
+               gtk_widget_set_sensitive(compose->toolbar->attach_btn, FALSE);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn, FALSE);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, FALSE);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, FALSE);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, FALSE);
 
        compose->modified = FALSE;
        compose_set_title(compose);
@@ -1822,26 +1847,33 @@ void compose_entry_append(Compose *compose, const gchar *address,
 
 void compose_entry_mark_default_to(Compose *compose, const gchar *mailto)
 {
-       static GtkStyle *bold_style = NULL;
-       static GdkColor bold_color;
+       static GdkColor yellow;
+       static GdkColor black;
+       static gboolean yellow_initialised = FALSE;
        GSList *h_list;
        GtkEntry *entry;
                
+       if (!yellow_initialised) {
+               gdk_color_parse("#f5f6be", &yellow);
+               gdk_color_parse("#000000", &black);
+               yellow_initialised = gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &yellow, FALSE, TRUE);
+               yellow_initialised &= gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &black, FALSE, TRUE);
+       }
+
        for (h_list = compose->header_list; h_list != NULL; h_list = h_list->next) {
                entry = GTK_ENTRY(((ComposeHeaderEntry *)h_list->data)->entry);
                if (gtk_entry_get_text(entry) && 
                    !g_utf8_collate(gtk_entry_get_text(entry), mailto)) {
-                       gtk_widget_ensure_style(GTK_WIDGET(entry));
-                       if (!bold_style) {
-                               gtkut_convert_int_to_gdk_color
-                                       (prefs_common.color_new, &bold_color);
-                               bold_style = gtk_style_copy(gtk_widget_get_style
-                                       (GTK_WIDGET(entry)));
-                               pango_font_description_set_weight
-                                       (bold_style->font_desc, PANGO_WEIGHT_BOLD);
-                               bold_style->fg[GTK_STATE_NORMAL] = bold_color;
+                       if (yellow_initialised) {
+                               gtk_widget_modify_base(
+                                       GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+                                       GTK_STATE_NORMAL, &yellow);
+                               gtk_widget_modify_text(
+                                       GTK_WIDGET(((ComposeHeaderEntry *)h_list->data)->entry),
+                                       GTK_STATE_NORMAL, &black);
                        }
-                       gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
                }
        }
 }
@@ -2714,6 +2746,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
        gchar *size_text;
        GtkListStore *store;
        gchar *name;
+       gboolean has_binary = FALSE;
 
        if (!is_file_exist(file)) {
                g_warning("File %s doesn't exist\n", filename);
@@ -2744,7 +2777,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                        MsgInfo *msginfo;
                        MsgFlags flags = {0, 0};
 
-                       if (procmime_get_encoding_for_text_file(file) == ENC_7BIT)
+                       if (procmime_get_encoding_for_text_file(file, &has_binary) == ENC_7BIT)
                                ainfo->encoding = ENC_7BIT;
                        else
                                ainfo->encoding = ENC_8BIT;
@@ -2760,7 +2793,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                        procmsg_msginfo_free(msginfo);
                } else {
                        if (!g_ascii_strncasecmp(content_type, "text", 4))
-                               ainfo->encoding = procmime_get_encoding_for_text_file(file);
+                               ainfo->encoding = procmime_get_encoding_for_text_file(file, &has_binary);
                        else
                                ainfo->encoding = ENC_BASE64;
                        name = g_path_get_basename(filename ? filename : file);
@@ -2775,7 +2808,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                        ainfo->encoding = ENC_BASE64;
                } else if (!g_ascii_strncasecmp(ainfo->content_type, "text", 4))
                        ainfo->encoding =
-                               procmime_get_encoding_for_text_file(file);
+                               procmime_get_encoding_for_text_file(file, &has_binary);
                else
                        ainfo->encoding = ENC_BASE64;
                name = g_path_get_basename(filename ? filename : file);
@@ -2783,7 +2816,7 @@ static void compose_attach_append(Compose *compose, const gchar *file,
                g_free(name);
        }
 
-       if (!strcmp(ainfo->content_type, "unknown")) {
+       if (!strcmp(ainfo->content_type, "unknown") || has_binary) {
                g_free(ainfo->content_type);
                ainfo->content_type = g_strdup("application/octet-stream");
        }
@@ -3195,6 +3228,8 @@ static gboolean compose_join_next_line(Compose *compose,
        prev = cur = iter_;
        gtk_text_iter_backward_char(&cur);
        if (gtk_text_iter_has_tag(&cur, compose->no_join_tag)) {
+               gtk_text_iter_forward_char(&cur);
+               *iter = cur;
                return FALSE;
        }
        gtk_text_iter_forward_char(&cur);
@@ -3267,6 +3302,7 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
        gint startq_offset = -1, noq_offset = -1;
        gint uri_start = -1, uri_stop = -1;
        gint nouri_start = -1, nouri_stop = -1;
+       gint num_blocks = 0;
 
        compose->autowrap = FALSE;
 
@@ -3331,11 +3367,12 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
                gint walk_pos;
                
-               if (!prev_autowrap)
+               if (!prev_autowrap && num_blocks == 0) {
+                       num_blocks++;
                        g_signal_handlers_block_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(text_inserted),
                                        compose);
-               
+               }
                if (gtk_text_iter_has_tag(&iter, compose->no_wrap_tag) && !force)
                        goto colorize;
 
@@ -3415,10 +3452,12 @@ static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter,
                }
 
 colorize:
-               if (!prev_autowrap)
+               if (!prev_autowrap && num_blocks > 0) {
+                       num_blocks--;
                        g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
                                        G_CALLBACK(text_inserted),
                                        compose);
+               }
                end_of_line = iter;
                while (!gtk_text_iter_ends_line(&end_of_line)) {
                        gtk_text_iter_forward_char(&end_of_line);
@@ -3724,15 +3763,17 @@ static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
                return FALSE;
        }
 
-       str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
-       if (*str == '\0' && check_subject == TRUE) {
-               AlertValue aval;
+       if (!compose->batch) {
+               str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+               if (*str == '\0' && check_subject == TRUE) {
+                       AlertValue aval;
 
-               aval = alertpanel(_("Send"),
-                                 _("Subject is empty. Send it anyway?"),
-                                 GTK_STOCK_CANCEL, _("+_Send"), NULL);
-               if (aval != G_ALERTALTERNATE)
-                       return FALSE;
+                       aval = alertpanel(_("Send"),
+                                         _("Subject is empty. Send it anyway?"),
+                                         GTK_STOCK_CANCEL, _("+_Send"), NULL);
+                       if (aval != G_ALERTALTERNATE)
+                               return FALSE;
+               }
        }
 
        return TRUE;
@@ -3743,17 +3784,29 @@ gint compose_send(Compose *compose)
        gint msgnum;
        FolderItem *folder;
        gint val = -1;
-       gchar *msgpath;
+       gchar *msgpath = NULL;
+       gboolean discard_window = FALSE;
+
+       if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS
+                       || compose->batch == TRUE)
+               discard_window = TRUE;
 
        compose_allow_user_actions (compose, FALSE);
        compose->sending = TRUE;
 
-       if (compose_check_entries(compose, TRUE) == FALSE)
+       if (compose_check_entries(compose, TRUE) == FALSE) {
+               if (compose->batch) {
+                       gtk_widget_show_all(compose->window);
+               }
                goto bail;
+       }
 
-       val = compose_queue(compose, &msgnum, &folder);
+       val = compose_queue(compose, &msgnum, &folder, &msgpath);
 
        if (val) {
+               if (compose->batch) {
+                       gtk_widget_show_all(compose->window);
+               }
                if (val == -4) {
                        alertpanel_error(_("Could not queue message for sending:\n\n"
                                           "Charset conversion failed."));
@@ -3768,8 +3821,7 @@ gint compose_send(Compose *compose)
                goto bail;
        }
 
-
-       if (prefs_common.send_dialog_mode != SEND_DIALOG_ALWAYS) {
+       if (discard_window) {
                compose->sending = FALSE;
                compose_close(compose);
                /* No more compose access in the normal codepath 
@@ -3778,22 +3830,25 @@ gint compose_send(Compose *compose)
        }
 
        if (msgnum == 0) {
+               if (!discard_window) {
+                       goto bail;
+               }
                alertpanel_error(_("The message was queued but could not be "
                                   "sent.\nUse \"Send queued messages\" from "
                                   "the main window to retry."));
-               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
-                       compose->sending = FALSE;
-                       compose->modified = TRUE; 
-                       compose_allow_user_actions (compose, TRUE);
-               }
-               return 0;
+               return -1;
        }
        
-       msgpath = folder_item_fetch_msg(folder, msgnum);
-       val = procmsg_send_message_queue(msgpath);
-       g_free(msgpath);
-
-       if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
+       if (msgpath == NULL) {
+               msgpath = folder_item_fetch_msg(folder, msgnum);
+               val = procmsg_send_message_queue(msgpath);
+               g_free(msgpath);
+       } else {
+               val = procmsg_send_message_queue(msgpath);
+               g_unlink(msgpath);
+               g_free(msgpath);
+       }
+       if (!discard_window) {
                compose->sending = FALSE;
                compose_allow_user_actions (compose, TRUE);
                if (val != 0) {
@@ -3805,17 +3860,15 @@ gint compose_send(Compose *compose)
        if (val == 0) {
                folder_item_remove_msg(folder, msgnum);
                folder_item_scan(folder);
-               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS)
+               if (!discard_window)
                        compose_close(compose);
        } else {
+               if (!discard_window) {
+                       goto bail;              
+               }
                alertpanel_error(_("The message was queued but could not be "
                                   "sent.\nUse \"Send queued messages\" from "
                                   "the main window to retry."));
-               if (prefs_common.send_dialog_mode == SEND_DIALOG_ALWAYS) {
-                       compose_allow_user_actions (compose, TRUE);
-                       compose->modified = TRUE; 
-                       compose->sending = FALSE;               
-               }
                return -1;
        }
 
@@ -4082,7 +4135,8 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                                test_conv_global_out = conv_codeset_strdup(chars, src_codeset, out_codeset);
                        }
                        
-                       if (!test_conv_global_out && compose->orig_charset) {
+                       if (!test_conv_global_out && compose->orig_charset
+                       &&  strcmp(compose->orig_charset, CS_US_ASCII)) {
                                out_codeset = compose->orig_charset;
                                debug_print("failure; trying to convert to %s\n", out_codeset);
                                test_conv_reply = conv_codeset_strdup(chars, src_codeset, out_codeset);
@@ -4091,7 +4145,7 @@ static gint compose_write_to_file(Compose *compose, FILE *fp, gint action)
                        if (!test_conv_global_out && !test_conv_reply) {
                                /* we're lost */
                                out_codeset = CS_INTERNAL;
-                               debug_print("finally using %s\n", out_codeset);
+                               debug_print("failure; finally using %s\n", out_codeset);
                        }
                        g_free(test_conv_global_out);
                        g_free(test_conv_reply);
@@ -4318,11 +4372,11 @@ void compose_remove_draft(Compose *compose)
 
 }
 
-static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
+static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath)
 {
-       return compose_queue_sub (compose, msgnum, item, FALSE);
+       return compose_queue_sub (compose, msgnum, item, msgpath, FALSE);
 }
-static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gboolean check_subject)
+static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item, gchar **msgpath, gboolean check_subject)
 {
        FolderItem *queue;
        gchar *tmp;
@@ -4516,14 +4570,18 @@ static gint compose_queue_sub(Compose *compose, gint *msgnum, FolderItem **item,
                return -1;
        }
        folder_item_scan(queue);
-       if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
+       if ((num = folder_item_add_msg(queue, tmp, NULL, FALSE)) < 0) {
                g_warning("can't queue the message\n");
                g_unlink(tmp);
                g_free(tmp);
                return -1;
        }
-       g_unlink(tmp);
-       g_free(tmp);
+       
+       if (msgpath == NULL) {
+               g_unlink(tmp);
+               g_free(tmp);
+       } else
+               *msgpath = tmp;
 
        if (compose->mode == COMPOSE_REEDIT) {
                compose_remove_reedit_target(compose, FALSE);
@@ -5299,6 +5357,8 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
 #if USE_ASPELL
        if (event->button == 3) {
                GtkTextIter iter;
+               GtkTextIter sel_start, sel_end;
+               gboolean stuff_selected;
                gint x, y;
                /* move the cursor to allow GtkAspell to check the word
                 * under the mouse */
@@ -5307,7 +5367,18 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
                        &x, &y);
                gtk_text_view_get_iter_at_location (GTK_TEXT_VIEW(text),
                        &iter, x, y);
+               /* get selection */
+               stuff_selected = gtk_text_buffer_get_selection_bounds(
+                               GTK_TEXT_VIEW(text)->buffer,
+                               &sel_start, &sel_end);
+
                gtk_text_buffer_place_cursor (GTK_TEXT_VIEW(text)->buffer, &iter);
+               /* reselect stuff */
+               if (stuff_selected 
+               && gtk_text_iter_in_range(&iter, &sel_start, &sel_end)) {
+                       gtk_text_buffer_select_range(GTK_TEXT_VIEW(text)->buffer,
+                               &sel_start, &sel_end);
+               }
                return FALSE; /* pass the event so that the right-click goes through */
        }
 #endif
@@ -5322,7 +5393,8 @@ static gboolean text_clicked(GtkWidget *text, GdkEventButton *event,
        return FALSE;
 }
 
-static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+static Compose *compose_create(PrefsAccount *account, ComposeMode mode,
+                                                gboolean batch)
 {
        Compose   *compose;
        GtkWidget *window;
@@ -5378,6 +5450,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        titles[COL_SIZE]     = _("Size");
        titles[COL_NAME]     = _("Name");
 
+       compose->batch = batch;
        compose->account = account;
        
        compose->mutex = g_mutex_new();
@@ -5439,11 +5512,17 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        gtk_widget_show(notebook);
 
        /* header labels and entries */
-       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header")));
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                       compose_create_header(compose),
+                       gtk_label_new_with_mnemonic(_("Hea_der")));
        /* attachment list */
-       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments")));
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                       compose_create_attach(compose),
+                       gtk_label_new_with_mnemonic(_("_Attachments")));
        /* Others Tab */
-       gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
+       gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
+                       compose_create_others(compose),
+                       gtk_label_new_with_mnemonic(_("Othe_rs")));
 
        /* Subject */
        subject_hbox = gtk_hbox_new(FALSE, 0);
@@ -5650,6 +5729,7 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                                                  conv_get_locale_charset_str(),
                                                  prefs_common.misspelled_col,
                                                  prefs_common.check_while_typing,
+                                                 prefs_common.recheck_when_changing_dict,
                                                  prefs_common.use_alternate,
                                                  GTK_TEXT_VIEW(text),
                                                  GTK_WINDOW(compose->window));
@@ -5724,7 +5804,11 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
 
        activate_privacy_system(compose, account, TRUE);
        toolbar_set_style(compose->toolbar->toolbar, compose->handlebox, prefs_common.toolbar_style);
-       gtk_widget_show(window);
+       if (batch) {
+               gtk_widget_realize(window);
+       } else {
+               gtk_widget_show(window);
+       }
        
        return compose;
 }
@@ -6053,20 +6137,11 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
        gint cursor_pos = 0;
        if (!tmpl) return;
 
+       /* process the body */
+
        text = GTK_TEXT_VIEW(compose->text);
        buffer = gtk_text_view_get_buffer(text);
 
-       if (tmpl->subject && *tmpl->subject != '\0')
-               gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
-                                  tmpl->subject);
-       if (tmpl->to && *tmpl->to != '\0')
-               compose_entry_append(compose, tmpl->to, COMPOSE_TO);
-       if (tmpl->cc && *tmpl->cc != '\0')
-               compose_entry_append(compose, tmpl->cc, COMPOSE_CC);
-
-       if (tmpl->bcc && *tmpl->bcc != '\0')
-               compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
-
        if (replace)
                gtk_text_buffer_set_text(buffer, "", -1);
 
@@ -6111,9 +6186,79 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
                gtk_text_buffer_place_cursor(buffer, &iter);
        }
 
+       /* process the other fields */
+       compose_template_apply_fields(compose, tmpl);
+       
        compose_changed_cb(NULL, compose);
 }
 
+void compose_template_apply_fields(Compose *compose, Template *tmpl)
+{
+       static MsgInfo dummyinfo;
+       MsgInfo *msginfo = NULL;
+       gchar *buf = NULL;
+
+       if (compose->replyinfo != NULL)
+               msginfo = compose->replyinfo;
+       else if (compose->fwdinfo != NULL)
+               msginfo = compose->fwdinfo;
+       else
+               msginfo = &dummyinfo;
+
+       if (tmpl->to && *tmpl->to != '\0') {
+               quote_fmt_init(msginfo, NULL, NULL, FALSE);
+               quote_fmt_scan_string(tmpl->to);
+               quote_fmt_parse();
+
+               buf = quote_fmt_get_buffer();
+               if (buf == NULL) {
+                       alertpanel_error(_("Message To format error."));
+               } else {
+                       compose_entry_append(compose, buf, COMPOSE_TO);
+               }
+       }
+
+       if (tmpl->cc && *tmpl->cc != '\0') {
+               quote_fmt_init(msginfo, NULL, NULL, FALSE);
+               quote_fmt_scan_string(tmpl->cc);
+               quote_fmt_parse();
+
+               buf = quote_fmt_get_buffer();
+               if (buf == NULL) {
+                       alertpanel_error(_("Message Cc format error."));
+               } else {
+                       compose_entry_append(compose, buf, COMPOSE_CC);
+               }
+       }
+
+       if (tmpl->bcc && *tmpl->bcc != '\0') {
+               quote_fmt_init(msginfo, NULL, NULL, FALSE);
+               quote_fmt_scan_string(tmpl->bcc);
+               quote_fmt_parse();
+
+               buf = quote_fmt_get_buffer();
+               if (buf == NULL) {
+                       alertpanel_error(_("Message Bcc format error."));
+               } else {
+                       compose_entry_append(compose, buf, COMPOSE_BCC);
+               }
+       }
+
+       /* process the subject */
+       if (tmpl->subject && *tmpl->subject != '\0') {
+               quote_fmt_init(msginfo, NULL, NULL, FALSE);
+               quote_fmt_scan_string(tmpl->subject);
+               quote_fmt_parse();
+
+               buf = quote_fmt_get_buffer();
+               if (buf == NULL) {
+                       alertpanel_error(_("Message subject format error."));
+               } else {
+                       gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf);
+               }
+       }
+}
+
 static void compose_destroy(Compose *compose)
 {
        compose_list = g_list_remove(compose_list, compose);
@@ -6622,7 +6767,6 @@ static void compose_exec_ext_editor(Compose *compose)
 #ifdef G_OS_UNIX
 static gint compose_exec_ext_editor_real(const gchar *file)
 {
-       static gchar *def_cmd = "emacs %s";
        gchar buf[1024];
        gchar *p;
        gchar **cmdline;
@@ -6650,7 +6794,7 @@ static gint compose_exec_ext_editor_real(const gchar *file)
                if (prefs_common.ext_editor_cmd)
                        g_warning("External editor command line is invalid: '%s'\n",
                                  prefs_common.ext_editor_cmd);
-               g_snprintf(buf, sizeof(buf), def_cmd, file);
+               g_snprintf(buf, sizeof(buf), DEFAULT_EDITOR_CMD, file);
        }
 
        cmdline = strsplit_with_quote(buf, " ", 1024);
@@ -6772,15 +6916,23 @@ static void compose_set_ext_editor_sensitive(Compose *compose,
        menu_set_sensitive(ifactory, "/Edit/Edit with external editor",
                           sensitive);
 
-       gtk_widget_set_sensitive(compose->text,                   sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->send_btn,      sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->sendl_btn,     sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->draft_btn,     sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->insert_btn,    sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->sig_btn,       sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn,  sensitive);
-       gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn,  sensitive);
+       gtk_widget_set_sensitive(compose->text,                       sensitive);
+       if (compose->toolbar->send_btn)
+               gtk_widget_set_sensitive(compose->toolbar->send_btn,      sensitive);
+       if (compose->toolbar->sendl_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sendl_btn,     sensitive);
+       if (compose->toolbar->draft_btn)
+               gtk_widget_set_sensitive(compose->toolbar->draft_btn,     sensitive);
+       if (compose->toolbar->insert_btn)
+               gtk_widget_set_sensitive(compose->toolbar->insert_btn,    sensitive);
+       if (compose->toolbar->sig_btn)
+               gtk_widget_set_sensitive(compose->toolbar->sig_btn,       sensitive);
+       if (compose->toolbar->exteditor_btn)
+               gtk_widget_set_sensitive(compose->toolbar->exteditor_btn, sensitive);
+       if (compose->toolbar->linewrap_current_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
+       if (compose->toolbar->linewrap_all_btn)
+               gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
 }
 #endif /* G_OS_UNIX */
 
@@ -6997,7 +7149,7 @@ static void compose_send_later_cb(gpointer data, guint action,
        Compose *compose = (Compose *)data;
        gint val;
 
-       val = compose_queue_sub(compose, NULL, NULL, TRUE);
+       val = compose_queue_sub(compose, NULL, NULL, NULL, TRUE);
        if (!val) 
                compose_close(compose);
        else if (val == -2) {
@@ -7083,6 +7235,7 @@ static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
                target_locked = MSG_IS_LOCKED(compose->targetinfo->flags);
                flag.perm_flags = target_locked?MSG_LOCKED:0;
        }
+       flag.tmp_flags = MSG_DRAFT;
 
        folder_item_scan(draft);
        if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
@@ -7831,6 +7984,13 @@ static void compose_wrap_cb(gpointer data, guint action, GtkWidget *widget)
                compose_beautify_paragraph(compose, NULL, TRUE);
 }
 
+static void compose_find_cb(gpointer data, guint action, GtkWidget *widget)
+{
+       Compose *compose = (Compose *)data;
+
+       message_search_compose(compose);
+}
+
 static void compose_toggle_autowrap_cb(gpointer data, guint action,
                                       GtkWidget *widget)
 {
@@ -7887,7 +8047,7 @@ static void compose_toggle_ruler_cb(gpointer data, guint action,
 }
 
 static void compose_attach_drag_received_cb (GtkWidget         *widget,
-                                            GdkDragContext     *drag_context,
+                                            GdkDragContext     *context,
                                             gint                x,
                                             gint                y,
                                             GtkSelectionData   *data,
@@ -7899,7 +8059,9 @@ static void compose_attach_drag_received_cb (GtkWidget            *widget,
        GList *list, *tmp;
 
        if (gdk_atom_name(data->type) && 
-           !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
+           !strcmp(gdk_atom_name(data->type), "text/uri-list")
+           && gtk_drag_get_source_widget(context) != 
+               mainwindow_get_mainwindow()->summaryview->ctree) {
                list = uri_list_extract_filenames((const gchar *)data->data);
                for (tmp = list; tmp != NULL; tmp = tmp->next)
                        compose_attach_append
@@ -7908,9 +8070,8 @@ static void compose_attach_drag_received_cb (GtkWidget            *widget,
                if (list) compose_changed_cb(NULL, compose);
                list_free_strings(list);
                g_list_free(list);
-       } else if (gdk_atom_name(data->type) && 
-                  !strcmp(gdk_atom_name(data->type), "text/plain") &&
-                  data->data && !strcmp(data->data, "Dummy-Summaryview")) {
+       } else if (gtk_drag_get_source_widget(context) 
+                  == mainwindow_get_mainwindow()->summaryview->ctree) {
                /* comes from our summaryview */
                SummaryView * summaryview = NULL;
                GSList * list = NULL, *cur = NULL;
@@ -8330,6 +8491,29 @@ void compose_reply_from_messageview(MessageView *msgview, GSList *msginfo_list,
        g_free(body);
 }
 
+void compose_set_position(Compose *compose, gint pos)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+       gtkut_text_view_set_position(text, pos);
+}
+
+gboolean compose_search_string(Compose *compose,
+                               const gchar *str, gboolean case_sens)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+       return gtkut_text_view_search_string(text, str, case_sens);
+}
+
+gboolean compose_search_string_backward(Compose *compose,
+                               const gchar *str, gboolean case_sens)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+
+       return gtkut_text_view_search_string_backward(text, str, case_sens);
+}
+
 /*
  * End of Source.
  */