Index: /MediaWiki/trunk/FCKeditorSkin.body.php
===================================================================
--- /MediaWiki/trunk/FCKeditorSkin.body.php	(revision 3178)
+++ /MediaWiki/trunk/FCKeditorSkin.body.php	(revision 3179)
@@ -51,8 +51,8 @@
 		if (!empty($params)) {
 			if (isset($params['width'])) {
-				$ret .= "_fck_mw_width=\"".$params['width']."\" ";
+				$ret .= "width=\"".$params['width']."\" ";
 			}
 			if (isset($params['height'])) {
-				$ret .= "_fck_mw_height=\"".$params['height']."\" ";
+				$ret .= "height=\"".$params['height']."\" ";
 			}
 		}
@@ -168,8 +168,8 @@
 		if (!empty($hp)) {
 			if (isset($hp['width'])) {
-				$ret .= "_fck_mw_width=\"".$hp['width']."\" ";
+				$ret .= "width=\"".$hp['width']."\" ";
 			}
 			if (isset($hp['height'])) {
-				$ret .= "_fck_mw_height=\"".$hp['height']."\" ";
+				$ret .= "height=\"".$hp['height']."\" ";
 			}
 		}
Index: /MediaWiki/trunk/plugins/mediawiki/dialogs/image.html
===================================================================
--- /MediaWiki/trunk/plugins/mediawiki/dialogs/image.html	(revision 3178)
+++ /MediaWiki/trunk/plugins/mediawiki/dialogs/image.html	(revision 3179)
@@ -74,6 +74,20 @@
 	GetE('cmbAlign').value  = GetAttribute( oImage, '_fck_mw_location', '' ) ;
 
-	GetE('txtWidth').value  = GetAttribute( oImage, '_fck_mw_width', '' ) ;
-	GetE('txtHeight').value = GetAttribute( oImage, '_fck_mw_height', '' ) ;
+	GetE('txtWidth').value  = GetAttribute( oImage, 'width', '' ) ;
+	if(!isNaN(parseInt(oImage.style.width)))
+	{
+		$width = parseInt(oImage.style.width)+'';
+		GetE('txtWidth').value = $width;
+		SetAttribute(oImage, 'width', $width);
+		oImage.style.width='';
+	}
+	GetE('txtHeight').value = GetAttribute( oImage, 'height', '' ) ;
+	if(!isNaN(parseInt(oImage.style.height)))
+	{
+		$height = parseInt(oImage.style.height)+'';
+		GetE('txtHeight').value = $height;
+		SetAttribute(oImage, 'height', $height);
+		oImage.style.height='';
+	}
 
 	UpdatePreview();
@@ -150,6 +164,4 @@
 	SetAttribute( e, "_fck_mw_type", imgType ) ;
 	SetAttribute( e, "_fck_mw_location", imgLocation ) ;
-	SetAttribute( e, "_fck_mw_width", GetE('txtWidth').value ) ;
-	SetAttribute( e, "_fck_mw_height", GetE('txtHeight').value ) ;
 
 	SetAttribute( e, "width" , GetE('txtWidth').value ) ;
Index: /MediaWiki/trunk/plugins/mediawiki/fckplugin.js
===================================================================
--- /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 3178)
+++ /MediaWiki/trunk/plugins/mediawiki/fckplugin.js	(revision 3179)
@@ -526,6 +526,16 @@
 							var imgType		= htmlNode.getAttribute( '_fck_mw_type' ) || '' ;
 							var imgLocation	= htmlNode.getAttribute( '_fck_mw_location' ) || '' ;
-							var imgWidth	= htmlNode.getAttribute( '_fck_mw_width' ) || '' ;
-							var imgHeight	= htmlNode.getAttribute( '_fck_mw_height' ) || '' ;
+							var imgWidth	= htmlNode.getAttribute( 'width' )+'' || '';
+							if(!isNaN(parseInt(htmlNode.style.width)))
+							{
+								imgWidth=parseInt(htmlNode.style.width)+'';
+								htmlNode.style.width = '';
+							}
+							var imgHeight	= htmlNode.getAttribute( 'height' )+'' || '';
+							if(!isNaN(parseInt(htmlNode.style.height)))
+							{
+								imgHeight = parseInt(htmlNode.style.height)+'';
+								htmlNode.style.height = '';
+							}
 
 							stringBuilder.push( '[[Image:' )