--- modules/wysiwyg_filter/wysiwyg_filter.inc	2010-04-09 16:23:34.543566995 +1000
+++ modules/wysiwyg_filter/wysiwyg_filter.inc	2010-04-09 16:23:11.251567263 +1000
@@ -373,12 +373,14 @@
     'box' => array(
       'title' => t('Box properties'),
       'properties' => array(
-        'margin' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .'(?:\s+(?:auto|'. $regexp_length .'|'. $regexp_percent .')){0,3})',
+        //'margin' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .'(?:\s+(?:auto|'. $regexp_length .'|'. $regexp_percent .')){0,3})',
+        'margin' => '(?:auto|'. $regexp_length .'(?:\s+(?:'. $regexp_length .')){0,3}|'. $regexp_percent .'(?:\s+(?:auto|'. $regexp_length .'|'. $regexp_percent .')){0,3})',
         'margin-top' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .')',
         'margin-right' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .')',
         'margin-bottom' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .')',
         'margin-left' => '(?:auto|'. $regexp_length .'|'. $regexp_percent .')',
-        'padding' => '(?:'. $regexp_length .'|'. $regexp_percent .'(?:\s+(?:'. $regexp_length .'|'. $regexp_percent .')){0,3})',
+        //'padding' => '(?:'. $regexp_length .'|'. $regexp_percent .'(?:\s+(?:'. $regexp_length .'|'. $regexp_percent .')){0,3})',
+        'padding' => '(?:'. $regexp_length .'(?:\s+(?:'. $regexp_length .')){0,3}|'. $regexp_percent .'(?:\s+(?:'. $regexp_length .'|'. $regexp_percent .')){0,3})',
         'padding-top' => '(?:'. $regexp_length .'|'. $regexp_percent .')',
         'padding-right' => '(?:'. $regexp_length .'|'. $regexp_percent .')',
         'padding-bottom' => '(?:'. $regexp_length .'|'. $regexp_percent .')',