2005-10-16 [colin] 1.9.15cvs50
[claws.git] / src / textview.c
index 6c855123b49956da0c185b1b778da5350e08f80d..5f2d6a7bc5241648b9cb2d556ef5ab1570c4fbe0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2005 Hiroyuki Yamamoto
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +24,7 @@
 #include "defs.h"
 
 #include <glib.h>
+#include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"
 #include "prefs_common.h"
 #include "codeconv.h"
-#include "gtkstext.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "procmime.h"
 #include "displayheader.h"
 #include "account.h"
 #include "mimeview.h"
-
-typedef struct _RemoteURI      RemoteURI;
+#include "alertpanel.h"
+#include "menu.h"
+#include "image_viewer.h"
+#include "filesel.h"
 
 struct _RemoteURI
 {
        gchar *uri;
 
+       gchar *filename;
+
        guint start;
        guint end;
 };
@@ -98,76 +101,81 @@ static GdkColor error_color = {
 };
 #endif
 
-#if USE_GPGME
-static GdkColor good_sig_color = {
-       (gulong)0,
-       (gushort)0,
-       (gushort)0xbfff,
-       (gushort)0
-};
 
-static GdkColor nocheck_sig_color = {
-       (gulong)0,
-       (gushort)0,
-       (gushort)0,
-       (gushort)0xcfff
-};
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *text_cursor = NULL;
 
-static GdkColor bad_sig_color = {
-       (gulong)0,
-       (gushort)0xefff,
-       (gushort)0,
-       (gushort)0
-};
-#endif
+#define TEXTVIEW_STATUSBAR_PUSH(textview, str)                             \
+{      if (textview->messageview->statusbar)                               \
+       gtk_statusbar_push(GTK_STATUSBAR(textview->messageview->statusbar), \
+                          textview->messageview->statusbar_cid, str);      \
+}
 
-static GdkFont *text_sb_font;
-static GdkFont *text_mb_font;
-static gint text_sb_font_orig_ascent;
-static gint text_sb_font_orig_descent;
-static gint text_mb_font_orig_ascent;
-static gint text_mb_font_orig_descent;
-static GdkFont *spacingfont;
+#define TEXTVIEW_STATUSBAR_POP(textview)                                  \
+{      if (textview->messageview->statusbar)                              \
+       gtk_statusbar_pop(GTK_STATUSBAR(textview->messageview->statusbar), \
+                         textview->messageview->statusbar_cid);           \
+}
 
 static void textview_show_ertf         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);
 static void textview_add_part          (TextView       *textview,
-                                        MimeInfo       *mimeinfo,
-                                        FILE           *fp);
+                                        MimeInfo       *mimeinfo);
 static void textview_add_parts         (TextView       *textview,
-                                        MimeInfo       *mimeinfo,
-                                        FILE           *fp);
+                                        MimeInfo       *mimeinfo);
 static void textview_write_body                (TextView       *textview,
-                                        MimeInfo       *mimeinfo,
-                                        FILE           *fp,
-                                        const gchar    *charset);
+                                        MimeInfo       *mimeinfo);
 static void textview_show_html         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);
+
 static void textview_write_line                (TextView       *textview,
                                         const gchar    *str,
                                         CodeConverter  *conv);
-static void textview_write_link         (TextView      *textview,
-                                         const gchar    *url,
+static void textview_write_link                (TextView       *textview,
                                         const gchar    *str,
+                                        const gchar    *uri,
                                         CodeConverter  *conv);
+
 static GPtrArray *textview_scan_header (TextView       *textview,
                                         FILE           *fp);
 static void textview_show_header       (TextView       *textview,
                                         GPtrArray      *headers);
 
-static gint textview_key_pressed       (GtkWidget      *widget,
-                                        GdkEventKey    *event,
-                                        TextView       *textview);
-static gint textview_button_pressed    (GtkWidget      *widget,
-                                        GdkEventButton *event,
-                                        TextView       *textview);
-static gint textview_button_released   (GtkWidget      *widget,
-                                        GdkEventButton *event,
-                                        TextView       *textview);
-
-static void textview_uri_list_remove_all(GSList                *uri_list);
+static gint textview_key_pressed               (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                TextView       *textview);
+static gboolean textview_motion_notify         (GtkWidget      *widget,
+                                                GdkEventMotion *motion,
+                                                TextView       *textview);
+static gboolean textview_leave_notify          (GtkWidget        *widget,
+                                                GdkEventCrossing *event,
+                                                TextView         *textview);
+static gboolean textview_visibility_notify     (GtkWidget      *widget,
+                                                GdkEventVisibility *event,
+                                                TextView       *textview);
+static void textview_uri_update                        (TextView       *textview,
+                                                gint           x,
+                                                gint           y);
+static gboolean textview_get_uri_range         (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag,
+                                                GtkTextIter    *start_iter,
+                                                GtkTextIter    *end_iter);
+static RemoteURI *textview_get_uri_from_range  (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag,
+                                                GtkTextIter    *start_iter,
+                                                GtkTextIter    *end_iter);
+static RemoteURI *textview_get_uri             (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag);
+static gboolean textview_uri_button_pressed    (GtkTextTag     *tag,
+                                                GObject        *obj,
+                                                GdkEvent       *event,
+                                                GtkTextIter    *iter,
+                                                TextView       *textview);
 
 static void textview_smooth_scroll_do          (TextView       *textview,
                                                 gfloat          old_value,
@@ -178,125 +186,231 @@ static void textview_smooth_scroll_one_line     (TextView       *textview,
 static gboolean textview_smooth_scroll_page    (TextView       *textview,
                                                 gboolean        up);
 
+static gboolean textview_uri_security_check    (TextView       *textview,
+                                                RemoteURI      *uri);
+static void textview_uri_list_remove_all       (GSList         *uri_list);
+
+static void open_uri_cb                                (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+static void copy_uri_cb                                (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+static void add_uri_to_addrbook_cb             (TextView       *textview, 
+                                                guint           action, 
+                                                void           *data);
+static void mail_to_uri_cb                     (TextView       *textview, 
+                                                guint           action, 
+                                                void           *data);
+static void copy_mail_to_uri_cb                        (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+static void save_file_cb                       (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+static void open_image_cb                      (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+
+static GtkItemFactoryEntry textview_link_popup_entries[] = 
+{
+       {N_("/_Open with Web browser"), NULL, open_uri_cb, 0, NULL},
+       {N_("/Copy this _link"),        NULL, copy_uri_cb, 0, NULL},
+};
+
+static GtkItemFactoryEntry textview_mail_popup_entries[] = 
+{
+       {N_("/Compose _new message"),   NULL, mail_to_uri_cb, 0, NULL},
+       {N_("/Add to _address book"),   NULL, add_uri_to_addrbook_cb, 0, NULL},
+       {N_("/Copy this add_ress"),     NULL, copy_mail_to_uri_cb, 0, NULL},
+};
+
+static GtkItemFactoryEntry textview_file_popup_entries[] = 
+{
+       {N_("/_Open image"),            NULL, open_image_cb, 0, NULL},
+       {N_("/_Save image..."),         NULL, save_file_cb, 0, NULL},
+};
+
 
 TextView *textview_create(void)
 {
        TextView *textview;
        GtkWidget *vbox;
-       GtkWidget *scrolledwin_sb;
-       GtkWidget *scrolledwin_mb;
-       GtkWidget *text_sb;
-       GtkWidget *text_mb;
+       GtkWidget *scrolledwin;
+       GtkWidget *text;
+       GtkTextBuffer *buffer;
+       GtkClipboard *clipboard;
+       GtkItemFactory *link_popupfactory, *mail_popupfactory, *file_popupfactory;
+       GtkWidget *link_popupmenu, *mail_popupmenu, *file_popupmenu;
+       gint n_entries;
 
        debug_print("Creating text view...\n");
        textview = g_new0(TextView, 1);
 
-       scrolledwin_sb = gtk_scrolled_window_new(NULL, NULL);
-       scrolledwin_mb = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin_sb),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin_mb),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_usize(scrolledwin_sb, prefs_common.mainview_width, -1);
-       gtk_widget_set_usize(scrolledwin_mb, prefs_common.mainview_width, -1);
+       scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
+                                      GTK_POLICY_AUTOMATIC,
+                                      GTK_POLICY_AUTOMATIC);
+       gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolledwin),
+                                           GTK_SHADOW_IN);
+       gtk_widget_set_size_request
+               (scrolledwin, prefs_common.mainview_width, -1);
 
        /* create GtkSText widgets for single-byte and multi-byte character */
-       text_sb = gtk_stext_new(NULL, NULL);
-       text_mb = gtk_stext_new(NULL, NULL);
-       GTK_STEXT(text_sb)->default_tab_width = 8;
-       GTK_STEXT(text_mb)->default_tab_width = 8;
-       gtk_widget_show(text_sb);
-       gtk_widget_show(text_mb);
-       gtk_stext_set_word_wrap(GTK_STEXT(text_sb), TRUE);
-       gtk_stext_set_word_wrap(GTK_STEXT(text_mb), TRUE);
-       gtk_widget_ensure_style(text_sb);
-       gtk_widget_ensure_style(text_mb);
-       if (text_sb->style && text_sb->style->font->type == GDK_FONT_FONTSET) {
-               GtkStyle *style;
-               GdkFont *font;
-
-               font = gtkut_font_load_from_fontset(prefs_common.normalfont);
-               if (font) {
-                       style = gtk_style_copy(text_sb->style);
-                       gdk_font_unref(style->font);
-                       style->font = font;
-                       gtk_widget_set_style(text_sb, style);
-               }
-       }
-       if (text_mb->style && text_mb->style->font->type == GDK_FONT_FONT) {
-               GtkStyle *style;
-               GdkFont *font;
-
-               font = gdk_fontset_load(prefs_common.normalfont);
-               if (font) {
-                       style = gtk_style_copy(text_mb->style);
-                       gdk_font_unref(style->font);
-                       style->font = font;
-                       gtk_widget_set_style(text_mb, style);
-               }
-       }
-       gtk_widget_ref(scrolledwin_sb);
-       gtk_widget_ref(scrolledwin_mb);
-
-       gtk_container_add(GTK_CONTAINER(scrolledwin_sb), text_sb);
-       gtk_container_add(GTK_CONTAINER(scrolledwin_mb), text_mb);
-       gtk_signal_connect(GTK_OBJECT(text_sb), "key_press_event",
-                          GTK_SIGNAL_FUNC(textview_key_pressed),
-                          textview);
-       gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_press_event",
-                                GTK_SIGNAL_FUNC(textview_button_pressed),
-                                textview);
-       gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_release_event",
-                                GTK_SIGNAL_FUNC(textview_button_released),
-                                textview);
-       gtk_signal_connect(GTK_OBJECT(text_mb), "key_press_event",
-                          GTK_SIGNAL_FUNC(textview_key_pressed),
-                          textview);
-       gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_press_event",
-                                GTK_SIGNAL_FUNC(textview_button_pressed),
-                                textview);
-       gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_release_event",
-                                GTK_SIGNAL_FUNC(textview_button_released),
-                                textview);
-
-       gtk_widget_show(scrolledwin_sb);
-       gtk_widget_show(scrolledwin_mb);
+       text = gtk_text_view_new();
+       gtk_widget_add_events(text, GDK_LEAVE_NOTIFY_MASK);
+       gtk_widget_show(text);
+       gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
+       gtk_text_view_set_left_margin(GTK_TEXT_VIEW(text), 6);
+       gtk_text_view_set_right_margin(GTK_TEXT_VIEW(text), 6);
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+       gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
+
+       gtk_widget_ensure_style(text);
+
+       gtk_widget_ref(scrolledwin);
+
+       gtk_container_add(GTK_CONTAINER(scrolledwin), text);
+
+       g_signal_connect(G_OBJECT(text), "key-press-event",
+                        G_CALLBACK(textview_key_pressed), textview);
+       g_signal_connect(G_OBJECT(text), "motion-notify-event",
+                        G_CALLBACK(textview_motion_notify), textview);
+       g_signal_connect(G_OBJECT(text), "leave-notify-event",
+                        G_CALLBACK(textview_leave_notify), textview);
+       g_signal_connect(G_OBJECT(text), "visibility-notify-event",
+                        G_CALLBACK(textview_visibility_notify), textview);
+
+       gtk_widget_show(scrolledwin);
 
        vbox = gtk_vbox_new(FALSE, 0);
-       gtk_box_pack_start(GTK_BOX(vbox), scrolledwin_sb, TRUE, TRUE, 0);
+       gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
 
        gtk_widget_show(vbox);
 
-       textview->vbox             = vbox;
-       textview->scrolledwin      = scrolledwin_sb;
-       textview->scrolledwin_sb   = scrolledwin_sb;
-       textview->scrolledwin_mb   = scrolledwin_mb;
-       textview->text             = text_sb;
-       textview->text_sb          = text_sb;
-       textview->text_mb          = text_mb;
-       textview->text_is_mb       = FALSE;
-       textview->uri_list         = NULL;
-       textview->body_pos         = 0;
-       textview->cur_pos          = 0;
-       textview->show_all_headers = FALSE;
-       textview->last_buttonpress = GDK_NOTHING;
-       textview->show_url_msgid   = 0;
+       n_entries = sizeof(textview_link_popup_entries) /
+               sizeof(textview_link_popup_entries[0]);
+       link_popupmenu = menu_create_items(textview_link_popup_entries, n_entries,
+                                     "<UriPopupMenu>", &link_popupfactory,
+                                     textview);
+
+       n_entries = sizeof(textview_mail_popup_entries) /
+               sizeof(textview_mail_popup_entries[0]);
+       mail_popupmenu = menu_create_items(textview_mail_popup_entries, n_entries,
+                                     "<UriPopupMenu>", &mail_popupfactory,
+                                     textview);
+
+       n_entries = sizeof(textview_file_popup_entries) /
+               sizeof(textview_file_popup_entries[0]);
+       file_popupmenu = menu_create_items(textview_file_popup_entries, n_entries,
+                                     "<FilePopupMenu>", &file_popupfactory,
+                                     textview);
+
+       textview->vbox               = vbox;
+       textview->scrolledwin        = scrolledwin;
+       textview->text               = text;
+       textview->uri_list           = NULL;
+       textview->body_pos           = 0;
+       textview->show_all_headers   = FALSE;
+       textview->last_buttonpress   = GDK_NOTHING;
+       textview->link_popup_menu    = link_popupmenu;
+       textview->link_popup_factory = link_popupfactory;
+       textview->mail_popup_menu    = mail_popupmenu;
+       textview->mail_popup_factory = mail_popupfactory;
+       textview->file_popup_menu    = file_popupmenu;
+       textview->file_popup_factory = file_popupfactory;
 
        return textview;
 }
 
+static void textview_create_tags(GtkTextView *text, TextView *textview)
+{
+       GtkTextBuffer *buffer;
+       GtkTextTag *tag;
+       static PangoFontDescription *font_desc, *bold_font_desc;
+       
+       if (!font_desc)
+               font_desc = pango_font_description_from_string
+                       (NORMAL_FONT);
+
+       if (!bold_font_desc) {
+               bold_font_desc = pango_font_description_from_string
+                       (NORMAL_FONT);
+               pango_font_description_set_weight
+                       (bold_font_desc, PANGO_WEIGHT_BOLD);
+       }
+
+       buffer = gtk_text_view_get_buffer(text);
+
+       gtk_text_buffer_create_tag(buffer, "header",
+                                  "pixels-above-lines", 0,
+                                  "pixels-above-lines-set", TRUE,
+                                  "pixels-below-lines", 0,
+                                  "pixels-below-lines-set", TRUE,
+                                  "font-desc", font_desc,
+                                  "left-margin", 0,
+                                  "left-margin-set", TRUE,
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "header_title",
+                                  "font-desc", bold_font_desc,
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "quote0",
+                                  "foreground-gdk", &quote_colors[0],
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "quote1",
+                                  "foreground-gdk", &quote_colors[1],
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "quote2",
+                                  "foreground-gdk", &quote_colors[2],
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "emphasis",
+                                  "foreground-gdk", &emphasis_color,
+                                  NULL);
+       gtk_text_buffer_create_tag(buffer, "signature",
+                                  "foreground-gdk", &signature_color,
+                                  NULL);
+       tag = gtk_text_buffer_create_tag(buffer, "link",
+                                        "foreground-gdk", &uri_color,
+                                        NULL);
+       gtk_text_buffer_create_tag(buffer, "link-hover",
+                                  "foreground-gdk", &uri_color,
+                                  "underline", PANGO_UNDERLINE_SINGLE,
+                                  NULL);
+       g_signal_connect(G_OBJECT(tag), "event",
+                         G_CALLBACK(textview_uri_button_pressed), textview);
+ }
+
 void textview_init(TextView *textview)
 {
-       gtkut_widget_disable_theme_engine(textview->text_sb);
-       gtkut_widget_disable_theme_engine(textview->text_mb);
-       textview_update_message_colors();
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
+       if (!text_cursor)
+               text_cursor = gdk_cursor_new(GDK_XTERM);
+
+       textview_reflect_prefs(textview);
        textview_set_all_headers(textview, FALSE);
        textview_set_font(textview, NULL);
+       textview_create_tags(GTK_TEXT_VIEW(textview->text), textview);
+}
+
+#define CHANGE_TAG_COLOR(tagname, color) { \
+       tag = gtk_text_tag_table_lookup(tags, tagname); \
+       if (tag) \
+               g_object_set(G_OBJECT(tag), "foreground-gdk", color, NULL); \
 }
 
-void textview_update_message_colors(void)
+static void textview_update_message_colors(TextView *textview)
 {
        GdkColor black = {0, 0, 0, 0};
+       GdkColor colored_emphasis = {0, 0, 0, 0xcfff};
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+       GtkTextTag *tag = NULL;
 
        if (prefs_common.enable_color) {
                /* grab the quote colors, converting from an int to a GdkColor */
@@ -310,365 +424,366 @@ void textview_update_message_colors(void)
                                               &uri_color);
                gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
                                               &signature_color);
+               emphasis_color = colored_emphasis;
        } else {
                quote_colors[0] = quote_colors[1] = quote_colors[2] = 
                        uri_color = emphasis_color = signature_color = black;
        }
+       CHANGE_TAG_COLOR("quote0", &quote_colors[0]);
+       CHANGE_TAG_COLOR("quote1", &quote_colors[1]);
+       CHANGE_TAG_COLOR("quote2", &quote_colors[2]);
+       CHANGE_TAG_COLOR("emphasis", &emphasis_color);
+       CHANGE_TAG_COLOR("signature", &signature_color);
+       CHANGE_TAG_COLOR("link", &uri_color);
+       CHANGE_TAG_COLOR("link-hover", &uri_color);
+
+}
+#undef CHANGE_TAG_COLOR
+
+void textview_reflect_prefs(TextView *textview)
+{
+       textview_set_font(textview, NULL);
+       textview_update_message_colors(textview);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview->text),
+                                        prefs_common.textview_cursor_visible);
 }
 
 void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
-       GtkSText *text;
-       FILE *fp;
-       const gchar *charset = NULL;
-       GPtrArray *headers = NULL;
-
-       if ((fp = fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
-               return;
-       }
-
-       if (prefs_common.force_charset)
-               charset = prefs_common.force_charset;
-       else if (mimeinfo->charset)
-               charset = mimeinfo->charset;
-       textview_set_font(textview, charset);
        textview_clear(textview);
 
-       text = GTK_STEXT(textview->text);
-
-       gtk_stext_freeze(text);
+       textview_add_parts(textview, mimeinfo);
 
-       if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) perror("fseek");
-       headers = textview_scan_header(textview, fp);
-       if (headers) {
-               textview_show_header(textview, headers);
-               procheader_header_array_destroy(headers);
-               textview->body_pos = gtk_stext_get_length(text);
-       }
-
-       textview_add_parts(textview, mimeinfo, fp);
-
-       gtk_stext_thaw(text);
-
-       fclose(fp);
+       textview_set_position(textview, 0);
 }
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
-       GtkSText *text;
-       gchar buf[BUFFSIZE];
-       const gchar *boundary = NULL;
-       gint boundary_len = 0;
-       const gchar *charset = NULL;
-       GPtrArray *headers = NULL;
-       gboolean is_rfc822_part = FALSE;
-
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
 
-       if (mimeinfo->mime_type == MIME_MULTIPART) {
+       if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
+           ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
                textview_clear(textview);
-               textview_add_parts(textview, mimeinfo, fp);
+               textview_add_parts(textview, mimeinfo);
                return;
        }
 
-       if (mimeinfo->parent && mimeinfo->parent->boundary) {
-               boundary = mimeinfo->parent->boundary;
-               boundary_len = strlen(boundary);
-       }
-
-       if (!boundary && (mimeinfo->mime_type == MIME_TEXT || 
-                         mimeinfo->mime_type == MIME_TEXT_HTML || 
-                         mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
-               
-               if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
-                       perror("fseek");
-               headers = textview_scan_header(textview, fp);
-       } else {
-               if (mimeinfo->mime_type == MIME_TEXT && mimeinfo->parent) {
-                       glong fpos;
-                       MimeInfo *parent = mimeinfo->parent;
-
-                       while (parent->parent) {
-                               if (parent->main &&
-                                   parent->main->mime_type ==
-                                       MIME_MESSAGE_RFC822)
-                                       break;
-                               parent = parent->parent;
-                       }
-
-                       if ((fpos = ftell(fp)) < 0)
-                               perror("ftell");
-                       else if (fseek(fp, parent->fpos, SEEK_SET) < 0)
-                               perror("fseek");
-                       else {
-                               headers = textview_scan_header(textview, fp);
-                               if (fseek(fp, fpos, SEEK_SET) < 0)
-                                       perror("fseek");
-                       }
-               }
-               /* skip MIME part headers */
-               while (fgets(buf, sizeof(buf), fp) != NULL)
-                       if (buf[0] == '\r' || buf[0] == '\n') break;
-       }
-
-       /* display attached RFC822 single text message */
-       if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
-               if (headers) procheader_header_array_destroy(headers);
-               if (!mimeinfo->sub) {
-                       textview_clear(textview);
-                       return;
-               }
-               headers = textview_scan_header(textview, fp);
-               mimeinfo = mimeinfo->sub;
-               is_rfc822_part = TRUE;
-       }
-
-       if (prefs_common.force_charset)
-               charset = prefs_common.force_charset;
-       else if (mimeinfo->charset)
-               charset = mimeinfo->charset;
-       textview_set_font(textview, charset);
-
-       text = GTK_STEXT(textview->text);
+       if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
+               perror("fseek");
 
-       gtk_stext_freeze(text);
        textview_clear(textview);
 
-       if (headers) {
-               textview_show_header(textview, headers);
-               procheader_header_array_destroy(headers);
-               textview->body_pos = gtk_stext_get_length(text);
-               if (!mimeinfo->main)
-                       gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
-       }
-
-       if (mimeinfo->mime_type == MIME_MULTIPART || is_rfc822_part)
-               textview_add_parts(textview, mimeinfo, fp);
+       if (mimeinfo->type == MIMETYPE_MULTIPART)
+               textview_add_parts(textview, mimeinfo);
        else
-               textview_write_body(textview, mimeinfo, fp, charset);
+               textview_write_body(textview, mimeinfo);
 
-       gtk_stext_thaw(text);
 }
 
-static void textview_add_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
+static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, start_iter;
        gchar buf[BUFFSIZE];
-       const gchar *boundary = NULL;
-       gint boundary_len = 0;
-       const gchar *charset = NULL;
        GPtrArray *headers = NULL;
+       const gchar *name;
+       gchar *content_type;
+       gint charcount;
 
        g_return_if_fail(mimeinfo != NULL);
-       g_return_if_fail(fp != NULL);
+       text = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(text);
+       charcount = gtk_text_buffer_get_char_count(buffer);
+       gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (mimeinfo->mime_type == MIME_MULTIPART) return;
+       if (mimeinfo->type == MIMETYPE_MULTIPART) return;
 
-       if (!mimeinfo->parent &&
-           mimeinfo->mime_type != MIME_TEXT &&
-           mimeinfo->mime_type != MIME_TEXT_HTML &&
-           mimeinfo->mime_type != MIME_TEXT_ENRICHED)
-               return;
+       if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
+               FILE *fp;
 
-       if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) {
-               perror("fseek");
-               return;
-       }
-
-       if (mimeinfo->parent && mimeinfo->parent->boundary) {
-               boundary = mimeinfo->parent->boundary;
-               boundary_len = strlen(boundary);
-       }
-
-       while (fgets(buf, sizeof(buf), fp) != NULL)
-               if (buf[0] == '\r' || buf[0] == '\n') break;
-
-       if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+               fp = g_fopen(mimeinfo->data.filename, "rb");
+               fseek(fp, mimeinfo->offset, SEEK_SET);
                headers = textview_scan_header(textview, fp);
                if (headers) {
-                       gtk_stext_freeze(text);
-                       gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+                       if (charcount > 0)
+                               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
                        textview_show_header(textview, headers);
                        procheader_header_array_destroy(headers);
-                       gtk_stext_thaw(text);
                }
+               fclose(fp);
                return;
        }
 
-       gtk_stext_freeze(text);
-
-#if USE_GPGME
-       if (mimeinfo->sigstatus)
-               g_snprintf(buf, sizeof(buf), "\n[%s (%s)]\n",
-                          mimeinfo->content_type, mimeinfo->sigstatus);
-       else
-#endif
-       if (mimeinfo->filename || mimeinfo->name)
+       name = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
+       content_type = procmime_get_content_type_str(mimeinfo->type,
+                                                    mimeinfo->subtype);
+       if (name == NULL)
+               name = procmime_mimeinfo_get_parameter(mimeinfo, "name");
+       if (name != NULL)
                g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]\n",
-                          mimeinfo->filename ? mimeinfo->filename :
-                          mimeinfo->name,
-                          mimeinfo->content_type, mimeinfo->size);
+                          name, content_type, mimeinfo->length);
        else
                g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
-                          mimeinfo->content_type, mimeinfo->size);
+                          content_type, mimeinfo->length);
 
-#if USE_GPGME
-       if (mimeinfo->sigstatus && !mimeinfo->sigstatus_full) {
-               gchar *tmp;
-               /* use standard font */
-               gpointer oldfont = textview->msgfont;
-               textview->msgfont = NULL;
+       g_free(content_type);                      
 
-               tmp = g_strconcat("pgp: ", _("Check signature"), NULL);
-               textview_write_link(textview, tmp, buf, NULL);
-               
-               /* put things back */
-               textview->msgfont = (GdkFont *)oldfont;
-               oldfont = NULL;
-               g_free(tmp);
-       } else if (mimeinfo->sigstatus) {
-               GdkColor *color;
-               if (!strcmp(mimeinfo->sigstatus, _("Good signature")))
-                       color = &good_sig_color;
-               else if (!strcmp(mimeinfo->sigstatus, _("BAD signature")))
-                       color = &bad_sig_color;
-               else
-                       color = &nocheck_sig_color; 
-               gtk_stext_insert(text, NULL, color, NULL, buf, -1);
-       } else
-#endif
-       if (mimeinfo->mime_type != MIME_TEXT &&
-           mimeinfo->mime_type != MIME_TEXT_HTML &&
-           mimeinfo->mime_type != MIME_TEXT_ENRICHED) {
-               gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
-       } else {
-               if (!mimeinfo->main &&
-                   mimeinfo->parent &&
-                   mimeinfo->parent->children != mimeinfo)
-                       gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
-               else if (prefs_common.display_header)
-                       gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
-               if (prefs_common.force_charset)
-                       charset = prefs_common.force_charset;
-               else if (mimeinfo->charset)
-                       charset = mimeinfo->charset;
-               textview_write_body(textview, mimeinfo, fp, charset);
+       if (mimeinfo->type != MIMETYPE_TEXT) {
+               gtk_text_buffer_insert(buffer, &iter, buf, -1);
+               if (mimeinfo->type == MIMETYPE_IMAGE  &&
+                   prefs_common.inline_img ) {
+                       GdkPixbuf *pixbuf;
+                       GError *error = NULL;
+                       gchar *filename;
+                       RemoteURI *uri;
+                       gchar *uri_str;
+                       FILE *fp;
+
+                       fp = g_fopen(mimeinfo->data.filename, "rb");
+                       fseek(fp, mimeinfo->offset, SEEK_SET);
+
+                       filename = procmime_get_tmp_file_name(mimeinfo);
+                       if (procmime_get_part(filename, mimeinfo) < 0) {
+                               g_warning("Can't get the image file.");
+                               g_free(filename);
+                               return;
+                       }
+
+                       pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       if (error != NULL) {
+                               g_warning("%s\n", error->message);
+                               g_error_free(error);
+                       }
+                       if (!pixbuf) {
+                               g_warning("Can't load the image.");
+                               g_free(filename);
+                               return;
+                       }
+
+                       if (prefs_common.resize_img) {
+                               int new_width, new_height;
+                               GdkPixbuf *scaled;
+                               image_viewer_get_resized_size(gdk_pixbuf_get_width(pixbuf),
+                                                gdk_pixbuf_get_height(pixbuf),
+                                                textview->scrolledwin->allocation.width - 100, 
+                                                gdk_pixbuf_get_height(pixbuf),
+                                                &new_width, &new_height);
+                               scaled = gdk_pixbuf_scale_simple
+                                       (pixbuf, new_width, new_height, GDK_INTERP_BILINEAR);
+
+                               g_object_unref(pixbuf);
+                               pixbuf = scaled;
+                       }
+
+                       uri_str = g_filename_to_uri(filename, NULL, NULL);
+                       if (uri_str) {
+                               uri = g_new(RemoteURI, 1);
+                               uri->uri = uri_str;
+                               uri->start = gtk_text_iter_get_offset(&iter);
+                               
+                               gtk_text_buffer_insert_pixbuf(buffer, &iter, pixbuf);
+                               
+                               uri->end = uri->start + 1;
+                               uri->filename = procmime_get_part_file_name(mimeinfo);
+                               textview->uri_list =
+                                       g_slist_append(textview->uri_list, uri);
+                               
+                               gtk_text_buffer_insert(buffer, &iter, " ", 1);
+                               gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);    
+                               gtk_text_buffer_apply_tag_by_name(buffer, "link", 
+                                               &start_iter, &iter);
+                       } else {
+                               gtk_text_buffer_insert_pixbuf(buffer, &iter, pixbuf);
+                               gtk_text_buffer_insert(buffer, &iter, " ", 1);
+                       }
+
+                       g_object_unref(pixbuf);
+                       g_free(filename);
+               }
+       } else if (mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
+               if (prefs_common.display_header && (charcount > 0))
+                       gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+
+               textview_write_body(textview, mimeinfo);
        }
-       
-       gtk_stext_thaw(text);
 }
 
-static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
+static void recursive_add_parts(TextView *textview, GNode *node)
 {
-       gint level;
+        GNode * iter;
+       MimeInfo *mimeinfo;
+        
+        mimeinfo = (MimeInfo *) node->data;
+        
+        textview_add_part(textview, mimeinfo);
+        
+        if ((mimeinfo->type != MIMETYPE_MULTIPART) &&
+            (mimeinfo->type != MIMETYPE_MESSAGE))
+                return;
+        
+        if (g_ascii_strcasecmp(mimeinfo->subtype, "alternative") == 0) {
+                GNode * prefered_body;
+                int prefered_score;
+                
+                /*
+                  text/plain : score 3
+                  text/ *    : score 2
+                  other      : score 1
+                */
+                prefered_body = NULL;
+                prefered_score = 0;
+                
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
+                        int score;
+                        MimeInfo * submime;
+                        
+                        score = 1;
+                        submime = (MimeInfo *) iter->data;
+                        if (submime->type == MIMETYPE_TEXT)
+                                score = 2;
+                        
+                        if (submime->subtype != NULL) {
+                                if (g_ascii_strcasecmp(submime->subtype, "plain") == 0)
+                                        score = 3;
+                        }
+                        
+                        if (score > prefered_score) {
+                                prefered_score = score;
+                                prefered_body = iter;
+                        }
+                }
+                
+                if (prefered_body != NULL) {
+                        recursive_add_parts(textview, prefered_body);
+                }
+        }
+        else {
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
+                        recursive_add_parts(textview, iter);
+                }
+        }
+}
 
+static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
+{
        g_return_if_fail(mimeinfo != NULL);
-       g_return_if_fail(fp != NULL);
-
-       level = mimeinfo->level;
-
-       for (;;) {
-               textview_add_part(textview, mimeinfo, fp);
-               if (mimeinfo->parent && mimeinfo->parent->content_type &&
-                   !strcasecmp(mimeinfo->parent->content_type,
-                               "multipart/alternative"))
-                       mimeinfo = mimeinfo->parent->next;
-               else
-                       mimeinfo = procmime_mimeinfo_next(mimeinfo);
-               if (!mimeinfo || mimeinfo->level <= level)
-                       break;
-       }
+        
+        recursive_add_parts(textview, mimeinfo->node);
 }
 
 #define TEXT_INSERT(str) \
-       gtk_stext_insert(text, textview->msgfont, NULL, NULL, str, -1)
+       gtk_text_buffer_insert(buffer, &iter, str, -1)
 
-void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
+void textview_show_error(TextView *textview)
 {
-       GtkSText *text;
-
-       if (!partinfo) return;
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
 
        textview_set_font(textview, NULL);
-       text = GTK_STEXT(textview->text);
        textview_clear(textview);
-       
-       gtk_stext_freeze(text);
-
-       TEXT_INSERT(_("To save this part, pop up the context menu with "));
-       TEXT_INSERT(_("right click and select `Save as...', "));
-       TEXT_INSERT(_("or press `y' key.\n\n"));
 
-       TEXT_INSERT(_("To display this part as a text message, select "));
-       TEXT_INSERT(_("`Display as text', or press `t' key.\n\n"));
+       text = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(text);
+       gtk_text_buffer_get_start_iter(buffer, &iter);
 
-       TEXT_INSERT(_("To display this part as an image, select "));
-       TEXT_INSERT(_("`Display image', or press `i' key.\n\n"));
+       TEXT_INSERT(_("This message can't be displayed.\n"));
 
-       TEXT_INSERT(_("To open this part with external program, select "));
-       TEXT_INSERT(_("`Open' or `Open with...', "));
-       TEXT_INSERT(_("or double-click, or click the center button, "));
-       TEXT_INSERT(_("or press `l' key."));
-
-       gtk_stext_thaw(text);
 }
 
-#if USE_GPGME
-void textview_show_signature_part(TextView *textview, MimeInfo *partinfo)
+void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 {
-       GtkSText *text;
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
 
        if (!partinfo) return;
 
        textview_set_font(textview, NULL);
-       text = GTK_STEXT(textview->text);
        textview_clear(textview);
 
-       gtk_stext_freeze(text);
+       text = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(text);
+       gtk_text_buffer_get_start_iter(buffer, &iter);
+
+       TEXT_INSERT(_("The following can be performed on this part by "));
+       TEXT_INSERT(_("right-clicking the icon or list item:\n"));
+
+       TEXT_INSERT(_("    To save select 'Save as...' (Shortcut key: 'y')\n"));
+       TEXT_INSERT(_("    To display as text select 'Display as text' "));
+       TEXT_INSERT(_("(Shortcut key: 't')\n"));
+       TEXT_INSERT(_("    To open with an external program select 'Open' "));
+       TEXT_INSERT(_("(Shortcut key: 'l'),\n"));
+       TEXT_INSERT(_("    (alternately double-click, or click the middle "));
+       TEXT_INSERT(_("mouse button),\n"));
+       TEXT_INSERT(_("    or 'Open with...' (Shortcut key: 'o')\n"));
 
-       if (partinfo->sigstatus_full == NULL) {
-               TEXT_INSERT(_("This signature has not been checked yet.\n"));
-               TEXT_INSERT(_("To check it, pop up the context menu with\n"));
-               TEXT_INSERT(_("right click and select `Check signature'.\n"));
-       } else {
-               TEXT_INSERT(partinfo->sigstatus_full);
-       }
-               
-       gtk_stext_thaw(text);
 }
-#endif /* USE_GPGME */
 
 #undef TEXT_INSERT
 
-static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
-                               FILE *fp, const gchar *charset)
+static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 {
        FILE *tmpfp;
        gchar buf[BUFFSIZE];
        CodeConverter *conv;
+       const gchar *charset;
+       
+       if (textview->messageview->forced_charset)
+               charset = textview->messageview->forced_charset;
+       else
+               charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+
+       textview_set_font(textview, charset);
 
        conv = conv_code_converter_new(charset);
 
-       tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
+       procmime_force_encoding(textview->messageview->forced_encoding);
        
        textview->is_in_signature = FALSE;
 
-       if (tmpfp) {
+       procmime_decode_content(mimeinfo);
+
+       if (!g_ascii_strcasecmp(mimeinfo->subtype, "html") &&
+           prefs_common.render_html) {
+               gchar *filename;
                
-               if (mimeinfo->mime_type == MIME_TEXT_HTML)
+               filename = procmime_get_tmp_file_name(mimeinfo);
+               if (procmime_get_part(filename, mimeinfo) == 0) {
+                       tmpfp = g_fopen(filename, "rb");
                        textview_show_html(textview, tmpfp, conv);
-               else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+                       fclose(tmpfp);
+                       g_unlink(filename);
+               }
+               g_free(filename);
+       } else if (!g_ascii_strcasecmp(mimeinfo->subtype, "enriched")) {
+               gchar *filename;
+               
+               filename = procmime_get_tmp_file_name(mimeinfo);
+               if (procmime_get_part(filename, mimeinfo) == 0) {
+                       tmpfp = g_fopen(filename, "rb");
                        textview_show_ertf(textview, tmpfp, conv);
-               else
-                       while (fgets(buf, sizeof(buf), tmpfp) != NULL)
-                               textview_write_line(textview, buf, conv);
+                       fclose(tmpfp);
+                       g_unlink(filename);
+               }
+               g_free(filename);
+       } else {
+               tmpfp = g_fopen(mimeinfo->data.filename, "rb");
+               fseek(tmpfp, mimeinfo->offset, SEEK_SET);
+               debug_print("Viewing text content of type: %s (length: %d)\n", mimeinfo->subtype, mimeinfo->length);
+               while ((fgets(buf, sizeof(buf), tmpfp) != NULL) && 
+                      (ftell(tmpfp) <= mimeinfo->offset + mimeinfo->length))
+                       textview_write_line(textview, buf, conv);
                fclose(tmpfp);
        }
 
        conv_code_converter_destroy(conv);
+       procmime_force_encoding(0);
 }
 
 static void textview_show_html(TextView *textview, FILE *fp,
@@ -676,7 +791,6 @@ static void textview_show_html(TextView *textview, FILE *fp,
 {
        HTMLParser *parser;
        gchar *str;
-       gchar* url = NULL;
 
        parser = html_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
@@ -684,29 +798,23 @@ static void textview_show_html(TextView *textview, FILE *fp,
        while ((str = html_parse(parser)) != NULL) {
                if (parser->state == HTML_HREF) {
                        /* first time : get and copy the URL */
-                       if (url == NULL) {
+                       if (parser->href == NULL) {
                                /* ALF - the sylpheed html parser returns an empty string,
                                 * if still inside an <a>, but already parsed past HREF */
                                str = strtok(str, " ");
                                if (str) { 
-                                       url = strdup(str);
+                                       parser->href = g_strdup(str);
                                        /* the URL may (or not) be followed by the
                                         * referenced text */
                                        str = strtok(NULL, "");
                                }       
                        }
-                       if (str != NULL) {
-                               textview_write_link(textview, url, str, NULL);
-                       }
-               } else {
-                       if (url != NULL) {
-                               free(url);
-                               url = NULL;
-                       }
+                       if (str != NULL)
+                               textview_write_link(textview, str, parser->href, NULL);
+               } else
                        textview_write_line(textview, str, NULL);
-               }
        }
-       
+       textview_write_line(textview, "\n", NULL);
        html_parser_destroy(parser);
 }
 
@@ -726,195 +834,6 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
        ertf_parser_destroy(parser);
 }
 
-/* get_uri_part() - retrieves a URI starting from scanpos.
-                   Returns TRUE if succesful */
-static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
-                            const gchar **bp, const gchar **ep)
-{
-       const gchar *ep_;
-
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
-
-       *bp = scanpos;
-
-       /* find end point of URI */
-       for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
-               if (!isgraph(*ep_) || !isascii(*ep_) || strchr("()<>\"", *ep_))
-                       break;
-       }
-
-       /* no punctuation at end of string */
-
-       /* FIXME: this stripping of trailing punctuations may bite with other URIs.
-        * should pass some URI type to this function and decide on that whether
-        * to perform punctuation stripping */
-
-#define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
-
-       for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
-               ;
-
-#undef IS_REAL_PUNCT
-
-       *ep = ep_;
-
-       return TRUE;            
-}
-
-static gchar *make_uri_string(const gchar *bp, const gchar *ep)
-{
-       return g_strndup(bp, ep - bp);
-}
-
-/* valid mail address characters */
-#define IS_RFC822_CHAR(ch) \
-       (isascii(ch) && \
-        (ch) > 32   && \
-        (ch) != 127 && \
-        !isspace(ch) && \
-        !strchr("(),;<>\"", (ch)))
-
-/* alphabet and number within 7bit ASCII */
-#define IS_ASCII_ALNUM(ch)     (isascii(ch) && isalnum(ch))
-#define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
-
-/* get_email_part() - retrieves an email address. Returns TRUE if succesful */
-static gboolean get_email_part(const gchar *start, const gchar *scanpos,
-                              const gchar **bp, const gchar **ep)
-{
-       /* more complex than the uri part because we need to scan back and forward starting from
-        * the scan position. */
-       gboolean result = FALSE;
-       const gchar *bp_ = NULL;
-       const gchar *ep_ = NULL;
-
-       /* the informative part of the email address (describing the name
-        * of the email address owner) may contain quoted parts. the
-        * closure stack stores the last encountered quotes. */
-       gchar closure_stack[128];
-       gchar *ptr = closure_stack;
-
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
-
-       /* scan start of address */
-       for (bp_ = scanpos - 1; bp_ >= start && IS_RFC822_CHAR(*bp_); bp_--)
-               ;
-
-       /* TODO: should start with an alnum? */
-       bp_++;
-       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
-               ;
-
-       if (bp_ != scanpos) {
-               /* scan end of address */
-               for (ep_ = scanpos + 1; *ep_ && IS_RFC822_CHAR(*ep_); ep_++)
-                       ;
-
-               /* TODO: really should terminate with an alnum? */
-               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
-                       ;
-               ep_++;
-
-               if (ep_ > scanpos + 1) {
-                       *ep = ep_;
-                       *bp = bp_;
-                       result = TRUE;
-               }
-       }
-
-       if (!result) return FALSE;
-
-       /* skip if it's between quotes "'alfons@proteus.demon.nl'" <alfons@proteus.demon.nl> */
-       if (bp_ - 1 > start && IS_QUOTE(*(bp_ - 1)) && IS_QUOTE(*ep_)) 
-               return FALSE;
-
-       /* see if this is <bracketed>; in this case we also scan for the informative part. */
-       if (bp_ - 1 <= start || *(bp_ - 1) != '<' || *ep_ != '>')
-               return TRUE;
-
-#define FULL_STACK()   ((size_t) (ptr - closure_stack) >= sizeof closure_stack)
-#define IN_STACK()     (ptr > closure_stack)
-/* has underrun check */
-#define POP_STACK()    if(IN_STACK()) --ptr
-/* has overrun check */
-#define PUSH_STACK(c)  if(!FULL_STACK()) *ptr++ = (c); else return TRUE
-/* has underrun check */
-#define PEEK_STACK()   (IN_STACK() ? *(ptr - 1) : 0)
-
-       ep_++;
-
-       /* scan for the informative part. */
-       for (bp_ -= 2; bp_ >= start; bp_--) {
-               /* if closure on the stack keep scanning */
-               if (PEEK_STACK() == *bp_) {
-                       POP_STACK();
-                       continue;
-               }
-               if (*bp_ == '\'' || *bp_ == '"') {
-                       PUSH_STACK(*bp_);
-                       continue;
-               }
-
-               /* if nothing in the closure stack, do the special conditions
-                * the following if..else expression simply checks whether 
-                * a token is acceptable. if not acceptable, the clause
-                * should terminate the loop with a 'break' */
-               if (!PEEK_STACK()) {
-                       if (*bp_ == '-'
-                       && (((bp_ - 1) >= start) && isalnum(*(bp_ - 1)))
-                       && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
-                               /* hyphens are allowed, but only in
-                                  between alnums */
-                       } else if (!ispunct(*bp_)) {
-                               /* but anything not being a punctiation
-                                  is ok */
-                       } else {
-                               break; /* anything else is rejected */
-                       }
-               }
-       }
-
-       bp_++;
-
-#undef PEEK_STACK
-#undef PUSH_STACK
-#undef POP_STACK
-#undef IN_STACK
-#undef FULL_STACK
-
-       /* scan forward (should start with an alnum) */
-       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
-               ;
-
-       *ep = ep_;
-       *bp = bp_;
-
-       return result;
-}
-
-#undef IS_QUOTE
-#undef IS_RFC822_CHAR
-
-static gchar *make_email_string(const gchar *bp, const gchar *ep)
-{
-       /* returns a mailto: URI; mailto: is also used to detect the
-        * uri type later on in the button_pressed signal handler */
-       gchar *tmp;
-       gchar *result;
-
-       tmp = g_strndup(bp, ep - bp);
-       result = g_strconcat("mailto:", tmp, NULL);
-       g_free(tmp);
-
-       return result;
-}
-
 #define ADD_TXT_POS(bp_, ep_, pti_) \
        if ((last->next = alloca(sizeof(struct txtpos))) != NULL) { \
                last = last->next; \
@@ -922,18 +841,23 @@ static gchar *make_email_string(const gchar *bp, const gchar *ep)
                last->next = NULL; \
        } else { \
                g_warning("alloc error scanning URIs\n"); \
-               gtk_stext_insert(text, textview->msgfont, fg_color, NULL, \
-                               linebuf, -1); \
+               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, \
+                                                        linebuf, -1, \
+                                                        fg_tag, NULL); \
                return; \
        }
 
 /* textview_make_clickable_parts() - colorizes clickable parts */
 static void textview_make_clickable_parts(TextView *textview,
-                                         GdkFont *font,
-                                         GdkColor *fg_color,
-                                         GdkColor *uri_color,
+                                         const gchar *fg_tag,
+                                         const gchar *uri_tag,
                                          const gchar *linebuf)
 {
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter iter;
+       gchar *mybuf = g_strdup(linebuf);
+       
        /* parse table - in order of priority */
        struct table {
                const gchar *needle; /* token */
@@ -955,7 +879,7 @@ static void textview_make_clickable_parts(TextView *textview,
                {"http://",  strcasestr, get_uri_part,   make_uri_string},
                {"https://", strcasestr, get_uri_part,   make_uri_string},
                {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
-               {"www.",     strcasestr, get_uri_part,   make_uri_string},
+               {"www.",     strcasestr, get_uri_part,   make_http_string},
                {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                {"@",        strcasestr, get_email_part, make_email_string}
        };
@@ -970,10 +894,15 @@ static void textview_make_clickable_parts(TextView *textview,
                struct txtpos   *next;          /* next */
        } head = {NULL, NULL, 0,  NULL}, *last = &head;
 
-       GtkSText *text = GTK_STEXT(textview->text);
+       if (!g_utf8_validate(linebuf, -1, NULL)) {
+               mybuf = g_malloc(strlen(linebuf)*2 +1);
+               conv_localetodisp(mybuf, strlen(linebuf)*2 +1, linebuf);
+       }
+
+       gtk_text_buffer_get_end_iter(buffer, &iter);
 
        /* parse for clickable parts, and build a list of begin and end positions  */
-       for (walk = linebuf, n = 0;;) {
+       for (walk = mybuf, n = 0;;) {
                gint last_index = PARSE_ELEMS;
                gchar *scanpos = NULL;
 
@@ -1005,106 +934,65 @@ static void textview_make_clickable_parts(TextView *textview,
 
        /* colorize this line */
        if (head.next) {
-               const gchar *normal_text = linebuf;
+               const gchar *normal_text = mybuf;
 
                /* insert URIs */
                for (last = head.next; last != NULL;
                     normal_text = last->ep, last = last->next) {
                        RemoteURI *uri;
-
                        uri = g_new(RemoteURI, 1);
                        if (last->bp - normal_text > 0)
-                               gtk_stext_insert(text, font,
-                                               fg_color, NULL,
-                                               normal_text,
-                                               last->bp - normal_text);
+                               gtk_text_buffer_insert_with_tags_by_name
+                                       (buffer, &iter,
+                                        normal_text,
+                                        last->bp - normal_text,
+                                        fg_tag, NULL);
                        uri->uri = parser[last->pti].build_uri(last->bp,
                                                               last->ep);
-                       uri->start = gtk_stext_get_point(text);
-                       gtk_stext_insert(text, font, uri_color,
-                                       NULL, last->bp, last->ep - last->bp);
-                       uri->end = gtk_stext_get_point(text);
+                       uri->start = gtk_text_iter_get_offset(&iter);
+                       gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &iter, last->bp, last->ep - last->bp,
+                                uri_tag, fg_tag, NULL);
+                       uri->end = gtk_text_iter_get_offset(&iter);
+                       uri->filename = NULL;
                        textview->uri_list =
                                g_slist_append(textview->uri_list, uri);
                }
 
                if (*normal_text)
-                       gtk_stext_insert(text, font, fg_color,
-                                       NULL, normal_text, -1);
-       } else
-               gtk_stext_insert(text, font, fg_color, NULL, linebuf, -1);
+                       gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &iter, normal_text, -1, fg_tag, NULL);
+       } else {
+               gtk_text_buffer_insert_with_tags_by_name
+                       (buffer, &iter, mybuf, -1, fg_tag, NULL);
+       }
+       g_free(mybuf);
 }
 
 #undef ADD_TXT_POS
 
-/* This function writes str as a double-clickable link with the given url. */ 
-static void textview_write_link(TextView *textview, const gchar *url,
-                                const gchar *str, CodeConverter *conv)
-{
-    GdkColor *link_color = NULL;
-    RemoteURI* uri;
-    GtkSText *text = GTK_STEXT(textview->text);
-    gchar buf[BUFFSIZE];
-
-    /* this part is taken from textview_write_line. Right now the only place
-     * that calls this function passes NULL for conv, but you never know. */
-#if 0
-    if (!conv)
-           strncpy2(buf, str, sizeof(buf));
-    else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
-                   gtk_stext_insert(text, textview->msgfont,
-                           prefs_common.enable_color
-                           ? &error_color : NULL, NULL,
-                           "*** Warning: code conversion failed ***\n",
-                           -1);
-           return;
-    }
-#endif
-
-    if (!conv || conv_convert(conv, buf, sizeof(buf), str) < 0)
-       strncpy2(buf, str, sizeof(buf));
-
-    strcrchomp(buf);
-    gtk_stext_insert(text, textview->msgfont, NULL, NULL, " ", 1);
-    /* this part is based on the code in make_clickable_parts */
-    if (prefs_common.enable_color) {
-       link_color = &uri_color;
-    }
-    uri = g_new(RemoteURI, 1);
-    uri->uri = g_strdup(url);
-    uri->start = gtk_stext_get_point(text);
-    gtk_stext_insert(text, textview->msgfont, link_color, NULL, str,
-                   strlen(str));
-    uri->end = gtk_stext_get_point(text);
-    textview->uri_list = g_slist_append(textview->uri_list, uri);
-}
-
 static void textview_write_line(TextView *textview, const gchar *str,
                                CodeConverter *conv)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
        gchar buf[BUFFSIZE];
-       GdkColor *fg_color;
+       gchar *fg_color;
        gint quotelevel = -1;
+       gchar quote_tag_str[10];
+
+       text = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(text);
+       gtk_text_buffer_get_end_iter(buffer, &iter);
 
-#if 0
        if (!conv)
                strncpy2(buf, str, sizeof(buf));
-       else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
-               gtk_stext_insert(text, textview->msgfont,
-                               prefs_common.enable_color
-                               ? &error_color : NULL, NULL,
-                               "*** Warning: code conversion failed ***\n",
-                               -1);
-               return;
-       }
-#endif
-       if (!conv || conv_convert(conv, buf, sizeof(buf), str) < 0)
-               strncpy2(buf, str, sizeof(buf));
-
+       else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
+               conv_localetodisp(buf, sizeof(buf), str);
+               
        strcrchomp(buf);
-       if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
+       //if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
        fg_color = NULL;
 
        /* change color of quotation
@@ -1127,39 +1015,87 @@ static void textview_write_line(TextView *textview, const gchar *str,
 
        if (quotelevel == -1)
                fg_color = NULL;
-       else
-               fg_color = &quote_colors[quotelevel];
+       else {
+               g_snprintf(quote_tag_str, sizeof(quote_tag_str),
+                          "quote%d", quotelevel);
+               fg_color = quote_tag_str;
+       }
 
        if (prefs_common.enable_color && (strcmp(buf,"-- \n") == 0 || textview->is_in_signature)) {
-               fg_color = &signature_color;
+               fg_color = "signature";
                textview->is_in_signature = TRUE;
        }
-       
-       if (prefs_common.head_space && spacingfont && buf[0] != '\n')
-               gtk_stext_insert(text, spacingfont, NULL, NULL, " ", 1);
 
-       if (prefs_common.enable_color)
-               textview_make_clickable_parts(textview, textview->msgfont,
-                                             fg_color, &uri_color, buf);
-       else
-               textview_make_clickable_parts(textview, textview->msgfont,
-                                             fg_color, NULL, buf);
+       textview_make_clickable_parts(textview, fg_color, "link", buf);
+}
+
+void textview_write_link(TextView *textview, const gchar *str,
+                        const gchar *uri, CodeConverter *conv)
+{
+       GdkColor *link_color = NULL;
+       GtkTextView *text;
+       GtkTextBuffer *buffer;
+       GtkTextIter iter;
+       gchar buf[BUFFSIZE];
+       gchar *bufp;
+       RemoteURI *r_uri;
+
+       if (!str || *str == '\0')
+               return;
+       if (!uri)
+               return;
+
+       text = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(text);
+       gtk_text_buffer_get_end_iter(buffer, &iter);
+
+       if (!conv)
+               strncpy2(buf, str, sizeof(buf));
+       else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
+               conv_utf8todisp(buf, sizeof(buf), str);
+
+       if (g_utf8_validate(buf, -1, NULL) == FALSE)
+               return;
+
+       strcrchomp(buf);
+
+       gtk_text_buffer_get_end_iter(buffer, &iter);
+       for (bufp = buf; *bufp != '\0'; bufp = g_utf8_next_char(bufp)) {
+               gunichar ch;
+
+               ch = g_utf8_get_char(bufp);
+               if (!g_unichar_isspace(ch))
+                       break;
+       }
+       if (bufp > buf)
+               gtk_text_buffer_insert(buffer, &iter, buf, bufp - buf);
+
+       if (prefs_common.enable_color) {
+               link_color = &uri_color;
+       }
+       r_uri = g_new(RemoteURI, 1);
+       r_uri->uri = g_strdup(uri);
+       r_uri->start = gtk_text_iter_get_offset(&iter);
+       gtk_text_buffer_insert_with_tags_by_name
+               (buffer, &iter, bufp, -1, "link", NULL);
+       r_uri->end = gtk_text_iter_get_offset(&iter);
+       r_uri->filename = NULL;
+       textview->uri_list = g_slist_append(textview->uri_list, r_uri);
 }
 
 void textview_clear(TextView *textview)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer;
 
-       gtk_stext_freeze(text);
-       gtk_stext_set_point(text, 0);
-       gtk_stext_forward_delete(text, gtk_stext_get_length(text));
-       gtk_stext_thaw(text);
+       buffer = gtk_text_view_get_buffer(text);
+       gtk_text_buffer_set_text(buffer, "", -1);
 
+       TEXTVIEW_STATUSBAR_POP(textview);
        textview_uri_list_remove_all(textview->uri_list);
        textview->uri_list = NULL;
 
        textview->body_pos = 0;
-       textview->cur_pos  = 0;
 }
 
 void textview_destroy(TextView *textview)
@@ -1167,16 +1103,6 @@ void textview_destroy(TextView *textview)
        textview_uri_list_remove_all(textview->uri_list);
        textview->uri_list = NULL;
 
-       if (!textview->scrolledwin_sb->parent)
-               gtk_widget_destroy(textview->scrolledwin_sb);
-       if (!textview->scrolledwin_mb->parent)
-               gtk_widget_destroy(textview->scrolledwin_mb);
-
-       if (textview->msgfont)
-               gdk_font_unref(textview->msgfont);
-       if (textview->boldfont)
-               gdk_font_unref(textview->boldfont);
-
        g_free(textview);
 }
 
@@ -1185,104 +1111,66 @@ void textview_set_all_headers(TextView *textview, gboolean all_headers)
        textview->show_all_headers = all_headers;
 }
 
+#define CHANGE_TAG_FONT(tagname, font) { \
+       tag = gtk_text_tag_table_lookup(tags, tagname); \
+       if (tag) \
+               g_object_set(G_OBJECT(tag), "font-desc", font, NULL); \
+}
+
 void textview_set_font(TextView *textview, const gchar *codeset)
 {
-       gboolean use_fontset = TRUE;
-
-       /* In multi-byte mode, GtkSText can't display 8bit characters
-          correctly, so it must be single-byte mode. */
-       if (MB_CUR_MAX > 1) {
-               if (codeset) {
-                       if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
-                           !g_strcasecmp(codeset, "BALTIC"))
-                               use_fontset = FALSE;
-                       else if (conv_get_current_charset() != C_EUC_JP &&
-                                (!g_strncasecmp(codeset, "KOI8-", 5) ||
-                                 !g_strncasecmp(codeset, "CP", 2)    ||
-                                 !g_strncasecmp(codeset, "WINDOWS-", 8)))
-                               use_fontset = FALSE;
+       GtkTextTag *tag;
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+       
+       if (NORMAL_FONT) {
+               PangoFontDescription *font_desc, *bold_font_desc;
+               font_desc = pango_font_description_from_string
+                                               (NORMAL_FONT);
+               bold_font_desc = pango_font_description_from_string
+                                               (NORMAL_FONT);
+               if (font_desc) {
+                       gtk_widget_modify_font(textview->text, font_desc);
+                       CHANGE_TAG_FONT("header", font_desc);
+                       pango_font_description_free(font_desc);
+               }
+               if (bold_font_desc) {
+                       pango_font_description_set_weight
+                               (bold_font_desc, PANGO_WEIGHT_BOLD);
+                       CHANGE_TAG_FONT("header_title", bold_font_desc);
+                       pango_font_description_free(bold_font_desc);
                }
-       } else
-               use_fontset = FALSE;
-
-       if (textview->text_is_mb && !use_fontset) {
-               GtkWidget *parent;
-
-               parent = textview->scrolledwin_mb->parent;
-               gtkut_container_remove(GTK_CONTAINER(parent),
-                                      textview->scrolledwin_mb);
-               gtk_container_add(GTK_CONTAINER(parent),
-                                 textview->scrolledwin_sb);
-
-               textview->text = textview->text_sb;
-               textview->text_is_mb = FALSE;
-       } else if (!textview->text_is_mb && use_fontset) {
-               GtkWidget *parent;
-
-               parent = textview->scrolledwin_sb->parent;
-               gtkut_container_remove(GTK_CONTAINER(parent),
-                                      textview->scrolledwin_sb);
-               gtk_container_add(GTK_CONTAINER(parent),
-                                 textview->scrolledwin_mb);
-
-               textview->text = textview->text_mb;
-               textview->text_is_mb = TRUE;
        }
 
        if (prefs_common.textfont) {
-               GdkFont *font;
+               PangoFontDescription *font_desc;
 
-               if (use_fontset) {
-                       if (text_mb_font) {
-                               text_mb_font->ascent = text_mb_font_orig_ascent;
-                               text_mb_font->descent = text_mb_font_orig_descent;
-                       }
-                       font = gdk_fontset_load(prefs_common.textfont);
-                       if (font && text_mb_font != font) {
-                               if (text_mb_font)
-                                       gdk_font_unref(text_mb_font);
-                               text_mb_font = font;
-                               text_mb_font_orig_ascent = font->ascent;
-                               text_mb_font_orig_descent = font->descent;
-                       }
-               } else {
-                       if (text_sb_font) {
-                               text_sb_font->ascent = text_sb_font_orig_ascent;
-                               text_sb_font->descent = text_sb_font_orig_descent;
-                       }
-                       if (MB_CUR_MAX > 1)
-                               font = gdk_font_load("-*-courier-medium-r-normal--14-*-*-*-*-*-iso8859-1");
-                       else
-                               font = gtkut_font_load_from_fontset
-                                       (prefs_common.textfont);
-                       if (font && text_sb_font != font) {
-                               if (text_sb_font)
-                                       gdk_font_unref(text_sb_font);
-                               text_sb_font = font;
-                               text_sb_font_orig_ascent = font->ascent;
-                               text_sb_font_orig_descent = font->descent;
-                       }
+               font_desc = pango_font_description_from_string
+                                               (prefs_common.textfont);
+               if (font_desc) {
+                       gtk_widget_modify_font(textview->text, font_desc);
+                       pango_font_description_free(font_desc);
                }
+       }
+       gtk_text_view_set_pixels_above_lines(GTK_TEXT_VIEW(textview->text),
+                                            prefs_common.line_space / 2);
+       gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(textview->text),
+                                            prefs_common.line_space / 2);
+}
 
-               if (font) {
-                       gint ascent, descent;
+void textview_set_text(TextView *textview, const gchar *text)
+{
+       GtkTextView *view;
+       GtkTextBuffer *buffer;
 
-                       descent = prefs_common.line_space / 2;
-                       ascent  = prefs_common.line_space - descent;
-                       font->ascent  += ascent;
-                       font->descent += descent;
+       g_return_if_fail(textview != NULL);
+       g_return_if_fail(text != NULL);
 
-                       if (textview->msgfont)
-                               gdk_font_unref(textview->msgfont);
-                       textview->msgfont = font;
-                       gdk_font_ref(font);
-               }
-       }
+       textview_clear(textview);
 
-       if (!textview->boldfont && prefs_common.boldfont)
-               textview->boldfont = gtkut_font_load(prefs_common.boldfont);
-       if (!spacingfont)
-               spacingfont = gdk_font_load("-*-*-medium-r-normal--6-*");
+       view = GTK_TEXT_VIEW(textview->text);
+       buffer = gtk_text_view_get_buffer(view);
+       gtk_text_buffer_set_text(buffer, text, strlen(text));
 }
 
 enum
@@ -1303,12 +1191,13 @@ enum
 
 void textview_set_position(TextView *textview, gint pos)
 {
-       if (pos < 0) {
-               textview->cur_pos =
-                       gtk_stext_get_length(GTK_STEXT(textview->text));
-       } else {
-               textview->cur_pos = pos;
-       }
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter iter;
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
+       gtk_text_buffer_place_cursor(buffer, &iter);
+       gtk_text_view_scroll_to_iter(text, &iter, 0.0, FALSE, 0.0, 0.0);
 }
 
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
@@ -1364,28 +1253,32 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
        } else
                procheader_header_array_destroy(headers);
 
+
        return sorted_headers;
 }
 
 static void textview_show_header(TextView *textview, GPtrArray *headers)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter iter;
        Header *header;
        gint i;
 
        g_return_if_fail(headers != NULL);
 
-       gtk_stext_freeze(text);
-
        for (i = 0; i < headers->len; i++) {
                header = g_ptr_array_index(headers, i);
                g_return_if_fail(header->name != NULL);
 
-               gtk_stext_insert(text, textview->boldfont, NULL, NULL,
-                               header->name, -1);
+               gtk_text_buffer_get_end_iter (buffer, &iter);
+               gtk_text_buffer_insert_with_tags_by_name
+                       (buffer, &iter, header->name, -1,
+                        "header_title", "header", NULL);
                if (header->name[strlen(header->name) - 1] != ' ')
-                       gtk_stext_insert(text, textview->boldfont,
-                                       NULL, NULL, " ", 1);
+               gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &iter, " ", 1,
+                                "header_title", "header", NULL);
 
                if (procheader_headername_equal(header->name, "Subject") ||
                    procheader_headername_equal(header->name, "From")    ||
@@ -1393,116 +1286,93 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                    procheader_headername_equal(header->name, "Cc"))
                        unfold_line(header->body);
 
-               if (prefs_common.enable_color &&
-                   (procheader_headername_equal(header->name, "X-Mailer") ||
+               if ((procheader_headername_equal(header->name, "X-Mailer") ||
                     procheader_headername_equal(header->name,
                                                 "X-Newsreader")) &&
-                   strstr(header->body, "Sylpheed") != NULL)
-                       gtk_stext_insert(text, NULL, &emphasis_color, NULL,
-                                       header->body, -1);
-               else if (prefs_common.enable_color) {
-                       textview_make_clickable_parts(textview,
-                                                     NULL, NULL, &uri_color,
-                                                     header->body);
+                   strstr(header->body, "Sylpheed") != NULL) {
+                       gtk_text_buffer_get_end_iter (buffer, &iter);
+                       gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &iter, header->body, -1,
+                                "header", "emphasis", NULL);
                } else {
-                       textview_make_clickable_parts(textview,
-                                                     NULL, NULL, NULL,
+                       textview_make_clickable_parts(textview, "header", "link",
                                                      header->body);
                }
-               gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+               gtk_text_buffer_get_end_iter (buffer, &iter);
+               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, "\n", 1,
+                                                        "header", NULL);
        }
-
-       gtk_stext_thaw(text);
 }
 
 gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
-       gint pos;
-       wchar_t *wcs;
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, match_pos;
+       GtkTextMark *mark;
        gint len;
-       gint text_len;
-       gboolean found = FALSE;
 
        g_return_val_if_fail(str != NULL, FALSE);
 
-       wcs = strdup_mbstowcs(str);
-       g_return_val_if_fail(wcs != NULL, FALSE);
-       len = wcslen(wcs);
-       pos = textview->cur_pos;
-       if (pos < textview->body_pos)
-               pos = textview->body_pos;
-       text_len = gtk_stext_get_length(text);
-       if (text_len - pos < len) {
-               g_free(wcs);
-               return FALSE;
-       }
+       buffer = gtk_text_view_get_buffer(text);
 
-       for (; pos < text_len; pos++) {
-               if (text_len - pos < len) break;
-               if (gtk_stext_match_string(text, pos, wcs, len, case_sens)
-                   == TRUE) {
-                       gtk_widget_hide(GTK_WIDGET(textview->scrolledwin));
-                       gtk_editable_set_position(GTK_EDITABLE(text),
-                                                 pos + len);
-                       gtk_editable_select_region(GTK_EDITABLE(text),
-                                                  pos, pos + len);
-                       gtk_widget_show(GTK_WIDGET(textview->scrolledwin));
-                       textview_set_position(textview, pos + len);
-                       found = TRUE;
-                       break;
-               }
-               if (text_len - pos == len) break;
+       len = g_utf8_strlen(str, -1);
+       g_return_val_if_fail(len >= 0, FALSE);
+
+       mark = gtk_text_buffer_get_insert(buffer);
+       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+       if (gtkut_text_buffer_find(buffer, &iter, str, case_sens,
+                                  &match_pos)) {
+               GtkTextIter end = match_pos;
+
+               gtk_text_iter_forward_chars(&end, len);
+               /* place "insert" at the last character */
+               gtk_text_buffer_select_range(buffer, &end, &match_pos);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               return TRUE;
        }
-       g_free(wcs);
-       return found;
+
+       return FALSE;
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
-       gint pos;
-       wchar_t *wcs;
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, match_pos;
+       GtkTextMark *mark;
        gint len;
-       gint text_len;
-       gboolean found = FALSE;
 
        g_return_val_if_fail(str != NULL, FALSE);
 
-       wcs = strdup_mbstowcs(str);
-       g_return_val_if_fail(wcs != NULL, FALSE);
-       len = wcslen(wcs);
-       pos = textview->cur_pos;
-       text_len = gtk_stext_get_length(text);
-       if (text_len - textview->body_pos < len) {
-               g_free(wcs);
-               return FALSE;
-       }
-       if (pos <= textview->body_pos || text_len - pos < len)
-               pos = text_len - len;
-
-       for (; pos >= textview->body_pos; pos--) {
-               if (gtk_stext_match_string(text, pos, wcs, len, case_sens)
-                   == TRUE) {
-                       gtk_editable_set_position(GTK_EDITABLE(text), pos);
-                       gtk_editable_select_region(GTK_EDITABLE(text),
-                                                  pos, pos + len);
-                       textview_set_position(textview, pos - 1);
-                       found = TRUE;
-                       break;
-               }
-               if (pos == textview->body_pos) break;
+       buffer = gtk_text_view_get_buffer(text);
+
+       len = g_utf8_strlen(str, -1);
+       g_return_val_if_fail(len >= 0, FALSE);
+
+       mark = gtk_text_buffer_get_insert(buffer);
+       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+       if (gtkut_text_buffer_find_backward(buffer, &iter, str, case_sens,
+                                           &match_pos)) {
+               GtkTextIter end = match_pos;
+
+               gtk_text_iter_forward_chars(&end, len);
+               gtk_text_buffer_select_range(buffer, &match_pos, &end);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               return TRUE;
        }
 
-       g_free(wcs);
-       return found;
+       return FALSE;
 }
 
 void textview_scroll_one_line(TextView *textview, gboolean up)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkAdjustment *vadj = text->vadjustment;
        gfloat upper;
 
        if (prefs_common.enable_smooth_scroll) {
@@ -1511,30 +1381,27 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
        }
 
        if (!up) {
-               upper = text->vadj->upper - text->vadj->page_size;
-               if (text->vadj->value < upper) {
-                       text->vadj->value +=
-                               text->vadj->step_increment * 4;
-                       text->vadj->value =
-                               MIN(text->vadj->value, upper);
-                       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj),
-                                               "value_changed");
+               upper = vadj->upper - vadj->page_size;
+               if (vadj->value < upper) {
+                       vadj->value += vadj->step_increment;
+                       vadj->value = MIN(vadj->value, upper);
+                       g_signal_emit_by_name(G_OBJECT(vadj),
+                                             "value_changed", 0);
                }
        } else {
-               if (text->vadj->value > 0.0) {
-                       text->vadj->value -=
-                               text->vadj->step_increment * 4;
-                       text->vadj->value =
-                               MAX(text->vadj->value, 0.0);
-                       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj),
-                                               "value_changed");
+               if (vadj->value > 0.0) {
+                       vadj->value -= vadj->step_increment;
+                       vadj->value = MAX(vadj->value, 0.0);
+                       g_signal_emit_by_name(G_OBJECT(vadj),
+                                             "value_changed", 0);
                }
        }
 }
 
 gboolean textview_scroll_page(TextView *textview, gboolean up)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkAdjustment *vadj = text->vadjustment;
        gfloat upper;
        gfloat page_incr;
 
@@ -1542,25 +1409,25 @@ gboolean textview_scroll_page(TextView *textview, gboolean up)
                return textview_smooth_scroll_page(textview, up);
 
        if (prefs_common.scroll_halfpage)
-               page_incr = text->vadj->page_increment / 2;
+               page_incr = vadj->page_increment / 2;
        else
-               page_incr = text->vadj->page_increment;
+               page_incr = vadj->page_increment;
 
        if (!up) {
-               upper = text->vadj->upper - text->vadj->page_size;
-               if (text->vadj->value < upper) {
-                       text->vadj->value += page_incr;
-                       text->vadj->value = MIN(text->vadj->value, upper);
-                       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj),
-                                               "value_changed");
+               upper = vadj->upper - vadj->page_size;
+               if (vadj->value < upper) {
+                       vadj->value += page_incr;
+                       vadj->value = MIN(vadj->value, upper);
+                       g_signal_emit_by_name(G_OBJECT(vadj),
+                                             "value_changed", 0);
                } else
                        return FALSE;
        } else {
-               if (text->vadj->value > 0.0) {
-                       text->vadj->value -= page_incr;
-                       text->vadj->value = MAX(text->vadj->value, 0.0);
-                       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj),
-                                               "value_changed");
+               if (vadj->value > 0.0) {
+                       vadj->value -= page_incr;
+                       vadj->value = MAX(vadj->value, 0.0);
+                       g_signal_emit_by_name(G_OBJECT(vadj),
+                                             "value_changed", 0);
                } else
                        return FALSE;
        }
@@ -1572,7 +1439,8 @@ static void textview_smooth_scroll_do(TextView *textview,
                                      gfloat old_value, gfloat last_value,
                                      gint step)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkAdjustment *vadj = text->vadjustment;
        gint change_value;
        gboolean up;
        gint i;
@@ -1585,33 +1453,31 @@ static void textview_smooth_scroll_do(TextView *textview,
                up = TRUE;
        }
 
-       gdk_key_repeat_disable();
-
        for (i = step; i <= change_value; i += step) {
-               text->vadj->value = old_value + (up ? -i : i);
-               gtk_signal_emit_by_name(GTK_OBJECT(text->vadj),
-                                       "value_changed");
+               vadj->value = old_value + (up ? -i : i);
+               g_signal_emit_by_name(G_OBJECT(vadj),
+                                     "value_changed", 0);
        }
 
-       text->vadj->value = last_value;
-       gtk_signal_emit_by_name(GTK_OBJECT(text->vadj), "value_changed");
+       vadj->value = last_value;
+       g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
 
-       gdk_key_repeat_restore();
+       gtk_widget_queue_draw(GTK_WIDGET(text));
 }
 
 static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkAdjustment *vadj = text->vadjustment;
        gfloat upper;
        gfloat old_value;
        gfloat last_value;
 
        if (!up) {
-               upper = text->vadj->upper - text->vadj->page_size;
-               if (text->vadj->value < upper) {
-                       old_value = text->vadj->value;
-                       last_value = text->vadj->value +
-                               text->vadj->step_increment * 4;
+               upper = vadj->upper - vadj->page_size;
+               if (vadj->value < upper) {
+                       old_value = vadj->value;
+                       last_value = vadj->value + vadj->step_increment;
                        last_value = MIN(last_value, upper);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1619,10 +1485,9 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
                                                  prefs_common.scroll_step);
                }
        } else {
-               if (text->vadj->value > 0.0) {
-                       old_value = text->vadj->value;
-                       last_value = text->vadj->value -
-                               text->vadj->step_increment * 4;
+               if (vadj->value > 0.0) {
+                       old_value = vadj->value;
+                       last_value = vadj->value - vadj->step_increment;
                        last_value = MAX(last_value, 0.0);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1634,22 +1499,23 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
 
 static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
 {
-       GtkSText *text = GTK_STEXT(textview->text);
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkAdjustment *vadj = text->vadjustment;
        gfloat upper;
        gfloat page_incr;
        gfloat old_value;
        gfloat last_value;
 
        if (prefs_common.scroll_halfpage)
-               page_incr = text->vadj->page_increment / 2;
+               page_incr = vadj->page_increment / 2;
        else
-               page_incr = text->vadj->page_increment;
+               page_incr = vadj->page_increment;
 
        if (!up) {
-               upper = text->vadj->upper - text->vadj->page_size;
-               if (text->vadj->value < upper) {
-                       old_value = text->vadj->value;
-                       last_value = text->vadj->value + page_incr;
+               upper = vadj->upper - vadj->page_size;
+               if (vadj->value < upper) {
+                       old_value = vadj->value;
+                       last_value = vadj->value + page_incr;
                        last_value = MIN(last_value, upper);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1658,9 +1524,9 @@ static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
                } else
                        return FALSE;
        } else {
-               if (text->vadj->value > 0.0) {
-                       old_value = text->vadj->value;
-                       last_value = text->vadj->value - page_incr;
+               if (vadj->value > 0.0) {
+                       old_value = vadj->value;
+                       last_value = vadj->value - page_incr;
                        last_value = MAX(last_value, 0.0);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1674,11 +1540,8 @@ static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
 }
 
 #define KEY_PRESS_EVENT_STOP() \
-       if (gtk_signal_n_emissions_by_name \
-               (GTK_OBJECT(widget), "key_press_event") > 0) { \
-               gtk_signal_emit_stop_by_name(GTK_OBJECT(widget), \
-                                            "key_press_event"); \
-       }
+       g_signal_stop_emission_by_name(G_OBJECT(widget), \
+                                      "key_press_event");
 
 static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 TextView *textview)
@@ -1702,39 +1565,39 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_End:
        case GDK_Control_L:
        case GDK_Control_R:
-               break;
+               return FALSE;
        case GDK_space:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                else
-                       textview_scroll_page(textview, FALSE);
+                       textview_scroll_page
+                               (textview,
+                                (event->state &
+                                 (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_BackSpace:
                textview_scroll_page(textview, TRUE);
                break;
        case GDK_Return:
-               textview_scroll_one_line(textview,
-                                        (event->state & GDK_MOD1_MASK) != 0);
+               textview_scroll_one_line
+                       (textview, (event->state &
+                                   (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_Delete:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                break;
-       case GDK_n:
-       case GDK_N:
-       case GDK_p:
-       case GDK_P:
        case GDK_y:
        case GDK_t:
        case GDK_l:
-               if (messageview->type == MVIEW_MIME &&
-                   textview == messageview->mimeview->textview) {
+       case GDK_c:
+               if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,
                                                      event);
                        break;
                }
-               /* fall through */
+               /* possible fall through */
        default:
                if (summaryview &&
                    event->window != messageview->mainwin->window->window) {
@@ -1751,120 +1614,339 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return TRUE;
 }
 
-static gint show_url_timeout_cb(gpointer data)
+static gboolean textview_motion_notify(GtkWidget *widget,
+                                      GdkEventMotion *event,
+                                      TextView *textview)
 {
-       TextView *textview = (TextView *)data;
-       
-       if (textview->messageview->mainwin)
-               if (textview->show_url_msgid)
-                       gtk_statusbar_remove(GTK_STATUSBAR(
-                               textview->messageview->mainwin->statusbar),
-                               textview->messageview->mainwin->folderview_cid,
-                               textview->show_url_msgid);
-               return FALSE;
+       textview_uri_update(textview, event->x, event->y);
+       gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
+
+       return FALSE;
 }
 
-static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
-                                   TextView *textview)
+static gboolean textview_leave_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     TextView *textview)
 {
-       if (event)
-               textview->last_buttonpress = event->type;
+       textview_uri_update(textview, -1, -1);
+
+       return FALSE;
+}
+
+static gboolean textview_visibility_notify(GtkWidget *widget,
+                                          GdkEventVisibility *event,
+                                          TextView *textview)
+{
+       gint wx, wy;
+       GdkWindow *window;
+
+       window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
+                                         GTK_TEXT_WINDOW_TEXT);
+
+       /* check if occurred for the text window part */
+       if (window != event->window)
+               return FALSE;
+       
+       gdk_window_get_pointer(widget->window, &wx, &wy, NULL);
+       textview_uri_update(textview, wx, wy);
+
        return FALSE;
 }
 
-static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
-                                   TextView *textview)
+static void textview_uri_update(TextView *textview, gint x, gint y)
 {
-       textview->cur_pos = 
-               gtk_editable_get_position(GTK_EDITABLE(textview->text));
+       GtkTextBuffer *buffer;
+       GtkTextIter start_iter, end_iter;
+       RemoteURI *uri = NULL;
+       
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
 
-       if (event && 
-           ((event->button == 1)
-            || event->button == 2 || event->button == 3)) {
+       if (x != -1 && y != -1) {
+               gint bx, by;
+               GtkTextIter iter;
+               GSList *tags;
                GSList *cur;
+           
+               gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(textview->text), 
+                                                     GTK_TEXT_WINDOW_WIDGET,
+                                                     x, y, &bx, &by);
+               gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(textview->text),
+                                                  &iter, bx, by);
+
+               tags = gtk_text_iter_get_tags(&iter);
+               for (cur = tags; cur != NULL; cur = cur->next) {
+                       GtkTextTag *tag = cur->data;
+                       char *name;
+
+                       g_object_get(G_OBJECT(tag), "name", &name, NULL);
+                       if (!strcmp(name, "link")
+                           && textview_get_uri_range(textview, &iter, tag,
+                                                     &start_iter, &end_iter))
+                               uri = textview_get_uri_from_range(textview,
+                                                                 &iter, tag,
+                                                                 &start_iter,
+                                                                 &end_iter);
+                       g_free(name);
+
+                       if (uri)
+                               break;
+               }
+               g_slist_free(tags);
+       }
+       
+       if (uri != textview->uri_hover) {
+               GdkWindow *window;
+
+               if (textview->uri_hover)
+                       gtk_text_buffer_remove_tag_by_name(buffer,
+                                                          "link-hover",
+                                                          &textview->uri_hover_start_iter,
+                                                          &textview->uri_hover_end_iter);
+                   
+               textview->uri_hover = uri;
+               if (uri) {
+                       textview->uri_hover_start_iter = start_iter;
+                       textview->uri_hover_end_iter = end_iter;
+               }
+               
+               window = gtk_text_view_get_window(GTK_TEXT_VIEW(textview->text),
+                                                 GTK_TEXT_WINDOW_TEXT);
+               gdk_window_set_cursor(window, uri ? hand_cursor : text_cursor);
+
+               TEXTVIEW_STATUSBAR_POP(textview);
+
+               if (uri) {
+                       char *trimmed_uri;
 
-               /* double click seems to set the cursor after the current
-                * word. The cursor position needs fixing, otherwise the
-                * last word of a clickable zone will not work */
-               if (event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS) {
-                       textview->cur_pos--;
+                       gtk_text_buffer_apply_tag_by_name(buffer,
+                                                         "link-hover",
+                                                         &start_iter,
+                                                         &end_iter);
+
+                       trimmed_uri = trim_string(uri->uri, 60);
+                       TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
+                       g_free(trimmed_uri);
                }
+       }
+}
 
-               for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
-                       RemoteURI *uri = (RemoteURI *)cur->data;
-
-                       if (textview->cur_pos >= uri->start &&
-                           textview->cur_pos <  uri->end) {
-                               /* single click: display url in statusbar */
-                               if (event->button == 1 && textview->last_buttonpress != GDK_2BUTTON_PRESS) {
-                                       if (textview->messageview->mainwin) {
-                                               if (textview->show_url_msgid) {
-                                                       gtk_timeout_remove(textview->show_url_timeout_tag);
-                                                       gtk_statusbar_remove(GTK_STATUSBAR(
-                                                               textview->messageview->mainwin->statusbar),
-                                                               textview->messageview->mainwin->folderview_cid,
-                                                               textview->show_url_msgid);
-                                                       textview->show_url_msgid = 0;
-                                               }
-                                               textview->show_url_msgid = gtk_statusbar_push(
-                                                               GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
-                                                               textview->messageview->mainwin->folderview_cid,
-                                                               uri->uri);
-                                               textview->show_url_timeout_tag = gtk_timeout_add( 4000, show_url_timeout_cb, textview );
-                                               gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
-                                       }
-                               } else
-                               if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
-                                       if (event->button == 3) {
-                                               gchar *fromname, *fromaddress;
-                                               
-                                               /* extract url */
-                                               fromaddress = g_strdup(uri->uri + 7);
-                                               /* Hiroyuki: please put this function in utils.c! */
-                                               fromname = procheader_get_fromname(fromaddress);
-                                               extract_address(fromaddress);
-                                               g_message("adding from textview %s <%s>", fromname, fromaddress);
-                                               /* Add to address book - Match */
-                                               addressbook_add_contact( fromname, fromaddress, NULL );
-                                               
-                                               g_free(fromaddress);
-                                               g_free(fromname);
-                                       } else {
-                                               PrefsAccount *account = NULL;
-                                               FolderItem   *folder_item;
-
-                                               if (textview->messageview && textview->messageview->mainwin 
-                                               &&  textview->messageview->mainwin->summaryview 
-                                               &&  textview->messageview->mainwin->summaryview->folder_item) {
-                                                       folder_item = textview->messageview->mainwin->summaryview->folder_item;
-                                                       if (folder_item->prefs && folder_item->prefs->enable_default_account)
-                                                               account = account_find_from_id(folder_item->prefs->default_account);
-                                               }
-                                               compose_new(account, uri->uri + 7, NULL);
-                                       }
-                               } else 
-#if USE_GPGME
-                               if (!g_strncasecmp(uri->uri, "pgp:", 4)) {
-                                       GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
-                                                               GTK_SCROLLED_WINDOW(textview->scrolledwin));
-                                       gfloat vpos = pos->value;
-                                       mimeview_check_signature(textview->messageview->mimeview);
-                                       /* scroll back where we were */
-                                       gtk_adjustment_set_value(pos, vpos);
-                               } else
-#endif
-                               {
+static gboolean textview_get_uri_range(TextView *textview,
+                                      GtkTextIter *iter,
+                                      GtkTextTag *tag,
+                                      GtkTextIter *start_iter,
+                                      GtkTextIter *end_iter)
+{
+       GtkTextIter _start_iter, _end_iter;
+
+       _end_iter = *iter;
+       if (!gtk_text_iter_forward_to_tag_toggle(&_end_iter, tag)) {
+               debug_print("Can't find end");
+               return FALSE;
+       }
+
+       _start_iter = _end_iter;
+       if (!gtk_text_iter_backward_to_tag_toggle(&_start_iter, tag)) {
+               debug_print("Can't find start.");
+               return FALSE;
+       }
+
+       *start_iter = _start_iter;
+       *end_iter = _end_iter;
+
+       return TRUE;
+}
+
+static RemoteURI *textview_get_uri_from_range(TextView *textview,
+                                             GtkTextIter *iter,
+                                             GtkTextTag *tag,
+                                             GtkTextIter *start_iter,
+                                             GtkTextIter *end_iter)
+{
+       gint start_pos, end_pos, cur_pos;
+       RemoteURI *uri = NULL;
+       GSList *cur;
+
+       start_pos = gtk_text_iter_get_offset(start_iter);
+       end_pos = gtk_text_iter_get_offset(end_iter);
+       cur_pos = gtk_text_iter_get_offset(iter);
+
+       for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
+               RemoteURI *uri_ = (RemoteURI *)cur->data;
+               if (start_pos == uri_->start &&
+                   end_pos ==  uri_->end) {
+                       uri = uri_;
+                       break;
+               } else if (start_pos == uri_->start ||
+                          end_pos == uri_->end) {
+                       /* in case of contiguous links, textview_get_uri_range
+                        * returns a broader range (start of 1st link to end
+                        * of last link).
+                        * In that case, correct link is the one covering
+                        * current iter.
+                        */
+                       if (uri_->start <= cur_pos && cur_pos <= uri_->end) {
+                               uri = uri_;
+                               break;
+                       }
+               } 
+       }
+
+       return uri;
+}
+
+static RemoteURI *textview_get_uri(TextView *textview,
+                                  GtkTextIter *iter,
+                                  GtkTextTag *tag)
+{
+       GtkTextIter start_iter, end_iter;
+       RemoteURI *uri = NULL;
+
+       if (textview_get_uri_range(textview, iter, tag, &start_iter,
+                                  &end_iter))
+               uri = textview_get_uri_from_range(textview, iter, tag,
+                                                 &start_iter, &end_iter);
+
+       return uri;
+}
+
+static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
+                                           GdkEvent *event, GtkTextIter *iter,
+                                           TextView *textview)
+{
+       GdkEventButton *bevent;
+       RemoteURI *uri = NULL;
+
+       if (!event)
+               return FALSE;
+
+       if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS
+               && event->type != GDK_MOTION_NOTIFY)
+               return FALSE;
+
+       uri = textview_get_uri(textview, iter, tag);
+       if (!uri)
+               return FALSE;
+
+       bevent = (GdkEventButton *) event;
+       
+       /* doubleclick: open compose / add address / browser */
+       if ((event->type == GDK_BUTTON_PRESS && bevent->button == 1) ||
+               bevent->button == 2 || bevent->button == 3) {
+               if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) {
+                       if (bevent->button == 3) {
+                               g_object_set_data(
+                                       G_OBJECT(textview->mail_popup_menu),
+                                       "menu_button", uri);
+                               gtk_menu_popup(GTK_MENU(textview->mail_popup_menu), 
+                                              NULL, NULL, NULL, NULL, 
+                                              bevent->button, bevent->time);
+                       } else {
+                               PrefsAccount *account = NULL;
+
+                               if (textview->messageview && textview->messageview->msginfo &&
+                                   textview->messageview->msginfo->folder) {
+                                       FolderItem   *folder_item;
+
+                                       folder_item = textview->messageview->msginfo->folder;
+                                       if (folder_item->prefs && folder_item->prefs->enable_default_account)
+                                               account = account_find_from_id(folder_item->prefs->default_account);
+                               }
+                               compose_new(account, uri->uri + 7, NULL);
+                       }
+                       return TRUE;
+               } else if (g_ascii_strncasecmp(uri->uri, "file:", 5)) {
+                       if (bevent->button == 1 &&
+                           textview_uri_security_check(textview, uri) == TRUE) 
                                        open_uri(uri->uri,
                                                 prefs_common.uri_cmd);
-                               }
+                       else if (bevent->button == 3) {
+                               g_object_set_data(
+                                       G_OBJECT(textview->link_popup_menu),
+                                       "menu_button", uri);
+                               gtk_menu_popup(GTK_MENU(textview->link_popup_menu), 
+                                              NULL, NULL, NULL, NULL, 
+                                              bevent->button, bevent->time);
+                       }
+                       return TRUE;
+               } else {
+                       if (bevent->button == 3) {
+                               g_object_set_data(
+                                       G_OBJECT(textview->file_popup_menu),
+                                       "menu_button", uri);
+                               gtk_menu_popup(GTK_MENU(textview->file_popup_menu), 
+                                              NULL, NULL, NULL, NULL, 
+                                              bevent->button, bevent->time);
+                               return TRUE;
                        }
                }
        }
-       if (event)
-               textview->last_buttonpress = event->type;
+
        return FALSE;
 }
 
+/*!
+ *\brief    Check to see if a web URL has been disguised as a different
+ *          URL (possible with HTML email).
+ *
+ *\param    uri The uri to check
+ *
+ *\param    textview The TextView the URL is contained in
+ *
+ *\return   gboolean TRUE if the URL is ok, or if the user chose to open
+ *          it anyway, otherwise FALSE          
+ */
+static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
+{
+       gchar *visible_str;
+       gboolean retval = TRUE;
+       GtkTextBuffer *buffer;
+       GtkTextIter start, end;
+
+       if (is_uri_string(uri->uri) == FALSE)
+               return TRUE;
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+       gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
+
+       visible_str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+       if (visible_str == NULL)
+               return TRUE;
+
+       if (strcmp(visible_str, uri->uri) != 0 && is_uri_string(visible_str)) {
+               gchar *uri_path;
+               gchar *visible_uri_path;
+
+               uri_path = get_uri_path(uri->uri);
+               visible_uri_path = get_uri_path(visible_str);
+               if (strcmp(uri_path, visible_uri_path) != 0)
+                       retval = FALSE;
+       }
+
+       if (retval == FALSE) {
+               gchar *msg;
+               AlertValue aval;
+
+               msg = g_strdup_printf(_("The real URL (%s) is different from\n"
+                                       "the apparent URL (%s).\n"
+                                       "\n"
+                                       "Open it anyway?"),
+                                     uri->uri, visible_str);
+               aval = alertpanel_full(_("Fake URL warning"), msg,
+                                      GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
+                                      NULL, ALERT_WARNING, G_ALERTALTERNATE);
+               g_free(msg);
+               if (aval == G_ALERTDEFAULT)
+                       retval = TRUE;
+       }
+
+       g_free(visible_str);
+
+       return retval;
+}
+
 static void textview_uri_list_remove_all(GSList *uri_list)
 {
        GSList *cur;
@@ -1872,9 +1954,216 @@ static void textview_uri_list_remove_all(GSList *uri_list)
        for (cur = uri_list; cur != NULL; cur = cur->next) {
                if (cur->data) {
                        g_free(((RemoteURI *)cur->data)->uri);
+                       g_free(((RemoteURI *)cur->data)->filename);
                        g_free(cur->data);
                }
        }
 
        g_slist_free(uri_list);
 }
+
+static void open_uri_cb (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       if (textview_uri_security_check(textview, uri) == TRUE) 
+               open_uri(uri->uri,
+                        prefs_common.uri_cmd);
+       g_object_set_data(G_OBJECT(textview->link_popup_menu), "menu_button",
+                         NULL);
+}
+
+static void open_image_cb (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
+                                          "menu_button");
+
+       static gchar *default_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
+       gchar buf[1024];
+       const gchar *cmd;
+       const gchar *def_cmd;
+       const gchar *p;
+       gchar *filename = NULL;
+       gchar *tmp_filename = NULL;
+
+       if (uri == NULL)
+               return;
+
+       if (uri->filename == NULL)
+               return;
+       
+       filename = g_strdup(uri->filename);
+       
+       if (!g_utf8_validate(filename, -1, NULL)) {
+               gchar *tmp = conv_filename_to_utf8(filename);
+               g_free(filename);
+               filename = tmp;
+       }
+
+       subst_for_filename(filename);
+
+       tmp_filename = g_filename_from_uri(uri->uri, NULL, NULL);
+       copy_file(tmp_filename, filename, FALSE);
+       g_free(tmp_filename);
+
+       cmd = prefs_common.mime_image_viewer;
+       def_cmd = default_cmdline;
+       
+       if (cmd && (p = strchr(cmd, '%')) && *(p + 1) == 's' &&
+           !strchr(p + 2, '%'))
+               g_snprintf(buf, sizeof(buf), cmd, filename);
+       else {
+               if (cmd)
+                       g_warning("Image viewer command line is invalid: '%s'", cmd);
+               if (def_cmd)
+                       g_snprintf(buf, sizeof(buf), def_cmd, filename);
+               else
+                       return;
+       }
+
+       execute_command_line(buf, TRUE);
+
+       g_free(filename);
+
+       g_object_set_data(G_OBJECT(textview->file_popup_menu), "menu_button",
+                         NULL);
+}
+
+static void save_file_cb (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
+                                          "menu_button");
+       gchar *filename = NULL;
+       gchar *filepath = NULL;
+       gchar *filedir = NULL;
+       gchar *tmp_filename = NULL;
+       if (uri == NULL)
+               return;
+
+       if (uri->filename == NULL)
+               return;
+       
+       filename = g_strdup(uri->filename);
+       
+       if (!g_utf8_validate(filename, -1, NULL)) {
+               gchar *tmp = conv_filename_to_utf8(filename);
+               g_free(filename);
+               filename = tmp;
+       }
+
+       subst_for_filename(filename);
+       
+       if (prefs_common.attach_save_dir)
+               filepath = g_strconcat(prefs_common.attach_save_dir,
+                                      G_DIR_SEPARATOR_S, filename, NULL);
+       else
+               filepath = g_strdup(filename);
+
+       g_free(filename);
+
+       filename = filesel_select_file_save(_("Save as"), filepath);
+       if (!filename) {
+               g_free(filepath);
+               return;
+       }
+
+       if (is_file_exist(filename)) {
+               AlertValue aval;
+               gchar *res;
+               
+               res = g_strdup_printf(_("Overwrite existing file '%s'?"),
+                                     filename);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK, 
+                                 GTK_STOCK_CANCEL, NULL);
+               g_free(res);                                      
+               if (G_ALERTDEFAULT != aval) 
+                       return;
+       }
+
+       tmp_filename = g_filename_from_uri(uri->uri, NULL, NULL);
+       copy_file(tmp_filename, filename, FALSE);
+       g_free(tmp_filename);
+       
+       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(filedir);
+       g_free(filepath);
+
+       g_object_set_data(G_OBJECT(textview->file_popup_menu), "menu_button",
+                         NULL);
+}
+
+static void copy_uri_cb        (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), uri->uri, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), uri->uri, -1);
+       g_object_set_data(G_OBJECT(textview->link_popup_menu), "menu_button",
+                         NULL);
+}
+
+static void add_uri_to_addrbook_cb (TextView *textview, guint action, void *data)
+{
+       gchar *fromname, *fromaddress;
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       /* extract url */
+       fromaddress = g_strdup(uri->uri + 7);
+       /* Hiroyuki: please put this function in utils.c! */
+       fromname = procheader_get_fromname(fromaddress);
+       extract_address(fromaddress);
+       g_message("adding from textview %s <%s>", fromname, fromaddress);
+       /* Add to address book - Match */
+       addressbook_add_contact( fromname, fromaddress, NULL );
+
+       g_free(fromaddress);
+       g_free(fromname);
+}
+
+static void mail_to_uri_cb (TextView *textview, guint action, void *data)
+{
+       PrefsAccount *account = NULL;
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       if (textview->messageview && textview->messageview->msginfo &&
+           textview->messageview->msginfo->folder) {
+               FolderItem   *folder_item;
+
+               folder_item = textview->messageview->msginfo->folder;
+               if (folder_item->prefs && folder_item->prefs->enable_default_account)
+                       account = account_find_from_id(folder_item->prefs->default_account);
+       }
+       compose_new(account, uri->uri + 7, NULL);
+}
+
+static void copy_mail_to_uri_cb        (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+                                          "menu_button");
+       if (uri == NULL)
+               return;
+
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), uri->uri +7, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), uri->uri +7, -1);
+       g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
+                         NULL);
+}
+