diff --git a/ChangeLog b/ChangeLog
index 618adaa721..611e5060c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-12  Sven Neumann  <sven@gimp.org>
+
+	* app/file/file-open.c: minor cleanup.
+
+	* app/file/file-save.c (file_save_as): no need to fiddle with the
+	image name, the URI is taken from the imagefile anyway.
+
 2004-10-12  Sven Neumann  <sven@gimp.org>
 
 	* app/actions/layers-actions.c (layers_actions_update): set
diff --git a/app/file/file-open.c b/app/file/file-open.c
index f2c23f5c20..1381f53f34 100644
--- a/app/file/file-open.c
+++ b/app/file/file-open.c
@@ -245,9 +245,8 @@ file_open_with_proc_and_display (Gimp               *gimp,
       /*  can only create a thumbnail if the passed uri and the
        *  resulting image's uri match.
        */
-      if (! strcmp (uri, gimp_image_get_uri (gimage)))
+      if (strcmp (uri, gimp_image_get_uri (gimage)) == 0)
         {
-          /* save a thumbnail of every opened image */
           gimp_imagefile_save_thumbnail (imagefile, gimage);
         }
 
diff --git a/app/file/file-save.c b/app/file/file-save.c
index 93248b0794..f7c39052a0 100644
--- a/app/file/file-save.c
+++ b/app/file/file-save.c
@@ -205,22 +205,7 @@ file_save_as (GimpImage      *gimage,
           gimp_image_set_save_proc (gimage, file_proc);
 	}
 
-      /* Write a thumbnail for the saved image */
-      if (set_uri_and_proc)
-        {
-          gimp_imagefile_save_thumbnail (imagefile, gimage);
-        }
-      else
-        {
-          gchar *saved_uri;
-
-          saved_uri = GIMP_OBJECT (gimage)->name;
-          GIMP_OBJECT (gimage)->name = (gchar *) uri;
-
-          gimp_imagefile_save_thumbnail (imagefile, gimage);
-
-          GIMP_OBJECT (gimage)->name = saved_uri;
-	}
+      gimp_imagefile_save_thumbnail (imagefile, gimage);
 
       gimp_recent_list_add_uri (uri, file_proc->mime_type);
     }