diff --git a/ChangeLog b/ChangeLog
index dbf59bf1ef8088b114928d171cd916677297aac9..608b89aed54764dcca0c0e7a73a5e27aefd6c8ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-09-12  Christian Neumair  <cneumair@gnome.org>
+
+	* libnautilus-private/nautilus-directory.c
+	(nautilus_directory_is_local):
+	Always assume that directories in trash are local. Fixes #546353.
+	Thanks to lvaro Vilanova Vidal.
+
 2008-09-10  Christian Neumair  <cneumair@gnome.org>
 
 	* src/file-manager/fm-icon-container.c
diff --git a/libnautilus-private/nautilus-directory.c b/libnautilus-private/nautilus-directory.c
index 4d15ba4f7af08ef9239ec9e29f4dbdacd96c83fa..75ab6e1ce9f15bdd8ad66a03c370abe8a87ca0ad 100644
--- a/libnautilus-private/nautilus-directory.c
+++ b/libnautilus-private/nautilus-directory.c
@@ -571,7 +571,9 @@ nautilus_directory_is_local (NautilusDirectory *directory)
 	if (directory->details->location == NULL) {
 		return TRUE;
 	}
-	return g_file_is_native (directory->details->location);
+
+	return nautilus_directory_is_in_trash (directory) ||
+	       g_file_is_native (directory->details->location);
 }
 
 gboolean