Index: mass_contact.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/mass_contact/mass_contact.module,v
retrieving revision 1.9.2.21
diff -u -r1.9.2.21 mass_contact.module
--- mass_contact.module	12 May 2010 06:12:45 -0000	1.9.2.21
+++ mass_contact.module	24 May 2010 17:33:20 -0000
@@ -1069,6 +1069,11 @@
 
     ////////////////////////////////////////////////////////////
     // Add the field for specifying the body of the message.
+    $form['body_filter'] = array(
+      '#prefix'   => '<div class="body-field-wrapper">',
+      '#suffix'   => '</div>',
+    );
+
     $form['body_filter']['message'] = array(
       '#type'     => 'textarea',
       '#title'    => t('Message'),
@@ -1103,7 +1108,7 @@
       // Check if the user is allowed to override the input format setting.
       if (variable_get('mass_contact_html_format_override', 0)) {
         // The user is allowed, so add that to the form.
-        $form['html_filter']['format'] = filter_form($html_filter_format, NULL, array('mass_contact_html_format'));
+        $form['body_filter']['format'] = filter_form($html_filter_format, NULL, array('mass_contact_html_format'));
       }
       else {
         // The user is not allowed, so save the setting for later use.
@@ -1132,7 +1137,7 @@
           '#value' => '<p>'. (variable_get('mass_contact_html_d', 1) ? t('The message will be sent as HTML.') : t('The message will be sent as plain text.')) .'</p>',
         );
         // The user is allowed, so add that to the form.
-        $form['html_filter']['format'] = filter_form($html_filter_format, NULL, array('mass_contact_html_format'));
+        $form['body_filter']['format'] = filter_form($html_filter_format, NULL, array('mass_contact_html_format'));
       }
       else {
         // The user is not allowed, so save the setting for later use.