--- webform.module	2009-11-05 19:01:17.000000000 -0700
+++ webform.module	2010-06-30 15:57:49.000000000 -0600
@@ -498,6 +498,10 @@
   );
 
   $form['webform']['settings']['body'] = array(
+    '#tree' => FALSE,
+  );
+
+  $form['webform']['settings']['body']['body'] = array(
     '#type' => 'textarea',
     '#title' => t('Description'),
     '#description' => t('Text to be shown as teaser and before the form.'),
@@ -516,7 +520,10 @@
     '#rows' => 10,
   );
 
-  $form['webform']['settings']['format'] = filter_form($node->format);
+  $form['webform']['settings']['body']['format'] = filter_form($node->format, NULL, array('body_format'));
+  $form['webform']['settings']['body']['format']['#attributes'] = array('style' => 'display: none;');
+  $form['webform']['settings']['format'] = filter_form($node->format, NULL, array('confirmation_format'));
+  $form['webform']['settings']['format']['#attributes'] = array('style' => 'display: none;');
   /* End Edit Form */
 
   /* Start per-role submission control */