diff --git a/ChangeLog b/ChangeLog
index acf70e4d56..22000ee971 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-11-23  Sven Neumann  <sven@gimp.org>
+
+	* app/core/gimpdrawable.c (gimp_drawable_resize): do nothing if
+	the size doesn't change. This keeps text layers from being
+	modified when an image is cropped and the layer is entirely inside
+	the cropped area.
+
+	* menus/image-menu.xml.in: put the Quit item back for now. We
+	should think about this again in the next development cycle.
+
 2004-11-21  Kevin Cozens  <kcozens@cvs.gimp.org>
 
 	* plug-ins/script-fu/scripts/copy-visible.scm: Fixed incorrect
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 74dbc269db..e77d1e2e43 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -449,6 +449,10 @@ gimp_drawable_resize (GimpItem    *item,
   gint          copy_x, copy_y;
   gint          copy_width, copy_height;
 
+  /*  if the size doesn't change, this is a nop  */
+  if (item->width == new_width && item->height == new_height)
+    return;
+
   new_offset_x = item->offset_x - offset_x;
   new_offset_y = item->offset_y - offset_y;
 
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 900b85afbf..01cca8f6ed 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -31,6 +31,7 @@
       <placeholder name="Send" />
       <separator />
       <menuitem action="view-close" />
+      <menuitem action="file-quit" />
     </menu>
 
 <!-- Context