2007-08-06 [wwp] 2.10.0cvs96
[claws.git] / src / textview.c
index 046c13cb80e925d78c292848fdf80c58053d0c3f..de774ac42cb8c62bda0c7a3f82ebf89b4aee34f8 100644 (file)
@@ -1,10 +1,10 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * 
  */
 
 #ifdef HAVE_CONFIG_H
 #include <ctype.h>
 #include <string.h>
 #include <stdlib.h>
+#include <errno.h>
+#if HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif
 #include "image_viewer.h"
 #include "filesel.h"
 #include "base64.h"
-
-struct _RemoteURI
-{
-       gchar *uri;
-
-       gchar *filename;
-
-       guint start;
-       guint end;
-};
+#include "inputdialog.h"
+#include "timing.h"
+#include "tags.h"
 
 static GdkColor quote_colors[3] = {
        {(gulong)0, (gushort)0, (gushort)0, (gushort)0},
@@ -79,6 +76,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,
@@ -97,21 +99,12 @@ static GdkColor emphasis_color = {
        (gulong)0,
        (gushort)0,
        (gushort)0,
-       (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)                             \
 {      if (textview->messageview->statusbar)                               \
@@ -140,7 +133,8 @@ static void textview_show_html              (TextView       *textview,
 
 static void textview_write_line                (TextView       *textview,
                                         const gchar    *str,
-                                        CodeConverter  *conv);
+                                        CodeConverter  *conv,
+                                        gboolean        do_quote_folding);
 static void textview_write_link                (TextView       *textview,
                                         const gchar    *str,
                                         const gchar    *uri,
@@ -171,12 +165,12 @@ static gboolean textview_get_uri_range            (TextView       *textview,
                                                 GtkTextTag     *tag,
                                                 GtkTextIter    *start_iter,
                                                 GtkTextIter    *end_iter);
-static RemoteURI *textview_get_uri_from_range  (TextView       *textview,
+static ClickableText *textview_get_uri_from_range      (TextView       *textview,
                                                 GtkTextIter    *iter,
                                                 GtkTextTag     *tag,
                                                 GtkTextIter    *start_iter,
                                                 GtkTextIter    *end_iter);
-static RemoteURI *textview_get_uri             (TextView       *textview,
+static ClickableText *textview_get_uri         (TextView       *textview,
                                                 GtkTextIter    *iter,
                                                 GtkTextTag     *tag);
 static gboolean textview_uri_button_pressed    (GtkTextTag     *tag,
@@ -185,19 +179,13 @@ static gboolean textview_uri_button_pressed       (GtkTextTag     *tag,
                                                 GtkTextIter    *iter,
                                                 TextView       *textview);
 
-static void textview_smooth_scroll_do          (TextView       *textview,
-                                                gfloat          old_value,
-                                                gfloat          last_value,
-                                                gint            step);
-static void textview_smooth_scroll_one_line    (TextView       *textview,
-                                                gboolean        up);
-static gboolean textview_smooth_scroll_page    (TextView       *textview,
-                                                gboolean        up);
-
-static gboolean textview_uri_security_check    (TextView       *textview,
-                                                RemoteURI      *uri);
 static void textview_uri_list_remove_all       (GSList         *uri_list);
 
+static void textview_toggle_quote              (TextView       *textview, 
+                                                GSList         *start_list,
+                                                ClickableText  *uri,
+                                                gboolean        expand_only);
+
 static void open_uri_cb                                (TextView       *textview,
                                                 guint           action,
                                                 void           *data);
@@ -370,9 +358,20 @@ TextView *textview_create(void)
 static void textview_create_tags(GtkTextView *text, TextView *textview)
 {
        GtkTextBuffer *buffer;
-       GtkTextTag *tag;
+       GtkTextTag *tag, *qtag;
+       static GdkColor yellow, black;
+       static gboolean color_init = FALSE;
        static PangoFontDescription *font_desc, *bold_font_desc;
        
+       if (!color_init) {
+               gdk_color_parse("#f5f6be", &yellow);
+               gdk_color_parse("#000000", &black);
+               color_init = gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &yellow, FALSE, TRUE);
+               color_init &= gdk_colormap_alloc_color(
+                       gdk_colormap_get_system(), &black, FALSE, TRUE);
+       }
+
        if (!font_desc)
                font_desc = pango_font_description_from_string
                        (NORMAL_FONT);
@@ -392,34 +391,74 @@ 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],
+       tag = gtk_text_buffer_create_tag(buffer, "hlink",
+                                  "pixels-above-lines", 0,
+                                  "pixels-above-lines-set", TRUE,
+                                  "pixels-below-lines", 0,
+                                  "pixels-below-lines-set", TRUE,
+                                  "font-desc", font_desc,
+                                  "left-margin", 3,
+                                  "left-margin-set", TRUE,
+                                  "foreground-gdk", &uri_color,
                                   NULL);
+       g_signal_connect(G_OBJECT(tag), "event",
+                         G_CALLBACK(textview_uri_button_pressed), textview);
+       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);
+       }
+#if GTK_CHECK_VERSION(2, 8, 0)
+       gtk_text_buffer_create_tag(buffer, "tags",
+                       "foreground-gdk", &black,
+                       "paragraph-background-gdk", &yellow,
+                       NULL);
+#else
+       gtk_text_buffer_create_tag(buffer, "tags",
+                       "foreground-gdk", &emphasis_color,
+                       NULL);
+#endif
        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);
+       qtag = gtk_text_buffer_create_tag(buffer, "qlink",
+                       NULL);
        gtk_text_buffer_create_tag(buffer, "link-hover",
-                                  "foreground-gdk", &uri_color,
-                                  "underline", PANGO_UNDERLINE_SINGLE,
-                                  NULL);
+                       "underline", PANGO_UNDERLINE_SINGLE,
+                       NULL);
+       g_signal_connect(G_OBJECT(qtag), "event",
+                         G_CALLBACK(textview_uri_button_pressed), textview);
        g_signal_connect(G_OBJECT(tag), "event",
                          G_CALLBACK(textview_uri_button_pressed), textview);
  }
@@ -430,6 +469,8 @@ 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_reflect_prefs(textview);
        textview_set_all_headers(textview, FALSE);
@@ -437,21 +478,32 @@ void textview_init(TextView *textview)
        textview_create_tags(GTK_TEXT_VIEW(textview->text), textview);
 }
 
-#define CHANGE_TAG_COLOR(tagname, color) { \
+#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", color, NULL); \
-}
+               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 */
                gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,
@@ -464,19 +516,29 @@ static void textview_update_message_colors(TextView *textview)
                                               &uri_color);
                gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
                                               &signature_color);
-               emphasis_color = colored_emphasis;
+               gtkut_convert_int_to_gdk_color(prefs_common.emphasis_col,
+                                              &emphasis_color);
+       }
+       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("quote0", &quote_colors[0]);
-       CHANGE_TAG_COLOR("quote1", &quote_colors[1]);
-       CHANGE_TAG_COLOR("quote2", &quote_colors[2]);
-       CHANGE_TAG_COLOR("emphasis", &emphasis_color);
-       CHANGE_TAG_COLOR("signature", &signature_color);
-       CHANGE_TAG_COLOR("link", &uri_color);
-       CHANGE_TAG_COLOR("link-hover", &uri_color);
 
+       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
 
@@ -491,24 +553,40 @@ void textview_reflect_prefs(TextView *textview)
 void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
+       textview->loading = TRUE;
+       textview->stop_loading = FALSE;
+
        textview_clear(textview);
 
        textview_add_parts(textview, mimeinfo);
 
        textview_set_position(textview, 0);
+
+       textview->loading = FALSE;
+       textview->stop_loading = FALSE;
 }
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
+       START_TIMING("");
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
 
        if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
            ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
+               textview->loading = TRUE;
+               textview->stop_loading = FALSE;
+               
                textview_clear(textview);
                textview_add_parts(textview, mimeinfo);
+
+               textview->loading = FALSE;
+               textview->stop_loading = FALSE;
+               END_TIMING();
                return;
        }
+       textview->loading = TRUE;
+       textview->stop_loading = FALSE;
 
        if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
                perror("fseek");
@@ -519,6 +597,10 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                textview_add_parts(textview, mimeinfo);
        else
                textview_write_body(textview, mimeinfo);
+
+       textview->loading = FALSE;
+       textview->stop_loading = FALSE;
+       END_TIMING();
 }
 
 static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
@@ -531,14 +613,23 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        const gchar *name;
        gchar *content_type;
        gint charcount;
+       START_TIMING("");
 
        g_return_if_fail(mimeinfo != NULL);
        text = GTK_TEXT_VIEW(textview->text);
        buffer = gtk_text_view_get_buffer(text);
        charcount = gtk_text_buffer_get_char_count(buffer);
        gtk_text_buffer_get_end_iter(buffer, &iter);
+       
+       if (textview->stop_loading) {
+               return;
+       }
+       if (mimeinfo->type == MIMETYPE_MULTIPART) {
+               END_TIMING();
+               return;
+       }
 
-       if (mimeinfo->type == MIMETYPE_MULTIPART) return;
+       textview->prev_quote_level = -1;
 
        if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                FILE *fp;
@@ -553,6 +644,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        procheader_header_array_destroy(headers);
                }
                fclose(fp);
+               END_TIMING();
                return;
        }
 
@@ -562,10 +654,10 @@ 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), _("[%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), _("[%s (%d bytes)]"),
                           content_type, mimeinfo->length);
 
        g_free(content_type);                      
@@ -573,23 +665,41 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        if (mimeinfo->disposition == DISPOSITIONTYPE_ATTACHMENT
        || (mimeinfo->disposition == DISPOSITIONTYPE_INLINE && 
            mimeinfo->type != MIMETYPE_TEXT)) {
-               gtk_text_buffer_insert(buffer, &iter, buf, -1);
+               gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+               TEXTVIEW_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;
                        GError *error = NULL;
                        gchar *filename;
-                       RemoteURI *uri;
+                       ClickableText *uri;
                        gchar *uri_str;
+                       gint err;
+                       START_TIMING("inserting image");
 
                        filename = procmime_get_tmp_file_name(mimeinfo);
-                       if (procmime_get_part(filename, mimeinfo) < 0) {
-                               g_warning("Can't get the image file.");
+
+                       if ((err = procmime_get_part(filename, mimeinfo)) < 0) {
+                               g_warning("Can't get the image file.(%s)", strerror(-err));
                                g_free(filename);
+                               END_TIMING();
                                return;
                        }
 
-                       pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       if (!prefs_common.resize_img) {
+                               pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       } else {
+                               gint w, h;
+                               gdk_pixbuf_get_file_info(filename, &w, &h);
+                               if (textview->scrolledwin->allocation.width - 100 > 0 &&
+                                   w > textview->scrolledwin->allocation.width - 100)
+                                       pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 
+                                               textview->scrolledwin->allocation.width - 100, 
+                                               -1, TRUE, &error);
+                               else
+                                       pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       }
                        if (error != NULL) {
                                g_warning("%s\n", error->message);
                                g_error_free(error);
@@ -597,27 +707,13 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        if (!pixbuf) {
                                g_warning("Can't load the image.");
                                g_free(filename);
+                               END_TIMING();
                                return;
                        }
 
-                       if (prefs_common.resize_img) {
-                               int new_width, new_height;
-                               GdkPixbuf *scaled;
-                               image_viewer_get_resized_size(gdk_pixbuf_get_width(pixbuf),
-                                                gdk_pixbuf_get_height(pixbuf),
-                                                textview->scrolledwin->allocation.width - 100, 
-                                                gdk_pixbuf_get_height(pixbuf),
-                                                &new_width, &new_height);
-                               scaled = gdk_pixbuf_scale_simple
-                                       (pixbuf, new_width, new_height, GDK_INTERP_BILINEAR);
-
-                               g_object_unref(pixbuf);
-                               pixbuf = scaled;
-                       }
-
                        uri_str = g_filename_to_uri(filename, NULL, NULL);
                        if (uri_str) {
-                               uri = g_new(RemoteURI, 1);
+                               uri = g_new0(ClickableText, 1);
                                uri->uri = uri_str;
                                uri->start = gtk_text_iter_get_offset(&iter);
                                
@@ -626,7 +722,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                                uri->end = uri->start + 1;
                                uri->filename = procmime_get_part_file_name(mimeinfo);
                                textview->uri_list =
-                                       g_slist_append(textview->uri_list, uri);
+                                       g_slist_prepend(textview->uri_list, uri);
                                
                                gtk_text_buffer_insert(buffer, &iter, " ", 1);
                                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);    
@@ -639,6 +735,8 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
                        g_object_unref(pixbuf);
                        g_free(filename);
+                       END_TIMING();
+                       GTK_EVENTS_FLUSH();
                }
        } else if (mimeinfo->type == MIMETYPE_TEXT) {
                if (prefs_common.display_header && (charcount > 0))
@@ -646,21 +744,24 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
                textview_write_body(textview, mimeinfo);
        }
+       END_TIMING();
 }
 
 static void recursive_add_parts(TextView *textview, GNode *node)
 {
         GNode * iter;
        MimeInfo *mimeinfo;
-        
+        START_TIMING("");
+
         mimeinfo = (MimeInfo *) node->data;
         
         textview_add_part(textview, mimeinfo);
         
         if ((mimeinfo->type != MIMETYPE_MULTIPART) &&
-            (mimeinfo->type != MIMETYPE_MESSAGE))
+            (mimeinfo->type != MIMETYPE_MESSAGE)) {
+               END_TIMING();
                 return;
-        
+        }
         if (g_ascii_strcasecmp(mimeinfo->subtype, "alternative") == 0) {
                 GNode * prefered_body;
                 int prefered_score;
@@ -704,6 +805,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                         recursive_add_parts(textview, iter);
                 }
         }
+       END_TIMING();
 }
 
 static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
@@ -713,9 +815,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;
@@ -729,7 +828,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"));
+       TEXTVIEW_INSERT(_("\n"
+                     "  This message can't be displayed.\n"
+                     "  This is probably due to a network error.\n"
+                     "\n"
+                     "  Use "));
+       TEXTVIEW_INSERT_LINK(_("'View Log'"), "sc://view_log", NULL);
+       TEXTVIEW_INSERT(_(" in the Tools menu for more information."));
+       textview_show_icon(textview, GTK_STOCK_DIALOG_ERROR);
 
 }
 
@@ -738,6 +844,8 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
        GtkTextView *text;
        GtkTextBuffer *buffer;
        GtkTextIter iter;
+       const gchar *name;
+       gchar *content_type;
 
        if (!partinfo) return;
 
@@ -748,27 +856,68 @@ 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"));
+       TEXTVIEW_INSERT("\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"));
-}
+       name = procmime_mimeinfo_get_parameter(partinfo, "filename");
+       if (name == NULL)
+               name = procmime_mimeinfo_get_parameter(partinfo, "name");
+       if (name != NULL) {
+               content_type = procmime_get_content_type_str(partinfo->type,
+                                                    partinfo->subtype);
+               TEXTVIEW_INSERT("  ");
+               TEXTVIEW_INSERT_BOLD(name);
+               TEXTVIEW_INSERT(" (");
+               TEXTVIEW_INSERT(content_type);
+               TEXTVIEW_INSERT(", ");
+               TEXTVIEW_INSERT(to_human_readable(partinfo->length));
+               TEXTVIEW_INSERT("):\n\n");
+               
+               g_free(content_type);
+       }
+       TEXTVIEW_INSERT(_("  The following can be performed on this part\n"));
+#ifndef MAEMO
+       TEXTVIEW_INSERT(_("  by right-clicking the icon or list item:"));
+#endif
+       TEXTVIEW_INSERT("\n");
+
+       TEXTVIEW_INSERT(_("     - To save, select "));
+       TEXTVIEW_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
+#ifndef MAEMO
+       TEXTVIEW_INSERT(_(" (Shortcut key: 'y')"));
+#endif
+       TEXTVIEW_INSERT("\n");
+
+       TEXTVIEW_INSERT(_("     - To display as text, select "));
+       TEXTVIEW_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
+
+#ifndef MAEMO
+       TEXTVIEW_INSERT(_(" (Shortcut key: 't')"));
+#endif
+       TEXTVIEW_INSERT("\n");
+
+       TEXTVIEW_INSERT(_("     - To open with an external program, select "));
+       TEXTVIEW_INSERT_LINK(_("'Open'"), "sc://open", NULL);
+
+#ifndef MAEMO
+       TEXTVIEW_INSERT(_(" (Shortcut key: 'l')\n"));
+       TEXTVIEW_INSERT(_("       (alternately double-click, or click the middle "));
+       TEXTVIEW_INSERT(_("mouse button)\n"));
+       TEXTVIEW_INSERT(_("     - Or use "));
+       TEXTVIEW_INSERT_LINK(_("'Open with...'"), "sc://open_with", NULL);
+       TEXTVIEW_INSERT(_(" (Shortcut key: 'o')"));
+#endif
+       TEXTVIEW_INSERT("\n");
 
-#undef TEXT_INSERT
+       textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
+}
 
 static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 {
        FILE *tmpfp;
        gchar buf[BUFFSIZE];
        CodeConverter *conv;
-       const gchar *charset;
+       const gchar *charset, *p, *cmd;
+       GSList *cur;
        
        if (textview->messageview->forced_charset)
                charset = textview->messageview->forced_charset;
@@ -808,18 +957,101 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                        g_unlink(filename);
                }
                g_free(filename);
+#ifndef G_OS_WIN32
+       } 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, TRUE);
+                       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, TRUE);
+                       close(pfd[0]);
+                       close(pfd[1]);
+                       goto textview_default;
+               }
+               if (pid == 0) { /* child */
+                       int rc;
+                       gchar **argv;
+                       argv = strsplit_with_quote(buf, " ", 0);
+                       close(1);
+                       close(pfd[0]);
+                       dup(pfd[1]);
+                       rc = execvp(argv[0], argv);
+                       close(pfd[1]);
+                       printf (_("The command to view attachment "
+                               "as text failed:\n"
+                               "    %s\n"
+                               "Exit code %d\n"), buf, rc);
+                       exit(255);
+               }
+               close(pfd[1]);
+               tmpfp = fdopen(pfd[0], "rb");
+               while (fgets(buf, sizeof(buf), tmpfp)) {
+                       textview_write_line(textview, buf, conv, TRUE);
+                       
+                       if (textview->stop_loading) {
+                               fclose(tmpfp);
+                               waitpid(pid, pfd, 0);
+                               unlink(fname);
+                               return;
+                       }
+               }
+
+               fclose(tmpfp);
+               waitpid(pid, pfd, 0);
+               unlink(fname);
+#endif
        } else {
+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) && 
-                      (ftell(tmpfp) <= mimeinfo->offset + mimeinfo->length))
-                       textview_write_line(textview, buf, conv);
+               while ((ftell(tmpfp) < mimeinfo->offset + mimeinfo->length) &&
+                      (fgets(buf, sizeof(buf), tmpfp) != NULL)) {
+                       textview_write_line(textview, buf, conv, TRUE);
+                       if (textview->stop_loading) {
+                               fclose(tmpfp);
+                               return;
+                       }
+               }
                fclose(tmpfp);
        }
 
        conv_code_converter_destroy(conv);
        procmime_force_encoding(0);
+
+       textview->uri_list = g_slist_reverse(textview->uri_list);
+       for (cur = textview->uri_list; cur; cur = cur->next) {
+               ClickableText *uri = (ClickableText *)cur->data;
+               if (!uri->is_quote)
+                       continue;
+               if (!prefs_common.hide_quotes ||
+                   uri->quote_level+1 < prefs_common.hide_quotes) {
+                       textview_toggle_quote(textview, cur, uri, TRUE);
+                       if (textview->stop_loading) {
+                               return;
+                       }
+               }
+       }
+       
+       GTK_EVENTS_FLUSH();
 }
 
 static void textview_show_html(TextView *textview, FILE *fp,
@@ -827,6 +1059,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
 {
        SC_HTMLParser *parser;
        gchar *str;
+       gint lines = 0;
 
        parser = sc_html_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
@@ -835,10 +1068,12 @@ static void textview_show_html(TextView *textview, FILE *fp,
                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,
+                               /* ALF - the claws 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 */
@@ -848,9 +1083,15 @@ static void textview_show_html(TextView *textview, FILE *fp,
                        if (str != NULL)
                                textview_write_link(textview, str, parser->href, NULL);
                } else
-                       textview_write_line(textview, str, NULL);
+                       textview_write_line(textview, str, NULL, FALSE);
+               lines++;
+               if (lines % 500 == 0)
+                       GTK_EVENTS_FLUSH();
+               if (textview->stop_loading) {
+                       return;
+               }
        }
-       textview_write_line(textview, "\n", NULL);
+       textview_write_line(textview, "\n", NULL, FALSE);
        sc_html_parser_destroy(parser);
 }
 
@@ -859,12 +1100,19 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
 {
        ERTFParser *parser;
        gchar *str;
+       gint lines = 0;
 
        parser = ertf_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
 
        while ((str = ertf_parse(parser)) != NULL) {
-               textview_write_line(textview, str, NULL);
+               textview_write_line(textview, str, NULL, FALSE);
+               lines++;
+               if (lines % 500 == 0)
+                       GTK_EVENTS_FLUSH();
+               if (textview->stop_loading) {
+                       return;
+               }
        }
        
        ertf_parser_destroy(parser);
@@ -883,6 +1131,15 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
                return; \
        }
 
+#define ADD_TXT_POS_LATER(bp_, ep_, pti_) \
+       if ((last->next = alloca(sizeof(struct txtpos))) != NULL) { \
+               last = last->next; \
+               last->bp = (bp_); last->ep = (ep_); last->pti = (pti_); \
+               last->next = NULL; \
+       } else { \
+               g_warning("alloc error scanning URIs\n"); \
+       }
+
 /* textview_make_clickable_parts() - colorizes clickable parts */
 static void textview_make_clickable_parts(TextView *textview,
                                          const gchar *fg_tag,
@@ -917,6 +1174,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}
@@ -933,6 +1191,7 @@ static void textview_make_clickable_parts(TextView *textview,
        } head = {NULL, NULL, 0,  NULL}, *last = &head;
 
        if (!g_utf8_validate(linebuf, -1, NULL)) {
+               g_free(mybuf);
                mybuf = g_malloc(strlen(linebuf)*2 +1);
                conv_localetodisp(mybuf, strlen(linebuf)*2 +1, linebuf);
        }
@@ -977,8 +1236,8 @@ static void textview_make_clickable_parts(TextView *textview,
                /* insert URIs */
                for (last = head.next; last != NULL;
                     normal_text = last->ep, last = last->next) {
-                       RemoteURI *uri;
-                       uri = g_new(RemoteURI, 1);
+                       ClickableText *uri;
+                       uri = g_new0(ClickableText, 1);
                        if (last->bp - normal_text > 0)
                                gtk_text_buffer_insert_with_tags_by_name
                                        (buffer, &iter,
@@ -994,7 +1253,7 @@ static void textview_make_clickable_parts(TextView *textview,
                        uri->end = gtk_text_iter_get_offset(&iter);
                        uri->filename = NULL;
                        textview->uri_list =
-                               g_slist_append(textview->uri_list, uri);
+                               g_slist_prepend(textview->uri_list, uri);
                }
 
                if (*normal_text)
@@ -1007,17 +1266,140 @@ static void textview_make_clickable_parts(TextView *textview,
        g_free(mybuf);
 }
 
+/* textview_make_clickable_parts() - colorizes clickable parts */
+static void textview_make_clickable_parts_later(TextView *textview,
+                                         gint start, gint end)
+{
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter start_iter, end_iter;
+       gchar *mybuf;
+       gint offset = 0;
+       /* parse table - in order of priority */
+       struct table {
+               const gchar *needle; /* token */
+
+               /* token search function */
+               gchar    *(*search)     (const gchar *haystack,
+                                        const gchar *needle);
+               /* part parsing function */
+               gboolean  (*parse)      (const gchar *start,
+                                        const gchar *scanpos,
+                                        const gchar **bp_,
+                                        const gchar **ep_,
+                                        gboolean hdr);
+               /* part to URI function */
+               gchar    *(*build_uri)  (const gchar *bp,
+                                        const gchar *ep);
+       };
+
+       static struct table parser[] = {
+               {"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}
+       };
+       const gint PARSE_ELEMS = sizeof parser / sizeof parser[0];
+
+       gint  n;
+       const gchar *walk, *bp, *ep;
+
+       struct txtpos {
+               const gchar     *bp, *ep;       /* text position */
+               gint             pti;           /* index in parse table */
+               struct txtpos   *next;          /* next */
+       } head = {NULL, NULL, 0,  NULL}, *last = &head;
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start);
+       gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end);
+       mybuf = gtk_text_buffer_get_text(buffer, &start_iter, &end_iter, FALSE);
+       offset = gtk_text_iter_get_offset(&start_iter);
+
+       /* parse for clickable parts, and build a list of begin and end positions  */
+       for (walk = mybuf, n = 0;;) {
+               gint last_index = PARSE_ELEMS;
+               gchar *scanpos = NULL;
+
+               /* FIXME: this looks phony. scanning for anything in the parse table */
+               for (n = 0; n < PARSE_ELEMS; n++) {
+                       gchar *tmp;
+
+                       tmp = parser[n].search(walk, parser[n].needle);
+                       if (tmp) {
+                               if (scanpos == NULL || tmp < scanpos) {
+                                       scanpos = tmp;
+                                       last_index = n;
+                               }
+                       }                                       
+               }
+
+               if (scanpos) {
+                       /* check if URI can be parsed */
+                       if (parser[last_index].parse(walk, scanpos, &bp, &ep, FALSE)
+                           && (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
+                                       ADD_TXT_POS_LATER(bp, ep, last_index);
+                                       walk = ep;
+                       } else
+                               walk = scanpos +
+                                       strlen(parser[last_index].needle);
+               } else
+                       break;
+       }
+
+       /* colorize this line */
+       if (head.next) {
+               /* insert URIs */
+               for (last = head.next; last != NULL; last = last->next) {
+                       ClickableText *uri;
+                       gint start_offset, end_offset;
+                       gchar *tmp_str;
+                       gchar old_char;
+                       uri = g_new0(ClickableText, 1);
+                       uri->uri = parser[last->pti].build_uri(last->bp,
+                                                              last->ep);
+                       
+                       tmp_str = mybuf;
+                       old_char = tmp_str[last->ep - mybuf];
+                       tmp_str[last->ep - mybuf] = '\0';                                      
+                       end_offset = g_utf8_strlen(tmp_str, -1);
+                       tmp_str[last->ep - mybuf] = old_char;
+                       
+                       old_char = tmp_str[last->bp - mybuf];
+                       tmp_str[last->bp - mybuf] = '\0';                                      
+                       start_offset = g_utf8_strlen(tmp_str, -1);
+                       tmp_str[last->bp - mybuf] = old_char;
+                       
+                       gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start_offset + offset);
+                       gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end_offset + offset);
+                       
+                       uri->start = gtk_text_iter_get_offset(&start_iter);
+                       
+                       gtk_text_buffer_apply_tag_by_name(buffer, "link", &start_iter, &end_iter);
+
+                       uri->end = gtk_text_iter_get_offset(&end_iter);
+                       uri->filename = NULL;
+                       textview->uri_list =
+                               g_slist_prepend(textview->uri_list, uri);
+               }
+       } 
+
+       g_free(mybuf);
+}
+
 #undef ADD_TXT_POS
 
 static void textview_write_line(TextView *textview, const gchar *str,
-                               CodeConverter *conv)
+                               CodeConverter *conv, gboolean do_quote_folding)
 {
        GtkTextView *text;
        GtkTextBuffer *buffer;
        GtkTextIter iter;
        gchar buf[BUFFSIZE];
        gchar *fg_color;
-       gint quotelevel = -1;
+       gint quotelevel = -1, real_quotelevel = -1;
        gchar quote_tag_str[10];
 
        text = GTK_TEXT_VIEW(textview->text);
@@ -1038,8 +1420,8 @@ static void textview_write_line(TextView *textview, const gchar *str,
           level is colored using a different color. */
        if (prefs_common.enable_color 
            && line_has_quote_char(buf, prefs_common.quote_chars)) {
-               quotelevel = get_quote_level(buf, prefs_common.quote_chars);
-
+               real_quotelevel = get_quote_level(buf, prefs_common.quote_chars);
+               quotelevel = real_quotelevel;
                /* set up the correct foreground color */
                if (quotelevel > 2) {
                        /* recycle colors */
@@ -1058,12 +1440,67 @@ static void textview_write_line(TextView *textview, const gchar *str,
                fg_color = quote_tag_str;
        }
 
-       if (prefs_common.enable_color && (strcmp(buf,"-- \n") == 0 || textview->is_in_signature)) {
+       if (prefs_common.enable_color && 
+           (strcmp(buf,"-- \n") == 0 || strcmp(buf, "- -- \n") == 0 || textview->is_in_signature)) {
                fg_color = "signature";
                textview->is_in_signature = TRUE;
        }
 
-       textview_make_clickable_parts(textview, fg_color, "link", buf, FALSE);
+       if (real_quotelevel > -1 && do_quote_folding) {
+               if (!g_utf8_validate(buf, -1, NULL)) {
+                       gchar *utf8buf = NULL;
+                       utf8buf = g_malloc(BUFFSIZE);
+                       conv_localetodisp(utf8buf, BUFFSIZE, buf);
+                       strncpy2(buf, utf8buf, BUFFSIZE-1);
+                       g_free(utf8buf);
+               }
+do_quote:
+               if ( textview->prev_quote_level != real_quotelevel ) {
+                       ClickableText *uri;
+                       uri = g_new0(ClickableText, 1);
+                       uri->uri = g_strdup("");
+                       uri->data = g_strdup(buf);
+                       uri->start = gtk_text_iter_get_offset(&iter);
+                       uri->is_quote = TRUE;
+                       uri->quote_level = real_quotelevel;
+                       uri->fg_color = g_strdup(fg_color);
+
+                       gtk_text_buffer_insert_with_tags_by_name
+                                       (buffer, &iter, " [...]", -1,
+                                        "qlink", fg_color, NULL);
+                       uri->end = gtk_text_iter_get_offset(&iter);
+                       gtk_text_buffer_insert(buffer, &iter, "  \n", -1);
+                       
+                       uri->filename = NULL;
+                       textview->uri_list =
+                               g_slist_prepend(textview->uri_list, uri);
+               
+                       textview->prev_quote_level = real_quotelevel;
+               } else {
+                       GSList *last = textview->uri_list;
+                       ClickableText *lasturi = NULL;
+                       gint e_len = 0, n_len = 0;
+                       
+                       if (textview->uri_list) {
+                               lasturi = (ClickableText *)last->data;
+                       } else {
+                               printf("oops (%d %d)\n",
+                                       real_quotelevel, textview->prev_quote_level);
+                       }               
+                       if (lasturi->is_quote == FALSE) {
+                               textview->prev_quote_level = -1;
+                               goto do_quote;
+                       }
+                       e_len = lasturi->data ? strlen(lasturi->data):0;
+                       n_len = strlen(buf);
+                       lasturi->data = g_realloc((gchar *)lasturi->data, e_len + n_len + 1);
+                       strcpy((gchar *)lasturi->data + e_len, buf);
+                       *((gchar *)lasturi->data + e_len + n_len) = '\0';
+               }
+       } else {
+               textview_make_clickable_parts(textview, fg_color, "link", buf, FALSE);
+               textview->prev_quote_level = -1;
+       }
 }
 
 void textview_write_link(TextView *textview, const gchar *str,
@@ -1075,13 +1512,16 @@ void textview_write_link(TextView *textview, const gchar *str,
        GtkTextIter iter;
        gchar buf[BUFFSIZE];
        gchar *bufp;
-       RemoteURI *r_uri;
+       ClickableText *r_uri;
 
        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);
@@ -1110,20 +1550,27 @@ void textview_write_link(TextView *textview, const gchar *str,
        if (prefs_common.enable_color) {
                link_color = &uri_color;
        }
-       r_uri = g_new(RemoteURI, 1);
+       r_uri = g_new0(ClickableText, 1);
        r_uri->uri = g_strdup(uri);
        r_uri->start = gtk_text_iter_get_offset(&iter);
        gtk_text_buffer_insert_with_tags_by_name
                (buffer, &iter, bufp, -1, "link", NULL);
        r_uri->end = gtk_text_iter_get_offset(&iter);
        r_uri->filename = NULL;
-       textview->uri_list = g_slist_append(textview->uri_list, r_uri);
+       textview->uri_list = g_slist_prepend(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);
@@ -1131,17 +1578,33 @@ 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->prev_quote_level = -1;
 
        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)
 {
+       GtkTextBuffer *buffer;
+       GtkClipboard *clipboard;
+
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+       clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+       gtk_text_buffer_remove_selection_clipboard(buffer, clipboard);
+
        textview_uri_list_remove_all(textview->uri_list);
        textview->uri_list = NULL;
+       textview->prev_quote_level = -1;
 
        g_free(textview);
 }
@@ -1172,6 +1635,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                if (font_desc) {
                        gtk_widget_modify_font(textview->text, font_desc);
                        CHANGE_TAG_FONT("header", font_desc);
+                       CHANGE_TAG_FONT("hlink", font_desc);
                        pango_font_description_free(font_desc);
                }
                if (bold_font_desc) {
@@ -1236,6 +1700,26 @@ void textview_set_position(TextView *textview, gint pos)
        gtkut_text_view_set_position(text, pos);
 }
 
+static gboolean header_is_internal(Header *header)
+{
+       const gchar *internal_hdrs[] = 
+               {"AF:", "NF:", "PS:", "SRH:", "SFN:", "DSR:", "MID:", 
+                "CFG:", "PT:", "S:", "RQ:", "SSV:", "NSV:", "SSH:", 
+                "R:", "MAID:", "SCF:", "RMID:", "FMID:", "NAID:", 
+                "X-Claws-Account-Id:", "X-Claws-Sign:", "X-Claws-Encrypt:", 
+                "X-Claws-Privacy-System:", "X-Claws-End-Special-Headers:",
+                "X-Sylpheed-Account-Id:", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt:", 
+                "X-Sylpheed-Privacy-System:", "X-Sylpheed-End-Special-Headers:",
+                NULL};
+       int i;
+       
+       for (i = 0; internal_hdrs[i]; i++) {
+               if (!strcmp(header->name, internal_hdrs[i]))
+                       return TRUE;
+       }
+       return FALSE;
+}
+
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 {
        gchar buf[BUFFSIZE];
@@ -1246,8 +1730,19 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
        g_return_val_if_fail(fp != NULL, NULL);
 
-       if (textview->show_all_headers)
-               return procheader_get_header_array_asis(fp);
+       if (textview->show_all_headers) {
+               headers = procheader_get_header_array_asis(fp);
+               sorted_headers = g_ptr_array_new();
+               for (i = 0; i < headers->len; i++) {
+                       header = g_ptr_array_index(headers, i);
+                       if (!header_is_internal(header))
+                               g_ptr_array_add(sorted_headers, header);
+                       else
+                               procheader_header_free(header);
+               }
+               g_ptr_array_free(headers, TRUE);
+               return sorted_headers;
+       }
 
        if (!prefs_common.display_header) {
                while (fgets(buf, sizeof(buf), fp) != NULL)
@@ -1283,7 +1778,11 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
        if (prefs_common.show_other_header) {
                for (i = 0; i < headers->len; i++) {
                        header = g_ptr_array_index(headers, i);
-                       g_ptr_array_add(sorted_headers, header);
+                       if (!header_is_internal(header)) {
+                               g_ptr_array_add(sorted_headers, header);
+                       } else {
+                               procheader_header_free(header);
+                       }
                }
                g_ptr_array_free(headers, TRUE);
        } else
@@ -1303,14 +1802,15 @@ static void textview_show_face(TextView *textview)
        ||  !prefs_common.display_xface)
                goto bail;
        
-       if (!msginfo->face) {
+       if (!msginfo->extradata || !msginfo->extradata->face) {
                goto bail;
        }
 
        if (textview->image) 
                gtk_widget_destroy(textview->image);
        
-       textview->image = face_get_from_header(msginfo->face);
+       textview->image = face_get_from_header(msginfo->extradata->face);
+       g_return_if_fail(textview->image != NULL);
 
        gtk_widget_show(textview->image);
        
@@ -1329,33 +1829,62 @@ bail:
        textview->image = NULL; 
 }
 
+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;
-
+       GdkWindow *window = NULL;
+       
        if (prefs_common.display_header_pane
        ||  !prefs_common.display_xface)
                goto bail;
        
-       if (!msginfo)
+       if (!msginfo || !msginfo->extradata)
                goto bail;
 
-       if (msginfo->face)
+       if (msginfo->extradata->face)
                return;
        
-       if (!msginfo->xface || strlen(msginfo->xface) < 5) {
+       if (!msginfo->extradata->xface || strlen(msginfo->extradata->xface) < 5) {
                goto bail;
        }
 
        if (textview->image) 
                gtk_widget_destroy(textview->image);
-       
-       textview->image = xface_get_from_header(msginfo->xface,
+
+       window = mainwindow_get_mainwindow() ?
+                       mainwindow_get_mainwindow()->window->window :
+                       textview->text->window;
+       textview->image = xface_get_from_header(msginfo->extradata->xface,
                                &textview->text->style->white,
-                               textview->text->window);
+                               window);
+       g_return_if_fail(textview->image != NULL);
 
        gtk_widget_show(textview->image);
        
@@ -1375,6 +1904,57 @@ bail:
 }
 #endif
 
+static void textview_show_tags(TextView *textview)
+{
+       MsgInfo *msginfo = textview->messageview->msginfo;
+       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+       GtkTextIter iter;
+       ClickableText *uri;
+       GSList *cur;
+       gboolean found_tag = FALSE;
+       
+       if (!msginfo->tags)
+               return;
+       
+       for (cur = msginfo->tags; cur; cur = cur->next) {
+               if (tags_get_tag(GPOINTER_TO_INT(cur->data)) != NULL) {
+                       found_tag = TRUE;
+                       break;
+               }
+       }
+       if (!found_tag) 
+               return;
+
+       gtk_text_buffer_get_end_iter (buffer, &iter);
+       gtk_text_buffer_insert_with_tags_by_name(buffer,
+               &iter, _("Tags: "), -1,
+               "header_title", "header", "tags", NULL);
+
+       for (cur = msginfo->tags; cur; cur = cur->next) {
+               uri = g_new0(ClickableText, 1);
+               uri->uri = g_strdup("");
+               uri->start = gtk_text_iter_get_offset(&iter);
+               gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, 
+                       tags_get_tag(GPOINTER_TO_INT(cur->data)), -1,
+                       "link", "header", "tags", NULL);
+               uri->end = gtk_text_iter_get_offset(&iter);
+               uri->filename = g_strdup_printf("sc://search_tags:%s", tags_get_tag(GPOINTER_TO_INT(cur->data)));
+               uri->data = NULL;
+               textview->uri_list =
+                       g_slist_prepend(textview->uri_list, uri);
+               if (cur->next)
+                       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, ", ", 2,
+                               "header", "tags", NULL);
+               else
+                       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, " ", 1,
+                               "header", "tags", NULL);
+       }
+
+       gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, "\n", 1,
+               "header", "tags", NULL);
+}
+
 static void textview_show_header(TextView *textview, GPtrArray *headers)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
@@ -1385,14 +1965,27 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
 
        g_return_if_fail(headers != NULL);
 
+       textview_show_tags(textview);
+
        for (i = 0; i < headers->len; i++) {
                header = g_ptr_array_index(headers, i);
                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,
@@ -1407,7 +2000,8 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                if ((procheader_headername_equal(header->name, "X-Mailer") ||
                     procheader_headername_equal(header->name,
                                                 "X-Newsreader")) &&
-                   strstr(header->body, "Sylpheed") != NULL) {
+                   (strstr(header->body, "Claws Mail") != 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,
@@ -1417,9 +2011,11 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                          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, "Bcc") ||
+                         procheader_headername_equal(header->name, "Reply-To") ||
+                         procheader_headername_equal(header->name, "Sender");
                        textview_make_clickable_parts(textview, "header", 
-                                                     "link", header->body, 
+                                                     "hlink", header->body, 
                                                      hdr);
                }
                gtk_text_buffer_get_end_iter (buffer, &iter);
@@ -1453,170 +2049,16 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
 
-       if (prefs_common.enable_smooth_scroll) {
-               textview_smooth_scroll_one_line(textview, up);
-               return;
-       }
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += vadj->step_increment;
-                       vadj->value = MIN(vadj->value, upper);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               }
-       } else {
-               if (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);
-               }
-       }
+       gtkutils_scroll_one_line(GTK_WIDGET(text), vadj, up);
 }
 
 gboolean textview_scroll_page(TextView *textview, gboolean up)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat page_incr;
-
-       if (prefs_common.enable_smooth_scroll)
-               return textview_smooth_scroll_page(textview, up);
-
-       if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += page_incr;
-                       vadj->value = MIN(vadj->value, upper);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               } else
-                       return FALSE;
-       } else {
-               if (vadj->value > 0.0) {
-                       vadj->value -= page_incr;
-                       vadj->value = MAX(vadj->value, 0.0);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               } else
-                       return FALSE;
-       }
-
-       return TRUE;
-}
-
-static void textview_smooth_scroll_do(TextView *textview,
-                                     gfloat old_value, gfloat last_value,
-                                     gint step)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gint change_value;
-       gboolean up;
-       gint i;
-
-       if (old_value < last_value) {
-               change_value = last_value - old_value;
-               up = FALSE;
-       } else {
-               change_value = old_value - last_value;
-               up = TRUE;
-       }
-
-       for (i = step; i <= change_value; i += step) {
-               vadj->value = old_value + (up ? -i : i);
-               g_signal_emit_by_name(G_OBJECT(vadj),
-                                     "value_changed", 0);
-       }
-
-       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)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat old_value;
-       gfloat last_value;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + vadj->step_increment;
-                       last_value = MIN(last_value, upper);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               }
-       } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - vadj->step_increment;
-                       last_value = MAX(last_value, 0.0);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               }
-       }
-}
-
-static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat page_incr;
-       gfloat old_value;
-       gfloat last_value;
 
-       if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + page_incr;
-                       last_value = MIN(last_value, upper);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               } else
-                       return FALSE;
-       } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - page_incr;
-                       last_value = MAX(last_value, 0.0);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               } else
-                       return FALSE;
-       }
-
-       return TRUE;
+       return gtkutils_scroll_page(GTK_WIDGET(text), vadj, up);
 }
 
 #define KEY_PRESS_EVENT_STOP() \
@@ -1650,17 +2092,18 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                else
-                       textview_scroll_page
-                               (textview,
+                       mimeview_scroll_page
+                               (messageview->mimeview,
                                 (event->state &
                                  (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_BackSpace:
-               textview_scroll_page(textview, TRUE);
+               mimeview_scroll_page(messageview->mimeview, TRUE);
                break;
        case GDK_Return:
-               textview_scroll_one_line
-                       (textview, (event->state &
+       case GDK_KP_Enter:
+               mimeview_scroll_one_line
+                       (messageview->mimeview, (event->state &
                                    (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_Delete:
@@ -1670,7 +2113,9 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        case GDK_y:
        case GDK_t:
        case GDK_l:
+       case GDK_o:
        case GDK_c:
+       case GDK_a:
                if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
                        KEY_PRESS_EVENT_STOP();
                        mimeview_pass_key_press_event(messageview->mimeview,
@@ -1698,6 +2143,8 @@ static gboolean textview_motion_notify(GtkWidget *widget,
                                       GdkEventMotion *event,
                                       TextView *textview)
 {
+       if (textview->loading)
+               return FALSE;
        textview_uri_update(textview, event->x, event->y);
        gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
 
@@ -1708,6 +2155,8 @@ static gboolean textview_leave_notify(GtkWidget *widget,
                                      GdkEventCrossing *event,
                                      TextView *textview)
 {
+       if (textview->loading)
+               return FALSE;
        textview_uri_update(textview, -1, -1);
 
        return FALSE;
@@ -1720,6 +2169,9 @@ static gboolean textview_visibility_notify(GtkWidget *widget,
        gint wx, wy;
        GdkWindow *window;
 
+       if (textview->loading)
+               return FALSE;
+
        window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
                                          GTK_TEXT_WINDOW_TEXT);
 
@@ -1733,11 +2185,27 @@ 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;
        GtkTextIter start_iter, end_iter;
-       RemoteURI *uri = NULL;
+       ClickableText *uri = NULL;
        
        buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
 
@@ -1746,7 +2214,7 @@ static void textview_uri_update(TextView *textview, gint x, gint y)
                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);
@@ -1759,15 +2227,17 @@ static void textview_uri_update(TextView *textview, gint x, gint y)
                        char *name;
 
                        g_object_get(G_OBJECT(tag), "name", &name, NULL);
-                       if (!strcmp(name, "link")
+
+                       if ((!strcmp(name, "link") || !strcmp(name, "hlink"))
                            && textview_get_uri_range(textview, &iter, tag,
-                                                     &start_iter, &end_iter))
+                                                     &start_iter, &end_iter)) {
+
                                uri = textview_get_uri_from_range(textview,
                                                                  &iter, tag,
                                                                  &start_iter,
                                                                  &end_iter);
+                       }
                        g_free(name);
-
                        if (uri)
                                break;
                }
@@ -1791,14 +2261,19 @@ 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);
 
                if (uri) {
                        char *trimmed_uri;
 
-                       gtk_text_buffer_apply_tag_by_name(buffer,
+                       if (!uri->is_quote)
+                               gtk_text_buffer_apply_tag_by_name(buffer,
                                                          "link-hover",
                                                          &start_iter,
                                                          &end_iter);
@@ -1819,14 +2294,14 @@ static gboolean textview_get_uri_range(TextView *textview,
        return get_tag_range(iter, tag, start_iter, end_iter);
 }
 
-static RemoteURI *textview_get_uri_from_range(TextView *textview,
+static ClickableText *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;
+       ClickableText *uri = NULL;
        GSList *cur;
 
        start_pos = gtk_text_iter_get_offset(start_iter);
@@ -1834,12 +2309,16 @@ static RemoteURI *textview_get_uri_from_range(TextView *textview,
        cur_pos = gtk_text_iter_get_offset(iter);
 
        for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
-               RemoteURI *uri_ = (RemoteURI *)cur->data;
+               ClickableText *uri_ = (ClickableText *)cur->data;
                if (start_pos == uri_->start &&
                    end_pos ==  uri_->end) {
                        uri = uri_;
                        break;
-               } else if (start_pos == uri_->start ||
+               } 
+       }
+       for (cur = textview->uri_list; uri == NULL && cur != NULL; cur = cur->next) {
+               ClickableText *uri_ = (ClickableText *)cur->data;
+               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
@@ -1857,12 +2336,12 @@ static RemoteURI *textview_get_uri_from_range(TextView *textview,
        return uri;
 }
 
-static RemoteURI *textview_get_uri(TextView *textview,
+static ClickableText *textview_get_uri(TextView *textview,
                                   GtkTextIter *iter,
                                   GtkTextTag *tag)
 {
        GtkTextIter start_iter, end_iter;
-       RemoteURI *uri = NULL;
+       ClickableText *uri = NULL;
 
        if (textview_get_uri_range(textview, iter, tag, &start_iter,
                                   &end_iter))
@@ -1872,12 +2351,114 @@ static RemoteURI *textview_get_uri(TextView *textview,
        return uri;
 }
 
+static void textview_shift_uris_after(TextView *textview, GSList *start_list, gint start, gint shift)
+{
+       GSList *cur;
+       if (!start_list)
+               start_list = textview->uri_list;
+
+       for (cur = start_list; cur; cur = cur->next) {
+               ClickableText *uri = (ClickableText *)cur->data;
+               if (uri->start <= start)
+                       continue;
+               uri->start += shift;
+               uri->end += shift;
+       }
+}
+
+static void textview_remove_uris_in(TextView *textview, gint start, gint end)
+{
+       GSList *cur;
+       for (cur = textview->uri_list; cur; ) {
+               ClickableText *uri = (ClickableText *)cur->data;
+               if (uri->start > start && uri->end < end) {
+                       cur = cur->next;
+                       textview->uri_list = g_slist_remove(textview->uri_list, uri);
+                       g_free(uri->uri);
+                       g_free(uri->filename);
+                       if (uri->is_quote) {
+                               g_free(uri->fg_color);
+                               g_free(uri->data); 
+                               /* (only free data in quotes uris) */
+                       }
+                       g_free(uri);
+               } else {
+                       cur = cur->next;
+               }
+               
+       }
+}
+
+static void textview_toggle_quote(TextView *textview, GSList *start_list, ClickableText *uri, gboolean expand_only)
+{
+       GtkTextIter start, end;
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+       
+       if (!uri->is_quote)
+               return;
+       
+       if (uri->q_expanded && expand_only)
+               return;
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+       gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
+       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 = NULL;
+       gtk_text_buffer_remove_tag_by_name(buffer,
+                                          "qlink",
+                                          &start,
+                                          &end);
+       /* when shifting URIs start and end, we have to do it per-UTF8-char
+        * so use g_utf8_strlen(). OTOH, when inserting in the text buffer, 
+        * we have to pass a number of bytes, so use strlen(). disturbing. */
+        
+       if (!uri->q_expanded) {
+               gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+               gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
+               textview_shift_uris_after(textview, start_list, uri->start, 
+                       g_utf8_strlen((gchar *)uri->data, -1)-strlen(" [...]\n"));
+               gtk_text_buffer_delete(buffer, &start, &end);
+               gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+               gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &start, (gchar *)uri->data, 
+                                strlen((gchar *)uri->data)-1,
+                                "qlink", (gchar *)uri->fg_color, NULL);
+               uri->end = gtk_text_iter_get_offset(&start);
+               textview_make_clickable_parts_later(textview,
+                                         uri->start, uri->end);
+               uri->q_expanded = TRUE;
+       } else {
+               gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+               gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
+               textview_remove_uris_in(textview, uri->start, uri->end);
+               textview_shift_uris_after(textview, start_list, uri->start, 
+                       strlen(" [...]\n")-g_utf8_strlen((gchar *)uri->data, -1));
+               gtk_text_buffer_delete(buffer, &start, &end);
+               gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+               gtk_text_buffer_insert_with_tags_by_name
+                               (buffer, &start, " [...]", -1,
+                                "qlink", (gchar *)uri->fg_color, NULL);
+               uri->end = gtk_text_iter_get_offset(&start);
+               uri->q_expanded = FALSE;
+       }
+       if (textview->messageview->mainwin->cursor_count == 0) {
+               textview_cursor_normal(textview);
+       } else {
+               textview_cursor_wait(textview);
+       }
+}
 static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                            GdkEvent *event, GtkTextIter *iter,
                                            TextView *textview)
 {
        GdkEventButton *bevent;
-       RemoteURI *uri = NULL;
+       ClickableText *uri = NULL;
+       char *tagname;
+       gboolean qlink = FALSE;
 
        if (!event)
                return FALSE;
@@ -1890,12 +2471,39 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
        if (!uri)
                return FALSE;
 
+       g_object_get(G_OBJECT(tag), "name", &tagname, NULL);
+       
+       if (!strcmp(tagname, "qlink"))
+               qlink = TRUE;
+
+       g_free(tagname);
+       
        bevent = (GdkEventButton *) event;
        
        /* doubleclick: open compose / add address / browser */
-       if ((event->type == GDK_BUTTON_PRESS && bevent->button == 1) ||
+       if (qlink && event->type == GDK_BUTTON_PRESS && bevent->button != 1) {
+               /* pass rightclick through */
+               return FALSE;
+       } else if ((event->type == (qlink ? GDK_2BUTTON_PRESS: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 (qlink && bevent->button == 1) {
+                       textview_toggle_quote(textview, NULL, uri, FALSE);
+                       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),
@@ -1905,16 +2513,18 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                               bevent->button, bevent->time);
                        } else {
                                PrefsAccount *account = NULL;
-
+                               FolderItem   *folder_item = 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);
+                                       if (!account)
+                                               account = account_find_from_item(folder_item);
                                }
-                               compose_new(account, uri->uri + 7, NULL);
+                               compose_new_with_folderitem(account, folder_item, uri->uri + 7);
                        }
                        return TRUE;
                } else if (g_ascii_strncasecmp(uri->uri, "file:", 5)) {
@@ -1922,7 +2532,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                            textview_uri_security_check(textview, uri) == TRUE) 
                                        open_uri(uri->uri,
                                                 prefs_common.uri_cmd);
-                       else if (bevent->button == 3) {
+                       else if (bevent->button == 3 && !qlink) {
                                g_object_set_data(
                                        G_OBJECT(textview->link_popup_menu),
                                        "menu_button", uri);
@@ -1932,7 +2542,7 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                        }
                        return TRUE;
                } else {
-                       if (bevent->button == 3) {
+                       if (bevent->button == 3 && !qlink) {
                                g_object_set_data(
                                        G_OBJECT(textview->file_popup_menu),
                                        "menu_button", uri);
@@ -1947,6 +2557,20 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
        return FALSE;
 }
 
+gchar *textview_get_visible_uri                (TextView       *textview, 
+                                        ClickableText  *uri)
+{
+       GtkTextBuffer *buffer;
+       GtkTextIter start, 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);
+
+       return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+}
+
 /*!
  *\brief    Check to see if a web URL has been disguised as a different
  *          URL (possible with HTML email).
@@ -1958,23 +2582,15 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
  *\return   gboolean TRUE if the URL is ok, or if the user chose to open
  *          it anyway, otherwise FALSE          
  */
-static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
+gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
 {
        gchar *visible_str;
        gboolean retval = TRUE;
-       GtkTextBuffer *buffer;
-       GtkTextIter start, end;
 
        if (is_uri_string(uri->uri) == FALSE)
                return TRUE;
 
-       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
-
-       gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
-       gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
-
-       visible_str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
-
+       visible_str = textview_get_visible_uri(textview, uri);
        if (visible_str == NULL)
                return TRUE;
 
@@ -1984,7 +2600,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;
        }
 
@@ -1992,12 +2608,16 @@ 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"
-                                       "\n"
-                                       "Open it anyway?"),
-                                     uri->uri, visible_str);
-               aval = alertpanel_full(_("Fake URL warning"), msg,
+               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);
@@ -2016,8 +2636,13 @@ static void textview_uri_list_remove_all(GSList *uri_list)
 
        for (cur = uri_list; cur != NULL; cur = cur->next) {
                if (cur->data) {
-                       g_free(((RemoteURI *)cur->data)->uri);
-                       g_free(((RemoteURI *)cur->data)->filename);
+                       g_free(((ClickableText *)cur->data)->uri);
+                       g_free(((ClickableText *)cur->data)->filename);
+                       if (((ClickableText *)cur->data)->is_quote) {
+                               g_free(((ClickableText *)cur->data)->fg_color);
+                               g_free(((ClickableText *)cur->data)->data); 
+                               /* (only free data in quotes uris) */
+                       }
                        g_free(cur->data);
                }
        }
@@ -2027,7 +2652,7 @@ static void textview_uri_list_remove_all(GSList *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),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2041,13 +2666,11 @@ static void open_uri_cb (TextView *textview, guint action, void *data)
 
 static void open_image_cb (TextView *textview, guint action, void *data)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
                                           "menu_button");
 
-       static gchar *default_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
+       gchar *cmd = NULL;
        gchar buf[1024];
-       const gchar *cmd;
-       const gchar *def_cmd;
        const gchar *p;
        gchar *filename = NULL;
        gchar *tmp_filename = NULL;
@@ -2072,24 +2695,32 @@ static void open_image_cb (TextView *textview, guint action, void *data)
        copy_file(tmp_filename, filename, FALSE);
        g_free(tmp_filename);
 
-       cmd = prefs_common.mime_image_viewer;
-       def_cmd = default_cmdline;
-       
+       cmd = mailcap_get_command_for_type("image/jpeg", filename);
+       if (cmd == NULL) {
+               gboolean remember = FALSE;
+               cmd = input_dialog_combo_remember
+                       (_("Open with"),
+                        _("Enter the command line to open file:\n"
+                          "('%s' will be replaced with file name)"),
+                        prefs_common.mime_open_cmd,
+                        prefs_common.mime_open_cmd_history,
+                        TRUE, &remember);
+               if (cmd && remember) {
+                       mailcap_update_default("image/jpeg", cmd);
+               }
+       }
        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;
+               g_warning("Image viewer command line is invalid: '%s'", cmd);
+               return;
        }
 
        execute_command_line(buf, TRUE);
 
        g_free(filename);
+       g_free(cmd);
 
        g_object_set_data(G_OBJECT(textview->file_popup_menu), "menu_button",
                          NULL);
@@ -2097,7 +2728,7 @@ static void open_image_cb (TextView *textview, guint action, void *data)
 
 static void save_file_cb (TextView *textview, guint action, void *data)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
                                           "menu_button");
        gchar *filename = NULL;
        gchar *filepath = NULL;
@@ -2152,9 +2783,8 @@ 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);
-               prefs_common.attach_save_dir = g_strdup(filedir);
+               g_free(prefs_common.attach_save_dir);
+               prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
        }
 
        g_free(filedir);
@@ -2166,7 +2796,7 @@ static void save_file_cb (TextView *textview, guint action, void *data)
 
 static void copy_uri_cb        (TextView *textview, guint action, void *data)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->link_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2180,7 +2810,7 @@ static void copy_uri_cb   (TextView *textview, guint action, void *data)
 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),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2190,7 +2820,7 @@ static void add_uri_to_addrbook_cb (TextView *textview, guint action, void *data
        /* 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 );
 
@@ -2201,7 +2831,7 @@ 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)
 {
        PrefsAccount *account = NULL;
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2219,7 +2849,7 @@ 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)
 {
-       RemoteURI *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
+       ClickableText *uri = g_object_get_data(G_OBJECT(textview->mail_popup_menu),
                                           "menu_button");
        if (uri == NULL)
                return;
@@ -2230,3 +2860,20 @@ static void copy_mail_to_uri_cb  (TextView *textview, guint action, void *data)
                          NULL);
 }
 
+void textview_get_selection_offsets(TextView *textview, gint *sel_start, gint *sel_end)
+{
+               GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+               GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+               GtkTextIter start, end;
+               if (gtk_text_buffer_get_selection_bounds(buffer, &start, &end)) {
+                       if (sel_start)
+                               *sel_start = gtk_text_iter_get_offset(&start);
+                       if (sel_end)
+                               *sel_end = gtk_text_iter_get_offset(&end);
+               } else {
+                       if (sel_start)
+                               *sel_start = -1;
+                       if (sel_end)
+                               *sel_end = -1;
+               }
+}