Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.3704.2.9
diff -u -r1.3704.2.9 ChangeLog
--- ChangeLog	2 Jan 2006 11:37:36 -0000	1.3704.2.9
+++ ChangeLog	13 Jan 2006 10:37:48 -0000
@@ -1,3 +1,11 @@
+2006-01-13  set REAL_NAME environment variable  <set EMAIL_ADDRESS environment variable>
+	
+	** See bug 324463
+	* em-folder-view.c: (emfv_setup_view_instance),
+	(em_folder_view_get_popup_target):
+	Now the delete button can not be seen when trash folder
+	is selected.
+
 2006-01-01  Changwoo Ryu  <cwryu@debian.org>
 
 	* em-folder-properties.c (emfp_dialog_got_folder): translate
Index: em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.131
diff -u -r1.131 em-folder-view.c
--- em-folder-view.c	15 Aug 2005 02:37:56 -0000	1.131
+++ em-folder-view.c	13 Jan 2006 10:37:50 -0000
@@ -523,6 +523,8 @@
 		|| em_utils_folder_is_sent (emfv->folder, emfv->folder_uri)
 		|| em_utils_folder_is_outbox (emfv->folder, emfv->folder_uri);
 	
+	if ( emfv->folder->folder_flags & CAMEL_FOLDER_IS_TRASH )
+		emfv->hide_deleted = FALSE;
 	/* TODO: should this go through mail-config api? */
 	id = mail_config_folder_to_safe_url (emfv->folder);
 	p->view_instance = gal_view_instance_new (collection, id);
@@ -2103,7 +2105,7 @@
 		t->target.mask &= ~EM_FOLDER_VIEW_SELECT_NOSELECTION;
 
 	/* See bug #54770 */
-	if (!emfv->hide_deleted)
+	if (emfv->hide_deleted)
 		t->target.mask &= ~EM_POPUP_SELECT_DELETE;
 	
 	return t;

