2007-07-23 [colin] 2.10.0cvs58
[claws.git] / src / mimeview.c
index f2895f311dc1d51df67952ee5b5efbbee1fc33e4..4f8c3476b0cbb99185eb2e061bfb378d5a077680 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include "utils.h"
 #include "gtkutils.h"
 #include "prefs_common.h"
+#include "procheader.h"
 #include "stock_pixmap.h"
 #include "gtk/gtkvscrollbutton.h"
-
+#include "gtk/logwindow.h"
+#include "timing.h"
+
+#ifdef MAEMO
+//#include <hildon-widgets/hildon-program.h>
+//#include <gtk/gtkmain.h>
+#include <libosso.h>
+#include <osso-mime.h>
+#endif
 
 typedef enum
 {
@@ -83,7 +92,7 @@ static void mimeview_show_message_part                (MimeView       *mimeview,
                                                 MimeInfo       *partinfo);
 static void mimeview_change_view_type          (MimeView       *mimeview,
                                                 MimeViewType    type);
-gchar *mimeview_get_filename_for_part          (MimeInfo       *partinfo,
+static gchar *mimeview_get_filename_for_part           (MimeInfo       *partinfo,
                                                 const gchar    *basedir,
                                                 gint            number);
 static gboolean mimeview_write_part            (const gchar    *filename,
@@ -111,14 +120,24 @@ static void mimeview_drag_data_get      (GtkWidget          *widget,
                                         guint             time,
                                         MimeView         *mimeview);
 
+static gboolean mimeview_scrolled      (GtkWidget      *widget,
+                                        GdkEventScroll *event,
+                                        MimeView       *mimeview);
 static void mimeview_display_as_text   (MimeView       *mimeview);
 static void mimeview_save_as           (MimeView       *mimeview);
 static void mimeview_save_all          (MimeView       *mimeview);
-static void mimeview_launch            (MimeView       *mimeview);
+static void mimeview_launch            (MimeView       *mimeview,
+                                        MimeInfo       *partinfo);
 static void mimeview_open_with         (MimeView       *mimeview);
+static void mimeview_open_part_with    (MimeView       *mimeview,
+                                        MimeInfo       *partinfo,
+                                        gboolean        automatic);
+static void mimeview_select_next_part  (MimeView       *mimeview);
+static void mimeview_select_prev_part  (MimeView       *mimeview);
 static void mimeview_view_file         (const gchar    *filename,
                                         MimeInfo       *partinfo,
-                                        const gchar    *cmdline);
+                                        const gchar    *cmd,
+                                        MimeView       *mimeview);
 static gboolean icon_clicked_cb                (GtkWidget      *button, 
                                         GdkEventButton *event, 
                                         MimeView       *mimeview);
@@ -128,8 +147,6 @@ static void icon_selected               (MimeView       *mimeview,
 static gint icon_key_pressed            (GtkWidget      *button, 
                                         GdkEventKey    *event,
                                         MimeView       *mimeview);
-static void toggle_icon                        (GtkToggleButton *button,
-                                        MimeView       *mimeview);
 static void icon_list_append_icon      (MimeView       *mimeview, 
                                         MimeInfo       *mimeinfo);
 static void icon_list_create           (MimeView       *mimeview, 
@@ -137,24 +154,30 @@ static void icon_list_create              (MimeView       *mimeview,
 static void icon_list_clear            (MimeView       *mimeview);
 static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
                                           MimeInfo     *mimeinfo);
-static gboolean icon_list_select_by_number(MimeView    *mimeview,
-                                          gint          number);
-static void mime_toggle_button_cb      (GtkWidget      *button,
-                                        MimeView       *mimeview);
+static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
+                                   MimeView *mimeview);
 static gboolean part_button_pressed    (MimeView       *mimeview, 
                                         GdkEventButton *event, 
                                         MimeInfo       *partinfo);
 static void icon_scroll_size_allocate_cb(GtkWidget     *widget, 
                                         GtkAllocation  *layout_size, 
                                         MimeView       *mimeview);
+static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview);
 
+static void mimeview_launch_cb(MimeView *mimeview)
+{
+       mimeview_launch(mimeview, mimeview_get_part_to_use(mimeview));
+}
 static GtkItemFactoryEntry mimeview_popup_entries[] =
 {
-       {N_("/_Open"),            NULL, mimeview_launch,          0, NULL},
-       {N_("/Open _with..."),    NULL, mimeview_open_with,       0, NULL},
-       {N_("/_Display as text"), NULL, mimeview_display_as_text, 0, NULL},
-       {N_("/_Save as..."),      NULL, mimeview_save_as,         0, NULL},
-       {N_("/Save _all..."),     NULL, mimeview_save_all,        0, NULL},
+       {N_("/_Open (l)"),                NULL, mimeview_launch_cb,       0, NULL},
+#ifndef MAEMO
+       {N_("/Open _with (o)..."),        NULL, mimeview_open_with,       0, NULL},
+#endif
+       {N_("/_Display as text (t)"),     NULL, mimeview_display_as_text, 0, NULL},
+       {N_("/_Save as (y)..."),          NULL, mimeview_save_as,         0, NULL},
+       {N_("/Save _all..."),             NULL, mimeview_save_all,        0, NULL},
+       {N_("/Next part (a)"),            NULL, mimeview_select_next_part,0, NULL},
 };
 
 static GtkTargetEntry mimeview_mime_types[] =
@@ -165,6 +188,32 @@ static GtkTargetEntry mimeview_mime_types[] =
 GSList *mimeviewer_factories;
 GSList *mimeviews;
 
+static GdkCursor *hand_cursor = NULL;
+
+static gboolean mimeview_visi_notify(GtkWidget *widget,
+                                      GdkEventVisibility *event,
+                                      MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, hand_cursor);
+       return FALSE;
+}
+
+static gboolean mimeview_leave_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, NULL);
+       return FALSE;
+}
+
+static gboolean mimeview_enter_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     MimeView *mimeview)
+{
+       gdk_window_set_cursor(widget->window, hand_cursor);
+       return FALSE;
+}
+
 MimeView *mimeview_create(MainWindow *mainwin)
 {
        MimeView *mimeview;
@@ -190,6 +239,9 @@ MimeView *mimeview_create(MainWindow *mainwin)
        gint n_entries;
        gint i;
 
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
+
        debug_print("Creating MIME view...\n");
        mimeview = g_new0(MimeView, 1);
 
@@ -241,16 +293,33 @@ MimeView *mimeview_create(MainWindow *mainwin)
        scrollbutton = gtk_vscrollbutton_new(gtk_layout_get_vadjustment(GTK_LAYOUT(icon_scroll)));
        gtk_widget_show(scrollbutton);
 
-       mime_toggle = gtk_toggle_button_new();
+       g_signal_connect(G_OBJECT(icon_scroll), "scroll_event",
+                        G_CALLBACK(mimeview_scrolled), mimeview);
+
+       mime_toggle = gtk_event_box_new();
+       gtk_event_box_set_visible_window(GTK_EVENT_BOX(mime_toggle), FALSE);
+
+       g_signal_connect(G_OBJECT(mime_toggle), "visibility-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(mime_toggle), "motion-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(mime_toggle), "leave-notify-event",
+                        G_CALLBACK(mimeview_leave_notify), mimeview);
+       g_signal_connect(G_OBJECT(mime_toggle), "enter-notify-event",
+                        G_CALLBACK(mimeview_enter_notify), mimeview);
+
+       gtk_container_set_border_width(GTK_CONTAINER(mime_toggle), 2);
        gtk_widget_show(mime_toggle);
+       mimeview->ctree_mode = FALSE;
        arrow = gtk_arrow_new(GTK_ARROW_LEFT, GTK_SHADOW_NONE);
        gtk_widget_show(arrow);
        gtk_container_add(GTK_CONTAINER(mime_toggle), arrow);
-       g_signal_connect(G_OBJECT(mime_toggle), "toggled", 
+       g_signal_connect(G_OBJECT(mime_toggle), "button_release_event", 
                         G_CALLBACK(mime_toggle_button_cb), mimeview);
 
        icon_mainbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(icon_mainbox);
+       gtk_widget_set_size_request(icon_mainbox, 32, -1);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), mime_toggle, FALSE, FALSE, 0);
        gtk_box_pack_start(GTK_BOX(icon_mainbox), icon_scroll, TRUE, TRUE, 3);
        gtk_box_pack_end(GTK_BOX(icon_mainbox), scrollbutton, FALSE, FALSE, 0);
@@ -265,7 +334,6 @@ MimeView *mimeview_create(MainWindow *mainwin)
        popupmenu = menu_create_items(mimeview_popup_entries, n_entries,
                                      "<MimeView>", &popupfactory, mimeview);
        tooltips = gtk_tooltips_new();
-       gtk_tooltips_set_delay(tooltips, 0); 
 
        vbox = gtk_vbox_new(FALSE, 0);
        gtk_widget_show(vbox);
@@ -287,7 +355,9 @@ MimeView *mimeview_create(MainWindow *mainwin)
 
        gtk_widget_show(hbox);
        gtk_widget_hide(ctree_mainbox);
-
+#ifdef MAEMO
+       gtk_widget_set_size_request(mime_toggle, -1, arrow->requisition.height + 8);
+#endif
        mimeview->hbox          = hbox;
        mimeview->paned         = paned;
        mimeview->scrolledwin   = scrolledwin;
@@ -306,7 +376,7 @@ MimeView *mimeview_create(MainWindow *mainwin)
        mimeview->oldsize       = 60;
        mimeview->mime_toggle   = mime_toggle;
        mimeview->siginfoview   = siginfoview;
-
+       mimeview->scrollbutton  = scrollbutton;
        mimeview->target_list   = gtk_target_list_new(mimeview_mime_types, 1); 
        
        mimeviews = g_slist_prepend(mimeviews, mimeview);
@@ -322,6 +392,17 @@ void mimeview_init(MimeView *mimeview)
                GTK_WIDGET_PTR(mimeview->textview));
 }
 
+static gboolean any_part_is_signed(MimeInfo *mimeinfo)
+{
+       while (mimeinfo) {
+               if (privacy_mimeinfo_is_signed(mimeinfo))
+                       return TRUE;
+               mimeinfo = procmime_mimeinfo_next(mimeinfo);
+       }
+
+       return FALSE;
+}
+
 void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
@@ -340,7 +421,13 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        g_signal_handlers_block_by_func(G_OBJECT(ctree), mimeview_selected,
                                        mimeview);
 
+       /* check if the mail's signed - it can change the mail structure */
+       
+       if (any_part_is_signed(mimeinfo))
+               debug_print("signed mail\n");
+
        mimeview_set_multipart_tree(mimeview, mimeinfo, NULL);
+       icon_list_clear(mimeview);
        icon_list_create(mimeview, mimeinfo);
 
        g_signal_handlers_unblock_by_func(G_OBJECT(ctree),
@@ -355,24 +442,52 @@ void mimeview_show_message(MimeView *mimeview, MimeInfo *mimeinfo,
        }
 }
 
+#ifdef USE_PTHREAD
+static void mimeview_check_sig_cancel_now(MimeView *mimeview);
+#endif
+
+static void mimeview_free_mimeinfo(MimeView *mimeview)
+{
+       gboolean defer = FALSE;
+#ifdef USE_PTHREAD
+       defer = (mimeview->check_data != NULL);
+       if (defer)
+               mimeview->check_data->free_after_use = TRUE;
+#endif
+       if (mimeview->mimeinfo != NULL && !defer) {
+               procmime_mimeinfo_free_all(mimeview->mimeinfo);
+               mimeview->mimeinfo = NULL;
+       } else if (defer) {
+#ifdef USE_PTHREAD
+               debug_print("deferring free(mimeinfo) and cancelling check\n");
+               mimeview_check_sig_cancel_now(mimeview);
+#endif
+       }
+}
+
 void mimeview_destroy(MimeView *mimeview)
 {
        GSList *cur;
        
        for (cur = mimeview->viewers; cur != NULL; cur = g_slist_next(cur)) {
                MimeViewer *viewer = (MimeViewer *) cur->data;
-               gtk_container_remove(GTK_CONTAINER(mimeview->mime_notebook),
-                       GTK_WIDGET(viewer->get_widget(viewer)));
                viewer->destroy_viewer(viewer);
        }
        g_slist_free(mimeview->viewers);
        gtk_target_list_unref(mimeview->target_list);
 
-       procmime_mimeinfo_free_all(mimeview->mimeinfo);
-       g_free(mimeview->file);
-       g_free(mimeview);
-
-       mimeviews = g_slist_remove(mimeviews, mimeview);
+       mimeview_free_mimeinfo(mimeview);
+#ifdef USE_PTHREAD
+       if (mimeview->check_data) {
+               mimeview->check_data->destroy_mimeview = TRUE;
+               debug_print("deferring destroy\n");
+       } else 
+#endif
+       {
+               g_free(mimeview->file);
+               g_free(mimeview);
+               mimeviews = g_slist_remove(mimeviews, mimeview);
+       }
        
 }
 
@@ -382,6 +497,28 @@ MimeInfo *mimeview_get_selected_part(MimeView *mimeview)
                (GTK_CTREE(mimeview->ctree), mimeview->opened);
 }
 
+gint mimeview_get_selected_part_num(MimeView *mimeview)
+{
+       gint i = 0;
+       GList *rows = GTK_CLIST(mimeview->ctree)->row_list;
+       while (rows) {
+               if (mimeview->opened == GTK_CTREE_NODE(rows))
+                       return i;
+               i++;
+               rows = rows->next;
+       }
+       return -1;
+}
+
+void mimeview_select_part_num(MimeView *mimeview, gint i)
+{
+       if (i < 0)
+               return;
+       gtk_clist_unselect_all(GTK_CLIST(mimeview->ctree));
+       gtk_clist_select_row(GTK_CLIST(mimeview->ctree), i, -1);
+       gtkut_clist_set_focus_row(GTK_CLIST(mimeview->ctree), i);
+}
+
 static void mimeview_set_multipart_tree(MimeView *mimeview,
                                        MimeInfo *mimeinfo,
                                        GtkCTreeNode *parent)
@@ -399,13 +536,22 @@ static void mimeview_set_multipart_tree(MimeView *mimeview,
        }
 }
 
-static const gchar *get_part_name(MimeInfo *partinfo)
+static const gchar *get_real_part_name(MimeInfo *partinfo)
 {
-       const gchar *name;
+       const gchar *name = NULL;
 
        name = procmime_mimeinfo_get_parameter(partinfo, "filename");
        if (name == NULL)
                name = procmime_mimeinfo_get_parameter(partinfo, "name");
+
+       return name;
+}
+
+static const gchar *get_part_name(MimeInfo *partinfo)
+{
+       const gchar *name;
+
+       name = get_real_part_name(partinfo);
        if (name == NULL)
                name = "";
 
@@ -442,7 +588,7 @@ static GtkCTreeNode *mimeview_append_part(MimeView *mimeview,
        else
                str[COL_NAME] = (gchar *) get_part_name(partinfo);
 
-       node = gtk_ctree_insert_node(ctree, parent, NULL, str, 0,
+       node = gtk_sctree_insert_node(ctree, parent, NULL, str, 0,
                                     NULL, NULL, NULL, NULL,
                                     FALSE, TRUE);
        gtk_ctree_node_set_row_data(ctree, node, partinfo);
@@ -572,6 +718,7 @@ gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
                mimeview->mimeviewer = viewer;
                mimeview_change_view_type(mimeview, MIMEVIEW_VIEWER);
        }
+       viewer->mimeview = mimeview;
        viewer->show_mimepart(viewer, mimeview->file, partinfo);
 
        return TRUE;
@@ -580,6 +727,11 @@ gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
 {
        TextView  *textview  = mimeview->textview;
+       GtkWidget *focused = NULL;
+       
+       if (mainwindow_get_mainwindow())
+               focused = gtkut_get_focused_child(
+                               GTK_CONTAINER(mainwindow_get_mainwindow()->window));
 
        if ((mimeview->type != MIMEVIEW_VIEWER) && 
            (mimeview->type == type)) return;
@@ -598,14 +750,23 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
        default:
                return;
        }
-
+       if (focused)
+               gtk_widget_grab_focus(focused);
        mimeview->type = type;
 }
 
 void mimeview_clear(MimeView *mimeview)
 {
-       GtkCList *clist = GTK_CLIST(mimeview->ctree);
+       GtkCList *clist = NULL;
+       
+       if (!mimeview)
+               return;
 
+       if (g_slist_find(mimeviews, mimeview) == NULL)
+               return;
+       
+       clist = GTK_CLIST(mimeview->ctree);
+       
        noticeview_hide(mimeview->siginfoview);
 
        gtk_clist_clear(clist);
@@ -613,8 +774,8 @@ void mimeview_clear(MimeView *mimeview)
        if (mimeview->mimeviewer != NULL)
                mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);
 
-       if (mimeview->mimeinfo != NULL)
-               procmime_mimeinfo_free_all(mimeview->mimeinfo);
+       mimeview_free_mimeinfo(mimeview);
+
        mimeview->mimeinfo = NULL;
 
        mimeview->opened = NULL;
@@ -623,22 +784,30 @@ void mimeview_clear(MimeView *mimeview)
        mimeview->file = NULL;
 
        icon_list_clear(mimeview);
+       mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
 void mimeview_check_signature(MimeView *mimeview);
 static void display_full_info_cb(GtkWidget *widget, gpointer user_data);
 
-static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
+static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo, 
+                                       gboolean special, SignatureStatus code)
 {
        gchar *text = NULL, *button_text = NULL;
        void  *func = NULL;
        StockPixmap icon = STOCK_PIXMAP_PRIVACY_SIGNED;
-
+       SignatureStatus mycode = SIGNATURE_UNCHECKED;
+       
        g_return_if_fail(mimeview != NULL);
        g_return_if_fail(mimeinfo != NULL);
        
-       switch (privacy_mimeinfo_get_sig_status(mimeinfo)) {
+       if (special)
+               mycode = code;
+       else 
+               mycode = privacy_mimeinfo_get_sig_status(mimeinfo);
+
+       switch (mycode) {
        case SIGNATURE_UNCHECKED:
                button_text = _("Check signature");
                func = check_signature_cb;
@@ -663,17 +832,27 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
                button_text = _("Check again");
                func = check_signature_cb;
                icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
+       case SIGNATURE_CHECK_TIMEOUT:
+               button_text = _("Check again");
+               func = check_signature_cb;
+               icon = STOCK_PIXMAP_PRIVACY_UNKNOWN;
        default:
                break;
        }
-       if (privacy_mimeinfo_get_sig_status(mimeinfo) == SIGNATURE_UNCHECKED) {
+       if (mycode == SIGNATURE_UNCHECKED) {
                gchar *tmp = privacy_mimeinfo_sig_info_short(mimeinfo);
                text = g_strdup_printf("%s %s",
                        tmp, _("Click the icon or hit 'C' to check it."));
                g_free(tmp);
-       } else
+       } else if (mycode != SIGNATURE_CHECK_TIMEOUT) {
                text = privacy_mimeinfo_sig_info_short(mimeinfo);
+       } else if (mycode == SIGNATURE_CHECK_TIMEOUT) {
+               text = g_strdup(_("Timeout checking the signature. Click the icon or hit 'C' to try again."));
+       }
+
        noticeview_set_text(mimeview->siginfoview, text);
+       gtk_label_set_selectable(GTK_LABEL(mimeview->siginfoview->text), TRUE);
+
        g_free(text);
        noticeview_set_button_text(mimeview->siginfoview, NULL);
        noticeview_set_button_press_callback(
@@ -684,6 +863,189 @@ static void update_signature_noticeview(MimeView *mimeview, MimeInfo *mimeinfo)
        noticeview_set_tooltip(mimeview->siginfoview, button_text);
 }
 
+#ifdef USE_PTHREAD
+
+/* reset all thread stuff, and do the cleanups we've been left to do */
+static void mimeview_check_data_reset(MimeView *mimeview)
+{
+       if (!mimeview->check_data)
+               return;
+
+       if (mimeview->check_data->free_after_use) {
+               debug_print("freeing deferred mimeinfo\n");
+               procmime_mimeinfo_free_all(mimeview->check_data->siginfo);
+       }
+       if (mimeview->check_data->destroy_mimeview) {
+               debug_print("freeing deferred mimeview\n");
+               g_free(mimeview->file);
+               g_free(mimeview);
+               mimeviews = g_slist_remove(mimeviews, mimeview);
+       }
+
+       g_free(mimeview->check_data);
+       mimeview->check_data = NULL;
+}
+
+/* GUI update once the checker thread is done or killed */
+static gboolean mimeview_check_sig_thread_cb(void *data)
+{
+       MimeView *mimeview = (MimeView *) data;
+       MimeInfo *mimeinfo = mimeview->siginfo;
+
+       debug_print("mimeview_check_sig_thread_cb\n");
+       
+       if (mimeinfo == NULL) {
+               /* message changed !? */
+               g_warning("no more siginfo!\n");
+               goto end;
+       }
+       
+       if (!mimeview->check_data) {
+               g_warning("nothing to check\n");
+               return FALSE;
+       }
+
+       if (mimeview->check_data->siginfo != mimeinfo) {
+               /* message changed !? */
+               g_warning("different siginfo!\n");
+               goto end;
+       }
+
+       if (mimeview->check_data->destroy_mimeview ||
+           mimeview->check_data->free_after_use) {
+               debug_print("not bothering, we're changing message\n"); 
+               goto end;
+       }
+       
+       /* update status */
+       if (mimeview->check_data->timeout) 
+               update_signature_noticeview(mimeview, mimeview->siginfo, 
+                       TRUE, SIGNATURE_CHECK_TIMEOUT);
+       else
+               update_signature_noticeview(mimeview, mimeview->siginfo, 
+                       FALSE, 0);
+       icon_list_clear(mimeview);
+       icon_list_create(mimeview, mimeview->mimeinfo);
+       
+end:
+       mimeview_check_data_reset(mimeview);
+       return FALSE;
+}
+
+/* sig checker thread */
+static void *mimeview_check_sig_worker_thread(void *data)
+{
+       MimeView *mimeview = (MimeView *)data;
+       MimeInfo *mimeinfo = mimeview->siginfo;
+       
+       debug_print("checking...\n");
+
+       if (!mimeview->check_data)
+               return NULL;
+
+       if (mimeinfo && mimeinfo == mimeview->check_data->siginfo)
+               privacy_mimeinfo_check_signature(mimeinfo);
+       else {
+               /* that's strange! we changed message without 
+                * getting killed. */
+               g_warning("different siginfo!\n");
+               mimeview_check_data_reset(mimeview);
+               return NULL;
+       }
+
+       /* use g_timeout so that GUI updates is done from the
+        * correct thread */
+       g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+       
+       return NULL;
+}
+
+/* killer thread - acts when the checker didn't work fast
+ * enough. */
+static void *mimeview_check_sig_cancel_thread(void *data)
+{
+       MimeView *mimeview = (MimeView *)data;
+       
+       if (!mimeview->check_data)
+               return NULL; /* nothing to kill ! */
+
+       /* wait for a few seconds... */
+       debug_print("waiting a while\n");
+
+       sleep(5);
+       
+       if (!mimeview->check_data)
+               return NULL; /* nothing to kill, it's done in time :) */
+       
+       /* too late, go away checker thread */
+       debug_print("killing checker thread\n");
+       pthread_cancel(mimeview->check_data->th);
+       
+       /* tell upstream it was a timeout */
+       mimeview->check_data->timeout = TRUE;
+       /* use g_timeout so that GUI updates is done from the
+        * correct thread */
+       g_timeout_add(0,mimeview_check_sig_thread_cb,mimeview);
+
+       return NULL;
+}
+
+/* get rid of the checker thread right now - used when changing the
+ * displayed message for example. */
+static void mimeview_check_sig_cancel_now(MimeView *mimeview)
+{
+       if (!mimeview->check_data)
+               return;
+       debug_print("killing checker thread NOW\n");
+       pthread_cancel(mimeview->check_data->th);
+
+       /* tell upstream it was a timeout */
+       mimeview->check_data->timeout = TRUE;
+       mimeview_check_sig_thread_cb(mimeview);
+       return;
+}
+
+/* creates a thread to check the signature, and a second one
+ * to kill the first one after a timeout */
+static void mimeview_check_sig_in_thread(MimeView *mimeview)
+{
+       pthread_t th, th2;
+       pthread_attr_t detach, detach2;
+       
+       if (mimeview->check_data) {
+               g_warning("already checking it");
+               return;
+       }
+       
+       mimeview->check_data = g_new0(SigCheckData, 1);
+       mimeview->check_data->siginfo = mimeview->siginfo;
+       debug_print("creating thread\n");
+
+       pthread_attr_init(&detach);
+       pthread_attr_setdetachstate(&detach, TRUE);
+
+       pthread_attr_init(&detach2);
+       pthread_attr_setdetachstate(&detach2, TRUE);
+
+       /* create the checker thread */
+       if (pthread_create(&th, &detach, 
+                       mimeview_check_sig_worker_thread, 
+                       mimeview) != 0) {
+               /* arh. We'll do it synchronously. */
+               g_warning("can't create thread");
+               g_free(mimeview->check_data);
+               mimeview->check_data = NULL;
+               return;
+       } else 
+               mimeview->check_data->th = th;
+
+       /* create the killer thread */
+       pthread_create(&th2, &detach2, 
+                       mimeview_check_sig_cancel_thread, 
+                       mimeview);
+}
+#endif
+
 static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 {
        MimeView *mimeview = (MimeView *) user_data;
@@ -691,13 +1053,24 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        
        if (mimeinfo == NULL)
                return;
-
+#ifdef USE_PTHREAD
+       if (mimeview->check_data)
+               return;
+#endif
        noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
        GTK_EVENTS_FLUSH();
-       privacy_mimeinfo_check_signature(mimeinfo);
-       update_signature_noticeview(mimeview, mimeview->siginfo);
-       icon_list_clear(mimeview);
-       icon_list_create(mimeview, mimeview->mimeinfo);
+#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+       /* let's do it non-blocking */
+       mimeview_check_sig_in_thread(mimeview);
+       if (!mimeview->check_data) /* let's check syncronously */
+#endif
+       {
+               debug_print("checking without thread\n");
+               privacy_mimeinfo_check_signature(mimeinfo);
+               update_signature_noticeview(mimeview, mimeview->siginfo, FALSE, 0);
+               icon_list_clear(mimeview);
+               icon_list_create(mimeview, mimeview->mimeinfo);
+       }
 }
 
 void mimeview_check_signature(MimeView *mimeview)
@@ -763,7 +1136,7 @@ static void update_signature_info(MimeView *mimeview, MimeInfo *selected)
                return;
        }
        
-       update_signature_noticeview(mimeview, siginfo);
+       update_signature_noticeview(mimeview, siginfo, FALSE, 0);
        noticeview_show(mimeview->siginfoview);
 }
 
@@ -771,9 +1144,9 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                              MimeView *mimeview)
 {
        MimeInfo *partinfo;
-
        if (mimeview->opened == node) return;
        mimeview->opened = node;
+       mimeview->spec_part = NULL;
        gtk_ctree_node_moveto(ctree, node, -1, 0.5, 0);
 
        partinfo = gtk_ctree_node_get_row_data(ctree, node);
@@ -799,8 +1172,9 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
                
                        break;
                default:
-                       mimeview->textview->default_text = TRUE;        
+                       mimeview->textview->default_text = TRUE;
                        mimeview_change_view_type(mimeview, MIMEVIEW_TEXT);
+                       textview_clear(mimeview->textview);
                        textview_show_mime_part(mimeview->textview, partinfo);
                        break;
                }
@@ -844,6 +1218,19 @@ static gint mimeview_button_pressed(GtkWidget *widget, GdkEventButton *event,
        return FALSE;
 }
 
+static gboolean mimeview_scrolled(GtkWidget *widget, GdkEventScroll *event,
+                                   MimeView *mimeview)
+{
+       GtkVScrollbutton *scrollbutton = (GtkVScrollbutton *)mimeview->scrollbutton;
+       if (event->direction == GDK_SCROLL_UP) {
+               scrollbutton->scroll_type = GTK_SCROLL_STEP_BACKWARD;
+       } else {
+               scrollbutton->scroll_type = GTK_SCROLL_STEP_FORWARD;
+       }
+       gtk_vscrollbutton_scroll(scrollbutton);
+       return TRUE;
+}
+
 /* from gdkevents.c */
 #define DOUBLE_CLICK_TIME 250
 
@@ -856,26 +1243,25 @@ static gboolean part_button_pressed(MimeView *mimeview, GdkEventButton *event,
        if (event->button == 2 ||
            (event->button == 1 && (event->time - lasttime) < DOUBLE_CLICK_TIME && lastinfo == partinfo)) {
                /* call external program for image, audio or html */
-               mimeview_launch(mimeview);
+               mimeview_launch(mimeview, partinfo);
                return TRUE;
        } else if (event->button == 3) {
-               if (partinfo && (partinfo->type == MIMETYPE_TEXT ||
-                                partinfo->type == MIMETYPE_MESSAGE ||
+               if (partinfo && (partinfo->type == MIMETYPE_MESSAGE ||
                                 partinfo->type == MIMETYPE_IMAGE ||
                                 partinfo->type == MIMETYPE_MULTIPART))
                        menu_set_sensitive(mimeview->popupfactory,
-                                          "/Display as text", FALSE);
+                                          "/Display as text (t)", FALSE);
                else
                        menu_set_sensitive(mimeview->popupfactory,
-                                          "/Display as text", TRUE);
+                                          "/Display as text (t)", TRUE);
                if (partinfo &&
                    partinfo->type == MIMETYPE_APPLICATION &&
                    !g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))
                        menu_set_sensitive(mimeview->popupfactory,
-                                          "/Open", FALSE);
+                                          "/Open (l)", FALSE);
                else
                        menu_set_sensitive(mimeview->popupfactory,
-                                          "/Open", TRUE);
+                                          "/Open (l)", TRUE);
 
                g_object_set_data(G_OBJECT(mimeview->popupmenu),
                                  "pop_partinfo", partinfo);
@@ -897,6 +1283,48 @@ void mimeview_pass_key_press_event(MimeView *mimeview, GdkEventKey *event)
        mimeview_key_pressed(mimeview->ctree, event, mimeview);
 }
 
+static void mimeview_select_next_part(MimeView *mimeview)
+{
+       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
+       GtkCTreeNode *node = mimeview->opened;
+       MimeInfo *partinfo = NULL;
+       
+skip:
+       node = GTK_CTREE_NODE_NEXT(node);
+       if (!node)
+               node = gtk_ctree_node_nth(GTK_CTREE(ctree), 0);
+
+       if (node) {
+               partinfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (partinfo->type == MIMETYPE_MULTIPART)
+                       goto skip;
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               icon_list_toggle_by_mime_info(mimeview, partinfo);
+       }
+}
+
+static void mimeview_select_prev_part(MimeView *mimeview)
+{
+       GtkCTree *ctree = GTK_CTREE(mimeview->ctree);
+       GtkCTreeNode *node = mimeview->opened;
+       MimeInfo *partinfo = NULL;
+       
+skip:
+       node = GTK_CTREE_NODE_PREV(node);
+       if (!node)
+               node = gtk_ctree_node_nth(GTK_CTREE(ctree), GTK_CLIST(ctree)->rows - 1);
+
+       if (node) {
+               partinfo = gtk_ctree_node_get_row_data(ctree, node);
+               if (partinfo->type == MIMETYPE_MULTIPART)
+                       goto skip;
+               gtk_sctree_unselect_all(GTK_SCTREE(ctree));
+               gtk_sctree_select(GTK_SCTREE(ctree), node);
+               icon_list_toggle_by_mime_info(mimeview, partinfo);
+       }
+}
+
 #define BREAK_ON_MODIFIER_KEY() \
        if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) != 0) break
 
@@ -909,7 +1337,6 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 {
        SummaryView *summaryview;
        GtkCTree *ctree = GTK_CTREE(widget);
-       GtkCTreeNode *node;
 
        if (!event) return FALSE;
        if (!mimeview->opened) return FALSE;
@@ -921,39 +1348,32 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                
        switch (event->keyval) {
        case GDK_space:
-               if (textview_scroll_page(mimeview->textview, FALSE))
+               if (mimeview_scroll_page(mimeview, FALSE))
                        return TRUE;
 
-               node = GTK_CTREE_NODE_NEXT(mimeview->opened);
-               if (node) {
-                       gtk_sctree_unselect_all(GTK_SCTREE(ctree));
-                       gtk_sctree_select(GTK_SCTREE(ctree), node);
-                       return TRUE;
-               }
-               break;
+               mimeview_select_next_part(mimeview);
+               return TRUE;
+
        case GDK_BackSpace:
-               textview_scroll_page(mimeview->textview, TRUE);
+               mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
-               textview_scroll_one_line(mimeview->textview,
+       case GDK_KP_Enter:
+               mimeview_scroll_one_line(mimeview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                return TRUE;
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (!GTK_CTREE_NODE_NEXT(mimeview->opened)) break;
-               KEY_PRESS_EVENT_STOP();
-               g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
-                                       GTK_SCROLL_STEP_FORWARD, 0.0);
+               mimeview_select_next_part(mimeview);
                return TRUE;
+
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (!GTK_CTREE_NODE_PREV(mimeview->opened)) break;
-               KEY_PRESS_EVENT_STOP();
-               g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical",
-                                       GTK_SCROLL_STEP_BACKWARD, 0.0);
+               mimeview_select_prev_part(mimeview);
                return TRUE;
+
        case GDK_y:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
@@ -967,7 +1387,7 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_l:
                BREAK_ON_MODIFIER_KEY();
                KEY_PRESS_EVENT_STOP();
-               mimeview_launch(mimeview);
+               mimeview_launch(mimeview, NULL);
                return TRUE;
        case GDK_o:
                BREAK_ON_MODIFIER_KEY();
@@ -979,6 +1399,11 @@ static gint mimeview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
+       case GDK_a:
+               BREAK_ON_MODIFIER_KEY();
+               KEY_PRESS_EVENT_STOP();
+               mimeview_select_next_part(mimeview);
+               return TRUE;
        default:
                break;
        }
@@ -996,8 +1421,9 @@ static void mimeview_drag_data_get(GtkWidget           *widget,
                                   guint             time,
                                   MimeView         *mimeview)
 {
-       gchar *filename, *uriname, *tmp;
+       gchar *filename = NULL, *uriname, *tmp;
        MimeInfo *partinfo;
+       gint err;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
@@ -1005,23 +1431,63 @@ static void mimeview_drag_data_get(GtkWidget        *widget,
        partinfo = mimeview_get_selected_part(mimeview);
        if (!partinfo) return;
 
-       filename = g_path_get_basename(get_part_name(partinfo));
-       if (*filename == '\0') return;
+       if (strlen(get_part_name(partinfo)) > 0) {
+               filename = g_path_get_basename(get_part_name(partinfo));
+               if (*filename == '\0') return;
+       } else if (partinfo->type == MIMETYPE_MESSAGE 
+                  && !g_ascii_strcasecmp(partinfo->subtype, "rfc822")) {
+               gchar *name = NULL;
+               GPtrArray *headers = NULL;
+               FILE *fp;
+
+               fp = g_fopen(partinfo->data.filename, "rb");
+               fseek(fp, partinfo->offset, SEEK_SET);
+               headers = procheader_get_header_array_asis(fp);
+               if (headers) {
+                       gint i;
+                       for (i = 0; i < headers->len; i++) {
+                               Header *header = g_ptr_array_index(headers, i);
+                               if (procheader_headername_equal(header->name, "Subject")) {
+                                       unfold_line(header->body);
+                                       name = g_strconcat(header->body, ".txt", NULL);
+                                       subst_for_filename(name);
+                               }
+                       }
+                       procheader_header_array_destroy(headers);
+               }
+               fclose(fp);
+               if (name)
+                       filename = g_path_get_basename(name);
+               g_free(name);
+       }
+       if (filename == NULL)
+               filename = g_path_get_basename("Unnamed part");
 
-       tmp = filename;
-       
+       if (!g_utf8_validate(filename, -1, NULL))
+               tmp = conv_codeset_strdup(filename,
+                               conv_get_locale_charset_str(),
+                               CS_UTF_8);
+       else
+               tmp = g_strdup(filename);
+
+       if (tmp == NULL) {
+               g_warning("filename not in UTF-8");
+               tmp = g_strdup("Unnamed part");
+       }
        filename = g_strconcat(get_mime_tmp_dir(), G_DIR_SEPARATOR_S,
-                              filename, NULL);
+                              tmp, NULL);
 
        g_free(tmp);
-       
-       if (procmime_get_part(filename, partinfo) < 0)
+
+       if ((err = procmime_get_part(filename, partinfo)) < 0)
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message: %s"), 
+                               strerror(-err));
+
+       uriname = g_strconcat("file://", filename, "\r\n", NULL);
 
-       uriname = g_strconcat("file://", filename, NULL);
        gtk_selection_data_set(selection_data, selection_data->target, 8,
-                              uriname, strlen(uriname));
+                              (guchar *)uriname, strlen(uriname));
 
        g_free(uriname);
        g_free(filename);
@@ -1033,7 +1499,7 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
  * \param basedir The target directory
  * \param number Used for dummy filename if attachment is unnamed
  */
-gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
+static gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
                                      const gchar *basedir,
                                      gint number)
 {
@@ -1057,7 +1523,9 @@ gchar *mimeview_get_filename_for_part(MimeInfo *partinfo,
                 ? &filename[1] : filename, NULL);
 
        g_free(filename);
-       return fullname;
+       filename = conv_filename_from_utf8(fullname);
+       g_free(fullname);
+       return filename;
 }
 
 /**
@@ -1069,7 +1537,8 @@ static gboolean mimeview_write_part(const gchar *filename,
                                    MimeInfo *partinfo)
 {
        gchar *dir;
-       
+       gint err;
+
        dir= g_path_get_dirname(filename);
        if (!is_dir_exist(dir))
                make_dir_hier(dir);
@@ -1078,18 +1547,26 @@ static gboolean mimeview_write_part(const gchar *filename,
        if (is_file_exist(filename)) {
                AlertValue aval;
                gchar *res;
+               gchar *tmp;
+               
+               if (!g_utf8_validate(filename, -1, NULL))
+                       tmp = conv_filename_to_utf8(filename);
+               else 
+                       tmp = g_strdup(filename);
                
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),
-                                     filename);
-               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
-                                 GTK_STOCK_CANCEL, NULL);
+                                     tmp);
+               g_free(tmp);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL, 
+                                 GTK_STOCK_OK, NULL);
                g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) return FALSE;
+               if (G_ALERTALTERNATE != aval) return FALSE;
        }
 
-       if (procmime_get_part(filename, partinfo) < 0) {
+       if ((err = procmime_get_part(filename, partinfo)) < 0) {
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message: %s"), 
+                               strerror(-err));
                return FALSE;
        }
 
@@ -1112,20 +1589,22 @@ static void mimeview_save_all(MimeView *mimeview)
        if (!mimeview->mimeinfo) return;
 
        partinfo = mimeview->mimeinfo;
-       if (prefs_common.attach_save_dir)
+       if (prefs_common.attach_save_dir && *prefs_common.attach_save_dir)
                startdir = g_strconcat(prefs_common.attach_save_dir,
                                       G_DIR_SEPARATOR_S, NULL);
+       else
+               startdir = g_strdup(get_home_dir());
 
        dirname = filesel_select_file_save_folder(_("Select destination folder"), startdir);
        if (!dirname) {
-               if (startdir) g_free(startdir);
+               g_free(startdir);
                return;
        }
 
        if (!is_dir_exist (dirname)) {
                alertpanel_error(_("'%s' is not a directory."),
                                 dirname);
-               if (startdir) g_free(startdir);
+               g_free(startdir);
                return;
        }
 
@@ -1144,7 +1623,8 @@ static void mimeview_save_all(MimeView *mimeview)
        while (partinfo != NULL) {
                if (partinfo->type != MIMETYPE_MESSAGE &&
                    partinfo->type != MIMETYPE_MULTIPART &&
-                   partinfo->disposition != DISPOSITIONTYPE_INLINE) {
+                   (partinfo->disposition != DISPOSITIONTYPE_INLINE
+                    || get_real_part_name(partinfo) != NULL)) {
                        gchar *filename = mimeview_get_filename_for_part
                                (partinfo, dirname, number++);
 
@@ -1154,14 +1634,31 @@ static void mimeview_save_all(MimeView *mimeview)
                partinfo = procmime_mimeinfo_next(partinfo);
        }
 
-       if (prefs_common.attach_save_dir)
-               g_free(prefs_common.attach_save_dir);
+       g_free(prefs_common.attach_save_dir);
+       g_free(startdir);
+       prefs_common.attach_save_dir = g_filename_to_utf8(dirname,
+                                       -1, NULL, NULL, NULL);
+}
 
-       prefs_common.attach_save_dir = g_strdup(dirname);
+static MimeInfo *mimeview_get_part_to_use(MimeView *mimeview)
+{
+       MimeInfo *partinfo = NULL;
+       if (mimeview->spec_part) {
+               partinfo = mimeview->spec_part;
+               mimeview->spec_part = NULL;
+       } else {
+               partinfo = (MimeInfo *) g_object_get_data
+                        (G_OBJECT(mimeview->popupmenu),
+                        "pop_partinfo");
+               g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                                 "pop_partinfo", NULL);
+               if (!partinfo) { 
+                       partinfo = mimeview_get_selected_part(mimeview);
+               }                        
+       }
 
-       if (startdir) g_free(startdir);
+       return partinfo;
 }
-
 /**
  * Menu callback: Save the selected attachment
  * \param mimeview Current display
@@ -1177,14 +1674,8 @@ static void mimeview_save_as(MimeView *mimeview)
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo) { 
-               partinfo = (MimeInfo *) g_object_get_data
-                        (G_OBJECT(mimeview->popupmenu),
-                        "pop_partinfo");
-               g_object_set_data(G_OBJECT(mimeview->popupmenu),
-                                 "pop_partinfo", NULL);
-       }                        
+       partinfo = mimeview_get_part_to_use(mimeview);
+
        g_return_if_fail(partinfo != NULL);
        
        if (get_part_name(partinfo) == NULL) {
@@ -1194,8 +1685,15 @@ static void mimeview_save_as(MimeView *mimeview)
        
        if (!g_utf8_validate(partname, -1, NULL)) {
                gchar *tmp = conv_filename_to_utf8(partname);
-               g_free(partname);
-               partname = tmp;
+               if (!tmp) {
+                       tmp = conv_codeset_strdup(partname,
+                               conv_get_locale_charset_str(),
+                               CS_UTF_8);
+               }
+               if (tmp) {
+                       g_free(partname);
+                       partname = tmp;
+               }
        }
 
        subst_for_filename(partname);
@@ -1218,9 +1716,8 @@ static void mimeview_save_as(MimeView *mimeview)
 
        filedir = g_path_get_dirname(filename);
        if (filedir && strcmp(filedir, ".")) {
-               if (prefs_common.attach_save_dir)
-                       g_free(prefs_common.attach_save_dir);
-               prefs_common.attach_save_dir = g_strdup(filedir);
+               g_free(prefs_common.attach_save_dir);
+               prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
        }
 
        g_free(filedir);
@@ -1233,44 +1730,33 @@ static void mimeview_display_as_text(MimeView *mimeview)
 
        if (!mimeview->opened) return;
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo)  {
-               partinfo = (MimeInfo *) g_object_get_data
-                       (G_OBJECT(mimeview->popupmenu),
-                        "pop_partinfo");
-               g_object_set_data(G_OBJECT(mimeview->popupmenu),
-                                 "pop_partinfo", NULL);
-       
-       }                        
+       partinfo = mimeview_get_part_to_use(mimeview);
+       mimeview_select_mimepart_icon(mimeview, partinfo);
        g_return_if_fail(partinfo != NULL);
        mimeview_show_message_part(mimeview, partinfo);
 }
 
-static void mimeview_launch(MimeView *mimeview)
+static void mimeview_launch(MimeView *mimeview, MimeInfo *partinfo)
 {
-       MimeInfo *partinfo;
        gchar *filename;
+       gint err;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo) { 
-               partinfo = (MimeInfo *) g_object_get_data
-                       (G_OBJECT(mimeview->popupmenu),
-                        "pop_partinfo");
-               g_object_set_data(G_OBJECT(mimeview->popupmenu),
-                                 "pop_partinfo", NULL);
-       }                        
+       if (!partinfo)
+               partinfo = mimeview_get_part_to_use(mimeview);
+
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
-       if (procmime_get_part(filename, partinfo) < 0)
+       if ((err = procmime_get_part(filename, partinfo)) < 0)
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message: %s"), 
+                               strerror(-err));
        else
-               mimeview_view_file(filename, partinfo, NULL);
+               mimeview_view_file(filename, partinfo, NULL, mimeview);
 
        g_free(filename);
 }
@@ -1278,112 +1764,148 @@ static void mimeview_launch(MimeView *mimeview)
 static void mimeview_open_with(MimeView *mimeview)
 {
        MimeInfo *partinfo;
-       gchar *filename;
-       gchar *cmd;
-       gchar *mime_command = NULL;
-       gchar *content_type = NULL;
 
+       if (!mimeview) return;
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
 
-       partinfo = mimeview_get_selected_part(mimeview);
-       if (!partinfo) { 
-               partinfo = (MimeInfo *) g_object_get_data
-                       (G_OBJECT(mimeview->popupmenu),
-                        "pop_partinfo");
-               g_object_set_data(G_OBJECT(mimeview->popupmenu),
-                                 "pop_partinfo", NULL);
-       }                        
+       partinfo = mimeview_get_part_to_use(mimeview);
+
+       mimeview_open_part_with(mimeview, partinfo, FALSE);
+}
+
+#ifdef MAEMO
+osso_context_t *get_osso_context(void);
+#endif
+static void mimeview_open_part_with(MimeView *mimeview, MimeInfo *partinfo, gboolean automatic)
+{
+       gchar *filename;
+       gchar *cmd;
+       gchar *mime_command = NULL;
+       gchar *content_type = NULL;
+       gint err;
+#ifdef MAEMO
+       DBusConnection *dbusconn;
+       gchar *uri;
+       int r = 0;
+#endif
        g_return_if_fail(partinfo != NULL);
 
        filename = procmime_get_tmp_file_name(partinfo);
 
-       if (procmime_get_part(filename, partinfo) < 0) {
+       if ((err = procmime_get_part(filename, partinfo)) < 0) {
                alertpanel_error
-                       (_("Can't save the part of multipart message."));
+                       (_("Couldn't save the part of multipart message: %s"), 
+                               strerror(-err));
                g_free(filename);
                return;
        }
-
+       
        if (!prefs_common.mime_open_cmd_history)
                prefs_common.mime_open_cmd_history =
                        add_history(NULL, prefs_common.mime_open_cmd);
 
-       content_type = procmime_get_content_type_str(partinfo->type,
+       if ((partinfo->type == MIMETYPE_APPLICATION) &&
+            (!g_ascii_strcasecmp(partinfo->subtype, "octet-stream"))) {
+               /* guess content-type from filename */
+               content_type = procmime_get_mime_type(filename);
+       } 
+       if (content_type == NULL) {
+               content_type = procmime_get_content_type_str(partinfo->type,
                        partinfo->subtype);
-       mime_command = mailcap_get_command_for_type(content_type);
-       g_free(content_type);
-       cmd = input_dialog_combo
-               (_("Open with"),
-                _("Enter the command line to open file:\n"
-                  "('%s' will be replaced with file name)"),
-                mime_command ? mime_command : prefs_common.mime_open_cmd,
-                prefs_common.mime_open_cmd_history,
-                TRUE);
-       g_free(mime_command);
+       }
+       
+#ifdef MAEMO
+       if (content_type != NULL) {
+               uri = g_strconcat ("file://", filename, NULL);
+               dbusconn = osso_get_dbus_connection (get_osso_context());
+               r = osso_mime_open_file_with_mime_type (dbusconn, uri, content_type);
+               g_free(uri);
+       }
+       if (r != 1) {
+               alertpanel_error(_("No registered viewer for this file type."));
+       }
+       goto out;
+#endif
+       
+       if ((partinfo->type == MIMETYPE_TEXT && !strcmp(partinfo->subtype, "html"))
+       && prefs_common.uri_cmd && prefs_common.uri_cmd[0]) {
+               mime_command = g_strdup(prefs_common.uri_cmd);
+               g_free(content_type);
+               content_type = NULL;
+       } else if (partinfo->type != MIMETYPE_TEXT || !prefs_common.ext_editor_cmd
+       ||  !prefs_common.ext_editor_cmd[0]) {
+               mime_command = mailcap_get_command_for_type(content_type, filename);
+       } else {
+               mime_command = g_strdup(prefs_common.ext_editor_cmd);
+               g_free(content_type);
+               content_type = NULL;
+       }
+       if (mime_command == NULL) {
+               /* try with extension this time */
+               g_free(content_type);
+               content_type = procmime_get_mime_type(filename);
+               mime_command = mailcap_get_command_for_type(content_type, filename);
+       }
+
+       if (mime_command == NULL)
+               automatic = FALSE;
+       
+       if (!automatic) {
+               gboolean remember = FALSE;
+               if (content_type != NULL)
+                       cmd = input_dialog_combo_remember
+                               (_("Open with"),
+                                _("Enter the command line to open file:\n"
+                                  "('%s' will be replaced with file name)"),
+                                mime_command ? mime_command : prefs_common.mime_open_cmd,
+                                prefs_common.mime_open_cmd_history,
+                                TRUE, &remember);
+               else
+                       cmd = input_dialog_combo
+                               (_("Open with"),
+                                _("Enter the command line to open file:\n"
+                                  "('%s' will be replaced with file name)"),
+                                mime_command ? mime_command : prefs_common.mime_open_cmd,
+                                prefs_common.mime_open_cmd_history,
+                                TRUE);
+               if (cmd && remember) {
+                       mailcap_update_default(content_type, cmd);
+               }
+               g_free(mime_command);
+       } else {
+               cmd = mime_command;
+       }
        if (cmd) {
-               mimeview_view_file(filename, partinfo, cmd);
+               mimeview_view_file(filename, partinfo, cmd, mimeview);
                g_free(prefs_common.mime_open_cmd);
                prefs_common.mime_open_cmd = cmd;
                prefs_common.mime_open_cmd_history =
                        add_history(prefs_common.mime_open_cmd_history, cmd);
        }
-
+out:
+       g_free(content_type);
        g_free(filename);
 }
 
 static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
-                              const gchar *cmdline)
-{
-       static gchar *default_image_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
-       static gchar *default_audio_cmdline = DEFAULT_AUDIO_PLAYER_CMD;
-       static gchar *default_html_cmdline = DEFAULT_BROWSER_CMD;
-       static gchar *mime_cmdline = DEFAULT_MIME_CMD;
-       gchar buf[1024];
-       gchar m_buf[1024];
-       const gchar *cmd;
-       const gchar *def_cmd;
-       const gchar *p;
-
-       if (cmdline) {
-               cmd = cmdline;
-               def_cmd = NULL;
-       } else if (MIMETYPE_APPLICATION == partinfo->type &&
-                  !g_ascii_strcasecmp(partinfo->subtype, "octet-stream")) {
-               return;
-       } else if (MIMETYPE_IMAGE == partinfo->type) {
-               cmd = prefs_common.mime_image_viewer;
-               def_cmd = default_image_cmdline;
-       } else if (MIMETYPE_AUDIO == partinfo->type) {
-               cmd = prefs_common.mime_audio_player;
-               def_cmd = default_audio_cmdline;
-       } else if (MIMETYPE_TEXT == partinfo->type && !strcmp(partinfo->subtype, "html")) {
-               cmd = prefs_common.uri_cmd;
-               def_cmd = default_html_cmdline;
-       } else {
-               gchar *content_type;
-               
-               content_type = procmime_get_content_type_str(partinfo->type, partinfo->subtype);
-               g_snprintf(m_buf, sizeof(m_buf), mime_cmdline,
-                          content_type, "%s");
-               g_free(content_type);
-               cmd = m_buf;
-               def_cmd = NULL;
-       }
-
-       if (cmd && (p = strchr(cmd, '%')) && *(p + 1) == 's' &&
-           !strchr(p + 2, '%'))
-               g_snprintf(buf, sizeof(buf), cmd, filename);
+                              const gchar *cmd, MimeView *mimeview)
+{
+       gchar *p;
+       gchar buf[BUFFSIZE];
+       if (cmd == NULL)
+               mimeview_open_part_with(mimeview, partinfo, TRUE);
        else {
-               if (cmd)
+               if ((p = strchr(cmd, '%')) && *(p + 1) == 's' &&
+                   !strchr(p + 2, '%'))
+                       g_snprintf(buf, sizeof(buf), cmd, filename);
+               else {
                        g_warning("MIME viewer command line is invalid: '%s'", cmd);
-               if (def_cmd)
-                       g_snprintf(buf, sizeof(buf), def_cmd, filename);
-               else
-                       return;
+                       mimeview_open_part_with(mimeview, partinfo, FALSE);
+               }
+               if (execute_command_line(buf, TRUE) != 0)
+                       mimeview_open_part_with(mimeview, partinfo, FALSE);
        }
-
-       execute_command_line(buf, TRUE);
 }
 
 void mimeview_register_viewer_factory(MimeViewerFactory *factory)
@@ -1427,16 +1949,12 @@ static gboolean icon_clicked_cb (GtkWidget *button, GdkEventButton *event, MimeV
        num      = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(button), "icon_number"));
        partinfo = g_object_get_data(G_OBJECT(button), "partinfo");
 
-       icon_selected(mimeview, num, partinfo);
-       gtk_widget_grab_focus(button);
-       if (!gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-               toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
-               if (event->button == 2 || event->button == 3)
-                       gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button),
-                                                    TRUE);
+       if (event->button == 1) {
+               icon_selected(mimeview, num, partinfo);
+               gtk_widget_grab_focus(button);
        }
-
        part_button_pressed(mimeview, event, partinfo);
+       icon_list_toggle_by_mime_info(mimeview, partinfo);
 
        return FALSE;
 }
@@ -1445,14 +1963,16 @@ static void icon_selected (MimeView *mimeview, gint num, MimeInfo *partinfo)
 {
        GtkCTreeNode *node;
        node = gtk_ctree_find_by_row_data(GTK_CTREE(mimeview->ctree), NULL, partinfo);
+
        if (node)
                gtk_ctree_select(GTK_CTREE(mimeview->ctree), node);
 }              
 
-#undef  KEY_PRESS_EVENT_STOP
-#define KEY_PRESS_EVENT_STOP() \
-        g_signal_stop_emission_by_name(G_OBJECT(button), \
-                                       "key_press_event");
+void mimeview_select_mimepart_icon(MimeView *mimeview, MimeInfo *partinfo)
+{
+       icon_list_toggle_by_mime_info(mimeview, partinfo);
+       icon_selected(mimeview, -1, partinfo);
+}
 
 static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
                             MimeView *mimeview)
@@ -1471,102 +1991,78 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_space:
-               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-                       /* stop the button being untoggled */
-                       KEY_PRESS_EVENT_STOP();
-                       if (textview_scroll_page(textview, FALSE))
-                               return TRUE;
-
-                       if (icon_list_select_by_number(mimeview, num + 1))
-                               return TRUE;
-               } else {
-                       icon_selected(mimeview, num, partinfo);
-                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
+               if (mimeview_scroll_page(mimeview, FALSE))
                        return TRUE;
-               }
+
+               mimeview_select_next_part(mimeview);
+               return TRUE;
 
                break;
        case GDK_BackSpace:
-               textview_scroll_page(textview, TRUE);
+               mimeview_scroll_page(mimeview, TRUE);
                return TRUE;
        case GDK_Return:
-               if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
-                       KEY_PRESS_EVENT_STOP();
-                       textview_scroll_one_line(textview,
-                                                (event->state & GDK_MOD1_MASK) != 0);
-                       return TRUE;
-               } else {
-                       icon_selected(mimeview, num, partinfo);
-                       toggle_icon(GTK_TOGGLE_BUTTON(button), mimeview);
-                       return TRUE;
-               }
+       case GDK_KP_Enter:
+               mimeview_scroll_one_line(mimeview,
+                                        (event->state & GDK_MOD1_MASK) != 0);
+               return TRUE;
 
        case GDK_n:
        case GDK_N:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num + 1)) {
-                       KEY_PRESS_EVENT_STOP();
-                       return TRUE;
-               }
-               break;
+               mimeview_select_next_part(mimeview);
+               return TRUE;
                
        case GDK_p:
        case GDK_P:
                BREAK_ON_MODIFIER_KEY();
-               if (icon_list_select_by_number(mimeview, num - 1)) {
-                       KEY_PRESS_EVENT_STOP();
-                       return TRUE;
-               }
+               mimeview_select_prev_part(mimeview);
                break;
 
        case GDK_y:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_save_as(mimeview);
                return TRUE;
        case GDK_t:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_display_as_text(mimeview);
                return TRUE;    
        case GDK_l:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-               mimeview_launch(mimeview);
+               mimeview_launch(mimeview, NULL);
                return TRUE;
        case GDK_o:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_open_with(mimeview);
                return TRUE;
        case GDK_c:
                BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
                mimeview_check_signature(mimeview);
                return TRUE;
+       case GDK_a:
+               BREAK_ON_MODIFIER_KEY();
+               mimeview_select_next_part(mimeview);
+               return TRUE;
        default:
                break;
        }
 
        if (!mimeview->messageview->mainwin) return FALSE;
        summaryview = mimeview->messageview->mainwin->summaryview;
-       summary_pass_key_press_event(summaryview, event);
-       return TRUE;
+       return summary_pass_key_press_event(summaryview, event);
 }
 
-static void toggle_icon(GtkToggleButton *button, MimeView *mimeview)
+static gboolean icon_popup_menu(GtkWidget *widget, gpointer data)
 {
-       GList *child;
-       
-       child = gtk_container_get_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) && 
-                   GTK_TOGGLE_BUTTON(child->data) != button &&
-                   gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(child->data)))
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data),
-                                FALSE);
-       }
+       MimeView *mimeview = (MimeView *)data;
+       MimeInfo *partinfo = g_object_get_data(G_OBJECT(widget), "partinfo");
+
+       g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                         "pop_partinfo", partinfo);
+       gtk_menu_popup(GTK_MENU(mimeview->popupmenu),
+                      NULL, NULL, NULL, NULL,
+                      0, gtk_get_current_event_time());
+       return TRUE;
 }
 
 static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo) 
@@ -1586,13 +2082,23 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        
        vbox = mimeview->icon_vbox;
        mimeview->icon_count++;
-       button = gtk_toggle_button_new();
-       gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
+       button = gtk_event_box_new();
+
+       g_signal_connect(G_OBJECT(button), "visibility-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(button), "motion-notify-event",
+                        G_CALLBACK(mimeview_visi_notify), mimeview);
+       g_signal_connect(G_OBJECT(button), "leave-notify-event",
+                        G_CALLBACK(mimeview_leave_notify), mimeview);
+       g_signal_connect(G_OBJECT(button), "enter-notify-event",
+                        G_CALLBACK(mimeview_enter_notify), mimeview);
+
+       gtk_container_set_border_width(GTK_CONTAINER(button), 2);
        g_object_set_data(G_OBJECT(button), "icon_number", 
                          GINT_TO_POINTER(mimeview->icon_count));
        g_object_set_data(G_OBJECT(button), "partinfo", 
                          mimeinfo);
-       
+
        switch (mimeinfo->type) {
                
        case MIMETYPE_TEXT:
@@ -1600,6 +2106,8 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                        stockp = STOCK_PIXMAP_MIME_TEXT_HTML;
                else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "enriched"))
                        stockp = STOCK_PIXMAP_MIME_TEXT_ENRICHED;
+               else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "calendar"))
+                       stockp = STOCK_PIXMAP_MIME_TEXT_CALENDAR;
                else
                        stockp = STOCK_PIXMAP_MIME_TEXT_PLAIN;
                break;
@@ -1607,7 +2115,14 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                stockp = STOCK_PIXMAP_MIME_MESSAGE;
                break;
        case MIMETYPE_APPLICATION:
-               stockp = STOCK_PIXMAP_MIME_APPLICATION;
+               if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pgp-signature"))
+                       stockp = STOCK_PIXMAP_MIME_PGP_SIG;
+               else if (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "pdf"))
+                       stockp = STOCK_PIXMAP_MIME_PDF;
+               else if  (mimeinfo->subtype && !g_ascii_strcasecmp(mimeinfo->subtype, "postscript"))
+                       stockp = STOCK_PIXMAP_MIME_PS;
+               else
+                       stockp = STOCK_PIXMAP_MIME_APPLICATION;
                break;
        case MIMETYPE_IMAGE:
                stockp = STOCK_PIXMAP_MIME_IMAGE;
@@ -1637,6 +2152,7 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                switch (privacy_mimeinfo_get_sig_status(siginfo)) {
                case SIGNATURE_UNCHECKED:
                case SIGNATURE_CHECK_FAILED:
+               case SIGNATURE_CHECK_TIMEOUT:
                        pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
                            STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED, OVERLAY_BOTTOM_RIGHT, 6, 3);
                        break;
@@ -1662,7 +2178,6 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
                                                          OVERLAY_NONE, 6, 3);
        }
        gtk_container_add(GTK_CONTAINER(button), pixmap);
-       
        if (!desc) {
                if (prefs_common.attach_desc)
                        desc = get_part_description(mimeinfo);
@@ -1698,11 +2213,28 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        gtk_tooltips_set_tip(mimeview->tooltips, button, tip, NULL);
        g_free(tip);
        gtk_widget_show_all(button);
+       gtk_drag_source_set(button, GDK_BUTTON1_MASK|GDK_BUTTON3_MASK, 
+                           mimeview_mime_types, 1, GDK_ACTION_COPY);
+#ifndef MAEMO
+       g_signal_connect(G_OBJECT(button), "popup-menu",
+                        G_CALLBACK(icon_popup_menu), mimeview);
+#else
+       gtk_widget_tap_and_hold_setup(GTK_WIDGET(button), NULL, NULL,
+                       GTK_TAP_AND_HOLD_NONE | GTK_TAP_AND_HOLD_NO_INTERNALS);
+       g_signal_connect(G_OBJECT(button), "tap-and-hold",
+                        G_CALLBACK(icon_popup_menu), mimeview);
+#endif
        g_signal_connect(G_OBJECT(button), "button_release_event", 
                         G_CALLBACK(icon_clicked_cb), mimeview);
        g_signal_connect(G_OBJECT(button), "key_press_event", 
                         G_CALLBACK(icon_key_pressed), mimeview);
+       g_signal_connect(G_OBJECT(button), "drag_data_get",
+                        G_CALLBACK(mimeview_drag_data_get), mimeview);
        gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);
+#ifdef MAEMO
+       gtk_widget_set_size_request(vbox, -1, pixmap->requisition.height + 8);
+       gtk_widget_set_size_request(button, -1, pixmap->requisition.height + 4);
+#endif
 
 }
 
@@ -1710,64 +2242,24 @@ static void icon_list_clear (MimeView *mimeview)
 {
        GList     *child;
        GtkAdjustment *adj;
-       
+               
        child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
        for (; child != NULL; child = g_list_next(child)) {
                gtkut_container_remove(GTK_CONTAINER(mimeview->icon_vbox), 
                                       GTK_WIDGET(child->data));
+               gtk_widget_destroy(GTK_WIDGET(child->data));
        }
+       g_list_free(child);
        mimeview->icon_count = 0;
        adj  = gtk_layout_get_vadjustment(GTK_LAYOUT(mimeview->icon_scroll));
        gtk_adjustment_set_value(adj, adj->lower);
 }
 
-static void icon_list_toggle_by_mime_info(MimeView     *mimeview,
-                                         MimeInfo      *mimeinfo)
-{
-       GList *child;
-       
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   g_object_get_data(G_OBJECT(child->data),
-                                     "partinfo") == (gpointer)mimeinfo) {
-                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
-               }                                
-       }
-}
-
 /*!
  *\brief        Used to 'click' the next or previous icon.
  *
  *\return       true if the icon 'number' exists and was selected.
  */
-static gboolean icon_list_select_by_number(MimeView    *mimeview,
-                                          gint          number)
-{
-       GList *child;
-
-       if (number == 0) return FALSE;
-       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
-       for (; child != NULL; child = g_list_next(child)) {
-               if (GTK_IS_TOGGLE_BUTTON(child->data) &&  
-                   GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child->data),
-                                       "icon_number")) == number) {
-                       icon_selected(mimeview, number,
-                                     (MimeInfo*)g_object_get_data(G_OBJECT(child->data),
-                                                                  "partinfo"));
-                       toggle_icon(GTK_TOGGLE_BUTTON(child->data), mimeview);
-                       gtk_toggle_button_set_active
-                               (GTK_TOGGLE_BUTTON(child->data), TRUE);
-                       gtk_widget_grab_focus(GTK_WIDGET(child->data));
-               
-                       return TRUE;
-               }                                
-       }
-       return FALSE;
-}
-
 static void icon_scroll_size_allocate_cb(GtkWidget *widget, 
                                         GtkAllocation *size, MimeView *mimeview)
 {
@@ -1785,7 +2277,7 @@ static void icon_scroll_size_allocate_cb(GtkWidget *widget,
        gtk_layout_set_size(GTK_LAYOUT(mimeview->icon_scroll), 
                            GTK_LAYOUT(mimeview->icon_scroll)->width, 
                            MAX(vbox_size->height, layout_size->height));
-       adj->step_increment = 5;
+       adj->step_increment = 10;
 }
 
 static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
@@ -1809,14 +2301,43 @@ static void icon_list_create(MimeView *mimeview, MimeInfo *mimeinfo)
                gtk_widget_set_size_request(mimeview->icon_mainbox, 
                                            size.width, -1);
        }
+}
 
+static void icon_list_toggle_by_mime_info (MimeView    *mimeview,
+                                          MimeInfo     *mimeinfo)
+{
+       GList *child;
+       
+       child = gtk_container_children(GTK_CONTAINER(mimeview->icon_vbox));
+       for (; child != NULL; child = g_list_next(child)) {
+               if (!GTK_IS_EVENT_BOX(child->data))
+                       continue;
+               if(g_object_get_data(G_OBJECT(child->data),
+                                     "partinfo") == (gpointer)mimeinfo) {
+                       gboolean *highlight = NULL;
+                       GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
+                       highlight = g_object_get_data(G_OBJECT(icon), "highlight");
+                       *highlight = TRUE;
+                       gtk_widget_queue_draw(icon);
+               } else {
+                       gint *highlight = NULL;
+                       GtkWidget *icon = gtk_bin_get_child(GTK_BIN(child->data));
+                       highlight = g_object_get_data(G_OBJECT(icon), "highlight");
+                       *highlight = FALSE;
+                       gtk_widget_queue_draw(icon);
+               }                        
+       }
 }
 
-static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview) 
+static gint mime_toggle_button_cb(GtkWidget *button, GdkEventButton *event,
+                                   MimeView *mimeview)
 {
        gtk_widget_ref(button); 
 
-       if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+       mimeview_leave_notify(button, NULL, NULL);
+
+       mimeview->ctree_mode = !mimeview->ctree_mode;
+       if (mimeview->ctree_mode) {
                gtk_arrow_set(GTK_ARROW(GTK_BIN(button)->child), GTK_ARROW_RIGHT, 
                                        GTK_SHADOW_NONE);
                gtk_widget_hide(mimeview->icon_mainbox);
@@ -1848,9 +2369,8 @@ static void mime_toggle_button_cb (GtkWidget *button, MimeView *mimeview)
 
                gtk_paned_set_gutter_size(GTK_PANED(mimeview->paned), 0);
        }
-       gtk_widget_grab_focus(button);
        gtk_widget_unref(button);
-
+       return TRUE;
 }
 
 void mimeview_update (MimeView *mimeview) {
@@ -1859,3 +2379,75 @@ void mimeview_update (MimeView *mimeview) {
                icon_list_create(mimeview, mimeview->mimeinfo);
        }
 }
+
+void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *event, gpointer data)
+{
+       MessageView *msgview = NULL;
+       MainWindow *mainwin = NULL;
+       
+       if (!cmd)
+               return;
+       
+       msgview = mimeview->messageview;
+       if (!msgview)
+               return;
+               
+       mainwin = msgview->mainwin;
+       if (!mainwin)
+               return;
+               
+       g_object_set_data(G_OBJECT(mimeview->popupmenu),
+                         "pop_partinfo", NULL);
+
+       if (!strcmp(cmd, "sc://view_log"))
+               log_window_show(mainwin->logwin);
+       else if (!strcmp(cmd, "sc://save_as"))
+               mimeview_save_as(mimeview);
+       else if (!strcmp(cmd, "sc://display_as_text"))
+               mimeview_display_as_text(mimeview);
+       else if (!strcmp(cmd, "sc://open_with"))
+               mimeview_open_with(mimeview);
+       else if (!strcmp(cmd, "sc://open"))
+               mimeview_launch(mimeview, NULL);
+       else if (!strcmp(cmd, "sc://select_attachment") && data != NULL) {
+               icon_list_toggle_by_mime_info(mimeview, (MimeInfo *)data);
+               icon_selected(mimeview, -1, (MimeInfo *)data);
+       } else if (!strcmp(cmd, "sc://open_attachment") && data != NULL) {
+               mimeview_launch(mimeview, (MimeInfo *)data);
+       } else if (!strcmp(cmd, "sc://menu_attachment") && data != NULL) {
+               mimeview->spec_part = (MimeInfo *)data;
+               part_button_pressed(mimeview, event, (MimeInfo *)data);
+       } else if (!strncmp(cmd, "sc://search_tags:", strlen("sc://search_tags:"))) {
+               const gchar *tagname = cmd + strlen("sc://search_tags:");
+               gchar *buf = g_strdup_printf("tag matchcase \"%s\"", tagname);
+               gtk_toggle_button_set_active(
+                               GTK_TOGGLE_BUTTON(mimeview->messageview->mainwin->summaryview->toggle_search), 
+                               TRUE);
+               quicksearch_set(mimeview->messageview->mainwin->summaryview->quicksearch, 
+                               QUICK_SEARCH_EXTENDED, buf);
+               g_free(buf);
+       }
+}
+
+gboolean mimeview_scroll_page(MimeView *mimeview, gboolean up)
+{
+       if (mimeview->type == MIMEVIEW_TEXT)
+               return textview_scroll_page(mimeview->textview, up);
+       else if (mimeview->mimeviewer) {
+               MimeViewer *mimeviewer = mimeview->mimeviewer;
+               if (mimeviewer->scroll_page)
+                       return mimeviewer->scroll_page(mimeviewer, up);
+       }
+       return TRUE;
+}
+
+void mimeview_scroll_one_line(MimeView *mimeview, gboolean up)
+{
+       if (mimeview->type == MIMEVIEW_TEXT)
+               textview_scroll_one_line(mimeview->textview, up);
+       else if (mimeview->mimeviewer) {
+               MimeViewer *mimeviewer = mimeview->mimeviewer;
+               if (mimeviewer->scroll_one_line)
+                       mimeviewer->scroll_one_line(mimeviewer, up);
+       }
+}