Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 3982)
+++ /CKEditor/trunk/CHANGES.html	(revision 3983)
@@ -189,4 +189,5 @@
 		<li><a href="http://dev.fckeditor.net/ticket/3622">#3622</a> : Fixed shift enter with selection not deleting highlighted text.</li>
 		<li><a href="http://dev.fckeditor.net/ticket/4092">#4092</a> : [IE6] Close button was missing for dialog without multiple tabs.</li> 
+		<li><a href="http://dev.fckeditor.net/ticket/4003">#4003</a> : Markup on the image dialog was disrupted when removing the border input.</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/_source/skins/office2003/skin.js
===================================================================
--- /CKEditor/trunk/_source/skins/office2003/skin.js	(revision 3982)
+++ /CKEditor/trunk/_source/skins/office2003/skin.js	(revision 3983)
@@ -47,5 +47,5 @@
 
 			// Fix the size of the elements which have flexible lengths.
-			setTimeout( function()
+			var fixSize = function()
 				{
 					var content = dialog.parts.contents,
@@ -68,6 +68,10 @@
 					el = innerDialog.getChild( 5 );
 					el.setStyle( 'height', ( body.$.offsetHeight - 31 - 14 ) + 'px' );
-				},
-				100 );
+				};
+			setTimeout( fixSize, 100 );
+
+			// Ensure size is correct for RTL mode. (#4003)
+			if ( evt.editor.lang.dir == 'rtl' )
+				setTimeout( fixSize, 1000 );
 		});
 }