Index: webform.module
===================================================================
--- webform.module  (revision 264)
+++ webform.module  (working copy)
@@ -1383,8 +1383,8 @@
       }
 
       // Assemble the FROM string.
-      if (isset($headers['From'])) {
-        $froms[$cid] = $headers['From'];
+      if (isset($headers[$cid]['From'])) {
+        $froms[$cid] = $headers[$cid]['From'];
       }
       elseif (strlen($email_from_name) > 0) {
         $froms[$cid] = '"'. mime_header_encode($email_from_name) .'" <'. $email_from_address .'>';
@@ -1394,8 +1394,8 @@
       }
 
       // Update the subject if set in the themed headers.
-      if (isset($headers['Subject'])) {
-        $subjects[$cid] = $headers['Subject'];
+      if (isset($headers[$cid]['Subject'])) {
+        $subjects[$cid] = $headers[$cid]['Subject'];
       }
       else {
         $subjects[$cid] = $email_subject;
@@ -1402,8 +1402,8 @@
       }
 
       // Update the to e-mail if set in the themed headers.
-      if (isset($headers['To'])) {
-        $emails[$cid] = $headers['To'];
+      if (isset($headers[$cid]['To'])) {
+        $emails[$cid] = $headers[$cid]['To'];
       }
     }
 
@@ -1420,7 +1420,7 @@
       // to be sent out.
       if (is_array($address)) {
         foreach ($address as $single_address) {
-          drupal_mail('webform-submission', $single_address, $email_subject, $messages[$cid], $froms[$cid], $headers[$cid]);
+          drupal_mail('webform-submission', $single_address, $subjects[$cid], $messages[$cid], $froms[$cid], $headers[$cid]);
 
           // Debugging output for email.
           if (variable_get('webform_debug', 0) >= 2) {
@@ -1429,11 +1429,11 @@
         }
       }
       else {
-        drupal_mail('webform-submission', $address, $email_subject, $messages[$cid], $froms[$cid], $headers[$cid]);
+        drupal_mail('webform-submission', $address, $subjects[$cid], $messages[$cid], $froms[$cid], $headers[$cid]);
 
         // Debugging output for email.
         if (variable_get('webform_debug', 0) >= 2) {
-          drupal_set_message("E-mail Headers: <pre>". htmlentities(print_r($headers[$cid], true)) ."</pre>To: ". $address ."<br />From: ". htmlentities($froms[$cid]) ."<br />Subject: ". $email_subject ."<br />E-mail Body: <pre>". $messages[$cid] ."</pre>");
+          drupal_set_message("E-mail Headers: <pre>". htmlentities(print_r($headers[$cid], true)) ."</pre>To: ". $address ."<br />From: ". htmlentities($froms[$cid]) ."<br />Subject: ". $subjects[$cid] ."<br />E-mail Body: <pre>". $messages[$cid] ."</pre>");
         }
       }
     }