Index: /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php
===================================================================
--- /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php	(revision 575)
+++ /MediaWiki/trunk/extensions/FCKeditor/FCKeditorSkin.body.php	(revision 576)
@@ -55,9 +55,25 @@
             }
         }
-        if ($thumb) {
-            $ret .= "_fck_mw_type=\"thumb"."\" class=\"fck_mw_frame\"";
+        $class = "";
+        if ($thumb) {            
+            $ret .= "_fck_mw_type=\"thumb"."\" ";
+            $class .= "fck_mw_frame";
         }
         else if ($framed) {
-            $ret .= "_fck_mw_type=\"frame"."\" class=\"fck_mw_frame\"";
+            $ret .= "_fck_mw_type=\"frame"."\" ";
+            $class .= "fck_mw_frame";
+        }
+        
+        if ($align == "right") {
+            $class .= ($class?" ":"") . "fck_mw_right";
+        } 
+        else if($align == "center") {
+            $class .= ($class?" ":"") . "fck_mw_center";
+        }
+        else if($align == "left") {
+            $class .= ($class?" ":"") . "fck_mw_left";
+        }
+        else if($framed || $thumb) {
+            $class .= ($class?" ":"") . "fck_mw_right";
         }
 
@@ -69,4 +85,8 @@
         }
 
+        if ($class) {
+            $ret .= "class=\"$class\" ";
+        }
+        
         $ret .= "/>";