fix 'Reply to all' bugs
[claws.git] / src / summaryview.c
index 17593d8b39091324040780ab5984b70da330d336..bdf7bccad2af9fef275566e1509102ce51f7d4d9 100644 (file)
@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
+
 #include "defs.h"
 
 #include <glib.h>
@@ -61,6 +62,7 @@
 #include "sourcewindow.h"
 #include "prefs_common.h"
 #include "prefs_summary_column.h"
+#include "prefs_filter.h"
 #include "account.h"
 #include "compose.h"
 #include "utils.h"
@@ -193,9 +195,11 @@ static void summary_set_header             (SummaryView            *summaryview,
                                         gchar                  *text[],
                                         MsgInfo                *msginfo);
 static void summary_display_msg                (SummaryView            *summaryview,
+                                        GtkCTreeNode           *row);
+static void summary_display_msg_full   (SummaryView            *summaryview,
                                         GtkCTreeNode           *row,
-                                        gboolean                new_window);
-static void summary_toggle_view                (SummaryView            *summaryview);
+                                        gboolean                new_window,
+                                        gboolean                all_headers);
 static void summary_set_row_marks      (SummaryView            *summaryview,
                                         GtkCTreeNode           *row);
 static void summaryview_subject_filter_init (PrefsFolderItem    *prefs);
@@ -265,10 +269,11 @@ static void summary_colorlabel_menu_create(SummaryView    *summaryview);
 
 static GtkWidget *summary_ctree_create (SummaryView    *summaryview);
 
+static void summary_toggle_view(SummaryView *summarview);
+
 /* callback functions */
-static void summary_toggle_pressed     (GtkWidget              *eventbox,
-                                        GdkEventButton         *event,
-                                        SummaryView            *summaryview);
+static void summary_toggle_view_cb     (GtkWidget      *widget,
+                                        gpointer       data);                                   
 static void summary_button_pressed     (GtkWidget              *ctree,
                                         GdkEventButton         *event,
                                         SummaryView            *summaryview);
@@ -448,8 +453,8 @@ SummaryView *summary_create(void)
        GtkWidget *statlabel_folder;
        GtkWidget *statlabel_select;
        GtkWidget *statlabel_msgs;
-       GtkWidget *toggle_eventbox;
-       GtkWidget *toggle_arrow;
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
        GtkWidget *popupmenu;
        GtkItemFactory *popupfactory;
        gint n_entries;
@@ -485,14 +490,14 @@ SummaryView *summary_create(void)
        statlabel_select = gtk_label_new("");
        gtk_box_pack_start(GTK_BOX(hbox), statlabel_select, FALSE, FALSE, 16);
 
-       /* toggle view button */
-       toggle_eventbox = gtk_event_box_new();
-       gtk_box_pack_end(GTK_BOX(hbox), toggle_eventbox, FALSE, FALSE, 4);
-       toggle_arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
-       gtk_container_add(GTK_CONTAINER(toggle_eventbox), toggle_arrow);
-       gtk_signal_connect(GTK_OBJECT(toggle_eventbox), "button_press_event",
-                          GTK_SIGNAL_FUNC(summary_toggle_pressed),
-                          summaryview);
+       /* toggle view buttons */
+       toggle_view_btn = gtk_button_new();
+       gtk_box_pack_end(GTK_BOX(hbox), toggle_view_btn, FALSE, FALSE, 0);
+       gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+       toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+       gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                               GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
 
        statlabel_msgs = gtk_label_new("");
        gtk_box_pack_end(GTK_BOX(hbox), statlabel_msgs, FALSE, FALSE, 4);
@@ -511,8 +516,8 @@ SummaryView *summary_create(void)
        summaryview->statlabel_folder = statlabel_folder;
        summaryview->statlabel_select = statlabel_select;
        summaryview->statlabel_msgs = statlabel_msgs;
-       summaryview->toggle_eventbox = toggle_eventbox;
-       summaryview->toggle_arrow = toggle_arrow;
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
        summaryview->popupmenu = popupmenu;
        summaryview->popupfactory = popupfactory;
        summaryview->msg_is_toggled_on = TRUE;
@@ -1120,25 +1125,16 @@ void summary_select_prev_unread(SummaryView *summaryview)
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
 void summary_select_next_unread(SummaryView *summaryview)
 {
-       GtkCTreeNode *node;
+       GtkCTreeNode *node = summaryview->selected;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 
-       node = summary_find_next_unread_msg(summaryview, summaryview->selected);
-
-       if (node) {
-               gtkut_ctree_expand_parent_all(ctree, node);
-               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-               gtk_sctree_select(GTK_SCTREE(ctree), node);
-               if (summaryview->displayed == node)
-                       summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
-       } else {
+       while ((node = summary_find_next_unread_msg(summaryview, node)) == NULL) {
                AlertValue val;
 
                switch (prefs_common.next_unread_msg_dialog) {
@@ -1146,7 +1142,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                                val = alertpanel(_("No more unread messages"),
                                                 _("No unread message found. "
                                                   "Go to next folder?"),
-                                                _("Yes"), _("No"), NULL);
+                                                _("Yes"), _("Search again"), _("No"));
                                break;
                        case NEXTUNREADMSGDIALOG_ASSUME_YES:
                                val = G_ALERTDEFAULT;
@@ -1166,7 +1162,20 @@ void summary_select_next_unread(SummaryView *summaryview)
                                                (GTK_OBJECT(ctree),
                                                 "key_press_event");
                        folderview_select_next_unread(summaryview->folderview);
-               }
+                       return;
+               } else if (val == G_ALERTALTERNATE)
+                       node = NULL;
+               else
+                       return;
+       }
+
+       if (node) {
+               gtkut_ctree_expand_parent_all(ctree, node);
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               if (summaryview->displayed == node)
+                       summaryview->displayed = NULL;
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -1196,7 +1205,7 @@ void summary_select_prev_marked(SummaryView *summaryview)
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -1226,7 +1235,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -1256,7 +1265,7 @@ void summary_select_prev_labeled(SummaryView *summaryview)
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -1286,7 +1295,7 @@ void summary_select_next_labeled(SummaryView *summaryview)
                gtk_sctree_select(GTK_SCTREE(ctree), node);
                if (summaryview->displayed == node)
                        summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg(summaryview, node);
        }
 }
 
@@ -2282,8 +2291,14 @@ msginfo->folder->folder->change_flags(msginfo->folder->folder, \
                                      msginfo); \
 }
 
-static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
-                               gboolean new_window)
+static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row)
+{
+       summary_display_msg_full(summaryview, row, FALSE, FALSE);
+}
+
+static void summary_display_msg_full(SummaryView *summaryview,
+                                    GtkCTreeNode *row,
+                                    gboolean new_window, gboolean all_headers)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        MsgInfo *msginfo;
@@ -2328,7 +2343,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                MessageView *msgview;
 
                msgview = messageview_create_with_new_window();
-               messageview_show(msgview, msginfo);
+               messageview_show(msgview, msginfo, all_headers);
        } else {
                MessageView *msgview;
 
@@ -2337,7 +2352,7 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summaryview->displayed = row;
                if (!summaryview->msg_is_toggled_on)
                        summary_toggle_view(summaryview);
-               messageview_show(msgview, msginfo);
+               messageview_show(msgview, msginfo, all_headers);
                if (msgview->type == MVIEW_TEXT ||
                    (msgview->type == MVIEW_MIME &&
                     GTK_CLIST(msgview->mimeview->ctree)->row_list == NULL))
@@ -2355,20 +2370,22 @@ static void summary_display_msg(SummaryView *summaryview, GtkCTreeNode *row,
                summary_status_show(summaryview);
        }
 
+#if 0
        if (GTK_WIDGET_VISIBLE(summaryview->headerwin->window))
                header_window_show(summaryview->headerwin, msginfo);
+#endif
 
        summary_unlock(summaryview);
 }
 
-void summary_redisplay_msg(SummaryView *summaryview)
+void summary_redisplay_msg(SummaryView *summaryview, gboolean all_headers)
 {
        GtkCTreeNode *node;
 
        if (summaryview->displayed) {
                node = summaryview->displayed;
                summaryview->displayed = NULL;
-               summary_display_msg(summaryview, node, FALSE);
+               summary_display_msg_full(summaryview, node, FALSE, all_headers);
        }
 }
 
@@ -2376,7 +2393,8 @@ void summary_open_msg(SummaryView *summaryview)
 {
        if (!summaryview->selected) return;
 
-       summary_display_msg(summaryview, summaryview->selected, TRUE);
+       summary_display_msg_full(summaryview, summaryview->selected,
+                                TRUE, FALSE);
 }
 
 void summary_view_source(SummaryView * summaryview)
@@ -2423,18 +2441,32 @@ void summary_step(SummaryView *summaryview, GtkScrollType type)
 
        gtk_signal_emit_by_name(GTK_OBJECT(ctree), "scroll_vertical",
                                type, 0.0);
-       
+
        if (summaryview->msg_is_toggled_on)
-               summary_display_msg(summaryview, summaryview->selected, FALSE);
+               summary_display_msg(summaryview, summaryview->selected);
 }
 
 static void summary_toggle_view(SummaryView *summaryview)
+{
+       MainWindow *mainwin = summaryview->mainwin;
+       GtkItemFactory *ifactory;
+       
+       if (!mainwin) return;
+       
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       menu_toggle_toggle(ifactory, "/View/Expand Summary View");
+}
+
+void summary_toggle_view_real(SummaryView *summaryview)
 {
        MainWindow *mainwin = summaryview->mainwin;
        union CompositeWin *cwin = &mainwin->win;
        GtkWidget *vpaned = NULL;
        GtkWidget *container = NULL;
-
+       GtkWidget *toggle_view_btn;
+       GtkWidget *toggle_view_arrow;
+       GtkItemFactory *ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       
        switch (mainwin->type) {
        case SEPARATE_NONE:
                vpaned = cwin->sep_none.vpaned;
@@ -2455,18 +2487,45 @@ static void summary_toggle_view(SummaryView *summaryview)
                gtk_widget_ref(vpaned);
                gtkut_container_remove(GTK_CONTAINER(container), vpaned);
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), container);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_UP, GTK_SHADOW_OUT);
+               
+               gtk_widget_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_UP, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", FALSE);
        } else {
                summaryview->msg_is_toggled_on = TRUE;
                gtk_widget_reparent(GTK_WIDGET_PTR(summaryview), vpaned);
                gtk_container_add(GTK_CONTAINER(container), vpaned);
                gtk_widget_unref(vpaned);
-               gtk_arrow_set(GTK_ARROW(summaryview->toggle_arrow),
-                             GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+               
+               gtk_widget_destroy(summaryview->toggle_view_arrow);
+               gtk_widget_destroy(summaryview->toggle_view_btn);
+               
+               toggle_view_btn = gtk_button_new();
+               gtk_box_pack_end(GTK_BOX(summaryview->hbox), toggle_view_btn, FALSE, FALSE, 0);
+               gtk_box_reorder_child(GTK_BOX(summaryview->hbox), toggle_view_btn, 0);
+               gtk_button_set_relief(GTK_BUTTON(toggle_view_btn), GTK_RELIEF_NONE);
+               toggle_view_arrow=gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+               gtk_container_add(GTK_CONTAINER(toggle_view_btn), toggle_view_arrow);
+               gtk_signal_connect(GTK_OBJECT(toggle_view_btn), "clicked",
+                                       GTK_SIGNAL_FUNC(summary_toggle_view_cb), summaryview);
+               gtk_widget_show_all(toggle_view_btn);
+               menu_set_sensitive(ifactory, "/View/Expand Message View", TRUE);
        }
 
        gtk_widget_grab_focus(summaryview->ctree);
+       
+       summaryview->toggle_view_btn = toggle_view_btn;
+       summaryview->toggle_view_arrow = toggle_view_arrow;
 }
 
 static gboolean summary_search_unread_recursive(GtkCTree *ctree,
@@ -2628,10 +2687,10 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
 
 void summary_set_marks_selected(SummaryView *summaryview)
 {
-       GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
 
-       for (cur = GTK_CLIST(ctree)->selection; cur != NULL; cur = cur->next)
+       for (cur = GTK_CLIST(summaryview->ctree)->selection; cur != NULL;
+            cur = cur->next)
                summary_set_row_marks(summaryview, GTK_CTREE_NODE(cur->data));
 }
 
@@ -3817,6 +3876,168 @@ static void summary_filter_func(GtkCTree *ctree, GtkCTreeNode *node,
                                              summaryview->folder_table);
 }
 
+void summary_filter_open(SummaryView *summaryview, PrefsFilterType type)
+{
+       static HeaderEntry hentry[] = {{"List-Id:",        NULL, FALSE},
+                                      {"X-ML-Name:",      NULL, FALSE},
+                                      {"X-List:",         NULL, FALSE},
+                                      {"X-Mailing-list:", NULL, FALSE},
+                                      {NULL,              NULL, FALSE}};
+       enum
+       {
+               H_LIST_ID        = 0,
+               H_X_ML_NAME      = 1,
+               H_X_LIST         = 2,
+               H_X_MAILING_LIST = 3
+       };
+
+       MsgInfo *msginfo;
+       gchar *header = NULL;
+       gchar *key = NULL;
+       FILE *fp;
+
+       if (!summaryview->selected) return;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       switch (type) {
+       case FILTER_BY_NONE:
+               break;
+       case FILTER_BY_AUTO:
+               if ((fp = procmsg_open_message(msginfo)) == NULL) return;
+               procheader_get_header_fields(fp, hentry);
+               fclose(fp);
+
+               if (hentry[H_LIST_ID].body != NULL) {
+                       header = "List-Id";
+                       Xstrdup_a(key, hentry[H_LIST_ID].body, );
+               } else if (hentry[H_X_ML_NAME].body != NULL) {
+                       header = "X-ML-Name";
+                       Xstrdup_a(key, hentry[H_X_ML_NAME].body, );
+               } else if (hentry[H_X_LIST].body != NULL) {
+                       header = "X-List";
+                       Xstrdup_a(key, hentry[H_X_LIST].body, );
+               } else if (hentry[H_X_MAILING_LIST].body != NULL) {
+                       header = "X-Mailing-list";
+                       Xstrdup_a(key, hentry[H_X_MAILING_LIST].body, );
+               } else if (msginfo->subject) {
+                       header = "Subject";
+                       key = msginfo->subject;
+               }
+
+               g_free(hentry[H_LIST_ID].body);
+               hentry[H_LIST_ID].body = NULL;
+               g_free(hentry[H_X_ML_NAME].body);
+               hentry[H_X_ML_NAME].body = NULL;
+               g_free(hentry[H_X_LIST].body);
+               hentry[H_X_LIST].body = NULL;
+               g_free(hentry[H_X_MAILING_LIST].body);
+               hentry[H_X_MAILING_LIST].body = NULL;
+
+               break;
+       case FILTER_BY_FROM:
+               header = "From";
+               key = msginfo->from;
+               break;
+       case FILTER_BY_TO:
+               header = "To";
+               key = msginfo->to;
+               break;
+       case FILTER_BY_SUBJECT:
+               header = "Subject";
+               key = msginfo->subject;
+               break;
+       default:
+               break;
+       }
+
+       prefs_filter_open(header, key);
+}
+
+void summary_reply(SummaryView *summaryview, ComposeMode mode)
+{
+       GtkWidget *widget;
+       MsgInfo *msginfo;
+       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
+
+       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                             summaryview->selected);
+       if (!msginfo) return;
+
+       switch (mode) {
+       case COMPOSE_REPLY:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, FALSE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             FALSE, TRUE);
+               break;
+       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
+               compose_followup_and_reply_to(msginfo,
+                                             prefs_common.reply_with_quote,
+                                             FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, FALSE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_ALL:
+               compose_reply(msginfo, prefs_common.reply_with_quote,
+                             TRUE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
+               compose_reply(msginfo, TRUE, TRUE, TRUE);
+               break;
+       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
+               compose_reply(msginfo, FALSE, TRUE, TRUE);
+               break;
+       case COMPOSE_FORWARD:
+               if (prefs_common.forward_as_attachment) {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
+                       return;
+               } else {
+                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
+                       return;
+               }
+               break;
+       case COMPOSE_FORWARD_INLINE:
+               if (!sel->next) {
+                       compose_forward(NULL, msginfo, FALSE);
+                       break;
+               }
+               /* if (sel->next) FALL THROUGH */
+       case COMPOSE_FORWARD_AS_ATTACH:
+               {
+                       GSList *msginfo_list = NULL;
+                       for ( ; sel != NULL; sel = sel->next)
+                               msginfo_list = g_slist_append(msginfo_list, 
+                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
+                                               GTK_CTREE_NODE(sel->data)));
+                       compose_forward_multiple(NULL, msginfo_list);
+                       g_slist_free(msginfo_list);
+               }                       
+               break;
+       case COMPOSE_BOUNCE:
+               compose_bounce(NULL, msginfo);
+               break;
+       default:
+               g_warning("summary_reply_cb(): invalid action: %d\n", mode);
+       }
+
+       summary_set_marks_selected(summaryview);
+}
+
 /* color label */
 
 #define N_COLOR_LABELS colorlabel_get_color_count()
@@ -4168,20 +4389,19 @@ void summary_set_column_order(SummaryView *summaryview)
        if (!summaryview->displayed)
                messageview_clear(summaryview->messageview);
        else
-               summary_redisplay_msg(summaryview);
+               summary_redisplay_msg(summaryview, TRUE);
 }
 
 
 /* callback functions */
 
-static void summary_toggle_pressed(GtkWidget *eventbox, GdkEventButton *event,
-                                  SummaryView *summaryview)
+static void summary_toggle_view_cb(GtkWidget *button,
+                                  gpointer data)
 {
-       if (!event)
-               return;
-
+       SummaryView *summaryview = (SummaryView *) data;
+       
        if (!summaryview->msg_is_toggled_on && summaryview->selected)
-               summary_display_msg(summaryview, summaryview->selected, FALSE);
+               summary_display_msg(summaryview, summaryview->selected);
        else
                summary_toggle_view(summaryview);
 }
@@ -4220,39 +4440,17 @@ void summary_pass_key_press_event(SummaryView *summaryview, GdkEventKey *event)
 #define RETURN_IF_LOCKED() \
        if (summaryview->mainwin->lock_count) return
 
-#define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(ctree), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(ctree), \
-                                            "key_press_event"); \
-       }
-
 static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(widget);
        GtkCTreeNode *node;
-       FolderItem *to_folder;
 
        if (summary_is_locked(summaryview)) return;
        if (!event) return;
 
        switch (event->keyval) {
-       case GDK_Q:             /* Quit */
-               RETURN_IF_LOCKED();
-               BREAK_ON_MODIFIER_KEY();
-
-               if (prefs_common.confirm_on_exit) {
-                       if (alertpanel(_("Exit"), _("Exit this program?"),
-                          _("OK"), _("Cancel"), NULL)
-                          == G_ALERTDEFAULT) {
-                               manage_window_focus_in
-                                       (summaryview->mainwin->window,
-                                        NULL, NULL);
-                                       app_will_exit(NULL, summaryview->mainwin);
-                       }
-               }
-               return;
+       case GDK_Left:          /* Move focus */
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return;
@@ -4272,27 +4470,20 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_space:         /* Page down or go to the next */
                if (summaryview->displayed != summaryview->selected) {
                        summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
+                                           summaryview->selected);
                        break;
                }
                if (!textview_scroll_page(summaryview->messageview->textview,
                                          FALSE))
                        summary_select_next_unread(summaryview);
                break;
-       case GDK_v:             /* Toggle summary mode / message mode */
-       case GDK_V:
-               BREAK_ON_MODIFIER_KEY();
-
-               if (!summaryview->msg_is_toggled_on && summaryview->selected)
-                       summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
-               else
-                       summary_toggle_view(summaryview);
+       case GDK_BackSpace:     /* Page up */
+               textview_scroll_page(summaryview->messageview->textview, TRUE);
                break;
        case GDK_Return:        /* Scroll up/down one line */
                if (summaryview->displayed != summaryview->selected) {
                        summary_display_msg(summaryview,
-                                           summaryview->selected, FALSE);
+                                           summaryview->selected);
                        break;
                }
                textview_scroll_one_line(summaryview->messageview->textview,
@@ -4303,24 +4494,11 @@ static void summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                BREAK_ON_MODIFIER_KEY();
                summary_delete(summaryview);
                break;
-       case GDK_asterisk:      /* Mark */
-               summary_mark(summaryview);
-               break;
-       case GDK_exclam:        /* Mark as unread */
-               summary_mark_as_unread(summaryview);
-               break;
-       case GDK_BackSpace:     /* Page up */
-               textview_scroll_page(summaryview->messageview->textview, TRUE);
-               break;
        default:
                break;
        }
 }
 
-#undef BREAK_ON_MODIFIER_KEY
-#undef RETURN_IF_LOCKED
-#undef KEY_PRESS_EVENT_STOP
-
 static void summary_open_row(GtkSCTree *sctree, SummaryView *summaryview)
 {
        if (summaryview->folder_item->stype == F_OUTBOX ||
@@ -4352,6 +4530,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
 
        summary_status_show(summaryview);
        summary_set_menu_sensitive(summaryview);
+       main_window_set_toolbar_sensitive(summaryview->mainwin);
 
        if (GTK_CLIST(ctree)->selection &&
             GTK_CLIST(ctree)->selection->next) {
@@ -4398,7 +4577,7 @@ static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
        }
 
        if (summaryview->display_msg)
-               summary_display_msg(summaryview, row, FALSE);
+               summary_display_msg(summaryview, row);
 
        summaryview->display_msg = FALSE;
 }
@@ -4414,83 +4593,7 @@ static void summary_col_resized(GtkCList *clist, gint column, gint width,
 static void summary_reply_cb(SummaryView *summaryview, guint action,
                             GtkWidget *widget)
 {
-       MsgInfo *msginfo;
-       GList  *sel = GTK_CLIST(summaryview->ctree)->selection;
-
-       msginfo = gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                             summaryview->selected);
-       if (!msginfo) return;
-
-       switch ((ComposeMode)action) {
-       case COMPOSE_REPLY:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             FALSE, TRUE);
-               break;
-       case COMPOSE_FOLLOWUP_AND_REPLY_TO:
-               compose_followup_and_reply_to(msginfo,
-                                             prefs_common.reply_with_quote,
-                                             FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, FALSE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL:
-               compose_reply(msginfo, prefs_common.reply_with_quote,
-                             TRUE, TRUE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITH_QUOTE:
-               compose_reply(msginfo, TRUE, TRUE, FALSE);
-               break;
-       case COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE:
-               compose_reply(msginfo, FALSE, TRUE, FALSE);
-               break;
-       case COMPOSE_FORWARD:
-               if (prefs_common.forward_as_attachment) {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_AS_ATTACH, widget);
-                       return;
-               } else {
-                       summary_reply_cb(summaryview, COMPOSE_FORWARD_INLINE, widget);
-                       return;
-               }
-               break;
-       case COMPOSE_FORWARD_INLINE:
-               if (!sel->next) {
-                       compose_forward(NULL, msginfo, FALSE);
-                       break;
-               }
-               /* if (sel->next) FALL THROUGH */
-       case COMPOSE_FORWARD_AS_ATTACH:
-               {
-                       GSList *msginfo_list = NULL;
-                       for ( ; sel != NULL; sel = sel->next)
-                               msginfo_list = g_slist_append(msginfo_list, 
-                                       gtk_ctree_node_get_row_data(GTK_CTREE(summaryview->ctree),
-                                               GTK_CTREE_NODE(sel->data)));
-                       compose_forward_multiple(NULL, msginfo_list);
-                       g_slist_free(msginfo_list);
-               }                       
-               break;
-       case COMPOSE_BOUNCE:
-               compose_bounce(NULL, msginfo);
-               break;
-       default:
-               g_warning("summary_reply_cb(): invalid action: %d\n", action);
-       }
-
-       summary_set_marks_selected(summaryview);
+       summary_reply(summaryview, (ComposeMode)action);
 }
 
 static void summary_execute_cb(SummaryView *summaryview, guint action,
@@ -4502,7 +4605,7 @@ static void summary_execute_cb(SummaryView *summaryview, guint action,
 static void summary_show_all_header_cb(SummaryView *summaryview,
                                       guint action, GtkWidget *widget)
 {
-       header_window_show_cb(summaryview->mainwin, action, widget);
+       summary_redisplay_msg(summaryview, TRUE);
 }
 
 static void summary_add_address_cb(SummaryView *summaryview,