--- webform_original.module	2008-10-31 13:00:54.000000000 +0100
+++ webform.module	2008-10-31 13:01:16.000000000 +0100
@@ -1736,6 +1736,7 @@ function webform_client_form_submit($for
       // Assemble the FROM string.
       if (isset($headers[$cid]['From'])) {
         $froms[$cid] = $headers[$cid]['From'];
+        unset($headers[$cid]['From']);
       }
       elseif (strlen($email_from_name) > 0) {
         $froms[$cid] = '"'. mime_header_encode($email_from_name) .'" <'. $email_from_address .'>';
@@ -1747,6 +1748,7 @@ function webform_client_form_submit($for
       // Update the subject if set in the themed headers.
       if (isset($headers[$cid]['Subject'])) {
         $subjects[$cid] = $headers[$cid]['Subject'];
+        unset($headers[$cid]['Subject']);
       }
       else {
         $subjects[$cid] = $email_subject;
@@ -1755,6 +1757,7 @@ function webform_client_form_submit($for
       // Update the to e-mail if set in the themed headers.
       if (isset($headers[$cid]['To'])) {
         $emails[$cid] = $headers[$cid]['To'];
+        unset($headers[$cid]['To']);
       }
     }