2005-02-13 [colin] 1.0.1cvs5.2
[claws.git] / src / textview.c
index e23d2a32621e19b4142e2313db14207e8d81a46b..831242566ec0c5a8cd78450b67dd958a4c76e811 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2004 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
@@ -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>
@@ -34,7 +35,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "intl.h"
 #include "main.h"
 #include "summaryview.h"
 #include "procheader.h"
@@ -51,8 +51,7 @@
 #include "account.h"
 #include "mimeview.h"
 #include "alertpanel.h"
-
-typedef struct _RemoteURI      RemoteURI;
+#include "menu.h"
 
 struct _RemoteURI
 {
@@ -99,6 +98,9 @@ static GdkColor error_color = {
 #endif
 
 
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *text_cursor = NULL;
+
 #define TEXTVIEW_STATUSBAR_PUSH(textview, str)                                     \
 {                                                                          \
        gtk_statusbar_push(GTK_STATUSBAR(textview->messageview->statusbar), \
@@ -137,12 +139,40 @@ static GPtrArray *textview_scan_header    (TextView       *textview,
 static void textview_show_header       (TextView       *textview,
                                         GPtrArray      *headers);
 
-static gint textview_key_pressed       (GtkWidget      *widget,
-                                        GdkEventKey    *event,
-                                        TextView       *textview);
-static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
-                                           GdkEvent *event, GtkTextIter *iter,
-                                           TextView *textview);
+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,
                                                 gfloat          last_value,
@@ -156,12 +186,35 @@ 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 GtkItemFactoryEntry textview_link_popup_entries[] = 
+{
+       {N_("/_Open link"),             NULL, open_uri_cb, 0, NULL},
+       {N_("/_Copy link location"),    NULL, copy_uri_cb, 0, NULL},
+};
 
-static void populate_popup(GtkTextView *textview, GtkMenu *menu,
-                          gpointer *dummy)
+static GtkItemFactoryEntry textview_mail_popup_entries[] = 
 {
-       gtk_menu_detach(menu);
-}
+       {N_("/_Add to addressbook"),    NULL, add_uri_to_addrbook_cb, 0, NULL},
+       {N_("/_Email"),                 NULL, mail_to_uri_cb, 0, NULL},
+       {N_("/_Copy"),                  NULL, copy_mail_to_uri_cb, 0, NULL},
+};
+
 
 TextView *textview_create(void)
 {
@@ -171,27 +224,31 @@ TextView *textview_create(void)
        GtkWidget *text;
        GtkTextBuffer *buffer;
        GtkClipboard *clipboard;
-       PangoFontDescription *font_desc = NULL;
+       GtkItemFactory *link_popupfactory, *mail_popupfactory;
+       GtkWidget *link_popupmenu, *mail_popupmenu;
+       gint n_entries;
 
        debug_print("Creating text view...\n");
        textview = g_new0(TextView, 1);
 
        scrolledwin = gtk_scrolled_window_new(NULL, NULL);
        gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_widget_set_size_request(scrolledwin, prefs_common.mainview_width, -1);
+                                      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 = 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);
+       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);
-       g_signal_connect(G_OBJECT(text), "populate-popup",
-                G_CALLBACK(populate_popup), NULL);
-
+       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);
@@ -199,14 +256,6 @@ TextView *textview_create(void)
 
        gtk_widget_ensure_style(text);
 
-       if (prefs_common.normalfont)
-               font_desc = pango_font_description_from_string
-                                       (prefs_common.normalfont);
-       if (font_desc) {
-               gtk_widget_modify_font(text, font_desc);
-       }
-       pango_font_description_free(font_desc);
-
        gtk_widget_ref(scrolledwin);
 
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
@@ -214,6 +263,15 @@ TextView *textview_create(void)
        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);
 
@@ -222,33 +280,63 @@ TextView *textview_create(void)
 
        gtk_widget_show(vbox);
 
-       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->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);
+
+       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;
 
        return textview;
 }
 
 static void textview_create_tags(GtkTextView *text, TextView *textview)
 {
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       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
+                       (BOLD_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", prefs_common.boldfont,
+                                  "font-desc", bold_font_desc,
                                   NULL);
        gtk_text_buffer_create_tag(buffer, "quote0",
                                   "foreground-gdk", &quote_colors[0],
@@ -268,6 +356,10 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
        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);
@@ -275,11 +367,14 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
 
 void textview_init(TextView *textview)
 {
-       gtkut_widget_disable_theme_engine(textview->text);
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
+       if (!text_cursor)
+               text_cursor = gdk_cursor_new(GDK_XTERM);
+
        textview_update_message_colors();
        textview_set_all_headers(textview, FALSE);
        textview_set_font(textview, NULL);
-
        textview_create_tags(GTK_TEXT_VIEW(textview->text), textview);
 }
 
@@ -332,7 +427,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
        g_return_if_fail(fp != NULL);
 
        if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
-           ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822"))) {
+           ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
                textview_clear(textview);
                textview_add_parts(textview, mimeinfo);
                return;
@@ -369,10 +464,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        if (mimeinfo->type == MIMETYPE_MULTIPART) return;
 
-       if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822")) {
+       if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                FILE *fp;
 
-               fp = fopen(mimeinfo->filename, "rb");
+               fp = fopen(mimeinfo->data.filename, "rb");
                fseek(fp, mimeinfo->offset, SEEK_SET);
                headers = textview_scan_header(textview, fp);
                if (headers) {
@@ -422,7 +517,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
             (mimeinfo->type != MIMETYPE_MESSAGE))
                 return;
         
-        if (strcasecmp(mimeinfo->subtype, "alternative") == 0) {
+        if (g_ascii_strcasecmp(mimeinfo->subtype, "alternative") == 0) {
                 GNode * prefered_body;
                 int prefered_score;
                 
@@ -434,8 +529,8 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                 prefered_body = NULL;
                 prefered_score = 0;
                 
-                for(iter = g_node_first_child(node) ; iter != NULL ;
-                    iter = g_node_next_sibling(iter)) {
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
                         int score;
                         MimeInfo * submime;
                         
@@ -445,7 +540,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                                 score = 2;
                         
                         if (submime->subtype != NULL) {
-                                if (strcasecmp(submime->subtype, "plain") == 0)
+                                if (g_ascii_strcasecmp(submime->subtype, "plain") == 0)
                                         score = 3;
                         }
                         
@@ -460,8 +555,8 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                 }
         }
         else {
-                for(iter = g_node_first_child(node) ; iter != NULL ;
-                    iter = g_node_next_sibling(iter)) {
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
                         recursive_add_parts(textview, iter);
                 }
         }
@@ -547,7 +642,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 
        procmime_decode_content(mimeinfo);
 
-       if (!g_strcasecmp(mimeinfo->subtype, "html")) {
+       if (!g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
                gchar *filename;
                
                filename = procmime_get_tmp_file_name(mimeinfo);
@@ -558,7 +653,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                        unlink(filename);
                }
                g_free(filename);
-       } else if (!g_strcasecmp(mimeinfo->subtype, "enriched")) {
+       } else if (!g_ascii_strcasecmp(mimeinfo->subtype, "enriched")) {
                gchar *filename;
                
                filename = procmime_get_tmp_file_name(mimeinfo);
@@ -570,7 +665,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                }
                g_free(filename);
        } else {
-               tmpfp = fopen(mimeinfo->filename, "rb");
+               tmpfp = 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) && 
@@ -600,7 +695,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
                                 * if still inside an <a>, but already parsed past HREF */
                                str = strtok(str, " ");
                                if (str) { 
-                                       parser->href = strdup(str);
+                                       parser->href = g_strdup(str);
                                        /* the URL may (or not) be followed by the
                                         * referenced text */
                                        str = strtok(NULL, "");
@@ -647,7 +742,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
        /* find end point of URI */
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
                if (!isgraph(*(const guchar *)ep_) ||
-                   !isascii(*(const guchar *)ep_) ||
+                   !IS_ASCII(*(const guchar *)ep_) ||
                    strchr("()<>\"", *ep_))
                        break;
        }
@@ -679,14 +774,14 @@ static gchar *make_uri_string(const gchar *bp, const gchar *ep)
 
 /* valid mail address characters */
 #define IS_RFC822_CHAR(ch) \
-       (isascii(ch) && \
+       (IS_ASCII(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_ASCII_ALNUM(ch)     (IS_ASCII(ch) && isalnum(ch))
 #define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
 
 static GHashTable *create_domain_tab(void)
@@ -759,7 +854,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
        const gchar *last_dot = NULL;
        const gchar *prelast_dot = NULL;
        const gchar *last_tld_char = 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. */
@@ -827,8 +922,30 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        if (!result) return FALSE;
 
+       if (*ep_ && *(bp_ - 1) == '"' && *(ep_) == '"' 
+       && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
+       && IS_RFC822_CHAR(*(ep_ + 3))) {
+               /* this informative part with an @ in it is 
+                * followed by the email address */
+               ep_ += 3;
+               
+               /* go to matching '>' (or next non-rfc822 char, like \n) */
+               for (; *ep_ != '>' && *ep != '\0' && IS_RFC822_CHAR(*ep_); ep_++)
+                       ;
+                       
+               /* include the bracket */
+               if (*ep_ == '>') ep_++;
+               
+               /* include the leading quote */         
+               bp_--;
+
+               *ep = ep_;
+               *bp = bp_;
+               return TRUE;
+       }
+
        /* 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_)) 
+       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. */
@@ -868,7 +985,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
                                /* hyphens are allowed, but only in
                                   between alnums */
-                       } else if (!ispunct(*bp_)) {
+                       } else if (!strchr(",;:=?./+<>!&", *bp_)) {
                                /* but anything not being a punctiation
                                   is ok */
                        } else {
@@ -891,7 +1008,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        *ep = ep_;
        *bp = bp_;
-
+       
        return result;
 }
 
@@ -1026,7 +1143,6 @@ static void textview_make_clickable_parts(TextView *textview,
                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_text_buffer_insert_with_tags_by_name
@@ -1038,22 +1154,19 @@ static void textview_make_clickable_parts(TextView *textview,
                                                               last->ep);
                        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, NULL);
+                               (buffer, &iter, last->bp, last->ep - last->bp,
+                                uri_tag, fg_tag, NULL);
                        uri->end = gtk_text_iter_get_offset(&iter);
                        textview->uri_list =
                                g_slist_append(textview->uri_list, uri);
                }
 
                if (*normal_text)
-                       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
-                                                                normal_text, -1,
-                                                                fg_tag, NULL);
+                       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,
-                                                        linebuf, -1,
-                                                        fg_tag, NULL);
+               gtk_text_buffer_insert_with_tags_by_name
+                       (buffer, &iter, linebuf, -1, fg_tag, NULL);
        }
 }
 
@@ -1074,14 +1187,13 @@ static void textview_write_line(TextView *textview, const gchar *str,
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (!conv) {
+       if (!conv)
                strncpy2(buf, str, sizeof(buf));
-       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
-               conv_localetodisp(buf, sizeof(buf), str);
-       }
+       else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
+               conv_utf8todisp(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
@@ -1139,23 +1251,10 @@ void textview_write_link(TextView *textview, const gchar *str,
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-#warning FIXME_GTK2
-#if 0
-       if (!conv) {
-               if (textview->text_is_mb)
-                       conv_localetodisp(buf, sizeof(buf), str);
-               else
-                       strncpy2(buf, str, sizeof(buf));
-       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_localetodisp(buf, sizeof(buf), str);
-       else if (textview->text_is_mb)
-               conv_unreadable_locale(buf);
-#else
        if (!conv)
                strncpy2(buf, str, sizeof(buf));
        else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_localetodisp(buf, sizeof(buf), str);
-#endif
+               conv_utf8todisp(buf, sizeof(buf), str);
 
        strcrchomp(buf);
 
@@ -1170,8 +1269,8 @@ void textview_write_link(TextView *textview, const gchar *str,
        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);
+       gtk_text_buffer_insert_with_tags_by_name
+               (buffer, &iter, bufp, -1, "link", NULL);
        r_uri->end = gtk_text_iter_get_offset(&iter);
        textview->uri_list = g_slist_append(textview->uri_list, r_uri);
 }
@@ -1182,7 +1281,7 @@ void textview_clear(TextView *textview)
        GtkTextBuffer *buffer;
 
        buffer = gtk_text_view_get_buffer(text);
-       gtk_text_buffer_set_text(buffer, "\0", -1);
+       gtk_text_buffer_set_text(buffer, "", -1);
 
        TEXTVIEW_STATUSBAR_POP(textview);
        textview_uri_list_remove_all(textview->uri_list);
@@ -1209,8 +1308,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
        if (prefs_common.textfont) {
                PangoFontDescription *font_desc = NULL;
 
-               if (prefs_common.textfont)
-                       font_desc = pango_font_description_from_string
+               font_desc = pango_font_description_from_string
                                                (prefs_common.textfont);
                if (font_desc) {
                        gtk_widget_modify_font(textview->text, font_desc);
@@ -1221,11 +1319,6 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                                             prefs_common.line_space / 2);
        gtk_text_view_set_pixels_below_lines(GTK_TEXT_VIEW(textview->text),
                                             prefs_common.line_space / 2);
-       if (prefs_common.head_space) {
-               gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview->text), 6);
-       } else {
-               gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview->text), 0);
-       }
 }
 
 void textview_set_text(TextView *textview, const gchar *text)
@@ -1388,124 +1481,79 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, end_iter;
        GtkTextMark *mark;
-       GtkTextIter iter, start, end, real_end, *pos;
-       gboolean found = FALSE;
-       gint insert_offset, selbound_offset;
+       gint pos;
+       gint len;
 
-       /* reset selection */
-       mark = gtk_text_buffer_get_mark(buffer, "insert");
-       gtk_text_buffer_get_iter_at_mark(buffer, &start, mark);
-       insert_offset = gtk_text_iter_get_offset(&start);
-       mark = gtk_text_buffer_get_mark(buffer, "selection_bound");
-       gtk_text_buffer_get_iter_at_mark(buffer, &end, mark);
-       selbound_offset = gtk_text_iter_get_offset(&end);
+       g_return_val_if_fail(str != NULL, FALSE);
+
+       buffer = gtk_text_view_get_buffer(text);
 
-       pos = insert_offset > selbound_offset ? &start : &end;
-       gtk_text_buffer_place_cursor(buffer, pos);
+       len = g_utf8_strlen(str, -1);
+       g_return_val_if_fail(len >= 0, FALSE);
 
-       /* search */
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-       if (case_sens) {
-               found = gtk_text_iter_forward_search(&iter, str,
-                                            GTK_TEXT_SEARCH_VISIBLE_ONLY,
-                                            &start, &end, NULL);
-       } else {
-               gchar *text = NULL;
-               int i = 0;
-               gtk_text_buffer_get_end_iter(buffer, &real_end);
-               text = strdup(gtk_text_buffer_get_text(buffer, &iter, 
-                                                      &real_end, FALSE));
-               
-               while (!found && i++ < strlen(text) - 1) {
-                       found = (strncasecmp(text+i, str, strlen(str)) == 0);
-               }
-               
-               i += gtk_text_iter_get_offset(&end);
-               
-               if (found) {
-                       gtk_text_buffer_get_iter_at_offset(buffer, &start, i);
-                       gtk_text_buffer_get_iter_at_offset(buffer, &end, 
-                                                          i + strlen(str));
-               }
-               
-               g_free(text);
-       }
-       
-       if (found) {
-               gtk_text_buffer_place_cursor(buffer, &start);
-               gtk_text_buffer_move_mark_by_name(buffer, "selection_bound", 
-                                                 &end);
-               mark = gtk_text_buffer_get_mark(buffer, "insert");
-               gtk_text_view_scroll_mark_onscreen(text, mark);
+       pos = gtk_text_iter_get_offset(&iter);
+
+       if ((pos = gtkut_text_buffer_find(buffer, pos, str, case_sens)) != -1) {
+               gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, pos);
+               gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos + len);
+               gtk_text_buffer_select_range(buffer, &iter, &end_iter);
+               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
+               return TRUE;
        }
 
-       return found;
+       return FALSE;
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextBuffer *buffer;
+       GtkTextIter iter, end_iter;
        GtkTextMark *mark;
-       GtkTextIter iter, start, real_start, end, *pos;
+       gint pos;
+       gunichar *wcs;
+       gint len;
+       glong items_read = 0, items_written = 0;
+       GError *error = NULL;
        gboolean found = FALSE;
-       gint insert_offset, selbound_offset;
 
-       /* reset selection */
-       mark = gtk_text_buffer_get_mark(buffer, "insert");
-       gtk_text_buffer_get_iter_at_mark(buffer, &start, mark);
-       insert_offset = gtk_text_iter_get_offset(&start);
-       mark = gtk_text_buffer_get_mark(buffer, "selection_bound");
-       gtk_text_buffer_get_iter_at_mark(buffer, &end, mark);
-       selbound_offset = gtk_text_iter_get_offset(&end);
+       g_return_val_if_fail(str != NULL, FALSE);
+
+       buffer = gtk_text_view_get_buffer(text);
 
-       pos = insert_offset < selbound_offset ? &start : &end;
-       gtk_text_buffer_place_cursor(buffer, pos);
+       wcs = g_utf8_to_ucs4(str, -1, &items_read, &items_written, &error);
+       if (error != NULL) {
+               g_warning("An error occured while converting a string from UTF-8 to UCS-4: %s\n", error->message);
+               g_error_free(error);
+       }
+       if (!wcs || items_written <= 0) return FALSE;
+       len = (gint)items_written;
 
-       /* search */
        mark = gtk_text_buffer_get_insert(buffer);
        gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-       if (case_sens) {
-               found = gtk_text_iter_backward_search(&iter, str,
-                                             GTK_TEXT_SEARCH_VISIBLE_ONLY,
-                                             &start, &end, NULL);
-       } else {
-               gchar *text = NULL;
-               int i = 0;
-               if (gtk_text_iter_get_offset(&iter) == 0) 
-                       gtk_text_buffer_get_end_iter(buffer, &iter);
-               
-               i = gtk_text_iter_get_offset(&iter) - strlen(str) - 1;
-               gtk_text_buffer_get_start_iter(buffer, &real_start);
-               
-               text = strdup(gtk_text_buffer_get_text(buffer, &real_start, 
-                                                      &iter, FALSE));
 
-               while (!found && i-- > 0) {
-                       found = (strncasecmp(text+i, str, strlen(str)) == 0);
-               }
-                               
-               if (found) {
-                       gtk_text_buffer_get_iter_at_offset(buffer, &start, i);
-                       gtk_text_buffer_get_iter_at_offset(buffer, &end, 
-                                                          i + strlen(str));
+       while (gtk_text_iter_backward_char(&iter)) {
+               pos = gtk_text_iter_get_offset(&iter);
+               if (gtkut_text_buffer_match_string
+                       (buffer, pos, wcs, len, case_sens) == TRUE) {
+                       gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
+                       gtk_text_buffer_get_iter_at_offset
+                               (buffer, &end_iter, pos + len);
+                       gtk_text_buffer_select_range(buffer, &iter, &end_iter);
+                       gtk_text_view_scroll_to_mark
+                               (text, mark, 0.0, FALSE, 0.0, 0.0);
+                       found = TRUE;
+                       break;
                }
-               
-               g_free(text);
-       }
-               
-       if (found) {
-               gtk_text_buffer_place_cursor(buffer, &end);
-               gtk_text_buffer_move_mark_by_name(buffer, "selection_bound", 
-                                                 &start);
-               mark = gtk_text_buffer_get_mark(buffer, "insert");
-               gtk_text_view_scroll_mark_onscreen(text, mark);
        }
 
+       g_free(wcs);
        return found;
 }
 
@@ -1523,19 +1571,15 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
        if (!up) {
                upper = vadj->upper - vadj->page_size;
                if (vadj->value < upper) {
-                       vadj->value +=
-                               vadj->step_increment * 4;
-                       vadj->value =
-                               MIN(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 (vadj->value > 0.0) {
-                       vadj->value -=
-                               vadj->step_increment * 4;
-                       vadj->value =
-                               MAX(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);
                }
@@ -1619,8 +1663,7 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
                upper = vadj->upper - vadj->page_size;
                if (vadj->value < upper) {
                        old_value = vadj->value;
-                       last_value = vadj->value +
-                               vadj->step_increment * 4;
+                       last_value = vadj->value + vadj->step_increment;
                        last_value = MIN(last_value, upper);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1630,8 +1673,7 @@ static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
        } else {
                if (vadj->value > 0.0) {
                        old_value = vadj->value;
-                       last_value = vadj->value -
-                               vadj->step_increment * 4;
+                       last_value = vadj->value - vadj->step_increment;
                        last_value = MAX(last_value, 0.0);
 
                        textview_smooth_scroll_do(textview, old_value,
@@ -1709,19 +1751,23 @@ 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)
@@ -1753,168 +1799,263 @@ 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_uri_update(textview, event->x, event->y);
+       gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
+
+       return FALSE;
+}
+
+static gboolean textview_leave_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     TextView *textview)
 {
-       TextView *textview = (TextView *)data;
+       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;
        
-       TEXTVIEW_STATUSBAR_POP(textview);
-       textview->show_url_timeout_tag = 0;
+       gdk_window_get_pointer(widget->window, &wx, &wy, NULL);
+       textview_uri_update(textview, wx, wy);
+
        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 uri_security_check(RemoteURI *uri, TextView *textview) 
+static void textview_uri_update(TextView *textview, gint x, gint y)
 {
-       gchar *clicked_str;
-       gboolean retval = TRUE;
+       GtkTextBuffer *buffer;
+       GtkTextIter start_iter, end_iter;
+       RemoteURI *uri = NULL;
+       
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       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);
 
-       if (g_strncasecmp(uri->uri, "http:", 5) &&
-           g_strncasecmp(uri->uri, "https:", 6) &&
-           g_strncasecmp(uri->uri, "www.", 4)) 
-               return retval;
+               TEXTVIEW_STATUSBAR_POP(textview);
 
-       clicked_str = gtk_editable_get_chars(GTK_EDITABLE(textview->text),
-                                            uri->start,
-                                            uri->end);
-       if (clicked_str == NULL)
-               return TRUE;
+               if (uri) {
+                       char *trimmed_uri;
 
-       if (strcmp(clicked_str, uri->uri) &&
-           (!g_strncasecmp(clicked_str, "http:",  5) ||
-            !g_strncasecmp(clicked_str, "https:", 6) ||
-            !g_strncasecmp(clicked_str, "www.",   4))) {
-               gchar *str;
-               retval = FALSE;
+                       gtk_text_buffer_apply_tag_by_name(buffer,
+                                                         "link-hover",
+                                                         &start_iter,
+                                                         &end_iter);
 
-               /* allow uri->uri    == http://somewhere.com
-                  and   clicked_str ==        somewhere.com */
-               str = g_strconcat("http://", clicked_str, NULL);
+                       trimmed_uri = trim_string(uri->uri, 60);
+                       TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
+                       g_free(trimmed_uri);
+               }
+       }
+}
 
-               if (!g_strcasecmp(str, uri->uri))
-                       retval = TRUE;
-               g_free(str);
+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;
        }
 
-       if (retval == FALSE) {
-               gchar *msg = NULL;
-               AlertValue resp;
+       _start_iter = _end_iter;
+       if (!gtk_text_iter_backward_to_tag_toggle(&_start_iter, tag)) {
+               debug_print("Can't find start.");
+               return FALSE;
+       }
 
-               msg = g_strdup_printf(_("The real URL (%s) is different from\n"
-                                       "the apparent URL (%s).  \n"
-                                       "Open it anyway?"),
-                                       uri->uri, clicked_str);
-               resp = alertpanel_with_type(_("Warning"), 
-                                 msg,
-                                 _("Yes"), 
-                                 _("No"),
-                                 NULL, NULL, ALERT_WARNING);
-               g_free(msg);
-               if (resp == G_ALERTDEFAULT)
-                       retval = TRUE;
-       } 
-       g_free(clicked_str);
-       return retval;
+       *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)
 {
-       GtkTextIter start_iter, end_iter;
-       gint start_pos, end_pos;
        GdkEventButton *bevent;
+       RemoteURI *uri = NULL;
        GSList *cur;
        gchar *trimmed_uri;
-       if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS
-               && event->type != GDK_MOTION_NOTIFY)
-               return FALSE;
-
-       bevent = (GdkEventButton *) event;
 
-       /* get start and end positions */
-        start_iter = *iter;
-        if(!gtk_text_iter_backward_to_tag_toggle(&start_iter, tag)) {
-               debug_print("Can't find start.");
+       if (!event)
                return FALSE;
-       }
-       start_pos = gtk_text_iter_get_offset(&start_iter);
 
-       end_iter = *iter;
-       if(!gtk_text_iter_forward_to_tag_toggle(&end_iter, tag)) {
-               debug_print("Can't find end");
+       if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS
+               && event->type != GDK_MOTION_NOTIFY)
                return FALSE;
-       }
-       end_pos = gtk_text_iter_get_offset(&end_iter);
 
-       /* search current uri */
-       for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
-               RemoteURI *uri = (RemoteURI *)cur->data;
+       uri = textview_get_uri(textview, iter, tag);
+       if (!uri)
+               return FALSE;
 
-               if (start_pos != uri->start || end_pos !=  uri->end)
-                       continue;
+       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;
 
-               trimmed_uri = trim_string(uri->uri, 60);
-               /* hover or single click: display url in statusbar */
+                               if (textview->messageview && textview->messageview->msginfo &&
+                                   textview->messageview->msginfo->folder) {
+                                       FolderItem   *folder_item;
 
-               if (event->type == GDK_MOTION_NOTIFY
-                   || (event->type == GDK_BUTTON_PRESS && bevent->button == 1)) {
-                       if (textview->messageview->mainwin) {
-                               TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
-                               textview->show_url_timeout_tag = gtk_timeout_add
-                                       (4000, show_url_timeout_cb, textview);
-                       }
-                       return FALSE;
-               }
-               /* doubleclick: open compose / add address / browser */
-               if ((event->type == GDK_2BUTTON_PRESS && bevent->button == 1) ||
-                       bevent->button == 2 || bevent->button == 3) {
-                       if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
-                               if (bevent->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;
-
-                                       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);
+                                       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);
                                }
-                               return TRUE;
-                       } else {
-                               if (textview_uri_security_check(textview, uri) == TRUE) 
+                               compose_new(account, uri->uri + 7, NULL);
+                       }
+                       return TRUE;
+               } else {
+                       if (bevent->button == 1 &&
+                           textview_uri_security_check(textview, uri) == TRUE) 
                                        open_uri(uri->uri,
                                                 prefs_common.uri_cmd);
-                               return TRUE;
+                       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;
                }
-               g_free(trimmed_uri);
        }
 
        return FALSE;
@@ -1935,12 +2076,19 @@ 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;
 
-       visible_str = gtk_editable_get_chars(GTK_EDITABLE(textview->text),
-                                            uri->start, uri->end);
+       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;
 
@@ -1962,8 +2110,9 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
                                        "the apparent URL (%s).\n"
                                        "Open it anyway?"),
                                      uri->uri, visible_str);
-               aval = alertpanel_with_type(_("Warning"), msg, _("Yes"), _("No"), NULL,
-                                           NULL, ALERT_WARNING);
+               aval = alertpanel_with_type(_("Warning"), msg,
+                                           GTK_STOCK_YES, GTK_STOCK_NO,
+                                           NULL, NULL, ALERT_WARNING);
                g_free(msg);
                if (aval == G_ALERTDEFAULT)
                        retval = TRUE;
@@ -1987,3 +2136,82 @@ static void textview_uri_list_remove_all(GSList *uri_list)
 
        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 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_NONE), 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_NONE), uri->uri + 7, -1);
+       g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
+                         NULL);
+}
+