Index: webform.submissions.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/webform/includes/webform.submissions.inc,v
retrieving revision 1.18.2.18
diff -u -r1.18.2.18 webform.submissions.inc
--- webform.submissions.inc	20 Feb 2011 00:32:33 -0000	1.18.2.18
+++ webform.submissions.inc	23 Feb 2011 01:49:53 -0000
@@ -269,8 +269,11 @@
           }
         }
 
+        // Prepare (but don't send) the e-mail normally.
+        $message = drupal_mail('webform', 'submission', $address, $language, $mail_params, $email['from'], FALSE);
+
         // 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');
+        $message = mimemail($email['from'], $address, $message['subject'], $message['body'], !$email['html'], $email['headers'], $email['html'] ? NULL : $email['message'], $attachments, 'webform');
         if ($message) {
           $send_count++;
         }