Index: canvasgesture_resize.cpp
===================================================================
--- canvasgesture_resize.cpp	(revision 11383)
+++ canvasgesture_resize.cpp	(working copy)
@@ -135,7 +135,7 @@
 }
 
 
-void ResizeGesture::doResize(bool scaleTextInGroup)
+void ResizeGesture::doResize(bool scaleContent)
 {
 	PageItem* currItem = m_doc->m_Selection->itemAt(0);
 	QRectF newBounds = m_canvas->globalToCanvas(m_bounds.normalized());
@@ -147,7 +147,7 @@
 		double scx = oldBounds.width() == 0? 1.0 : newBounds.width() / oldBounds.width();
 		double scy = oldBounds.height() == 0? 1.0 : newBounds.height() / oldBounds.height();
 		//CB #3012 only scale text in a group if alt is pressed
-		if ((currItem->itemType() == PageItem::TextFrame) && scaleTextInGroup)
+		if ((currItem->itemType() == PageItem::TextFrame) && scaleContent)
 			m_view->scaleGroup(scx, scy, true);
 		else
 			m_view->scaleGroup(scx, scy, false);
@@ -159,6 +159,22 @@
 	else
 	{
 		currItem->setXYPos(newBounds.x(), newBounds.y());
+                // Scale the image in the image frame if the scaleContent modifier is in use.
+                if ((currItem->itemType() == PageItem::ImageFrame) && scaleContent)
+                {
+                    double imgScX = newBounds.width() / currItem->width() * currItem->imageXScale();
+                    double imgScY = newBounds.height() / currItem->height() * currItem->imageYScale();
+                    // The aspect ratio has been fixed, so make the modification in the direction of the larger movement.
+                    if (currItem->AspectRatio) 
+                    {
+                        if (qAbs(newBounds.width() - currItem->width()) > qAbs(newBounds.height() - currItem->height()))
+                            imgScY = imgScX;
+                        else
+                            imgScX = imgScY;
+                    }
+
+                    currItem->setImageXYScale(imgScX, imgScY);
+                }
 		currItem->setWidth(newBounds.width());
 		currItem->setHeight(newBounds.height());
 		// rotation does not change

Index: canvasgesture_resize.h
===================================================================
--- canvasgesture_resize.h	(revision 11383)
+++ canvasgesture_resize.h	(working copy)
@@ -70,7 +70,7 @@
 	
 private:
 	void adjustBounds(QMouseEvent *m);
-	void doResize(bool scaleTextInGroup);
+	void doResize(bool scaleContent);
 	Canvas::FrameHandle m_handle;
 	double m_rotation;
 	double m_origRatio;