Bug 628350 - Allow deletion of a deleted message to advance cursor

1 files changed, 5 insertions, 1 deletions

diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index f0c91d78f8..f628b657bf 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -2607,8 +2607,12 @@ mail_reader_update_actions (EMailReader *reader,
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);
 
+	/* If a single message is selected, let the user hit delete to
+	 * advance the cursor even if the message is already deleted. */
 	action_name = "mail-delete";
-	sensitive = selection_has_undeleted_messages;
+	sensitive =
+		single_message_selected ||
+		selection_has_undeleted_messages;
 	action = e_mail_reader_get_action (reader, action_name);
 	gtk_action_set_sensitive (action, sensitive);