sync with sylpheed 0.7.0cvs27
[claws.git] / src / textview.c
index 82906f0856aff743d6007607f7ec90b89f848179..1f75beb868d44870581bc5da36853fb2f29efb2e 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999,2000 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2002 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
@@ -28,7 +28,6 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkvbox.h>
 #include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktext.h>
 #include <gtk/gtksignal.h>
 #include <stdio.h>
 #include <ctype.h>
 #include "procheader.h"
 #include "prefs_common.h"
 #include "codeconv.h"
+#include "gtkstext.h"
 #include "utils.h"
 #include "gtkutils.h"
 #include "procmime.h"
 #include "html.h"
+#include "enriched.h"
 #include "compose.h"
 #include "addressbook.h"
-#include "headers_display.h"
-#include "prefs_display_headers.h"
+#include "displayheader.h"
+#include "account.h"
 
 #define FONT_LOAD(font, s) \
 { \
@@ -57,6 +58,8 @@
        Xstrdup_a(fontstr, s, ); \
        if ((p = strchr(fontstr, ',')) != NULL) *p = '\0'; \
        font = gdk_font_load(fontstr); \
+       if (!font) \
+               g_warning("Couldn't load the font '%s'\n", fontstr); \
 }
 
 typedef struct _RemoteURI      RemoteURI;
@@ -98,21 +101,31 @@ static GdkColor error_color = {
 
 static GdkFont *spacingfont;
 
+static void textview_show_ertf         (TextView       *textview,
+                                        FILE           *fp,
+                                        CodeConverter  *conv);
 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,
+                                        const gchar    *str,
+                                        CodeConverter  *conv);
 static GPtrArray *textview_scan_header (TextView       *textview,
                                         FILE           *fp);
 static void textview_show_header       (TextView       *textview,
                                         GPtrArray      *headers);
 
-static void textview_key_pressed       (GtkWidget      *widget,
+static gint textview_key_pressed       (GtkWidget      *widget,
                                         GdkEventKey    *event,
                                         TextView       *textview);
-static void textview_button_pressed    (GtkWidget      *widget,
+static gint textview_button_pressed    (GtkWidget      *widget,
+                                        GdkEventButton *event,
+                                        TextView       *textview);
+static gint textview_button_released   (GtkWidget      *widget,
                                         GdkEventButton *event,
                                         TextView       *textview);
 
@@ -149,30 +162,40 @@ TextView *textview_create(void)
        gtk_widget_set_usize(scrolledwin_sb, prefs_common.mainview_width, -1);
        gtk_widget_set_usize(scrolledwin_mb, prefs_common.mainview_width, -1);
 
-       /* create GtkText widgets for single-byte and multi-byte character */
-       text_sb = gtk_text_new(NULL, NULL);
-       text_mb = gtk_text_new(NULL, NULL);
+       /* 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_text_set_word_wrap(GTK_TEXT(text_sb), TRUE);
-       gtk_text_set_word_wrap(GTK_TEXT(text_mb), TRUE);
+       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;
-
-               style = gtk_style_copy(text_sb->style);
-               gdk_font_unref(style->font);
-               FONT_LOAD(style->font, NORMAL_FONT);
-               gtk_widget_set_style(text_sb, style);
+               GdkFont *font;
+
+               FONT_LOAD(font, 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;
-
-               style = gtk_style_copy(text_mb->style);
-               gdk_font_unref(style->font);
-               style->font = gdk_fontset_load(NORMAL_FONT);
-               gtk_widget_set_style(text_mb, 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);
@@ -182,15 +205,21 @@ TextView *textview_create(void)
        gtk_signal_connect(GTK_OBJECT(text_sb), "key_press_event",
                           GTK_SIGNAL_FUNC(textview_key_pressed),
                           textview);
-       gtk_signal_connect(GTK_OBJECT(text_sb), "button_press_event",
-                          GTK_SIGNAL_FUNC(textview_button_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(GTK_OBJECT(text_mb), "button_press_event",
-                          GTK_SIGNAL_FUNC(textview_button_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);
@@ -207,6 +236,9 @@ TextView *textview_create(void)
        textview->text_mb        = text_mb;
        textview->text_is_mb     = FALSE;
        textview->uri_list       = NULL;
+       textview->body_pos       = 0;
+       textview->cur_pos        = 0;
+       textview->last_buttonpress = GDK_NOTHING;
 
        return textview;
 }
@@ -256,7 +288,7 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
-       GtkText *text;
+       GtkSText *text;
        gchar buf[BUFFSIZE];
        const gchar *boundary = NULL;
        gint boundary_len = 0;
@@ -283,18 +315,27 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                boundary_len = strlen(boundary);
        }
 
-       if (!boundary && mimeinfo->mime_type == MIME_TEXT) {
+       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, mimeinfo->parent->fpos, SEEK_SET)
-                                < 0)
+                       else if (fseek(fp, parent->fpos, SEEK_SET) < 0)
                                perror("fseek");
                        else {
                                headers = textview_scan_header(textview, fp);
@@ -302,17 +343,20 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                                        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->parent && mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+               if (headers) procheader_header_array_destroy(headers);
                if (!mimeinfo->sub || mimeinfo->sub->children) return;
                headers = textview_scan_header(textview, fp);
                mimeinfo = mimeinfo->sub;
        } else if (!mimeinfo->parent &&
                   mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+               if (headers) procheader_header_array_destroy(headers);
                if (!mimeinfo->sub) return;
                headers = textview_scan_header(textview, fp);
                mimeinfo = mimeinfo->sub;
@@ -327,120 +371,155 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
        conv = conv_code_converter_new(charset);
 
        textview_clear(textview);
-       text = GTK_TEXT(textview->text);
-       gtk_text_freeze(text);
+       text = GTK_STEXT(textview->text);
+       gtk_stext_freeze(text);
 
-       if (headers) {
-               gint i;
+       textview->body_pos = 0;
+       textview->cur_pos  = 0;
 
+       if (headers) {
                textview_show_header(textview, headers);
-               for (i = 0; i < headers->len; i++) {
-                       Header *header = g_ptr_array_index(headers, i);
-                       g_free(header->body);
-                       g_free(header->name);
-                       g_free(header);
-               }
-               g_ptr_array_free(headers, TRUE);
+               procheader_header_array_destroy(headers);
        }
 
+/* #if 0 */
        tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
+
        if (tmpfp) {
                if (mimeinfo->mime_type == MIME_TEXT_HTML)
                        textview_show_html(textview, tmpfp, conv);
+               else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+                       textview_show_ertf(textview, tmpfp, conv);
                else
                        while (fgets(buf, sizeof(buf), tmpfp) != NULL)
                                textview_write_line(textview, buf, conv);
                fclose(tmpfp);
        }
+/* #else
+       tmpfp = procmime_get_text_content(mimeinfo, fp);
+
+       while (fgets(buf, sizeof(buf), tmpfp) != NULL)
+               textview_write_line(textview, buf, conv);
+
+       fclose(tmpfp);
+#endif */
 
        conv_code_converter_destroy(conv);
 
-       gtk_text_thaw(text);
+       gtk_stext_thaw(text);
 }
 
+#define TEXT_INSERT(str) \
+       gtk_stext_insert(text, textview->msgfont, NULL, NULL, str, -1)
+
 void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 {
-       GtkText *text;
+       GtkSText *text;
 
        if (!partinfo) return;
 
        textview_set_font(textview, NULL);
-       text = GTK_TEXT(textview->text);
+       text = GTK_STEXT(textview->text);
        textview_clear(textview);
 
-       gtk_text_freeze(text);
-
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("To save this part, pop up the context menu with\n"), -1);
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("right click and select `Save as...', or press `y' key.\n\n"), -1);
-
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("To display this part as a text message, select\n"), -1);
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("`Display as text', or press `t' key.\n\n"), -1);
-
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("To open this part with external program, select `Open',\n"), -1);
-       gtk_text_insert
-               (text, textview->msgfont, NULL, NULL,
-                _("or double-click, or click the center button, or press `l' key."), -1);
-
-       gtk_text_thaw(text);
+       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_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)
 {
-       GtkText *text;
+       GtkSText *text;
 
        if (!partinfo) return;
 
        textview_set_font(textview, NULL);
-       text = GTK_TEXT(textview->text);
+       text = GTK_STEXT(textview->text);
        textview_clear(textview);
 
-       gtk_text_freeze(text);
+       gtk_stext_freeze(text);
 
        if (partinfo->sigstatus_full == NULL) {
-               gtk_text_insert
-                       (text, textview->msgfont, NULL, NULL,
-                        _("This signature has not been checked yet.\n"), -1);
-               gtk_text_insert
-                       (text, textview->msgfont, NULL, NULL,
-                        _("To check it, pop up the context menu with\n"), -1);
-               gtk_text_insert
-                       (text, textview->msgfont, NULL, NULL,
-                        _("right click and select `Check signature'.\n"), -1);
+               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 {
-               gtk_text_insert(text, textview->msgfont, NULL, NULL,
-                               partinfo->sigstatus_full, -1);
+               TEXT_INSERT(partinfo->sigstatus_full);
        }
 
-       gtk_text_thaw(text);
+       gtk_stext_thaw(text);
 }
 #endif /* USE_GPGME */
 
+#undef TEXT_INSERT
+
 static void textview_show_html(TextView *textview, FILE *fp,
                               CodeConverter *conv)
 {
        HTMLParser *parser;
        gchar *str;
+       gchar* url = NULL;
 
        parser = html_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
 
        while ((str = html_parse(parser)) != NULL) {
-               textview_write_line(textview, str, NULL);
+               if (parser->state == HTML_HREF) {
+                       /* first time : get and copy the URL */
+                       if (url == 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);
+                                       /* 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;
+                       }
+                       textview_write_line(textview, str, NULL);
+               }
        }
        html_parser_destroy(parser);
 }
 
+static void textview_show_ertf(TextView *textview, FILE *fp,
+                              CodeConverter *conv)
+{
+       ERTFParser *parser;
+       gchar *str;
+       gchar* url = NULL;
+
+       parser = ertf_parser_new(fp, conv);
+       g_return_if_fail(parser != NULL);
+
+       while ((str = ertf_parse(parser)) != NULL) {
+               textview_write_line(textview, str, NULL);
+       }
+       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,
@@ -467,8 +546,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * 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) != '/')) 
+#define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
 
        for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
                ;
@@ -493,6 +571,10 @@ static gchar *make_uri_string(const gchar *bp, const gchar *ep)
         !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)
@@ -500,8 +582,14 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
        /* 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_;
-       const gchar *ep_;
+       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);
@@ -514,7 +602,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        /* TODO: should start with an alnum? */
        bp_++;
-       for (; bp_ < scanpos && !isalnum(*bp_); bp_++)
+       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
                ;
 
        if (bp_ != scanpos) {
@@ -523,7 +611,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        ;
 
                /* TODO: really should terminate with an alnum? */
-               for (; ep_ > scanpos  && !isalnum(*ep_); --ep_)
+               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
                        ;
                ep_++;
 
@@ -534,62 +622,59 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                }
        }
 
-       /* we now have at least the address. now see if this is <bracketed>; in this
-        * case we also scan for the informative part. we could make this a useful
-        * function because it tries to parse out an email address backwards. :) */
-       if (result) {
-               if ( ((bp_ - 1 > start) && *(bp_ - 1) == '<') &&  (*ep_ == '>')) {
-                       
-                       /* 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. */
-                       char    closure_stack[128];
-                       char   *ptr = closure_stack;
-#define FULL_STACK()   ((ptr - closure_stack) >= sizeof closure_stack) 
-#define IN_STACK()             (ptr > closure_stack)
+       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            
+#define POP_STACK()    if(IN_STACK()) --ptr
 /* has overrun check */
-#define PUSH_STACK(c)  if(!FULL_STACK()) *ptr++ = (c); else return TRUE 
+#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();
-                               }                                       
-                               else {
-                                       if (*bp_ == '\'' || *bp_ == '"')  {
-                                               PUSH_STACK(*bp_);
-                                       }                                               
-                                       else {
-                                               /* 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 */
-                                                       }
-                                               }
-                                       }
-                               }
+       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_++;
+               }
+       }
+
+       bp_++;
 
 #undef PEEK_STACK
 #undef PUSH_STACK
@@ -597,17 +682,17 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 #undef IN_STACK
 #undef FULL_STACK
 
-                       /* scan forward (should start with an alnum) */
-                       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
-                               ;
+       /* scan forward (should start with an alnum) */
+       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
+               ;
+
+       *ep = ep_;
+       *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)
@@ -631,14 +716,14 @@ static gchar *make_email_string(const gchar *bp, const gchar *ep)
                last->next = NULL; \
        } else { \
                g_warning("alloc error scanning URIs\n"); \
-               gtk_text_insert(text, textview->msgfont, fg_color, NULL, \
+               gtk_stext_insert(text, textview->msgfont, fg_color, NULL, \
                                linebuf, -1); \
                return; \
        }
 
 /* textview_make_clickable_parts() - colorizes clickable parts */
-static void textview_make_clickable_parts(TextView *textview, GtkText *text,
-                                         GdkFont  *textfont,
+static void textview_make_clickable_parts(TextView *textview,
+                                         GdkFont *font,
                                          GdkColor *fg_color,
                                          GdkColor *uri_color,
                                          const gchar *linebuf)
@@ -678,6 +763,8 @@ static void textview_make_clickable_parts(TextView *textview, GtkText *text,
                struct txtpos   *next;          /* next */
        } head = {NULL, NULL, 0,  NULL}, *last = &head;
 
+       GtkSText *text = GTK_STEXT(textview->text);
+
        /* parse for clickable parts, and build a list of begin and end positions  */
        for (walk = linebuf, n = 0;;) {
                gint last_index = PARSE_ELEMS;
@@ -699,7 +786,7 @@ static void textview_make_clickable_parts(TextView *textview, GtkText *text,
                if (scanpos) {
                        /* check if URI can be parsed */
                        if (parser[last_index].parse(linebuf, scanpos, &bp, &ep)
-                           && (ep - bp - 1) > strlen(parser[last_index].needle)) {
+                           && (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
                                        ADD_TXT_POS(bp, ep, last_index);
                                        walk = ep;
                        } else
@@ -720,42 +807,76 @@ static void textview_make_clickable_parts(TextView *textview, GtkText *text,
 
                        uri = g_new(RemoteURI, 1);
                        if (last->bp - normal_text > 0)
-                               gtk_text_insert(text, textfont,
+                               gtk_stext_insert(text, font,
                                                fg_color, NULL,
                                                normal_text,
                                                last->bp - normal_text);
-                       uri->uri = parser[last->pti].build_uri(last->bp, last->ep);
-                       uri->start = gtk_text_get_point(text);
-                       gtk_text_insert(text, textfont, uri_color,
+                       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_text_get_point(text);
+                       uri->end = gtk_stext_get_point(text);
                        textview->uri_list =
                                g_slist_append(textview->uri_list, uri);
                }
 
                if (*normal_text)
-                       gtk_text_insert(text, textfont, fg_color,
+                       gtk_stext_insert(text, font, fg_color,
                                        NULL, normal_text, -1);
        } else
-               gtk_text_insert(text, textfont, fg_color, NULL,
-                               linebuf, -1);
+               gtk_stext_insert(text, font, fg_color, NULL, linebuf, -1);
 }
 
 #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 (!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;
+    }
+
+    /* 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, buf,
+                   strlen(buf));
+    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)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gchar buf[BUFFSIZE];
-       size_t len;
        GdkColor *fg_color;
        gint quotelevel = -1;
 
        if (!conv)
                strncpy2(buf, str, sizeof(buf));
        else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
-               gtk_text_insert(text, textview->msgfont,
+               gtk_stext_insert(text, textview->msgfont,
                                prefs_common.enable_color
                                ? &error_color : NULL, NULL,
                                "*** Warning: code conversion failed ***\n",
@@ -763,11 +884,7 @@ static void textview_write_line(TextView *textview, const gchar *str,
                return;
        }
 
-       len = strlen(buf);
-       if (len > 1 && buf[len - 1] == '\n' && buf[len - 2] == '\r') {
-               buf[len - 2] = '\n';
-               buf[len - 1] = '\0';
-       }
+       strcrchomp(buf);
        if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
        fg_color = NULL;
 
@@ -794,24 +911,24 @@ static void textview_write_line(TextView *textview, const gchar *str,
                fg_color = &quote_colors[quotelevel];
 
        if (prefs_common.head_space && spacingfont && buf[0] != '\n')
-               gtk_text_insert(text, spacingfont, NULL, NULL, " ", 1);
+               gtk_stext_insert(text, spacingfont, NULL, NULL, " ", 1);
 
        if (prefs_common.enable_color)
-               textview_make_clickable_parts(textview, text,
-                                                 textview->msgfont,
+               textview_make_clickable_parts(textview, textview->msgfont,
                                              fg_color, &uri_color, buf);
        else
-               gtk_text_insert(text, textview->msgfont, fg_color, NULL,
-                               buf, -1);
+               textview_make_clickable_parts(textview, textview->msgfont,
+                                             fg_color, NULL, buf);
 }
 
 void textview_clear(TextView *textview)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
 
-       gtk_text_freeze(text);
-       gtk_text_backward_delete(text, gtk_text_get_length(text));
-       gtk_text_thaw(text);
+       gtk_stext_freeze(text);
+       gtk_stext_set_point(text, 0);
+       gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+       gtk_stext_thaw(text);
 
        textview_uri_list_remove_all(textview->uri_list);
        textview->uri_list = NULL;
@@ -842,15 +959,17 @@ void textview_set_font(TextView *textview, const gchar *codeset)
 {
        gboolean use_fontset = TRUE;
 
-       /* In multi-byte mode, GtkText can't display 8bit characters
+       /* 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 (!strncasecmp(codeset, "ISO-8859-", 9) ||
-                           !strncasecmp(codeset, "KOI8-", 5)     ||
-                           !strncasecmp(codeset, "CP", 2)        ||
-                           !strncasecmp(codeset, "WINDOWS-", 8)  ||
-                           !strcasecmp(codeset, "BALTIC"))
+                       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;
                }
        } else
@@ -860,10 +979,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_mb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_mb), 0, 0);
-               gtk_container_remove(GTK_CONTAINER(parent),
-                                    textview->scrolledwin_mb);
+               gtkut_container_remove(GTK_CONTAINER(parent),
+                                      textview->scrolledwin_mb);
                gtk_container_add(GTK_CONTAINER(parent),
                                  textview->scrolledwin_sb);
 
@@ -873,10 +990,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_sb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_sb), 0, 0);
-               gtk_container_remove(GTK_CONTAINER(parent),
-                                    textview->scrolledwin_sb);
+               gtkut_container_remove(GTK_CONTAINER(parent),
+                                      textview->scrolledwin_sb);
                gtk_container_add(GTK_CONTAINER(parent),
                                  textview->scrolledwin_mb);
 
@@ -938,31 +1053,23 @@ enum
        H_ORGANIZATION  = 11,
 };
 
+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;
+       }
+}
+
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 {
-       /*
-       static HeaderEntry hentry[] = {{"Date:",         NULL, FALSE},
-                                      {"From:",         NULL, TRUE},
-                                      {"To:",           NULL, FALSE},
-                                      {"Newsgroups:",   NULL, FALSE},
-                                      {"Subject:",      NULL, TRUE},
-                                      {"Cc:",           NULL, FALSE},
-                                      {"Reply-To:",     NULL, FALSE},
-                                      {"Followup-To:",  NULL, FALSE},
-                                      {"X-Mailer:",     NULL, TRUE},
-                                      {"X-Newsreader:", NULL, TRUE},
-                                      {"User-Agent:",   NULL, TRUE},
-                                      {"Organization:", NULL, TRUE},
-                                      {NULL,            NULL, FALSE}};
-       */
-       gchar buf[BUFFSIZE], tmp[BUFFSIZE];
-       gint hnum;
-       HeaderEntry *hp;
-       GPtrArray *headers;
-       GSList * l;
-
-       int i;
-       GPtrArray *sorted_headers;
+       gchar buf[BUFFSIZE];
+       GPtrArray *headers, *sorted_headers;
+       GSList *disphdr_list;
+       Header *header;
+       gint i;
 
        g_return_val_if_fail(fp != NULL, NULL);
 
@@ -972,70 +1079,38 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
                return NULL;
        }
 
-       headers = g_ptr_array_new();
-
-       /*
-       while ((hnum = procheader_get_one_field(buf, sizeof(buf), fp, hentry))
-              != -1) {
-               Header *header;
+       headers = procheader_get_header_array_asis(fp);
 
-               hp = hentry + hnum;
+       sorted_headers = g_ptr_array_new();
 
-               header = g_new(Header, 1);
-               header->name = g_strndup(buf, strlen(hp->name));
-               conv_unmime_header(tmp, sizeof(tmp), buf + strlen(hp->name),
-                                  NULL);
-               header->body = g_strdup(tmp);
+       for (disphdr_list = prefs_common.disphdr_list; disphdr_list != NULL;
+            disphdr_list = disphdr_list->next) {
+               DisplayHeaderProp *dp =
+                       (DisplayHeaderProp *)disphdr_list->data;
 
-               g_ptr_array_add(headers, header);
-       }
-       */
-       //      while (procheader_get_unfolded_line(buf, sizeof(buf), fp) != NULL) {
-       while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
-               gchar * p;
-               Header *header;
-
-               header = procheader_parse_header(buf);
-               if (header != NULL)
-                       g_ptr_array_add(headers, header);
-       }
+               for (i = 0; i < headers->len; i++) {
+                       header = g_ptr_array_index(headers, i);
 
-       sorted_headers = g_ptr_array_new();
-       for(l = prefs_display_headers.headers_list ; l != NULL ;
-           l = g_slist_next(l)) {
-               HeaderDisplayProp * dp = (HeaderDisplayProp *) l->data;
-               for(i = 0 ; i < headers->len ; i++) {
-                       Header * header = g_ptr_array_index(headers, i);
                        if (procheader_headername_equal(header->name,
                                                        dp->name)) {
-                               if (dp->hidden) {
-                                       g_ptr_array_remove_index(headers, i);
+                               if (dp->hidden)
                                        procheader_header_free(header);
-                                       i--;
-                               }
-                               else {
-                                       g_ptr_array_add(sorted_headers,
-                                                       header);
-                                       g_ptr_array_remove_index(headers, i);
-                                       i--;
-                               }
+                               else
+                                       g_ptr_array_add(sorted_headers, header);
+
+                               g_ptr_array_remove_index(headers, i);
+                               i--;
                        }
                }
        }
 
-       if (prefs_display_headers.show_other_headers) {
-               while (headers->len != 0) {
-                       Header * header = g_ptr_array_index(headers, 0);
+       if (prefs_common.show_other_header) {
+               for (i = 0; i < headers->len; i++) {
+                       header = g_ptr_array_index(headers, i);
                        g_ptr_array_add(sorted_headers, header);
-                       g_ptr_array_remove_index(headers, 0);
                }
        }
 
-       for(i = 0 ; i < headers->len ; i++) {
-               Header * header = g_ptr_array_index(headers, i);
-               procheader_header_free(header);
-       }
-
        g_ptr_array_free(headers, FALSE);
 
        return sorted_headers;
@@ -1043,51 +1118,141 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
 static void textview_show_header(TextView *textview, GPtrArray *headers)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        Header *header;
        gint i;
 
        g_return_if_fail(headers != NULL);
 
-       gtk_text_freeze(text);
+       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_text_insert(text, textview->boldfont, NULL, NULL,
+               gtk_stext_insert(text, textview->boldfont, NULL, NULL,
                                header->name, -1);
-               gtk_text_insert(text, textview->boldfont, NULL, NULL,
-                               " ", -1);
+               if (header->name[strlen(header->name) - 1] != ' ')
+                       gtk_stext_insert(text, textview->boldfont,
+                                       NULL, NULL, " ", 1);
+
+               if (procheader_headername_equal(header->name, "Subject") ||
+                   procheader_headername_equal(header->name, "From")    ||
+                   procheader_headername_equal(header->name, "To")      ||
+                   procheader_headername_equal(header->name, "Cc"))
+                       unfold_line(header->body);
+
                if (prefs_common.enable_color &&
-                   (strncmp(header->name, "X-Mailer", 8) == 0 ||
-                    strncmp(header->name, "X-Newsreader", 12) == 0) &&
+                   (procheader_headername_equal(header->name, "X-Mailer") ||
+                    procheader_headername_equal(header->name,
+                                                "X-Newsreader")) &&
                    strstr(header->body, "Sylpheed") != NULL)
-                       gtk_text_insert(text, NULL, &emphasis_color, NULL,
+                       gtk_stext_insert(text, NULL, &emphasis_color, NULL,
                                        header->body, -1);
-               else {
-                       if (prefs_common.enable_color) {
-                               textview_make_clickable_parts(textview, text,
-                                                                                         NULL,
-                                                                                         NULL, 
-                                                                                         &uri_color, 
-                                                                                         header->body);
-                       }                                                                                         
-                       else {                                                                                    
-                               gtk_text_insert(text, NULL, NULL, NULL,
-                                               header->body, -1);
-                       }                                               
-               }                                       
-               gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+               else if (prefs_common.enable_color) {
+                       textview_make_clickable_parts(textview,
+                                                     NULL, NULL, &uri_color,
+                                                     header->body);
+               } else {
+                       textview_make_clickable_parts(textview,
+                                                     NULL, NULL, NULL,
+                                                     header->body);
+               }
+               gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+       }
+
+       gtk_stext_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
+       gtk_stext_thaw(text);
+       textview->body_pos = gtk_stext_get_length(text);
+}
+
+gboolean textview_search_string(TextView *textview, const gchar *str,
+                               gboolean case_sens)
+{
+       GtkSText *text = GTK_STEXT(textview->text);
+       gint pos;
+       wchar_t *wcs;
+       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;
+       }
+
+       for (; pos < text_len; pos++) {
+               if (text_len - pos < len) break;
+               if (gtkut_stext_match_string(text, pos, wcs, len, case_sens)
+                   == TRUE) {
+                       gtk_editable_set_position(GTK_EDITABLE(text),
+                                                 pos + len);
+                       gtk_editable_select_region(GTK_EDITABLE(text),
+                                                  pos, pos + len);
+                       textview_set_position(textview, pos + len);
+                       found = TRUE;
+                       break;
+               }
+               if (text_len - pos == len) break;
+       }
+
+       g_free(wcs);
+       return found;
+}
+
+gboolean textview_search_string_backward(TextView *textview, const gchar *str,
+                                        gboolean case_sens)
+{
+       GtkSText *text = GTK_STEXT(textview->text);
+       gint pos;
+       wchar_t *wcs;
+       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 (gtkut_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;
        }
 
-       gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
-       gtk_text_thaw(text);
+       g_free(wcs);
+       return found;
 }
 
 void textview_scroll_one_line(TextView *textview, gboolean up)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gfloat upper;
 
        if (prefs_common.enable_smooth_scroll) {
@@ -1119,7 +1284,7 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
 
 gboolean textview_scroll_page(TextView *textview, gboolean up)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gfloat upper;
        gfloat page_incr;
 
@@ -1157,7 +1322,7 @@ static void textview_smooth_scroll_do(TextView *textview,
                                      gfloat old_value, gfloat last_value,
                                      gint step)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gint change_value;
        gboolean up;
        gint i;
@@ -1186,7 +1351,7 @@ static void textview_smooth_scroll_do(TextView *textview,
 
 static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gfloat upper;
        gfloat old_value;
        gfloat last_value;
@@ -1219,7 +1384,7 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
 
 static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
 {
-       GtkText *text = GTK_TEXT(textview->text);
+       GtkSText *text = GTK_STEXT(textview->text);
        gfloat upper;
        gfloat page_incr;
        gfloat old_value;
@@ -1258,14 +1423,22 @@ static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
        return TRUE;
 }
 
-static void textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
+#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"); \
+       }
+
+static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                 TextView *textview)
 {
        SummaryView *summaryview = NULL;
+       MessageView *messageview = textview->messageview;
 
-       if (!event) return;
-       if (textview->messageview->mainwin)
-               summaryview = textview->messageview->mainwin->summaryview;
+       if (!event) return FALSE;
+       if (messageview->mainwin)
+               summaryview = messageview->mainwin->summaryview;
 
        switch (event->keyval) {
        case GDK_Tab:
@@ -1287,47 +1460,106 @@ static void textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        textview_scroll_page(textview, FALSE);
                break;
        case GDK_BackSpace:
-       case GDK_Delete:
                textview_scroll_page(textview, TRUE);
                break;
        case GDK_Return:
                textview_scroll_one_line(textview,
                                         (event->state & GDK_MOD1_MASK) != 0);
                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) {
+                       KEY_PRESS_EVENT_STOP();
+                       mimeview_pass_key_press_event(messageview->mimeview,
+                                                     event);
+                       break;
+               }
+               /* fall through */
        default:
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                break;
        }
+
+       return TRUE;
+}
+
+static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+                                   TextView *textview)
+{
+       if (event)
+               textview->last_buttonpress = event->type;
+       return FALSE;
 }
 
-static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
                                    TextView *textview)
 {
-       if (event &&
-           ((event->button == 1 && event->type == GDK_2BUTTON_PRESS) 
-               || event->button == 2
-               || event->button == 3)) {
+       textview->cur_pos = 
+               gtk_editable_get_position(GTK_EDITABLE(textview->text));
+
+       if (event && 
+           ((event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS)
+            || event->button == 2 || event->button == 3)) {
                GSList *cur;
-               guint current_pos;
 
-               current_pos = GTK_EDITABLE(textview->text)->current_pos;
+               /* 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--;
+               }
 
                for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
                        RemoteURI *uri = (RemoteURI *)cur->data;
 
-                       if (current_pos >= uri->start &&
-                           current_pos <  uri->end) {
-                               if (!strncasecmp(uri->uri, "mailto:", 7)) {
-                                       compose_new_with_recipient
-                                               (NULL, uri->uri + 7);
-                               }                                               
-                               else
+                       if (textview->cur_pos >= uri->start &&
+                           textview->cur_pos <  uri->end) {
+                               if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
+                                       if (event->button == 3) {
+                                               gchar *fromname, *fromaddress;
+                                               GdkEventButton tmpev;   
+                                               
+                                               /* 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_with_recipient
+                                                       (account, uri->uri + 7);
+                                       }
+                               } else {
                                        open_uri(uri->uri,
                                                 prefs_common.uri_cmd);
-                       }                               
+                               }
+                       }
                }
        }
+       if (event)
+               textview->last_buttonpress = event->type;
+       return FALSE;
 }
 
 static void textview_uri_list_remove_all(GSList *uri_list)