Index: includes/webform.emails.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.emails.inc,v
retrieving revision 1.26
diff -u -r1.26 webform.emails.inc
--- includes/webform.emails.inc	18 Feb 2011 17:25:35 -0000	1.26
+++ includes/webform.emails.inc	20 Feb 2011 00:28:49 -0000
@@ -286,6 +286,7 @@
     '#title' => t('Send e-mail as HTML'),
     '#default_value' => $email['html'],
     '#access' => module_exists('mimemail') && !variable_get('webform_format_override', 0),
+    '#description' => t('This feature not yet working in Drupal 7. See <a href="https://drupal.org/node/1043086">Webform-MIME Mail integration issue</a>.'),
   );
 
   $form['template']['attachments'] = array(
@@ -293,6 +294,7 @@
     '#title' => t('Include files as attachments'),
     '#default_value' => $email['attachments'],
     '#access' => module_exists('mimemail'),
+    '#description' => t('This feature not yet working in Drupal 7. See <a href="https://drupal.org/node/1043086">Webform-MIME Mail integration issue</a>.'),
   );
 
   $form['template']['tokens'] = array(
Index: includes/webform.submissions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.submissions.inc,v
retrieving revision 1.36
diff -u -r1.36 webform.submissions.inc
--- includes/webform.submissions.inc	17 Feb 2011 04:08:56 -0000	1.36
+++ includes/webform.submissions.inc	20 Feb 2011 00:28:49 -0000
@@ -199,6 +199,9 @@
   // Create a themed message for mailing.
   $send_count = 0;
   foreach ($emails as $eid => $email) {
+    // Set the HTML property based on availablity of MIME Mail.
+    $email['html'] = ($email['html'] && module_exists('mimemail'));
+
     // Pass through the theme layer if using the default template.
     if ($email['template'] == 'default') {
       $email['message'] = theme(array('webform_mail_' . $node->nid, 'webform_mail', 'webform_mail_message'), array('node' => $node, 'submission' => $submission, 'email' => $email));
@@ -208,7 +211,6 @@
     }
 
     // Replace tokens in the message.
-    $email['html'] = ($email['html'] && module_exists('mimemail'));
     $email['message'] = _webform_filter_values($email['message'], $node, $submission, $email, FALSE, TRUE);
 
     // Build the e-mail headers.
@@ -296,18 +298,17 @@
           }
         }
 
-        // Send the e-mail via MIME mail.
-        $message = mimemail($email['from'], $address, $email['subject'], $email['message'], !$email['html'], $email['headers'], $email['html'] ? NULL : $email['message'], $attachments, 'webform');
-        if ($message) {
-          $send_count++;
-        }
+        // Add the attachments to the mail parameters.
+        $mail_params['attachments'] = $attachments;
+
+        // TODO: Perform any other modifications necessary to get MIME Mail
+        // sending e-mail properly as HTML and attachments.
       }
-      else {
-        // Normal Drupal mailer.
-        $message = drupal_mail('webform', 'submission', $address, $language, $mail_params, $email['from']);
-        if ($message['result']) {
-          $send_count++;
-        }
+
+      // Mail the submission.
+      $message = drupal_mail('webform', 'submission', $address, $language, $mail_params, $email['from']);
+      if ($message['result']) {
+        $send_count++;
       }
     }
   }