2006-07-08 [colin] 2.3.1cvs75
[claws.git] / src / textview.c
index 2a3404cfa20cbee30512f254fc6b94161b9bc821..4cff9ef1af269641fd114911bb2ecda838660ac0 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2005 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifdef HAVE_CONFIG_H
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
+#include <sys/wait.h>
+#if HAVE_LIBCOMPFACE
+#  include <compface.h>
+#endif
+
+#if HAVE_LIBCOMPFACE
+#define XPM_XFACE_HEIGHT       (HEIGHT + 3)  /* 3 = 1 header + 2 colors */
+#endif
 
 #include "main.h"
 #include "summaryview.h"
@@ -54,6 +63,7 @@
 #include "menu.h"
 #include "image_viewer.h"
 #include "filesel.h"
+#include "base64.h"
 
 struct _RemoteURI
 {
@@ -61,6 +71,8 @@ struct _RemoteURI
 
        gchar *filename;
 
+       gpointer data;
+
        guint start;
        guint end;
 };
@@ -71,6 +83,11 @@ static GdkColor quote_colors[3] = {
        {(gulong)0, (gushort)0, (gushort)0, (gushort)0}
 };
 
+static GdkColor quote_bgcolors[3] = {
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0},
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0},
+       {(gulong)0, (gushort)0, (gushort)0, (gushort)0}
+};
 static GdkColor signature_color = {
        (gulong)0,
        (gushort)0x7fff,
@@ -92,27 +109,18 @@ static GdkColor emphasis_color = {
        (gushort)0xcfff
 };
 
-#if 0
-static GdkColor error_color = {
-       (gulong)0,
-       (gushort)0xefff,
-       (gushort)0,
-       (gushort)0
-};
-#endif
-
-
 static GdkCursor *hand_cursor = NULL;
 static GdkCursor *text_cursor = NULL;
+static GdkCursor *watch_cursor= NULL;
 
-#define TEXTVIEW_STATUSBAR_PUSH(textview, str)                                     \
-{                                                                          \
+#define TEXTVIEW_STATUSBAR_PUSH(textview, str)                             \
+{      if (textview->messageview->statusbar)                               \
        gtk_statusbar_push(GTK_STATUSBAR(textview->messageview->statusbar), \
                           textview->messageview->statusbar_cid, str);      \
 }
 
-#define TEXTVIEW_STATUSBAR_POP(textview)                                                  \
-{                                                                         \
+#define TEXTVIEW_STATUSBAR_POP(textview)                                  \
+{      if (textview->messageview->statusbar)                              \
        gtk_statusbar_pop(GTK_STATUSBAR(textview->messageview->statusbar), \
                          textview->messageview->statusbar_cid);           \
 }
@@ -208,25 +216,53 @@ static void copy_mail_to_uri_cb                   (TextView       *textview,
 static void save_file_cb                       (TextView       *textview,
                                                 guint           action,
                                                 void           *data);
+static void open_image_cb                      (TextView       *textview,
+                                                guint           action,
+                                                void           *data);
+static void textview_show_icon(TextView *textview, const gchar *stock_id);
 
 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},
+       {N_("/_Open with Web browser"), NULL, open_uri_cb, 0, NULL},
+       {N_("/Copy this _link"),        NULL, copy_uri_cb, 0, NULL},
 };
 
 static GtkItemFactoryEntry textview_mail_popup_entries[] = 
 {
-       {N_("/_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},
+       {N_("/Compose _new message"),   NULL, mail_to_uri_cb, 0, NULL},
+       {N_("/Add to _address book"),   NULL, add_uri_to_addrbook_cb, 0, NULL},
+       {N_("/Copy this add_ress"),     NULL, copy_mail_to_uri_cb, 0, NULL},
 };
 
 static GtkItemFactoryEntry textview_file_popup_entries[] = 
 {
-       {N_("/_Save this image..."),            NULL, save_file_cb, 0, NULL},
+       {N_("/_Open image"),            NULL, open_image_cb, 0, NULL},
+       {N_("/_Save image..."),         NULL, save_file_cb, 0, NULL},
 };
 
+static void scrolled_cb (GtkAdjustment *adj, TextView *textview)
+{
+#ifndef WIDTH
+#  define WIDTH 48
+#  define HEIGHT 48
+#endif
+       if (textview->image) {
+               gint x, y, x1;
+               x1 = textview->text->allocation.width - WIDTH - 5;
+               gtk_text_view_buffer_to_window_coords(
+                       GTK_TEXT_VIEW(textview->text),
+                       GTK_TEXT_WINDOW_TEXT, x1, 5, &x, &y);
+               gtk_text_view_move_child(GTK_TEXT_VIEW(textview->text), 
+                       textview->image, x1, y);
+       }
+}
+
+static void textview_size_allocate_cb  (GtkWidget      *widget,
+                                        GtkAllocation  *allocation,
+                                        gpointer        data)
+{
+       scrolled_cb(NULL, (TextView *)data);
+}
 
 TextView *textview_create(void)
 {
@@ -238,6 +274,7 @@ TextView *textview_create(void)
        GtkClipboard *clipboard;
        GtkItemFactory *link_popupfactory, *mail_popupfactory, *file_popupfactory;
        GtkWidget *link_popupmenu, *mail_popupmenu, *file_popupmenu;
+       GtkAdjustment *adj;
        gint n_entries;
 
        debug_print("Creating text view...\n");
@@ -280,6 +317,14 @@ TextView *textview_create(void)
                         G_CALLBACK(textview_leave_notify), textview);
        g_signal_connect(G_OBJECT(text), "visibility-notify-event",
                         G_CALLBACK(textview_visibility_notify), textview);
+       adj = gtk_scrolled_window_get_vadjustment(
+               GTK_SCROLLED_WINDOW(scrolledwin));
+       g_signal_connect(G_OBJECT(adj), "value-changed",
+                        G_CALLBACK(scrolled_cb), textview);
+       g_signal_connect(G_OBJECT(text), "size_allocate",
+                        G_CALLBACK(textview_size_allocate_cb),
+                        textview);
+
 
        gtk_widget_show(scrolledwin);
 
@@ -319,7 +364,7 @@ TextView *textview_create(void)
        textview->mail_popup_factory = mail_popupfactory;
        textview->file_popup_menu    = file_popupmenu;
        textview->file_popup_factory = file_popupfactory;
-
+       textview->image              = NULL;
        return textview;
 }
 
@@ -328,14 +373,14 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
        GtkTextBuffer *buffer;
        GtkTextTag *tag;
        static PangoFontDescription *font_desc, *bold_font_desc;
-
+       
        if (!font_desc)
                font_desc = pango_font_description_from_string
                        (NORMAL_FONT);
 
        if (!bold_font_desc) {
                bold_font_desc = pango_font_description_from_string
-                       (BOLD_FONT);
+                       (NORMAL_FONT);
                pango_font_description_set_weight
                        (bold_font_desc, PANGO_WEIGHT_BOLD);
        }
@@ -348,36 +393,50 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
                                   "pixels-below-lines", 0,
                                   "pixels-below-lines-set", TRUE,
                                   "font-desc", font_desc,
-                                  "left-margin", 0,
+                                  "left-margin", 3,
                                   "left-margin-set", TRUE,
                                   NULL);
        gtk_text_buffer_create_tag(buffer, "header_title",
                                   "font-desc", bold_font_desc,
                                   NULL);
-       gtk_text_buffer_create_tag(buffer, "quote0",
-                                  "foreground-gdk", &quote_colors[0],
-                                  NULL);
-       gtk_text_buffer_create_tag(buffer, "quote1",
-                                  "foreground-gdk", &quote_colors[1],
-                                  NULL);
-       gtk_text_buffer_create_tag(buffer, "quote2",
-                                  "foreground-gdk", &quote_colors[2],
-                                  NULL);
+       if (prefs_common.enable_bgcolor) {
+               gtk_text_buffer_create_tag(buffer, "quote0",
+                               "foreground-gdk", &quote_colors[0],
+                               "paragraph-background-gdk", &quote_bgcolors[0],
+                               NULL);
+               gtk_text_buffer_create_tag(buffer, "quote1",
+                               "foreground-gdk", &quote_colors[1],
+                               "paragraph-background-gdk", &quote_bgcolors[1],
+                               NULL);
+               gtk_text_buffer_create_tag(buffer, "quote2",
+                               "foreground-gdk", &quote_colors[2],
+                               "paragraph-background-gdk", &quote_bgcolors[2],
+                               NULL);
+       } else {
+               gtk_text_buffer_create_tag(buffer, "quote0",
+                               "foreground-gdk", &quote_colors[0],
+                               NULL);
+               gtk_text_buffer_create_tag(buffer, "quote1",
+                               "foreground-gdk", &quote_colors[1],
+                               NULL);
+               gtk_text_buffer_create_tag(buffer, "quote2",
+                               "foreground-gdk", &quote_colors[2],
+                               NULL);
+       }
        gtk_text_buffer_create_tag(buffer, "emphasis",
-                                  "foreground-gdk", &emphasis_color,
-                                  NULL);
-       gtk_text_buffer_create_tag(buffer, "signature",
-                                  "foreground-gdk", &signature_color,
-                                  NULL);
-       tag = gtk_text_buffer_create_tag(buffer, "link",
-                                        "foreground-gdk", &uri_color,
-                                        NULL);
+                       "foreground-gdk", &emphasis_color,
+                       NULL);
+       gtk_text_buffer_create_tag(buffer, "signature",
+                       "foreground-gdk", &signature_color,
+                       NULL);
+       tag = gtk_text_buffer_create_tag(buffer, "link",
+                       "foreground-gdk", &uri_color,
+                       NULL);
        gtk_text_buffer_create_tag(buffer, "link-hover",
-                                  "foreground-gdk", &uri_color,
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
-
-       g_signal_connect(G_OBJECT(tag), "event",
+                       "foreground-gdk", &uri_color,
+                       "underline", PANGO_UNDERLINE_SINGLE,
+                       NULL);
+       g_signal_connect(G_OBJECT(tag), "event",
                          G_CALLBACK(textview_uri_button_pressed), textview);
  }
 
@@ -387,16 +446,41 @@ void textview_init(TextView *textview)
                hand_cursor = gdk_cursor_new(GDK_HAND2);
        if (!text_cursor)
                text_cursor = gdk_cursor_new(GDK_XTERM);
+       if (!watch_cursor)
+               watch_cursor = gdk_cursor_new(GDK_WATCH);
 
-       textview_update_message_colors();
+       textview_reflect_prefs(textview);
        textview_set_all_headers(textview, FALSE);
        textview_set_font(textview, NULL);
        textview_create_tags(GTK_TEXT_VIEW(textview->text), textview);
 }
 
-void textview_update_message_colors(void)
+#if GTK_CHECK_VERSION(2, 8, 0)
+ #define CHANGE_TAG_COLOR(tagname, colorfg, colorbg) { \
+       tag = gtk_text_tag_table_lookup(tags, tagname); \
+       if (tag) \
+               g_object_set(G_OBJECT(tag), "foreground-gdk", colorfg, "paragraph-background-gdk", colorbg, NULL); \
+ }
+#else
+ #define CHANGE_TAG_COLOR(tagname, colorfg, colorbg) { \
+       tag = gtk_text_tag_table_lookup(tags, tagname); \
+       if (tag) \
+               g_object_set(G_OBJECT(tag), "foreground-gdk", colorfg, NULL); \
+ }
+#endif
+
+static void textview_update_message_colors(TextView *textview)
 {
        GdkColor black = {0, 0, 0, 0};
+       GdkColor colored_emphasis = {0, 0, 0, 0xcfff};
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+       GtkTextTag *tag = NULL;
+
+       quote_bgcolors[0] = quote_bgcolors[1] = quote_bgcolors[2] = black;
+       quote_colors[0] = quote_colors[1] = quote_colors[2] = 
+               uri_color = emphasis_color = signature_color = black;
 
        if (prefs_common.enable_color) {
                /* grab the quote colors, converting from an int to a GdkColor */
@@ -410,35 +494,51 @@ void textview_update_message_colors(void)
                                               &uri_color);
                gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
                                               &signature_color);
+               emphasis_color = colored_emphasis;
+       }
+       if (prefs_common.enable_color && prefs_common.enable_bgcolor) {
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_bgcol,
+                                                  &quote_bgcolors[0]);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level2_bgcol,
+                                                  &quote_bgcolors[1]);
+               gtkut_convert_int_to_gdk_color(prefs_common.quote_level3_bgcol,
+                                                  &quote_bgcolors[2]);
+               CHANGE_TAG_COLOR("quote0", &quote_colors[0], &quote_bgcolors[0]);
+               CHANGE_TAG_COLOR("quote1", &quote_colors[1], &quote_bgcolors[1]);
+               CHANGE_TAG_COLOR("quote2", &quote_colors[2], &quote_bgcolors[2]);
        } else {
-               quote_colors[0] = quote_colors[1] = quote_colors[2] = 
-                       uri_color = emphasis_color = signature_color = black;
+               CHANGE_TAG_COLOR("quote0", &quote_colors[0], NULL);
+               CHANGE_TAG_COLOR("quote1", &quote_colors[1], NULL);
+               CHANGE_TAG_COLOR("quote2", &quote_colors[2], NULL);
        }
+
+       CHANGE_TAG_COLOR("emphasis", &emphasis_color, NULL);
+       CHANGE_TAG_COLOR("signature", &signature_color, NULL);
+       CHANGE_TAG_COLOR("link", &uri_color, NULL);
+       CHANGE_TAG_COLOR("link-hover", &uri_color, NULL);
+}
+#undef CHANGE_TAG_COLOR
+
+void textview_reflect_prefs(TextView *textview)
+{
+       textview_set_font(textview, NULL);
+       textview_update_message_colors(textview);
+       gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview->text),
+                                        prefs_common.textview_cursor_visible);
 }
 
 void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
-       FILE *fp;
-
-       if ((fp = fopen(file, "rb")) == NULL) {
-               FILE_OP_ERROR(file, "fopen");
-               return;
-       }
-
        textview_clear(textview);
 
        textview_add_parts(textview, mimeinfo);
 
-       fclose(fp);
-
        textview_set_position(textview, 0);
 }
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
-       GtkTextView *text;
-
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
 
@@ -458,7 +558,27 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                textview_add_parts(textview, mimeinfo);
        else
                textview_write_body(textview, mimeinfo);
+}
 
+#define TEXT_INSERT(str) \
+       gtk_text_buffer_insert_with_tags_by_name \
+                               (buffer, &iter, str, -1,\
+                                "header", NULL)
+
+#define TEXT_INSERT_LINK(str, fname, udata) {                          \
+       RemoteURI *uri;                                                 \
+       uri = g_new(RemoteURI, 1);                                      \
+       uri->uri = g_strdup("");                                        \
+       uri->start = gtk_text_iter_get_offset(&iter);                   \
+       gtk_text_buffer_insert_with_tags_by_name                        \
+                               (buffer, &iter, str, -1,                \
+                                "link", "header_title", "header",      \
+                                NULL);                                 \
+       uri->end = gtk_text_iter_get_offset(&iter);                     \
+       uri->filename = fname?g_strdup(fname):NULL;                     \
+       uri->data = udata;                                              \
+       textview->uri_list =                                            \
+               g_slist_append(textview->uri_list, uri);                \
 }
 
 static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
@@ -483,7 +603,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                FILE *fp;
 
-               fp = fopen(mimeinfo->data.filename, "rb");
+               fp = g_fopen(mimeinfo->data.filename, "rb");
                fseek(fp, mimeinfo->offset, SEEK_SET);
                headers = textview_scan_header(textview, fp);
                if (headers) {
@@ -502,16 +622,19 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        if (name == NULL)
                name = procmime_mimeinfo_get_parameter(mimeinfo, "name");
        if (name != NULL)
-               g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]\n",
+               g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]",
                           name, content_type, mimeinfo->length);
        else
-               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
+               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]",
                           content_type, mimeinfo->length);
 
        g_free(content_type);                      
 
-       if (mimeinfo->type != MIMETYPE_TEXT) {
-               gtk_text_buffer_insert(buffer, &iter, buf, -1);
+       if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
+       || (mimeinfo->disposition == DISPOSITIONTYPE_INLINE && 
+           mimeinfo->type != MIMETYPE_TEXT)) {
+               TEXT_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
+               gtk_text_buffer_insert(buffer, &iter, " \n", -1);
                if (mimeinfo->type == MIMETYPE_IMAGE  &&
                    prefs_common.inline_img ) {
                        GdkPixbuf *pixbuf;
@@ -519,10 +642,6 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        gchar *filename;
                        RemoteURI *uri;
                        gchar *uri_str;
-                       FILE *fp;
-
-                       fp = fopen(mimeinfo->data.filename, "rb");
-                       fseek(fp, mimeinfo->offset, SEEK_SET);
 
                        filename = procmime_get_tmp_file_name(mimeinfo);
                        if (procmime_get_part(filename, mimeinfo) < 0) {
@@ -582,7 +701,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        g_object_unref(pixbuf);
                        g_free(filename);
                }
-       } else if (mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
+       } else if (mimeinfo->type == MIMETYPE_TEXT) {
                if (prefs_common.display_header && (charcount > 0))
                        gtk_text_buffer_insert(buffer, &iter, "\n", 1);
 
@@ -655,9 +774,6 @@ static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
         recursive_add_parts(textview, mimeinfo->node);
 }
 
-#define TEXT_INSERT(str) \
-       gtk_text_buffer_insert(buffer, &iter, str, -1)
-
 void textview_show_error(TextView *textview)
 {
        GtkTextView *text;
@@ -671,7 +787,14 @@ void textview_show_error(TextView *textview)
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_start_iter(buffer, &iter);
 
-       TEXT_INSERT(_("This message can't be displayed.\n"));
+       TEXT_INSERT(_("\n"
+                     "  This message can't be displayed.\n"
+                     "  This is probably due to a network error.\n"
+                     "\n"
+                     "  Use "));
+       TEXT_INSERT_LINK(_("'View Log'"), "sc://view_log", NULL);
+       TEXT_INSERT(_(" in the Tools menu for more information."));
+       textview_show_icon(textview, GTK_STOCK_DIALOG_ERROR);
 
 }
 
@@ -690,28 +813,36 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_start_iter(buffer, &iter);
 
-       TEXT_INSERT(_("The following can be performed on this part by "));
-       TEXT_INSERT(_("right-clicking the icon or list item:\n"));
-
-       TEXT_INSERT(_("    To save select 'Save as...' (Shortcut key: 'y')\n"));
-       TEXT_INSERT(_("    To display as text select 'Display as text' "));
-       TEXT_INSERT(_("(Shortcut key: 't')\n"));
-       TEXT_INSERT(_("    To open with an external program select 'Open' "));
-       TEXT_INSERT(_("(Shortcut key: 'l'),\n"));
-       TEXT_INSERT(_("    (alternately double-click, or click the middle "));
-       TEXT_INSERT(_("mouse button),\n"));
-       TEXT_INSERT(_("    or 'Open with...' (Shortcut key: 'o')\n"));
-
+       TEXT_INSERT("\n");
+       TEXT_INSERT(_("  The following can be performed on this part by\n"));
+       TEXT_INSERT(_("  right-clicking the icon or list item:\n"));
+
+       TEXT_INSERT(_("     - To save, select "));
+       TEXT_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
+       TEXT_INSERT(_(" (Shortcut key: 'y')\n"));
+       TEXT_INSERT(_("     - To display as text, select "));
+       TEXT_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
+       TEXT_INSERT(_(" (Shortcut key: 't')\n"));
+       TEXT_INSERT(_("     - To open with an external program, select "));
+       TEXT_INSERT_LINK(_("'Open'"), "sc://open", NULL);
+       TEXT_INSERT(_(" (Shortcut key: 'l')\n"));
+       TEXT_INSERT(_("       (alternately double-click, or click the middle "));
+       TEXT_INSERT(_("mouse button)\n"));
+       TEXT_INSERT(_("     - Or use "));
+       TEXT_INSERT_LINK(_("'Open with...'"), "sc://open_with", NULL);
+       TEXT_INSERT(_(" (Shortcut key: 'o')\n"));
+       textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
 }
 
 #undef TEXT_INSERT
+#undef TEXT_INSERT_LINK
 
 static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 {
        FILE *tmpfp;
        gchar buf[BUFFSIZE];
        CodeConverter *conv;
-       const gchar *charset;
+       const gchar *charset, *p, *cmd;
        
        if (textview->messageview->forced_charset)
                charset = textview->messageview->forced_charset;
@@ -734,10 +865,10 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                
                filename = procmime_get_tmp_file_name(mimeinfo);
                if (procmime_get_part(filename, mimeinfo) == 0) {
-                       tmpfp = fopen(filename, "rb");
+                       tmpfp = g_fopen(filename, "rb");
                        textview_show_html(textview, tmpfp, conv);
                        fclose(tmpfp);
-                       unlink(filename);
+                       g_unlink(filename);
                }
                g_free(filename);
        } else if (!g_ascii_strcasecmp(mimeinfo->subtype, "enriched")) {
@@ -745,14 +876,60 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                
                filename = procmime_get_tmp_file_name(mimeinfo);
                if (procmime_get_part(filename, mimeinfo) == 0) {
-                       tmpfp = fopen(filename, "rb");
+                       tmpfp = g_fopen(filename, "rb");
                        textview_show_ertf(textview, tmpfp, conv);
                        fclose(tmpfp);
-                       unlink(filename);
+                       g_unlink(filename);
                }
                g_free(filename);
+       } else if ( g_ascii_strcasecmp(mimeinfo->subtype, "plain") &&
+                  (cmd = prefs_common.mime_textviewer) && *cmd &&
+                  (p = strchr(cmd, '%')) && *(p + 1) == 's') {
+               int pid, pfd[2];
+               const gchar *fname;
+
+               fname  = procmime_get_tmp_file_name(mimeinfo);
+               if (procmime_get_part(fname, mimeinfo)) goto textview_default;
+
+               g_snprintf(buf, sizeof(buf), cmd, fname);
+               debug_print("Viewing text content of type: %s (length: %d) "
+                       "using %s\n", mimeinfo->subtype, mimeinfo->length, buf);
+
+               if (pipe(pfd) < 0) {
+                       g_snprintf(buf, sizeof(buf),
+                               "pipe failed for textview\n\n%s\n", strerror(errno));
+                       textview_write_line(textview, buf, conv);
+                       goto textview_default;
+               }
+               pid = fork();
+               if (pid < 0) {
+                       g_snprintf(buf, sizeof(buf),
+                               "fork failed for textview\n\n%s\n", strerror(errno));
+                       textview_write_line(textview, buf, conv);
+                       close(pfd[0]);
+                       close(pfd[1]);
+                       goto textview_default;
+               }
+               if (pid == 0) { /* child */
+                       gchar **argv;
+                       argv = strsplit_with_quote(buf, " ", 0);
+                       close(1);
+                       close(pfd[0]);
+                       dup(pfd[1]);
+                       execvp(argv[0], argv);
+                       close(pfd[1]);
+                       exit(255);
+               }
+               close(pfd[1]);
+               tmpfp = fdopen(pfd[0], "rb");
+               while (fgets(buf, sizeof(buf), tmpfp))
+                       textview_write_line(textview, buf, conv);
+               fclose(tmpfp);
+               waitpid(pid, pfd, 0);
+               unlink(fname);
        } else {
-               tmpfp = fopen(mimeinfo->data.filename, "rb");
+textview_default:
+               tmpfp = g_fopen(mimeinfo->data.filename, "rb");
                fseek(tmpfp, mimeinfo->offset, SEEK_SET);
                debug_print("Viewing text content of type: %s (length: %d)\n", mimeinfo->subtype, mimeinfo->length);
                while ((fgets(buf, sizeof(buf), tmpfp) != NULL) && 
@@ -768,20 +945,22 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 static void textview_show_html(TextView *textview, FILE *fp,
                               CodeConverter *conv)
 {
-       HTMLParser *parser;
+       SC_HTMLParser *parser;
        gchar *str;
 
-       parser = html_parser_new(fp, conv);
+       parser = sc_html_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
 
-       while ((str = html_parse(parser)) != NULL) {
-               if (parser->state == HTML_HREF) {
+       while ((str = sc_html_parse(parser)) != NULL) {
+               if (parser->state == SC_HTML_HREF) {
                        /* first time : get and copy the URL */
                        if (parser->href == NULL) {
                                /* ALF - the sylpheed html parser returns an empty string,
                                 * if still inside an <a>, but already parsed past HREF */
                                str = strtok(str, " ");
-                               if (str) { 
+                               if (str) {
+                                       while (str && *str && g_ascii_isspace(*str))
+                                               str++; 
                                        parser->href = g_strdup(str);
                                        /* the URL may (or not) be followed by the
                                         * referenced text */
@@ -794,7 +973,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
                        textview_write_line(textview, str, NULL);
        }
        textview_write_line(textview, "\n", NULL);
-       html_parser_destroy(parser);
+       sc_html_parser_destroy(parser);
 }
 
 static void textview_show_ertf(TextView *textview, FILE *fp,
@@ -813,324 +992,6 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
        ertf_parser_destroy(parser);
 }
 
-/* get_uri_part() - retrieves a URI starting from scanpos.
-                   Returns TRUE if succesful */
-static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
-                            const gchar **bp, const gchar **ep)
-{
-       const gchar *ep_;
-
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
-
-       *bp = scanpos;
-
-       /* find end point of URI */
-       for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
-               if (!isgraph(*(const guchar *)ep_) ||
-                   !IS_ASCII(*(const guchar *)ep_) ||
-                   strchr("()<>\"", *ep_))
-                       break;
-       }
-
-       /* no punctuation at end of string */
-
-       /* FIXME: this stripping of trailing punctuations may bite with other URIs.
-        * should pass some URI type to this function and decide on that whether
-        * to perform punctuation stripping */
-
-#define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
-
-       for (; ep_ - 1 > scanpos + 1 &&
-              IS_REAL_PUNCT(*(const guchar *)(ep_ - 1));
-            ep_--)
-               ;
-
-#undef IS_REAL_PUNCT
-
-       *ep = ep_;
-
-       return TRUE;            
-}
-
-static gchar *make_uri_string(const gchar *bp, const gchar *ep)
-{
-       return g_strndup(bp, ep - bp);
-}
-
-/* valid mail address characters */
-#define IS_RFC822_CHAR(ch) \
-       (IS_ASCII(ch) && \
-        (ch) > 32   && \
-        (ch) != 127 && \
-        !isspace(ch) && \
-        !strchr("(),;<>\"", (ch)))
-
-/* alphabet and number within 7bit ASCII */
-#define IS_ASCII_ALNUM(ch)     (IS_ASCII(ch) && isalnum(ch))
-#define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
-
-static GHashTable *create_domain_tab(void)
-{
-       static const gchar *toplvl_domains [] = {
-           "museum", "aero",
-           "arpa", "coop", "info", "name", "biz", "com", "edu", "gov",
-           "int", "mil", "net", "org", "ac", "ad", "ae", "af", "ag",
-           "ai", "al", "am", "an", "ao", "aq", "ar", "as", "at", "au",
-           "aw", "az", "ba", "bb", "bd", "be", "bf", "bg", "bh", "bi",
-           "bj", "bm", "bn", "bo", "br", "bs", "bt", "bv", "bw", "by",
-           "bz", "ca", "cc", "cd", "cf", "cg", "ch", "ci", "ck", "cl",
-           "cm", "cn", "co", "cr", "cu", "cv", "cx", "cy", "cz", "de",
-           "dj", "dk", "dm", "do", "dz", "ec", "ee", "eg", "eh", "er",
-           "es", "et", "fi", "fj", "fk", "fm", "fo", "fr", "ga", "gd",
-           "ge", "gf", "gg", "gh", "gi", "gl", "gm", "gn", "gp", "gq",
-           "gr", "gs", "gt", "gu", "gw", "gy", "hk", "hm", "hn", "hr",
-           "ht", "hu", "id", "ie", "il", "im", "in", "io", "iq", "ir",
-           "is", "it", "je", "jm", "jo", "jp", "ke", "kg", "kh", "ki",
-           "km", "kn", "kp", "kr", "kw", "ky", "kz", "la", "lb", "lc",
-           "li", "lk", "lr", "ls", "lt", "lu", "lv", "ly", "ma", "mc",
-           "md", "mg", "mh", "mk", "ml", "mm", "mn", "mo", "mp", "mq",
-           "mr", "ms", "mt", "mu", "mv", "mw", "mx", "my", "mz", "na",
-           "nc", "ne", "nf", "ng", "ni", "nl", "no", "np", "nr", "nu",
-           "nz", "om", "pa", "pe", "pf", "pg", "ph", "pk", "pl", "pm",
-           "pn", "pr", "ps", "pt", "pw", "py", "qa", "re", "ro", "ru",
-           "rw", "sa", "sb", "sc", "sd", "se", "sg", "sh", "si", "sj",
-           "sk", "sl", "sm", "sn", "so", "sr", "st", "sv", "sy", "sz",
-           "tc", "td", "tf", "tg", "th", "tj", "tk", "tm", "tn", "to",
-           "tp", "tr", "tt", "tv", "tw", "tz", "ua", "ug", "uk", "um",
-           "us", "uy", "uz", "va", "vc", "ve", "vg", "vi", "vn", "vu",
-            "wf", "ws", "ye", "yt", "yu", "za", "zm", "zw" 
-       };
-       gint n;
-       GHashTable *htab = g_hash_table_new(g_stricase_hash, g_stricase_equal);
-       
-       g_return_val_if_fail(htab, NULL);
-       for (n = 0; n < sizeof toplvl_domains / sizeof toplvl_domains[0]; n++) 
-               g_hash_table_insert(htab, (gpointer) toplvl_domains[n], (gpointer) toplvl_domains[n]);
-       return htab;
-}
-
-static gboolean is_toplvl_domain(GHashTable *tab, const gchar *first, const gchar *last)
-{
-       const gint MAX_LVL_DOM_NAME_LEN = 6;
-       gchar buf[MAX_LVL_DOM_NAME_LEN + 1];
-       const gchar *m = buf + MAX_LVL_DOM_NAME_LEN + 1;
-       register gchar *p;
-       
-       if (last - first > MAX_LVL_DOM_NAME_LEN || first > last)
-               return FALSE;
-
-       for (p = buf; p < m &&  first < last; *p++ = *first++)
-               ;
-       *p = 0;
-
-       return g_hash_table_lookup(tab, buf) != NULL;
-}
-
-/* get_email_part() - retrieves an email address. Returns TRUE if succesful */
-static gboolean get_email_part(const gchar *start, const gchar *scanpos,
-                              const gchar **bp, const gchar **ep)
-{
-       /* more complex than the uri part because we need to scan back and forward starting from
-        * the scan position. */
-       gboolean result = FALSE;
-       const gchar *bp_ = NULL;
-       const gchar *ep_ = NULL;
-       static GHashTable *dom_tab;
-       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. */
-       gchar closure_stack[128];
-       gchar *ptr = closure_stack;
-
-       g_return_val_if_fail(start != NULL, FALSE);
-       g_return_val_if_fail(scanpos != NULL, FALSE);
-       g_return_val_if_fail(bp != NULL, FALSE);
-       g_return_val_if_fail(ep != NULL, FALSE);
-
-       if (!dom_tab)
-               dom_tab = create_domain_tab();
-       g_return_val_if_fail(dom_tab, FALSE);   
-
-       /* scan start of address */
-       for (bp_ = scanpos - 1;
-            bp_ >= start && IS_RFC822_CHAR(*(const guchar *)bp_); bp_--)
-               ;
-
-       /* TODO: should start with an alnum? */
-       bp_++;
-       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*(const guchar *)bp_); bp_++)
-               ;
-
-       if (bp_ != scanpos) {
-               /* scan end of address */
-               for (ep_ = scanpos + 1;
-                    *ep_ && IS_RFC822_CHAR(*(const guchar *)ep_); ep_++)
-                       if (*ep_ == '.') {
-                               prelast_dot = last_dot;
-                               last_dot = ep_;
-                               if (*(last_dot + 1) == '.') {
-                                       if (prelast_dot == NULL)
-                                               return FALSE;
-                                       last_dot = prelast_dot;
-                                       break;
-                               }
-                       }
-
-               /* TODO: really should terminate with an alnum? */
-               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*(const guchar *)ep_);
-                    --ep_)
-                       ;
-               ep_++;
-
-               if (last_dot == NULL)
-                       return FALSE;
-               if (last_dot >= ep_)
-                       last_dot = prelast_dot;
-               if (last_dot == NULL || (scanpos + 1 >= last_dot))
-                       return FALSE;
-               last_dot++;
-
-               for (last_tld_char = last_dot; last_tld_char < ep_; last_tld_char++)
-                       if (*last_tld_char == '?')
-                               break;
-
-               if (is_toplvl_domain(dom_tab, last_dot, last_tld_char))
-                       result = TRUE;
-
-               *ep = ep_;
-               *bp = bp_;
-       }
-
-       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_))
-               return FALSE;
-
-       /* see if this is <bracketed>; in this case we also scan for the informative part. */
-       if (bp_ - 1 <= start || *(bp_ - 1) != '<' || *ep_ != '>')
-               return TRUE;
-
-#define FULL_STACK()   ((size_t) (ptr - closure_stack) >= sizeof closure_stack)
-#define IN_STACK()     (ptr > closure_stack)
-/* has underrun check */
-#define POP_STACK()    if(IN_STACK()) --ptr
-/* has overrun check */
-#define PUSH_STACK(c)  if(!FULL_STACK()) *ptr++ = (c); else return TRUE
-/* has underrun check */
-#define PEEK_STACK()   (IN_STACK() ? *(ptr - 1) : 0)
-
-       ep_++;
-
-       /* scan for the informative part. */
-       for (bp_ -= 2; bp_ >= start; bp_--) {
-               /* if closure on the stack keep scanning */
-               if (PEEK_STACK() == *bp_) {
-                       POP_STACK();
-                       continue;
-               }
-               if (*bp_ == '\'' || *bp_ == '"') {
-                       PUSH_STACK(*bp_);
-                       continue;
-               }
-
-               /* if nothing in the closure stack, do the special conditions
-                * the following if..else expression simply checks whether 
-                * a token is acceptable. if not acceptable, the clause
-                * should terminate the loop with a 'break' */
-               if (!PEEK_STACK()) {
-                       if (*bp_ == '-'
-                       && (((bp_ - 1) >= start) && isalnum(*(bp_ - 1)))
-                       && (((bp_ + 1) < ep_)    && isalnum(*(bp_ + 1)))) {
-                               /* hyphens are allowed, but only in
-                                  between alnums */
-                       } else if (!strchr(",;:=?./+<>!&", *bp_)) {
-                               /* but anything not being a punctiation
-                                  is ok */
-                       } else {
-                               break; /* anything else is rejected */
-                       }
-               }
-       }
-
-       bp_++;
-
-#undef PEEK_STACK
-#undef PUSH_STACK
-#undef POP_STACK
-#undef IN_STACK
-#undef FULL_STACK
-
-       /* scan forward (should start with an alnum) */
-       for (; *bp_ != '<' && isspace(*bp_) && *bp_ != '"'; bp_++)
-               ;
-
-       *ep = ep_;
-       *bp = bp_;
-       
-       return result;
-}
-
-#undef IS_QUOTE
-#undef IS_ASCII_ALNUM
-#undef IS_RFC822_CHAR
-
-static gchar *make_email_string(const gchar *bp, const gchar *ep)
-{
-       /* returns a mailto: URI; mailto: is also used to detect the
-        * uri type later on in the button_pressed signal handler */
-       gchar *tmp;
-       gchar *result;
-
-       tmp = g_strndup(bp, ep - bp);
-       result = g_strconcat("mailto:", tmp, NULL);
-       g_free(tmp);
-
-       return result;
-}
-
-static gchar *make_http_string(const gchar *bp, const gchar *ep)
-{
-       /* returns an http: URI; */
-       gchar *tmp;
-       gchar *result;
-
-       tmp = g_strndup(bp, ep - bp);
-       result = g_strconcat("http://", tmp, NULL);
-       g_free(tmp);
-
-       return result;
-}
-
 #define ADD_TXT_POS(bp_, ep_, pti_) \
        if ((last->next = alloca(sizeof(struct txtpos))) != NULL) { \
                last = last->next; \
@@ -1148,12 +1009,14 @@ static gchar *make_http_string(const gchar *bp, const gchar *ep)
 static void textview_make_clickable_parts(TextView *textview,
                                          const gchar *fg_tag,
                                          const gchar *uri_tag,
-                                         const gchar *linebuf)
+                                         const gchar *linebuf,
+                                         gboolean hdr)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
        GtkTextIter iter;
-
+       gchar *mybuf = g_strdup(linebuf);
+       
        /* parse table - in order of priority */
        struct table {
                const gchar *needle; /* token */
@@ -1165,7 +1028,8 @@ static void textview_make_clickable_parts(TextView *textview,
                gboolean  (*parse)      (const gchar *start,
                                         const gchar *scanpos,
                                         const gchar **bp_,
-                                        const gchar **ep_);
+                                        const gchar **ep_,
+                                        gboolean hdr);
                /* part to URI function */
                gchar    *(*build_uri)  (const gchar *bp,
                                         const gchar *ep);
@@ -1175,6 +1039,7 @@ static void textview_make_clickable_parts(TextView *textview,
                {"http://",  strcasestr, get_uri_part,   make_uri_string},
                {"https://", strcasestr, get_uri_part,   make_uri_string},
                {"ftp://",   strcasestr, get_uri_part,   make_uri_string},
+               {"sftp://",  strcasestr, get_uri_part,   make_uri_string},
                {"www.",     strcasestr, get_uri_part,   make_http_string},
                {"mailto:",  strcasestr, get_uri_part,   make_uri_string},
                {"@",        strcasestr, get_email_part, make_email_string}
@@ -1190,10 +1055,15 @@ static void textview_make_clickable_parts(TextView *textview,
                struct txtpos   *next;          /* next */
        } head = {NULL, NULL, 0,  NULL}, *last = &head;
 
+       if (!g_utf8_validate(linebuf, -1, NULL)) {
+               mybuf = g_malloc(strlen(linebuf)*2 +1);
+               conv_localetodisp(mybuf, strlen(linebuf)*2 +1, linebuf);
+       }
+
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
        /* parse for clickable parts, and build a list of begin and end positions  */
-       for (walk = linebuf, n = 0;;) {
+       for (walk = mybuf, n = 0;;) {
                gint last_index = PARSE_ELEMS;
                gchar *scanpos = NULL;
 
@@ -1212,7 +1082,7 @@ static void textview_make_clickable_parts(TextView *textview,
 
                if (scanpos) {
                        /* check if URI can be parsed */
-                       if (parser[last_index].parse(walk, scanpos, &bp, &ep)
+                       if (parser[last_index].parse(walk, scanpos, &bp, &ep, hdr)
                            && (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
                                        ADD_TXT_POS(bp, ep, last_index);
                                        walk = ep;
@@ -1225,7 +1095,7 @@ static void textview_make_clickable_parts(TextView *textview,
 
        /* colorize this line */
        if (head.next) {
-               const gchar *normal_text = linebuf;
+               const gchar *normal_text = mybuf;
 
                /* insert URIs */
                for (last = head.next; last != NULL;
@@ -1255,8 +1125,9 @@ static void textview_make_clickable_parts(TextView *textview,
                                (buffer, &iter, normal_text, -1, fg_tag, NULL);
        } else {
                gtk_text_buffer_insert_with_tags_by_name
-                       (buffer, &iter, linebuf, -1, fg_tag, NULL);
+                       (buffer, &iter, mybuf, -1, fg_tag, NULL);
        }
+       g_free(mybuf);
 }
 
 #undef ADD_TXT_POS
@@ -1279,10 +1150,9 @@ static void textview_write_line(TextView *textview, const gchar *str,
        if (!conv)
                strncpy2(buf, str, sizeof(buf));
        else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_utf8todisp(buf, sizeof(buf), str);
-
+               conv_localetodisp(buf, sizeof(buf), str);
+               
        strcrchomp(buf);
-       //if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
        fg_color = NULL;
 
        /* change color of quotation
@@ -1316,10 +1186,7 @@ static void textview_write_line(TextView *textview, const gchar *str,
                textview->is_in_signature = TRUE;
        }
 
-       if (prefs_common.enable_color)
-               textview_make_clickable_parts(textview, fg_color, "link", buf);
-       else
-               textview_make_clickable_parts(textview, fg_color, NULL, buf);
+       textview_make_clickable_parts(textview, fg_color, "link", buf, FALSE);
 }
 
 void textview_write_link(TextView *textview, const gchar *str,
@@ -1333,9 +1200,14 @@ void textview_write_link(TextView *textview, const gchar *str,
        gchar *bufp;
        RemoteURI *r_uri;
 
-       if (*str == '\0')
+       if (!str || *str == '\0')
+               return;
+       if (!uri)
                return;
 
+       while (uri && *uri && g_ascii_isspace(*uri))
+               uri++;
+               
        text = GTK_TEXT_VIEW(textview->text);
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
@@ -1345,12 +1217,21 @@ void textview_write_link(TextView *textview, const gchar *str,
        else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
                conv_utf8todisp(buf, sizeof(buf), str);
 
+       if (g_utf8_validate(buf, -1, NULL) == FALSE)
+               return;
+
        strcrchomp(buf);
 
        gtk_text_buffer_get_end_iter(buffer, &iter);
+       for (bufp = buf; *bufp != '\0'; bufp = g_utf8_next_char(bufp)) {
+               gunichar ch;
 
-       for (bufp = buf; isspace(*(guchar *)bufp); bufp++)
-               gtk_text_buffer_insert(buffer, &iter, bufp, 1);
+               ch = g_utf8_get_char(bufp);
+               if (!g_unichar_isspace(ch))
+                       break;
+       }
+       if (bufp > buf)
+               gtk_text_buffer_insert(buffer, &iter, buf, bufp - buf);
 
        if (prefs_common.enable_color) {
                link_color = &uri_color;
@@ -1365,10 +1246,17 @@ void textview_write_link(TextView *textview, const gchar *str,
        textview->uri_list = g_slist_append(textview->uri_list, r_uri);
 }
 
+static void textview_set_cursor(GdkWindow *window, GdkCursor *cursor)
+{
+       if (GDK_IS_WINDOW(window))
+               gdk_window_set_cursor(window, cursor);
+}
 void textview_clear(TextView *textview)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkTextBuffer *buffer;
+       GdkWindow *window = gtk_text_view_get_window(text,
+                               GTK_TEXT_WINDOW_TEXT);
 
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_set_text(buffer, "", -1);
@@ -1376,8 +1264,18 @@ void textview_clear(TextView *textview)
        TEXTVIEW_STATUSBAR_POP(textview);
        textview_uri_list_remove_all(textview->uri_list);
        textview->uri_list = NULL;
+       textview->uri_hover = NULL;
 
        textview->body_pos = 0;
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       textview->image = NULL;
+
+       if (textview->messageview->mainwin->cursor_count == 0) {
+               textview_set_cursor(window, text_cursor);
+       } else {
+               textview_set_cursor(window, watch_cursor);
+       }
 }
 
 void textview_destroy(TextView *textview)
@@ -1393,10 +1291,39 @@ void textview_set_all_headers(TextView *textview, gboolean all_headers)
        textview->show_all_headers = all_headers;
 }
 
+#define CHANGE_TAG_FONT(tagname, font) { \
+       tag = gtk_text_tag_table_lookup(tags, tagname); \
+       if (tag) \
+               g_object_set(G_OBJECT(tag), "font-desc", font, NULL); \
+}
+
 void textview_set_font(TextView *textview, const gchar *codeset)
 {
+       GtkTextTag *tag;
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+       GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+       
+       if (NORMAL_FONT) {
+               PangoFontDescription *font_desc, *bold_font_desc;
+               font_desc = pango_font_description_from_string
+                                               (NORMAL_FONT);
+               bold_font_desc = pango_font_description_from_string
+                                               (NORMAL_FONT);
+               if (font_desc) {
+                       gtk_widget_modify_font(textview->text, font_desc);
+                       CHANGE_TAG_FONT("header", font_desc);
+                       pango_font_description_free(font_desc);
+               }
+               if (bold_font_desc) {
+                       pango_font_description_set_weight
+                               (bold_font_desc, PANGO_WEIGHT_BOLD);
+                       CHANGE_TAG_FONT("header_title", bold_font_desc);
+                       pango_font_description_free(bold_font_desc);
+               }
+       }
+
        if (prefs_common.textfont) {
-               PangoFontDescription *font_desc = NULL;
+               PangoFontDescription *font_desc;
 
                font_desc = pango_font_description_from_string
                                                (prefs_common.textfont);
@@ -1445,12 +1372,8 @@ enum
 void textview_set_position(TextView *textview, gint pos)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
-       GtkTextIter iter;
 
-       gtk_text_buffer_get_iter_at_offset(buffer, &iter, pos);
-       gtk_text_buffer_place_cursor(buffer, &iter);
-       gtk_text_view_scroll_to_iter(text, &iter, 0.0, FALSE, 0.0, 0.0);
+       gtkut_text_view_set_position(text, pos);
 }
 
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
@@ -1510,6 +1433,114 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
        return sorted_headers;
 }
 
+static void textview_show_face(TextView *textview)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       MsgInfo *msginfo = textview->messageview->msginfo;
+       int x = 0;
+       
+       if (prefs_common.display_header_pane
+       ||  !prefs_common.display_xface)
+               goto bail;
+       
+       if (!msginfo->face) {
+               goto bail;
+       }
+
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       
+       textview->image = face_get_from_header(msginfo->face);
+       g_return_if_fail(textview->image != NULL);
+
+       gtk_widget_show(textview->image);
+       
+       x = textview->text->allocation.width - WIDTH -5;
+
+       gtk_text_view_add_child_in_window(text, textview->image, 
+               GTK_TEXT_WINDOW_TEXT, x, 5);
+
+       gtk_widget_show_all(textview->text);
+       
+
+       return;
+bail:
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       textview->image = NULL; 
+}
+
+static void textview_show_icon(TextView *textview, const gchar *stock_id)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       int x = 0;
+       
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       
+       textview->image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_DIALOG);
+       g_return_if_fail(textview->image != NULL);
+
+       gtk_widget_show(textview->image);
+       
+       x = textview->text->allocation.width - WIDTH -5;
+
+       gtk_text_view_add_child_in_window(text, textview->image, 
+               GTK_TEXT_WINDOW_TEXT, x, 5);
+
+       gtk_widget_show_all(textview->text);
+       
+
+       return;
+}
+
+#if HAVE_LIBCOMPFACE
+static void textview_show_xface(TextView *textview)
+{
+       MsgInfo *msginfo = textview->messageview->msginfo;
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       int x = 0;
+
+       if (prefs_common.display_header_pane
+       ||  !prefs_common.display_xface)
+               goto bail;
+       
+       if (!msginfo)
+               goto bail;
+
+       if (msginfo->face)
+               return;
+       
+       if (!msginfo->xface || strlen(msginfo->xface) < 5) {
+               goto bail;
+       }
+
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       
+       textview->image = xface_get_from_header(msginfo->xface,
+                               &textview->text->style->white,
+                               textview->text->window);
+       g_return_if_fail(textview->image != NULL);
+
+       gtk_widget_show(textview->image);
+       
+       x = textview->text->allocation.width - WIDTH -5;
+
+       gtk_text_view_add_child_in_window(text, textview->image, 
+               GTK_TEXT_WINDOW_TEXT, x, 5);
+
+       gtk_widget_show_all(textview->text);
+       
+       return;
+bail:
+       if (textview->image) 
+               gtk_widget_destroy(textview->image);
+       textview->image = NULL;
+       
+}
+#endif
+
 static void textview_show_header(TextView *textview, GPtrArray *headers)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
@@ -1525,9 +1556,20 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                g_return_if_fail(header->name != NULL);
 
                gtk_text_buffer_get_end_iter (buffer, &iter);
-               gtk_text_buffer_insert_with_tags_by_name
-                       (buffer, &iter, header->name, -1,
-                        "header_title", "header", NULL);
+               if(prefs_common.trans_hdr == TRUE) {
+                       gchar *hdr = g_strndup(header->name, strlen(header->name) - 1);
+                       gchar *trans_hdr = gettext(hdr);
+                       gtk_text_buffer_insert_with_tags_by_name(buffer,
+                               &iter, trans_hdr, -1,
+                               "header_title", "header", NULL);
+                       gtk_text_buffer_insert_with_tags_by_name(buffer,
+                               &iter, ":", 1, "header_title", "header", NULL);
+                       g_free(hdr);
+               } else {
+                       gtk_text_buffer_insert_with_tags_by_name(buffer,
+                               &iter, header->name,
+                               -1, "header_title", "header", NULL);
+               }
                if (header->name[strlen(header->name) - 1] != ' ')
                gtk_text_buffer_insert_with_tags_by_name
                                (buffer, &iter, " ", 1,
@@ -1539,91 +1581,51 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                    procheader_headername_equal(header->name, "Cc"))
                        unfold_line(header->body);
 
-               if (prefs_common.enable_color &&
-                   (procheader_headername_equal(header->name, "X-Mailer") ||
+               if ((procheader_headername_equal(header->name, "X-Mailer") ||
                     procheader_headername_equal(header->name,
                                                 "X-Newsreader")) &&
-                   strstr(header->body, "Sylpheed") != NULL) {
+                   strstr(header->body, "Sylpheed-Claws") != NULL) {
                        gtk_text_buffer_get_end_iter (buffer, &iter);
                        gtk_text_buffer_insert_with_tags_by_name
                                (buffer, &iter, header->body, -1,
                                 "header", "emphasis", NULL);
-               } else if (prefs_common.enable_color) {
-                       textview_make_clickable_parts(textview, "header", "link",
-                                                     header->body);
                } else {
-                       textview_make_clickable_parts(textview, "header", NULL,
-                                                     header->body);
+                       gboolean hdr = 
+                         procheader_headername_equal(header->name, "From") ||
+                         procheader_headername_equal(header->name, "To") ||
+                         procheader_headername_equal(header->name, "Cc") ||
+                         procheader_headername_equal(header->name, "Bcc") ||
+                         procheader_headername_equal(header->name, "Reply-To") ||
+                         procheader_headername_equal(header->name, "Sender");
+                       textview_make_clickable_parts(textview, "header", 
+                                                     "link", header->body, 
+                                                     hdr);
                }
                gtk_text_buffer_get_end_iter (buffer, &iter);
                gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, "\n", 1,
                                                         "header", NULL);
        }
+       
+       textview_show_face(textview);
+#if HAVE_LIBCOMPFACE
+       textview_show_xface(textview);
+#endif
 }
 
 gboolean textview_search_string(TextView *textview, const gchar *str,
                                gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer;
-       GtkTextIter iter, match_pos;
-       GtkTextMark *mark;
-       gint len;
-
-       g_return_val_if_fail(str != NULL, FALSE);
-
-       buffer = gtk_text_view_get_buffer(text);
-
-       len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
-
-       mark = gtk_text_buffer_get_insert(buffer);
-       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-
-       if (gtkut_text_buffer_find(buffer, &iter, str, case_sens,
-                                  &match_pos)) {
-               GtkTextIter end = match_pos;
-
-               gtk_text_iter_forward_chars(&end, len);
-               /* place "insert" at the last character */
-               gtk_text_buffer_select_range(buffer, &end, &match_pos);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
-               return TRUE;
-       }
 
-       return FALSE;
+       return gtkut_text_view_search_string(text, str, case_sens);
 }
 
 gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                                         gboolean case_sens)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkTextBuffer *buffer;
-       GtkTextIter iter, match_pos;
-       GtkTextMark *mark;
-       gint len;
-
-       g_return_val_if_fail(str != NULL, FALSE);
 
-       buffer = gtk_text_view_get_buffer(text);
-
-       len = g_utf8_strlen(str, -1);
-       g_return_val_if_fail(len >= 0, FALSE);
-
-       mark = gtk_text_buffer_get_insert(buffer);
-       gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
-
-       if (gtkut_text_buffer_find_backward(buffer, &iter, str, case_sens,
-                                           &match_pos)) {
-               GtkTextIter end = match_pos;
-
-               gtk_text_iter_forward_chars(&end, len);
-               gtk_text_buffer_select_range(buffer, &match_pos, &end);
-               gtk_text_view_scroll_to_mark(text, mark, 0.0, FALSE, 0.0, 0.0);
-               return TRUE;
-       }
-
-       return FALSE;
+       return gtkut_text_view_search_string_backward(text, str, case_sens);
 }
 
 void textview_scroll_one_line(TextView *textview, gboolean up)
@@ -1718,6 +1720,8 @@ static void textview_smooth_scroll_do(TextView *textview,
 
        vadj->value = last_value;
        g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
+
+       gtk_widget_queue_draw(GTK_WIDGET(text));
 }
 
 static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
@@ -1845,6 +1849,7 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_y:
        case GDK_t:
        case GDK_l:
+       case GDK_c:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,
@@ -1907,6 +1912,22 @@ static gboolean textview_visibility_notify(GtkWidget *widget,
        return FALSE;
 }
 
+void textview_cursor_wait(TextView *textview)
+{
+       GdkWindow *window = gtk_text_view_get_window(
+                       GTK_TEXT_VIEW(textview->text),
+                       GTK_TEXT_WINDOW_TEXT);
+       textview_set_cursor(window, watch_cursor);
+}
+
+void textview_cursor_normal(TextView *textview)
+{
+       GdkWindow *window = gtk_text_view_get_window(
+                       GTK_TEXT_VIEW(textview->text),
+                       GTK_TEXT_WINDOW_TEXT);
+       textview_set_cursor(window, text_cursor);
+}
+
 static void textview_uri_update(TextView *textview, gint x, gint y)
 {
        GtkTextBuffer *buffer;
@@ -1965,7 +1986,11 @@ static void textview_uri_update(TextView *textview, gint x, gint y)
                
                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 (textview->messageview->mainwin->cursor_count == 0) {
+                       textview_set_cursor(window, uri ? hand_cursor : text_cursor);
+               } else {
+                       textview_set_cursor(window, watch_cursor);
+               }
 
                TEXTVIEW_STATUSBAR_POP(textview);
 
@@ -1990,24 +2015,7 @@ static gboolean textview_get_uri_range(TextView *textview,
                                       GtkTextIter *start_iter,
                                       GtkTextIter *end_iter)
 {
-       GtkTextIter _start_iter, _end_iter;
-
-       _end_iter = *iter;
-       if (!gtk_text_iter_forward_to_tag_toggle(&_end_iter, tag)) {
-               debug_print("Can't find end");
-               return FALSE;
-       }
-
-       _start_iter = _end_iter;
-       if (!gtk_text_iter_backward_to_tag_toggle(&_start_iter, tag)) {
-               debug_print("Can't find start.");
-               return FALSE;
-       }
-
-       *start_iter = _start_iter;
-       *end_iter = _end_iter;
-
-       return TRUE;
+       return get_tag_range(iter, tag, start_iter, end_iter);
 }
 
 static RemoteURI *textview_get_uri_from_range(TextView *textview,
@@ -2069,8 +2077,6 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
 {
        GdkEventButton *bevent;
        RemoteURI *uri = NULL;
-       GSList *cur;
-       gchar *trimmed_uri;
 
        if (!event)
                return FALSE;
@@ -2088,7 +2094,21 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
        /* 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 (uri->filename && !g_ascii_strncasecmp(uri->filename, "sc://", 5)) {
+                       MimeView *mimeview = 
+                               (textview->messageview)?
+                                       textview->messageview->mimeview:NULL;
+                       if (mimeview && bevent->button == 1) {
+                               mimeview_handle_cmd(mimeview, uri->filename, NULL, uri->data);
+                       } else if (mimeview && bevent->button == 2 && 
+                               !g_ascii_strcasecmp(uri->filename, "sc://select_attachment")) {
+                               mimeview_handle_cmd(mimeview, "sc://open_attachment", NULL, uri->data);
+                       } else if (mimeview && bevent->button == 3 && 
+                               !g_ascii_strcasecmp(uri->filename, "sc://select_attachment")) {
+                               mimeview_handle_cmd(mimeview, "sc://menu_attachment", bevent, uri->data);
+                       } 
+                       return TRUE;
+               } else if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) {
                        if (bevent->button == 3) {
                                g_object_set_data(
                                        G_OBJECT(textview->mail_popup_menu),
@@ -2177,7 +2197,7 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
 
                uri_path = get_uri_path(uri->uri);
                visible_uri_path = get_uri_path(visible_str);
-               if (strcmp(uri_path, visible_uri_path) != 0)
+               if (path_cmp(uri_path, visible_uri_path) != 0)
                        retval = FALSE;
        }
 
@@ -2185,15 +2205,20 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
                gchar *msg;
                AlertValue aval;
 
-               msg = g_strdup_printf(_("The real URL (%s) is different from\n"
-                                       "the apparent URL (%s).\n"
-                                       "Open it anyway?"),
-                                     uri->uri, visible_str);
-               aval = alertpanel_with_type(_("Warning"), msg,
-                                           GTK_STOCK_YES, GTK_STOCK_NO,
-                                           NULL, NULL, ALERT_WARNING);
+               msg = g_markup_printf_escaped(_("The real URL is different from "
+                                               "the displayed URL.\n"
+                                               "\n"
+                                               "<b>Displayed URL:</b> %s\n"
+                                               "\n"
+                                               "<b>Real URL:</b> %s\n"
+                                               "\n"
+                                               "Open it anyway?"),
+                                              visible_str,uri->uri);
+               aval = alertpanel_full(_("Phishing attempt warning"), msg,
+                                      GTK_STOCK_CANCEL, _("_Open URL"), NULL, FALSE,
+                                      NULL, ALERT_WARNING, G_ALERTDEFAULT);
                g_free(msg);
-               if (aval == G_ALERTDEFAULT)
+               if (aval == G_ALERTALTERNATE)
                        retval = TRUE;
        }
 
@@ -2231,6 +2256,62 @@ static void open_uri_cb (TextView *textview, guint action, void *data)
                          NULL);
 }
 
+static void open_image_cb (TextView *textview, guint action, void *data)
+{
+       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
+                                          "menu_button");
+
+       static gchar *default_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
+       gchar buf[1024];
+       const gchar *cmd;
+       const gchar *def_cmd;
+       const gchar *p;
+       gchar *filename = NULL;
+       gchar *tmp_filename = NULL;
+
+       if (uri == NULL)
+               return;
+
+       if (uri->filename == NULL)
+               return;
+       
+       filename = g_strdup(uri->filename);
+       
+       if (!g_utf8_validate(filename, -1, NULL)) {
+               gchar *tmp = conv_filename_to_utf8(filename);
+               g_free(filename);
+               filename = tmp;
+       }
+
+       subst_for_filename(filename);
+
+       tmp_filename = g_filename_from_uri(uri->uri, NULL, NULL);
+       copy_file(tmp_filename, filename, FALSE);
+       g_free(tmp_filename);
+
+       cmd = prefs_common.mime_image_viewer;
+       def_cmd = default_cmdline;
+       
+       if (cmd && (p = strchr(cmd, '%')) && *(p + 1) == 's' &&
+           !strchr(p + 2, '%'))
+               g_snprintf(buf, sizeof(buf), cmd, filename);
+       else {
+               if (cmd)
+                       g_warning("Image viewer command line is invalid: '%s'", cmd);
+               if (def_cmd)
+                       g_snprintf(buf, sizeof(buf), def_cmd, filename);
+               else
+                       return;
+       }
+
+       execute_command_line(buf, TRUE);
+
+       g_free(filename);
+
+       g_object_set_data(G_OBJECT(textview->file_popup_menu), "menu_button",
+                         NULL);
+}
+
 static void save_file_cb (TextView *textview, guint action, void *data)
 {
        RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
@@ -2275,10 +2356,10 @@ static void save_file_cb (TextView *textview, guint action, void *data)
                
                res = g_strdup_printf(_("Overwrite existing file '%s'?"),
                                      filename);
-               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_OK
-                                 GTK_STOCK_CANCEL, NULL);
+               aval = alertpanel(_("Overwrite"), res, GTK_STOCK_CANCEL
+                                 GTK_STOCK_OK, NULL);
                g_free(res);                                      
-               if (G_ALERTDEFAULT != aval) 
+               if (G_ALERTALTERNATE != aval)
                        return;
        }
 
@@ -2288,8 +2369,7 @@ static void save_file_cb (TextView *textview, guint action, void *data)
        
        filedir = g_path_get_dirname(filename);
        if (filedir && strcmp(filedir, ".")) {
-               if (prefs_common.attach_save_dir)
-                       g_free(prefs_common.attach_save_dir);
+               g_free(prefs_common.attach_save_dir);
                prefs_common.attach_save_dir = g_strdup(filedir);
        }
 
@@ -2307,7 +2387,8 @@ static void copy_uri_cb   (TextView *textview, guint action, void *data)
        if (uri == NULL)
                return;
 
-       gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), uri->uri, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), uri->uri, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), uri->uri, -1);
        g_object_set_data(G_OBJECT(textview->link_popup_menu), "menu_button",
                          NULL);
 }
@@ -2359,7 +2440,8 @@ static void copy_mail_to_uri_cb   (TextView *textview, guint action, void *data)
        if (uri == NULL)
                return;
 
-       gtk_clipboard_set_text(gtk_clipboard_get(GDK_NONE), uri->uri + 7, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_PRIMARY), uri->uri +7, -1);
+       gtk_clipboard_set_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), uri->uri +7, -1);
        g_object_set_data(G_OBJECT(textview->mail_popup_menu), "menu_button",
                          NULL);
 }