Index: /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js
===================================================================
--- /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js	(revision 2825)
+++ /CKEditor/branches/prototype/_source/plugins/image/dialogs/image.js	(revision 2826)
@@ -22,4 +22,6 @@
 imageDialog = function( editor, dialogType )
 {
+	// Load image preview.
+	var showPreview = true;
 	var uploadAction = 'nowhere.php';
 	var regexSize = /^\s*(\d+)((px)|\%)?\s*$/i;
@@ -121,8 +123,6 @@
 			return 1;
 
-		var url = dialog.getContentElement( 'info', 'txtUrl' ).getValue();
-
 		var oImageOriginal = dialog.editObj[ 'imageOriginal' ];
-		if ( oImageOriginal && oImageOriginal.getCustomData( 'isReady' ) == 'true' )
+		if ( oImageOriginal && oImageOriginal.getCustomData( 'isReady' ) == 'true' && showPreview )
 		{
 			var width = dialog.getValueOf( 'info', 'txtWidth' );
@@ -175,12 +175,12 @@
 	{
 		var editor = dialog.getParentEditor();
+
 		var url = dialog.getContentElement( 'info', 'txtUrl' ).getValue()
-
-		dialog.editObj[ 'imageOriginal' ].setCustomData( 'isReady', 'false' );
 		if ( dialog.editObj && url.length > 0 )
 		{
+			dialog.editObj[ 'imageOriginal' ].setCustomData( 'isReady', 'false' );
 			// Show loader
 			var loader = CKEDITOR.document.getById( 'ImagePreviewLoader' );
-			if ( loader )
+			if ( loader && showPreview )
 				loader.setStyle( 'display', '' );
 
@@ -213,5 +213,6 @@
 					'skins/' + editor.config.skin + '/images/dialog.noimage.gif' );
 
-				this.editObj[ 'imagePreview' ].setAttribute( 'src', noimage );
+				if ( showPreview )
+					this.editObj[ 'imagePreview' ].setAttribute( 'src', noimage );
 
 				// Hide loader
@@ -219,8 +220,10 @@
 				switchLockRatio( dialog, false );	// Unlock.
 			}
-
-			dialog.editObj[ 'imagePreview' ].removeStyle( 'width' );
-			dialog.editObj[ 'imagePreview' ].removeStyle( 'height' );
-			dialog.editObj[ 'imagePreview' ].setAttribute( 'src', url );
+			if ( showPreview )		// Load image preview
+			{
+				dialog.editObj[ 'imagePreview' ].removeStyle( 'width' );
+				dialog.editObj[ 'imagePreview' ].removeStyle( 'height' );
+				dialog.editObj[ 'imagePreview' ].setAttribute( 'src', url );
+			}
 			dialog.editObj[ 'imageOriginal' ].on( 'load', onImgLoad, dialog );
 			dialog.editObj[ 'imageOriginal' ].on( 'error', onImgLoadError, dialog );
@@ -602,5 +605,4 @@
 					selection.selectElement( element );
 					this.saveSelection();
-					this.pushDefault();
 				}
 			}
@@ -608,6 +610,15 @@
 			updatePreview( this );
 
+			if ( !showPreview )		
+			{
+				// Show sample image
+				var defaultImage = CKEDITOR.getUrl(
+					'_source/' +	// TODO: Add @-Packager.RemoveLine to the final build process.
+					'skins/' + editor.config.skin + '/images/dialog.noimage.gif' );
+				this.editObj[ 'imagePreview' ].setAttribute( 'src', defaultImage );
+			}
+
 			this.allowOnChange = true;
-
+			this.pushDefault();
 			this.getContentElement( 'info', 'txtUrl' ).focus();
 		},