--- webform.module.old	2009-12-04 03:00:20.000000000 -0500
+++ webform.module	2009-12-04 03:19:09.000000000 -0500
@@ -1864,7 +1864,7 @@ function webform_client_form_submit($for
       // to be sent out.
       if (is_array($address)) {
         foreach ($address as $single_address) {
-          drupal_mail('webform', 'submission', $single_address, user_preferred_language($user), array('message' => $messages[$cid], 'subject' => $subjects[$cid], 'headers' => $headers[$cid]), $froms[$cid]);
+          drupal_mail('webform', 'submission', $single_address, user_preferred_language($user), array('message' => $messages[$cid], 'subject' => $subjects[$cid], 'headers' => $headers[$cid], 'nid' => $node->nid, 'sid' => $sid), $froms[$cid]);
 
           // Debugging output for email.
           if (variable_get('webform_debug', 0) >= 2) {
@@ -1873,7 +1873,7 @@ function webform_client_form_submit($for
         }
       }
       else {
-        drupal_mail('webform', 'submission', $address, user_preferred_language($user), array('message' => $messages[$cid], 'subject' => $subjects[$cid], 'headers' => $headers[$cid]), $froms[$cid]);
+        drupal_mail('webform', 'submission', $address, user_preferred_language($user), array('message' => $messages[$cid], 'subject' => $subjects[$cid], 'headers' => $headers[$cid], 'nid' => $node->nid, 'sid' => $sid), $froms[$cid]);
 
         // Debugging output for email.
         if (variable_get('webform_debug', 0) >= 2) {