2006-09-04 [colin] 2.4.0cvs143

[claws.git] / src / summaryview.c

diff --git a/src/summaryview.c b/src/summaryview.c
index d885d6fcfd975ee36bd1540b0068df89c9c7ccdc..ccbb6aec033f26dfee33914a7b882a51cf3a87ce 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -107,6 +107,10 @@ static GdkPixmap *markxpm;
 static GdkBitmap *markxpmmask;
 static GdkPixmap *deletedxpm;
 static GdkBitmap *deletedxpmmask;
+static GdkPixmap *movedxpm;
+static GdkBitmap *movedxpmmask;
+static GdkPixmap *copiedxpm;
+static GdkBitmap *copiedxpmmask;
 
 static GdkPixmap *newxpm;
 static GdkBitmap *newxpmmask;
@@ -469,8 +473,8 @@ static GtkItemFactoryEntry summary_popup_entries[] =
        {N_("/_View"),                  NULL, NULL,             0, "<Branch>"},
        {N_("/_View/Open in new _window"),
                                        "<control><alt>N", summary_open_msg,    0, NULL},
-       {N_("/_View/_Source"),          "<control>U", summary_view_source, 0, NULL},
-       {N_("/_View/All _header"),      "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
+       {N_("/_View/Message _source"),  "<control>U", summary_view_source, 0, NULL},
+       {N_("/_View/All _headers"),     "<control>H", summary_show_all_header_cb, 0, "<ToggleItem>"},
        {N_("/---"),                    NULL, NULL,             0, "<Separator>"},
        {N_("/_Save as..."),            "<control>S", summary_save_as,   0, NULL},
        {N_("/_Print..."),              "<control>P", summary_print,   0, NULL},
@@ -490,10 +494,13 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
        "",             /* S_COL_LOCKED  */
 };
 
-#define START_LONG_OPERATION(summaryview) {                    \
+#define START_LONG_OPERATION(summaryview,force_freeze) {       \
        summary_lock(summaryview);                              \
        main_window_cursor_wait(summaryview->mainwin);          \
-       gtk_clist_freeze(GTK_CLIST(summaryview->ctree));        \
+       if (force_freeze || sc_g_list_bigger(GTK_CLIST(summaryview->ctree)->selection, 1)) {\
+               froze = TRUE;                                           \
+               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));        \
+       }                                                       \
        folder_item_update_freeze();                            \
        inc_lock();                                             \
        hooks_unregister_hook(MSGINFO_UPDATE_HOOKLIST,          \
@@ -502,7 +509,8 @@ static const gchar *const col_label[N_SUMMARY_COLS] = {
 #define END_LONG_OPERATION(summaryview) {                      \
        inc_unlock();                                           \
        folder_item_update_thaw();                              \
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));          \
+       if (froze)                                              \
+               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));  \
        main_window_cursor_normal(summaryview->mainwin);        \
        summary_unlock(summaryview);                            \
        summaryview->msginfo_update_callback_id =               \
@@ -730,6 +738,10 @@ void summary_init(SummaryView *summaryview)
                         &clipgpgsignedxpm, &clipgpgsignedxpmmask);
        stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
                         &spamxpm, &spamxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
+                        &movedxpm, &movedxpmmask);
+       stock_pixmap_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
+                        &copiedxpm, &copiedxpmmask);
 
        summary_set_fonts(summaryview);
 
@@ -837,6 +849,7 @@ static gboolean summaryview_quicksearch_recurse(gpointer data)
        main_window_cursor_normal(summaryview->mainwin);
        return FALSE;
 }
+
 gboolean summary_show(SummaryView *summaryview, FolderItem *item)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
@@ -989,6 +1002,7 @@ START_TIMING("--------- summary_show");
 
        if (quicksearch_is_active(summaryview->quicksearch)) {
                GSList *not_killed;
+               START_TIMING("quicksearch");
                gint num = 0, total = summaryview->folder_item->total_msgs;
                statusbar_print_all(_("Searching in %s... \n"), 
                        summaryview->folder_item->path ? 
@@ -1025,6 +1039,7 @@ START_TIMING("--------- summary_show");
                }
                g_slist_free(mlist);
                mlist = not_killed;
+               END_TIMING();
        }
 
        if (!hidden_removed) {
@@ -1363,8 +1378,8 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
                {"/View"                        , M_SINGLE_TARGET_EXIST},
                {"/View/Open in new window"     , M_SINGLE_TARGET_EXIST},
-               {"/View/Source"                 , M_SINGLE_TARGET_EXIST},
-               {"/View/All header"             , M_SINGLE_TARGET_EXIST},
+               {"/View/Message source"         , M_SINGLE_TARGET_EXIST},
+               {"/View/All headers"            , M_SINGLE_TARGET_EXIST},
                {"/Save as..."                  , M_TARGET_EXIST},
                {"/Print..."                    , M_TARGET_EXIST},
                {NULL, 0}
@@ -1381,7 +1396,7 @@ void summary_set_menu_sensitive(SummaryView *summaryview)
 
 
        summary_lock(summaryview);
-       menuitem = gtk_item_factory_get_widget(ifactory, "/View/All header");
+       menuitem = gtk_item_factory_get_widget(ifactory, "/View/All headers");
        if (summaryview->messageview 
        &&  summaryview->messageview->mimeview
        &&  summaryview->messageview->mimeview->textview)
@@ -1479,7 +1494,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
-                               folderview_select_next_unread(summaryview->folderview);
+                               folderview_select_next_unread(summaryview->folderview, TRUE);
                                return;
                        } 
                        else
@@ -2466,7 +2481,6 @@ static void summary_set_ctree_from_list(SummaryView *summaryview,
                END_TIMING();
        } else {
                gchar *text[N_SUMMARY_COLS];
-               gint *col_pos = summaryview->col_pos;
                START_TIMING("summaryview_set_ctree_from_list(2)");
                cur = mlist;
                for (; mlist != NULL; mlist = mlist->next) {
@@ -3072,7 +3086,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
                                          markxpm, markxpmmask);
        } else if (MSG_IS_MOVE(flags)) {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "o");
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+                                         movedxpm, movedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
@@ -3081,7 +3096,8 @@ static void summary_set_row_marks(SummaryView *summaryview, GtkCTreeNode *row)
                        gtk_ctree_node_set_foreground
                                (ctree, row, &summaryview->color_marked);
        } else if (MSG_IS_COPY(flags)) {
-               gtk_ctree_node_set_text(ctree, row, col_pos[S_COL_MARK], "O");
+               gtk_ctree_node_set_pixmap(ctree, row, col_pos[S_COL_MARK],
+                                         copiedxpm, copiedxpmmask);
                if (style)
                        style = bold_marked_style;
                else {
@@ -3143,7 +3159,8 @@ static void summary_mark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->copied--;
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       summary_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+       summary_msginfo_change_flags(msginfo, MSG_MARKED, 0, MSG_DELETED, 
+               MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
        summary_set_row_marks(summaryview, row);
        debug_print("Message %s/%d is marked\n", msginfo->folder->path, msginfo->msgnum);
 }
@@ -3167,7 +3184,8 @@ static void summary_lock_row(SummaryView *summaryview, GtkCTreeNode *row)
                changed = TRUE;
        }
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, MSG_MOVE | MSG_COPY);
+       summary_msginfo_change_flags(msginfo, MSG_LOCKED, 0, MSG_DELETED, 
+               MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
        
        summary_set_row_marks(summaryview, row);
        debug_print("Message %d is locked\n", msginfo->msgnum);
@@ -3192,8 +3210,9 @@ void summary_mark(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row(summaryview, GTK_CTREE_NODE(cur->data));
@@ -3226,8 +3245,9 @@ void summary_mark_as_read
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_mark_row_as_read(summaryview,
@@ -3242,8 +3262,9 @@ void summary_msgs_lock(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_lock_row(summaryview,
                                         GTK_CTREE_NODE(cur->data));
@@ -3256,8 +3277,9 @@ void summary_msgs_unlock(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unlock_row(summaryview,
                                   GTK_CTREE_NODE(cur->data));
@@ -3271,6 +3293,7 @@ void summary_mark_all_read(SummaryView *summaryview)
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GtkCTreeNode *node;
        AlertValue val;
+       gboolean froze = FALSE;
 
        if (prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
@@ -3284,7 +3307,7 @@ void summary_mark_all_read(SummaryView *summaryview)
                        prefs_common.ask_mark_all_read = FALSE;
        }
        
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, TRUE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list); node != NULL;
             node = gtkut_ctree_node_next(ctree, node))
@@ -3308,9 +3331,11 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
        GSList *msgs = NULL;
        gboolean immediate_exec = prefs_common.immediate_exec;
        gboolean moved = FALSE;
+       gboolean froze = FALSE;
+
        prefs_common.immediate_exec = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
 
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                GtkCTreeNode *row = GTK_CTREE_NODE(cur->data);
@@ -3340,8 +3365,6 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
                log_error(_("An error happened while learning.\n"));
        }
 
-       g_slist_free(msgs);
-       
        prefs_common.immediate_exec = immediate_exec;
 
        END_LONG_OPERATION(summaryview);
@@ -3350,6 +3373,14 @@ void summary_mark_as_spam(SummaryView *summaryview, guint action, GtkWidget *wid
                summary_execute(summaryview);
        }
 
+       if (!moved && msgs) {
+               MsgInfo *msginfo = (MsgInfo *)msgs->data;
+               toolbar_set_learn_button
+                       (summaryview->mainwin->toolbar,
+                        MSG_IS_SPAM(msginfo->flags)?LEARN_HAM:LEARN_SPAM);
+       }
+       g_slist_free(msgs);
+       
        summary_status_show(summaryview);       
 }
 
@@ -3379,8 +3410,9 @@ void summary_mark_as_unread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; 
                cur = cur->next)
@@ -3459,7 +3491,8 @@ static void summary_delete_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->copied--;
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       summary_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, MSG_MOVE | MSG_COPY);
+       summary_msginfo_change_flags(msginfo, MSG_DELETED, 0, MSG_MARKED, 
+               MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
        summaryview->deleted++;
 
        if (!prefs_common.immediate_exec && 
@@ -3507,6 +3540,7 @@ void summary_delete(SummaryView *summaryview)
        GtkCTreeNode *node;
        AlertValue aval;
        MsgInfo *msginfo;
+       gboolean froze = FALSE;
 
        if (!item) return;
 
@@ -3534,7 +3568,7 @@ void summary_delete(SummaryView *summaryview)
 
        /* next code sets current row focus right. We need to find a row
         * that is not deleted. */
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next) {
                sel_last = GTK_CTREE_NODE(cur->data);
@@ -3597,7 +3631,8 @@ static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
                summaryview->copied--;
 
        procmsg_msginfo_set_to_folder(msginfo, NULL);
-       summary_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, MSG_MOVE | MSG_COPY);
+       summary_msginfo_unset_flags(msginfo, MSG_MARKED | MSG_DELETED, 
+               MSG_MOVE | MSG_COPY | MSG_MOVE_DONE);
        summary_set_row_marks(summaryview, row);
 
        debug_print("Message %s/%d is unmarked\n",
@@ -3608,8 +3643,9 @@ void summary_unmark(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        folder_item_set_batch(summaryview->folder_item, TRUE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_unmark_row(summaryview, GTK_CTREE_NODE(cur->data));
@@ -3639,7 +3675,8 @@ static void summary_move_row_to(SummaryView *summaryview, GtkCTreeNode *row,
                summaryview->copied--;
        }
        if (!MSG_IS_MOVE(msginfo->flags)) {
-               summary_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED, MSG_COPY);
+               summary_msginfo_change_flags(msginfo, 0, MSG_MOVE, MSG_DELETED, 
+                       MSG_COPY | MSG_MOVE_DONE);
                summaryview->moved++;
        } else {
                summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_COPY);
@@ -3657,6 +3694,8 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 {
        GList *cur;
        GtkCTreeNode *sel_last = NULL;
+       gboolean froze = FALSE;
+
        if (!to_folder) return;
        if (!summaryview->folder_item ||
            FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
@@ -3668,7 +3707,7 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
-       START_LONG_OPERATION(summaryview); 
+       START_LONG_OPERATION(summaryview, FALSE); 
 
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next) {
@@ -3729,7 +3768,8 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
        }
        
        if (!MSG_IS_COPY(msginfo->flags)) {
-               summary_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED, MSG_MOVE);
+               summary_msginfo_change_flags(msginfo, 0, MSG_COPY, MSG_DELETED, 
+                       MSG_MOVE | MSG_MOVE_DONE);
                summaryview->copied++;
        } else {
                summary_msginfo_unset_flags(msginfo, MSG_DELETED, MSG_MOVE);
@@ -3745,6 +3785,7 @@ static void summary_copy_row_to(SummaryView *summaryview, GtkCTreeNode *row,
 void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
 {
        GList *cur;
+       gboolean froze = FALSE;
 
        if (!to_folder) return;
        if (!summaryview->folder_item) return;
@@ -3757,7 +3798,7 @@ void summary_copy_selected_to(SummaryView *summaryview, FolderItem *to_folder)
                return;
        }
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
 
        for (cur = GTK_CLIST(summaryview->ctree)->selection;
             cur != NULL && cur->data != NULL; cur = cur->next)
@@ -4050,23 +4091,21 @@ gboolean summary_execute(SummaryView *summaryview)
        }
 
        folder_item_update_thaw();
-       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
 
        if (new_selected) {
                summary_unlock(summaryview);
                gtk_sctree_select
-                       (GTK_SCTREE(ctree),
-                        new_selected);
+                       (GTK_SCTREE(ctree), new_selected);
                summary_lock(summaryview);
        }
 
        if (summaryview->threaded) {
-               gtk_clist_freeze(GTK_CLIST(summaryview->ctree));
                summary_thread_build(summaryview);
                summary_thread_init(summaryview);
-               gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
        }
 
+       gtk_clist_thaw(GTK_CLIST(summaryview->ctree));
+
        summaryview->selected = clist->selection ?
                GTK_CTREE_NODE(clist->selection->data) : NULL;
 
@@ -4334,11 +4373,11 @@ static void summary_unthread_for_exec(SummaryView *summaryview)
 {
        GtkCTreeNode *node;
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
+       gboolean froze = FALSE;
 
        debug_print("Unthreading for execution...");
 
-       START_LONG_OPERATION(summaryview);
-
+       START_LONG_OPERATION(summaryview, TRUE);
        for (node = GTK_CTREE_NODE(GTK_CLIST(ctree)->row_list);
             node != NULL; node = GTK_CTREE_NODE_NEXT(node)) {
                summary_unthread_for_exec_func(ctree, node, summaryview);
@@ -4718,9 +4757,9 @@ void summary_set_colorlabel(SummaryView *summaryview, guint labelcolor,
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
-
+       START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                summary_set_row_colorlabel(summaryview,
                                           GTK_CTREE_NODE(cur->data), labelcolor);
@@ -4914,9 +4953,17 @@ static GtkWidget *summary_ctree_create(SummaryView *summaryview)
                                   prefs_common.summary_col_size[S_COL_NUMBER]);
        gtk_clist_set_column_width(GTK_CLIST(ctree), col_pos[S_COL_SCORE],
                                   prefs_common.summary_col_size[S_COL_SCORE]);
-       gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
-       gtk_ctree_set_expander_style(GTK_CTREE(ctree),
+
+       if (prefs_common.enable_dotted_lines) {
+               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_DOTTED);
+               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
                                     GTK_CTREE_EXPANDER_SQUARE);
+       } else {
+               gtk_ctree_set_line_style(GTK_CTREE(ctree), GTK_CTREE_LINES_NONE);
+               gtk_ctree_set_expander_style(GTK_CTREE(ctree),
+                                    GTK_CTREE_EXPANDER_TRIANGLE);
+       }
+
        gtk_ctree_set_indent(GTK_CTREE(ctree), 12);
        g_object_set_data(G_OBJECT(ctree), "summaryview", (gpointer)summaryview); 
 
@@ -5144,7 +5191,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        switch (event->keyval) {
        case GDK_space:         /* Page down or go to the next */
                if (event->state & GDK_SHIFT_MASK) 
-                       textview_scroll_page(textview, TRUE);
+                       mimeview_scroll_page(messageview->mimeview, TRUE);
                else {
                        if (summaryview->displayed != summaryview->selected) {
                                summary_display_msg(summaryview,
@@ -5152,16 +5199,16 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                break;
                        }
                        if (mod_pressed) {
-                               if (!textview_scroll_page(textview, TRUE))
+                               if (!mimeview_scroll_page(messageview->mimeview, TRUE))
                                        summary_select_prev_unread(summaryview);
                        } else {
-                               if (!textview_scroll_page(textview, FALSE))
+                               if (!mimeview_scroll_page(messageview->mimeview, FALSE))
                                        summary_select_next_unread(summaryview);
                        }                               
                }
                break;
        case GDK_BackSpace:     /* Page up */
-               textview_scroll_page(textview, TRUE);
+               mimeview_scroll_page(messageview->mimeview, TRUE);
                break;
        case GDK_Return:        /* Scroll up/down one line */
                if (summaryview->displayed != summaryview->selected) {
@@ -5169,7 +5216,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                            summaryview->selected);
                        break;
                }
-               textview_scroll_one_line(textview, mod_pressed);
+               mimeview_scroll_one_line(messageview->mimeview, mod_pressed);
                break;
        case GDK_Delete:
                BREAK_ON_MODIFIER_KEY();
@@ -5261,12 +5308,46 @@ static void summary_unselected(GtkCTree *ctree, GtkCTreeNode *row,
        summary_status_show(summaryview);
 }
 
+typedef struct _PostponedSelectData
+{
+       GtkCTree *ctree;
+       GtkCTreeNode *row;
+       gint column;
+       SummaryView *summaryview;
+} PostponedSelectData;
+
+static gboolean summary_select_retry(void *data)
+{
+       PostponedSelectData *psdata = (PostponedSelectData *)data;
+       debug_print("trying again\n");
+       summary_selected(psdata->ctree, psdata->row,
+                           psdata->column, psdata->summaryview);
+       g_free(psdata);
+       return FALSE;
+}
+
 static void summary_selected(GtkCTree *ctree, GtkCTreeNode *row,
                             gint column, SummaryView *summaryview)
 {
        MsgInfo *msginfo;
        gboolean marked_unread = FALSE;
 
+       if (summary_is_locked(summaryview)
+       && !GTK_SCTREE(ctree)->selecting_range
+       && summaryview->messageview->mimeview
+       && summaryview->messageview->mimeview->type == MIMEVIEW_TEXT
+       && summaryview->messageview->mimeview->textview->loading) {
+               PostponedSelectData *data = g_new0(PostponedSelectData, 1);
+               summaryview->messageview->mimeview->textview->stop_loading = TRUE;
+               
+               data->ctree = ctree;
+               data->row = row;
+               data->column = column;
+               data->summaryview = summaryview;
+               debug_print("postponing open of message till end of load\n");
+               g_timeout_add(100, summary_select_retry, data);
+               return;
+       }
        if (summary_is_locked(summaryview)
        ||  GTK_SCTREE(ctree)->selecting_range) {
                return;
@@ -5810,8 +5891,9 @@ static void summary_ignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_ignore_thread_func), 
@@ -5841,8 +5923,9 @@ static void summary_unignore_thread(SummaryView *summaryview)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
        GList *cur;
+       gboolean froze = FALSE;
 
-       START_LONG_OPERATION(summaryview);
+       START_LONG_OPERATION(summaryview, FALSE);
        for (cur = GTK_CLIST(ctree)->selection; cur != NULL && cur->data != NULL; cur = cur->next)
                gtk_ctree_pre_recursive(ctree, GTK_CTREE_NODE(cur->data), 
                                        GTK_CTREE_FUNC(summary_unignore_thread_func), 
@@ -5933,6 +6016,8 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm, &gpgsignedxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm, &clipgpgsignedxpmmask);
        stock_pixmap_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm, &spamxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm, &movedxpmmask);
+       stock_pixmap_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm, &copiedxpmmask);
 
        pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_DIR_OPEN);
        gtk_box_pack_start(GTK_BOX(summaryview->hbox), pixmap, FALSE, FALSE, 4);