more fixes for Go To actions not obeying 'always_show_msg' option

diff --git a/src/folderview.c b/src/folderview.c
index 42c3fe077b7bbbcc9085e6cec5b4ce0f4158ebe8..a7ab89f53e83ea9cd3f5b7d86df70f0e03a3e079 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -942,6 +942,10 @@ static GtkCMCTreeNode *folderview_find_next_with_flag(GtkCMCTree *ctree,
                        if(item->marked_msgs > 0)
                                return node;
                        break;
                        if(item->marked_msgs > 0)
                                return node;
                        break;

+               default:
+                       if(item->total_msgs > 0)
+                               return node;
+                       break;

                }
        }
 
                }
        }
 


@@ -949,13 +953,11 @@ static GtkCMCTreeNode *folderview_find_next_with_flag(GtkCMCTree *ctree,
 }
 
 void folderview_select_next_with_flag(FolderView *folderview,
 }
 
 void folderview_select_next_with_flag(FolderView *folderview,

-                                     MsgPermFlags flag,
-                                     gboolean force_open)
+                                     MsgPermFlags flag)

 {
        GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        GtkCMCTreeNode *node = NULL;
        EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];
 {
        GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        GtkCMCTreeNode *node = NULL;
        EntryAction last_summary_select_prio = prefs_common.summary_select_prio[0];

-       gboolean last_open = prefs_common.always_show_msg;

        
        switch (flag) {
        case MSG_UNREAD:
        
        switch (flag) {
        case MSG_UNREAD:


@@ -967,8 +969,10 @@ void folderview_select_next_with_flag(FolderView *folderview,
        case MSG_MARKED:
                prefs_common.summary_select_prio[0] = ACTION_MARKED;
                break;
        case MSG_MARKED:
                prefs_common.summary_select_prio[0] = ACTION_MARKED;
                break;

+       default:
+               prefs_common.summary_select_prio[0] = ACTION_FIRST_LIST;
+               break;

        }
        }

-       prefs_common.always_show_msg = force_open ? OPENMSG_ALWAYS : last_open;

 
        node = folderview_find_next_with_flag(ctree, folderview->opened, flag);
        if (node != NULL) {
 
        node = folderview_find_next_with_flag(ctree, folderview->opened, flag);
        if (node != NULL) {


@@ -988,7 +992,6 @@ void folderview_select_next_with_flag(FolderView *folderview,
 
 out:
        prefs_common.summary_select_prio[0] = last_summary_select_prio;
 
 out:
        prefs_common.summary_select_prio[0] = last_summary_select_prio;

-       prefs_common.always_show_msg = last_open;

 }
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)
 }
 
 FolderItem *folderview_get_selected_item(FolderView *folderview)


@@ -2061,7 +2064,7 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                        if (folderview->opened == folderview->selected &&
                            (!folderview->summaryview->folder_item ||
                             folderview->summaryview->folder_item->total_msgs == 0))
                        if (folderview->opened == folderview->selected &&
                            (!folderview->summaryview->folder_item ||
                             folderview->summaryview->folder_item->total_msgs == 0))

-                               folderview_select_next_with_flag(folderview, MSG_UNREAD, TRUE);
+                               folderview_select_next_with_flag(folderview, MSG_UNREAD);

                        else
                                folderview_select_node(folderview,
                                                       folderview->selected);
                        else
                                folderview_select_node(folderview,
                                                       folderview->selected);

diff --git a/src/folderview.h b/src/folderview.h
index 4ec6f48db06acb6b9febc6deb3bcbdaadb9b3891..68bb2e8c3f8662d3548eb074def60cac0d4e62f7 100644 (file)
--- a/src/folderview.h
+++ b/src/folderview.h
@@ -114,8 +114,7 @@ void folderview_select                      (FolderView     *folderview,
                                         FolderItem     *item);
 void folderview_unselect               (FolderView     *folderview);
 void folderview_select_next_with_flag  (FolderView     *folderview,
                                         FolderItem     *item);
 void folderview_unselect               (FolderView     *folderview);
 void folderview_select_next_with_flag  (FolderView     *folderview,

-                                        MsgPermFlags    flag,
-                                        gboolean        force_open);
+                                        MsgPermFlags    flag);

 
 FolderItem *folderview_get_selected_item(FolderView    *folderview);
 FolderItem *folderview_get_opened_item(FolderView      *folderview);
 
 FolderItem *folderview_get_selected_item(FolderView    *folderview);
 FolderItem *folderview_get_opened_item(FolderView      *folderview);

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 48e31bba9c9e66abc8fcf102aef125ad5d38da39..e8e759e6dee504a7f2f01dc128346535ccb84c45 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1407,7 +1407,7 @@ static gboolean mainwindow_key_pressed (GtkWidget *widget, GdkEventKey *event,
                                    && mainwin->summaryview->folder_item->total_msgs == 0))) {
                                g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                               "key_press_event");
                                    && mainwin->summaryview->folder_item->total_msgs == 0))) {
                                g_signal_stop_emission_by_name(G_OBJECT(widget), 
                                               "key_press_event");

-                               folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD, TRUE);
+                               folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD);

                        }
                }
                break;
                        }
                }
                break;


@@ -4785,13 +4785,13 @@ static void update_summary_cb(GtkAction *action, gpointer data)
 static void prev_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 static void prev_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;

-       summary_step(mainwin->summaryview, GTK_SCROLL_STEP_BACKWARD);
+       summary_select_prev(mainwin->summaryview);

 }
 
 static void next_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 }
 
 static void next_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;

-       summary_step(mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
+       summary_select_next(mainwin->summaryview);

 }
 
 static void prev_unread_cb(GtkAction *action, gpointer data)
 }
 
 static void prev_unread_cb(GtkAction *action, gpointer data)


@@ -4891,7 +4891,7 @@ static void goto_folder_cb(GtkAction *action, gpointer data)
 static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;
 static void goto_unread_folder_cb(GtkAction *action, gpointer data)
 {
        MainWindow *mainwin = (MainWindow *)data;

-       folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD, FALSE);
+       folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD);

 }
 
 static void scroll_prev_line_cb(GtkAction *action, gpointer data)
 }
 
 static void scroll_prev_line_cb(GtkAction *action, gpointer data)

diff --git a/src/messageview.c b/src/messageview.c
index d2373161c1c3992a405dd49fd096cc468deb4e58..6a35e3f4fa8b601085d6db886e25b2205a1e517f 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2293,7 +2293,7 @@ static void prev_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;

-       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_BACKWARD);
+       summary_select_prev(messageview->mainwin->summaryview);

        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {


@@ -2318,7 +2318,7 @@ static void next_cb(GtkAction *action, gpointer data)
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;
 {
        MessageView *messageview = (MessageView *)data;
        messageview->updating = TRUE;

-       summary_step(messageview->mainwin->summaryview, GTK_SCROLL_STEP_FORWARD);
+       summary_select_next(messageview->mainwin->summaryview);

        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {


@@ -2605,7 +2605,7 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
        MessageView *messageview = (MessageView *)data;
 
        messageview->updating = TRUE;
        MessageView *messageview = (MessageView *)data;
 
        messageview->updating = TRUE;

-       folderview_select_next_with_flag(messageview->mainwin->folderview, MSG_UNREAD, FALSE);
+       folderview_select_next_with_flag(messageview->mainwin->folderview, MSG_UNREAD);

        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {
        messageview->updating = FALSE;
 
        if (messageview->deferred_destroy) {

diff --git a/src/summaryview.c b/src/summaryview.c
index 55321a01125fb4e5f713e8de6f6efe3cafe71eb0..e924a3a8ce90f69d922bfbee291ecbc3ba7e9c1f 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -135,10 +135,12 @@ static void summary_set_hide_menu (SummaryView *summaryview,
 
 static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,
 
 static GtkCMCTreeNode *summary_find_prev_msg
                                        (SummaryView            *summaryview,

-                                        GtkCMCTreeNode         *current_node);
+                                        GtkCMCTreeNode         *current_node,
+                                        gboolean                start_from_prev);

 static GtkCMCTreeNode *summary_find_next_msg
                                        (SummaryView            *summaryview,
 static GtkCMCTreeNode *summary_find_next_msg
                                        (SummaryView            *summaryview,

-                                        GtkCMCTreeNode         *current_node);
+                                        GtkCMCTreeNode         *current_node,
+                                        gboolean                start_from_next);

 
 static GtkCMCTreeNode *summary_find_prev_flagged_msg
                                        (SummaryView    *summaryview,
 
 static GtkCMCTreeNode *summary_find_prev_flagged_msg
                                        (SummaryView    *summaryview,


@@ -1796,6 +1798,27 @@ do { \
 #endif
        summary_unlock(summaryview);
 }
 #endif
        summary_unlock(summaryview);
 }

+void summary_select_prev(SummaryView *summaryview)
+{
+       GtkCMCTreeNode *node = summaryview->selected;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+
+       node = gtkut_ctree_node_prev(ctree, node);
+
+       if (node && node != summaryview->selected)
+               summary_select_node(summaryview, node, -1);
+}
+
+void summary_select_next(SummaryView *summaryview)
+{
+       GtkCMCTreeNode *node = summaryview->selected;
+       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
+
+       node = gtkut_ctree_node_next(ctree, node);
+
+       if (node && node != summaryview->selected)
+               summary_select_node(summaryview, node, -1);
+}

 
 void summary_select_prev_unread(SummaryView *summaryview)
 {
 
 void summary_select_prev_unread(SummaryView *summaryview)
 {


@@ -1884,7 +1907,7 @@ void summary_select_next_unread(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE)
                        }
 
                        if (val == G_ALERTALTERNATE)

-                               folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD, TRUE);
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_UNREAD);

                } else {
                        summary_select_node(summaryview, node, -1);
                }
                } else {
                        summary_select_node(summaryview, node, -1);
                }


@@ -1978,7 +2001,7 @@ void summary_select_next_new(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
                        }
 
                        if (val == G_ALERTALTERNATE) {

-                               folderview_select_next_with_flag(summaryview->folderview, MSG_NEW, TRUE);
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_NEW);

                                return;
                        } 
                        else
                                return;
                        } 
                        else


@@ -2056,7 +2079,7 @@ void summary_select_next_marked(SummaryView *summaryview)
                        }
 
                        if (val == G_ALERTALTERNATE) {
                        }
 
                        if (val == G_ALERTALTERNATE) {

-                               folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED, TRUE);
+                               folderview_select_next_with_flag(summaryview->folderview, MSG_MARKED);

                                return;
                        } 
                        else
                                return;
                        } 
                        else


@@ -2184,8 +2207,6 @@ static gboolean summary_select_retry(void *data)
        else if (psdata->node)
                summary_select_node(psdata->summaryview, psdata->node,
                            psdata->display_msg);
        else if (psdata->node)
                summary_select_node(psdata->summaryview, psdata->node,
                            psdata->display_msg);

-       else
-               summary_step(psdata->summaryview, psdata->type);

        g_free(psdata);
        return FALSE;
 }
        g_free(psdata);
        return FALSE;
 }


@@ -2211,7 +2232,7 @@ void summary_select_node(SummaryView *summaryview, GtkCMCTreeNode *node,
                (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
                ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
                                messageview_is_visible(summaryview->messageview)));
                (prefs_common.always_show_msg == OPENMSG_ALWAYS) ||
                ((prefs_common.always_show_msg == OPENMSG_WHEN_VIEW_VISIBLE &&
                                messageview_is_visible(summaryview->messageview)));

-       
+

        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
        && summaryview->messageview->mimeview
        if (summary_is_locked(summaryview)
        && !GTK_SCTREE(ctree)->selecting_range
        && summaryview->messageview->mimeview


@@ -2271,18 +2292,22 @@ guint summary_get_msgnum(SummaryView *summaryview, GtkCMCTreeNode *node)
 }
 
 static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 }
 
 static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,

-                                          GtkCMCTreeNode *current_node)
+                                            GtkCMCTreeNode *current_node,
+                                            gboolean start_from_prev)

 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 

-       if (current_node)
-               node = current_node;
-       else
+       if (current_node) {
+               if (start_from_prev)
+                       node = gtkut_ctree_node_prev(ctree, current_node);
+               else
+                       node = current_node;
+       } else

                node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
                node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 

-       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_prev(ctree, node)) {

                msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }
                msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && !MSG_IS_DELETED(msginfo->flags)) break;
        }


@@ -2291,15 +2316,19 @@ static GtkCMCTreeNode *summary_find_prev_msg(SummaryView *summaryview,
 }
 
 static GtkCMCTreeNode *summary_find_next_msg(SummaryView *summaryview,
 }
 
 static GtkCMCTreeNode *summary_find_next_msg(SummaryView *summaryview,

-                                          GtkCMCTreeNode *current_node)
+                                           GtkCMCTreeNode *current_node,
+                                           gboolean start_from_next)

 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 
 {
        GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
        GtkCMCTreeNode *node;
        MsgInfo *msginfo;
 

-       if (current_node)
-               node = current_node;
-       else
+       if (current_node) {
+               if (start_from_next)
+                       node = gtkut_ctree_node_next(ctree, current_node);
+               else
+                       node = current_node;
+       } else

                node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {
                node = GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->row_list);
 
        for (; node != NULL; node = gtkut_ctree_node_next(ctree, node)) {


@@ -2322,13 +2351,13 @@ static GtkCMCTreeNode *summary_find_prev_flagged_msg(SummaryView *summaryview,
 
        if (current_node) {
                if (start_from_prev)
 
        if (current_node) {
                if (start_from_prev)

-                       node = GTK_CMCTREE_NODE_PREV(current_node);
+                       node = gtkut_ctree_node_prev(ctree, current_node);

                else
                        node = current_node;
        } else
                node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 
                else
                        node = current_node;
        } else
                node = gtk_cmctree_node_nth(ctree, GTK_CMCLIST(ctree)->rows - 1);
 

-       for (; node != NULL; node = GTK_CMCTREE_NODE_PREV(node)) {
+       for (; node != NULL; node = gtkut_ctree_node_prev(ctree, node)) {

                msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
        }
                msginfo = gtk_cmctree_node_get_row_data(ctree, node);
                if (msginfo && (msginfo->flags.perm_flags & flags) != 0) break;
        }


@@ -3714,56 +3743,6 @@ void summary_reedit(SummaryView *summaryview)
        compose_reedit(msginfo, FALSE);
 }
 
        compose_reedit(msginfo, FALSE);
 }
 

-gboolean summary_step(SummaryView *summaryview, GtkScrollType type)
-{
-       GtkCMCTree *ctree = GTK_CMCTREE(summaryview->ctree);
-       GtkCMCTreeNode *node;
-
-       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 = NULL;
-               data->node = NULL;
-               data->type = type;
-               data->summaryview = summaryview;
-               debug_print("postponing open of message till end of load\n");
-               g_timeout_add(100, summary_select_retry, data);
-               return FALSE;
-       }
-       if (summary_is_locked(summaryview))
-               return FALSE;
-       if (type == GTK_SCROLL_STEP_FORWARD) {
-               node = gtkut_ctree_node_next(ctree, summaryview->selected);
-               if (node)
-                       gtkut_ctree_expand_parent_all(ctree, node);
-               else
-                       return FALSE;
-       } else {
-               if (summaryview->selected) {
-                       node = GTK_CMCTREE_NODE_PREV(summaryview->selected);
-                       if (!node) return FALSE;
-               }
-       }
-
-       if (messageview_is_visible(summaryview->messageview))
-               summaryview->display_msg = TRUE;
-
-       g_signal_emit_by_name(G_OBJECT(ctree), "scroll_vertical", type, 0.0);
-
-       if (GTK_CMCLIST(ctree)->selection)
-               gtk_sctree_set_anchor_row
-                       (GTK_SCTREE(ctree),
-                        GTK_CMCTREE_NODE(GTK_CMCLIST(ctree)->selection->data));
-
-       return TRUE;
-}
-

 gboolean summary_is_list(SummaryView *summaryview)
 {
        return (gtk_notebook_get_current_page(
 gboolean summary_is_list(SummaryView *summaryview)
 {
        return (gtk_notebook_get_current_page(


@@ -4422,13 +4401,13 @@ void summary_delete(SummaryView *summaryview)
        END_LONG_OPERATION(summaryview);
 
        if (summaryview->sort_type == SORT_ASCENDING) {
        END_LONG_OPERATION(summaryview);
 
        if (summaryview->sort_type == SORT_ASCENDING) {

-               node = summary_find_next_msg(summaryview, sel_last);
+               node = summary_find_next_msg(summaryview, sel_last, TRUE);

                if (!node || prefs_common.next_on_delete == FALSE)
                if (!node || prefs_common.next_on_delete == FALSE)

-                       node = summary_find_prev_msg(summaryview, sel_last);
+                       node = summary_find_prev_msg(summaryview, sel_last,TRUE);

        } else {
        } else {

-               node = summary_find_prev_msg(summaryview, sel_last);
+               node = summary_find_prev_msg(summaryview, sel_last,TRUE);

                if (!node || prefs_common.next_on_delete == FALSE)
                if (!node || prefs_common.next_on_delete == FALSE)

-                       node = summary_find_next_msg(summaryview, sel_last);
+                       node = summary_find_next_msg(summaryview, sel_last,TRUE);

        }
        summary_select_node(summaryview, node, -1);
        
        }
        summary_select_node(summaryview, node, -1);
        


@@ -4579,13 +4558,13 @@ void summary_move_selected_to(SummaryView *summaryview, FolderItem *to_folder)
        } else {
                GtkCMCTreeNode *node = NULL;
                if (summaryview->sort_type == SORT_ASCENDING) {
        } else {
                GtkCMCTreeNode *node = NULL;
                if (summaryview->sort_type == SORT_ASCENDING) {

-                       node = summary_find_next_msg(summaryview, sel_last);
+                       node = summary_find_next_msg(summaryview, sel_last,TRUE);

                        if (!node || prefs_common.next_on_delete == FALSE)
                        if (!node || prefs_common.next_on_delete == FALSE)

-                               node = summary_find_prev_msg(summaryview, sel_last);
+                               node = summary_find_prev_msg(summaryview, sel_last,TRUE);

                } else {
                } else {

-                       node = summary_find_prev_msg(summaryview, sel_last);
+                       node = summary_find_prev_msg(summaryview, sel_last,TRUE);

                        if (!node || prefs_common.next_on_delete == FALSE)
                        if (!node || prefs_common.next_on_delete == FALSE)

-                               node = summary_find_next_msg(summaryview, sel_last);
+                               node = summary_find_next_msg(summaryview, sel_last,TRUE);

                }
                summary_select_node(summaryview, node, -1);
                summary_status_show(summaryview);
                }
                summary_select_node(summaryview, node, -1);
                summary_status_show(summaryview);


@@ -4949,13 +4928,13 @@ gboolean summary_execute(SummaryView *summaryview)
                    gtkut_ctree_node_is_selected(ctree, node)) {
                        summary_unselect_all(summaryview);
                        if (summaryview->sort_type == SORT_ASCENDING) {
                    gtkut_ctree_node_is_selected(ctree, node)) {
                        summary_unselect_all(summaryview);
                        if (summaryview->sort_type == SORT_ASCENDING) {

-                               new_selected = summary_find_next_msg(summaryview, node);
+                               new_selected = summary_find_next_msg(summaryview, node,TRUE);

                                if (!new_selected || prefs_common.next_on_delete == FALSE)
                                if (!new_selected || prefs_common.next_on_delete == FALSE)

-                                       new_selected = summary_find_prev_msg(summaryview, node);
+                                       new_selected = summary_find_prev_msg(summaryview, node,TRUE);

                        } else {
                        } else {

-                               new_selected = summary_find_prev_msg(summaryview, node);
+                               new_selected = summary_find_prev_msg(summaryview, node,TRUE);

                                if (!new_selected || prefs_common.next_on_delete == FALSE)
                                if (!new_selected || prefs_common.next_on_delete == FALSE)

-                                       new_selected = summary_find_next_msg(summaryview, node);
+                                       new_selected = summary_find_next_msg(summaryview, node,TRUE);

                        }
                }
 
                        }
                }
 


@@ -5054,10 +5033,10 @@ gboolean summary_expunge(SummaryView *summaryview)
                if (!new_selected &&
                    gtkut_ctree_node_is_selected(ctree, node)) {
                        summary_unselect_all(summaryview);
                if (!new_selected &&
                    gtkut_ctree_node_is_selected(ctree, node)) {
                        summary_unselect_all(summaryview);

-                       new_selected = summary_find_next_msg(summaryview, node);
+                       new_selected = summary_find_next_msg(summaryview, node,TRUE);

                        if (!new_selected)
                                new_selected = summary_find_prev_msg
                        if (!new_selected)
                                new_selected = summary_find_prev_msg

-                                       (summaryview, node);
+                                       (summaryview, node,TRUE);

                }
 
                gtk_sctree_remove_node((GtkSCTree *)ctree, node);
                }
 
                gtk_sctree_remove_node((GtkSCTree *)ctree, node);