Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 35472)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2008-05-06  Karsten Bräckelmann  <guenther@rudersport.de>
+
+	* em-folder-view.c (em_folder_view_get_popup_target): Restore
+	behavior of deleting previously deleted mail. Fixes bug 531836 and
+	bug 254770 a second time.
+
 2008-05-05  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes bug #531426
Index: mail/em-folder-view.c
===================================================================
--- mail/em-folder-view.c	(revision 35472)
+++ mail/em-folder-view.c	(working copy)
@@ -2409,10 +2409,9 @@
 	if (emfv->preview_active)
 		t->target.mask &= ~EM_FOLDER_VIEW_PREVIEW_PRESENT;
 
-	/* See bug 352980 */
-	/* See bug #54770 */
-	/* if (!emfv->hide_deleted)
-		t->target.mask &= ~EM_POPUP_SELECT_DELETE;*/
+	/* See b.g.o bug 531836 and bug 254770 */
+	if (!emfv->hide_deleted)
+		t->target.mask &= ~EM_POPUP_SELECT_DELETE;
 
 	return t;
 }
