2007-10-19 [colin] 3.0.2cvs92
[claws.git] / src / mimeview.c
index c9ad62eb5980dc4280dd0eaf94bed6593a550a9b..7283de3a1919de2c142669862fbd85edb20cc136 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * 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
@@ -41,6 +41,8 @@
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkbutton.h>
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #ifndef HAVE_APACHE_FNMATCH
 /* kludge: apache's fnmatch clashes with <regex.h>, don't include
 #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
 {
@@ -85,7 +94,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,
@@ -113,14 +122,23 @@ 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, 
@@ -131,8 +149,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, 
@@ -140,24 +156,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[] =
@@ -168,6 +190,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;
@@ -193,6 +241,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);
 
@@ -244,16 +295,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);
@@ -268,7 +336,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);
@@ -290,7 +357,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;
@@ -309,7 +378,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);
@@ -325,6 +394,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)
 {
@@ -343,7 +423,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),
@@ -413,6 +499,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)
@@ -621,6 +729,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;
@@ -639,7 +752,8 @@ static void mimeview_change_view_type(MimeView *mimeview, MimeViewType type)
        default:
                return;
        }
-
+       if (focused)
+               gtk_widget_grab_focus(focused);
        mimeview->type = type;
 }
 
@@ -676,7 +790,7 @@ void mimeview_clear(MimeView *mimeview)
 }
 
 static void check_signature_cb(GtkWidget *widget, gpointer user_data);
-void mimeview_check_signature(MimeView *mimeview);
+static 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, 
@@ -947,7 +1061,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
 #endif
        noticeview_set_text(mimeview->siginfoview, _("Checking signature..."));
        GTK_EVENTS_FLUSH();
-#if (defined USE_PTHREAD && defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)))
+#if (defined USE_PTHREAD && ((defined __GLIBC__ && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3))) || !defined __GLIBC__))
        /* let's do it non-blocking */
        mimeview_check_sig_in_thread(mimeview);
        if (!mimeview->check_data) /* let's check syncronously */
@@ -961,7 +1075,7 @@ static void check_signature_cb(GtkWidget *widget, gpointer user_data)
        }
 }
 
-void mimeview_check_signature(MimeView *mimeview)
+static void mimeview_check_signature(MimeView *mimeview)
 {
        check_signature_cb(NULL, mimeview);     
 }
@@ -1034,6 +1148,7 @@ static void mimeview_selected(GtkCTree *ctree, GtkCTreeNode *node, gint column,
        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);
@@ -1105,6 +1220,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
 
@@ -1117,26 +1245,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);
@@ -1158,6 +1285,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
 
@@ -1170,7 +1339,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;
@@ -1182,39 +1350,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();
@@ -1228,7 +1389,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();
@@ -1240,6 +1401,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;
        }
@@ -1259,6 +1425,7 @@ static void mimeview_drag_data_get(GtkWidget          *widget,
 {
        gchar *filename = NULL, *uriname, *tmp;
        MimeInfo *partinfo;
+       gint err;
 
        if (!mimeview->opened) return;
        if (!mimeview->file) return;
@@ -1297,10 +1464,14 @@ static void mimeview_drag_data_get(GtkWidget        *widget,
        }
        if (filename == NULL)
                filename = g_path_get_basename("Unnamed part");
-               
 
-       tmp = g_filename_from_utf8(filename, -1, NULL, NULL, NULL);
-       
+       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");
@@ -1310,13 +1481,15 @@ static void mimeview_drag_data_get(GtkWidget        *widget,
 
        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);
 
        gtk_selection_data_set(selection_data, selection_data->target, 8,
-                              uriname, strlen(uriname));
+                              (guchar *)uriname, strlen(uriname));
 
        g_free(uriname);
        g_free(filename);
@@ -1328,7 +1501,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)
 {
@@ -1366,7 +1539,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);
@@ -1391,9 +1565,10 @@ static gboolean mimeview_write_part(const gchar *filename,
                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;
        }
 
@@ -1416,9 +1591,11 @@ 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) {
@@ -1461,9 +1638,29 @@ static void mimeview_save_all(MimeView *mimeview)
 
        g_free(prefs_common.attach_save_dir);
        g_free(startdir);
-       prefs_common.attach_save_dir = g_strdup(dirname);
+       prefs_common.attach_save_dir = g_filename_to_utf8(dirname,
+                                       -1, NULL, NULL, NULL);
 }
 
+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);
+               }                        
+       }
+
+       return partinfo;
+}
 /**
  * Menu callback: Save the selected attachment
  * \param mimeview Current display
@@ -1479,14 +1676,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) {
@@ -1496,8 +1687,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);
@@ -1521,7 +1719,7 @@ static void mimeview_save_as(MimeView *mimeview)
        filedir = g_path_get_dirname(filename);
        if (filedir && strcmp(filedir, ".")) {
                g_free(prefs_common.attach_save_dir);
-               prefs_common.attach_save_dir = g_strdup(filedir);
+               prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
        }
 
        g_free(filedir);
@@ -1534,42 +1732,31 @@ 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);
 
@@ -1579,34 +1766,43 @@ 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);
@@ -1620,24 +1816,66 @@ static void mimeview_open_with(MimeView *mimeview)
                content_type = procmime_get_content_type_str(partinfo->type,
                        partinfo->subtype);
        }
-       mime_command = mailcap_get_command_for_type(content_type);
-
+       
+#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);
+               mime_command = mailcap_get_command_for_type(content_type, filename);
        }
 
-       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);
+       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, &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);
+               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);
                g_free(prefs_common.mime_open_cmd);
@@ -1645,66 +1883,34 @@ static void mimeview_open_with(MimeView *mimeview)
                prefs_common.mime_open_cmd_history =
                        add_history(prefs_common.mime_open_cmd_history, cmd);
        }
-
+#ifdef MAEMO
+out:
+#endif
+       g_free(content_type);
        g_free(filename);
 }
 
 static void mimeview_view_file(const gchar *filename, MimeInfo *partinfo,
-                              const gchar *cmdline, MimeView *mimeview)
-{
-       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")) {
-               mimeview_open_with(mimeview);
-               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);
+                       g_chmod(filename, S_IRUSR);
+               } else {
                        g_warning("MIME viewer command line is invalid: '%s'", cmd);
-               if (def_cmd)
-                       g_snprintf(buf, sizeof(buf), def_cmd, filename);
-               else {
-                       mimeview_open_with(mimeview);
-                       return;
+                       mimeview_open_part_with(mimeview, partinfo, FALSE);
+               }
+               if (execute_command_line(buf, TRUE) != 0) {
+                       g_chmod(filename, S_IRUSR|S_IWUSR);
+                       mimeview_open_part_with(mimeview, partinfo, FALSE);
                }
        }
-
-       if (execute_command_line(buf, TRUE) != 0)
-               mimeview_open_with(mimeview);
 }
 
 void mimeview_register_viewer_factory(MimeViewerFactory *factory)
@@ -1748,16 +1954,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;
 }
@@ -1766,14 +1968,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)
@@ -1792,79 +1996,58 @@ 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;
        }
@@ -1874,19 +2057,17 @@ static gint icon_key_pressed(GtkWidget *button, GdkEventKey *event,
        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) 
@@ -1906,13 +2087,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:
@@ -1920,6 +2111,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;
@@ -1927,7 +2120,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;
@@ -1983,7 +2183,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);
@@ -2021,6 +2220,15 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        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", 
@@ -2028,6 +2236,10 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
        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
 
 }
 
@@ -2035,7 +2247,7 @@ 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), 
@@ -2046,23 +2258,7 @@ static void icon_list_clear (MimeView *mimeview)
        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);
-               }                                
-       }
+       gtk_adjustment_changed(adj);
 }
 
 /*!
@@ -2070,31 +2266,6 @@ static void icon_list_toggle_by_mime_info(MimeView       *mimeview,
  *
  *\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)
 {
@@ -2112,7 +2283,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)
@@ -2136,14 +2307,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);
@@ -2175,9 +2375,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) {
@@ -2187,7 +2386,7 @@ void mimeview_update (MimeView *mimeview) {
        }
 }
 
-void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, gpointer data)
+void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, GdkEventButton *event, gpointer data)
 {
        MessageView *msgview = NULL;
        MainWindow *mainwin = NULL;
@@ -2203,7 +2402,10 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, gpointer data)
        if (!mainwin)
                return;
                
-       else if (!strcmp(cmd, "sc://view_log"))
+       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);
@@ -2212,10 +2414,46 @@ void mimeview_handle_cmd(MimeView *mimeview, const gchar *cmd, gpointer data)
        else if (!strcmp(cmd, "sc://open_with"))
                mimeview_open_with(mimeview);
        else if (!strcmp(cmd, "sc://open"))
-               mimeview_launch(mimeview);
-       else if (!strcmp(cmd, "sc://open_attachment") && data != NULL) {
+               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);
+       }
+}