Index: webform2pdf.module
===================================================================
--- webform2pdf.module	(revision 1938)
+++ webform2pdf.module	(working copy)
@@ -122,11 +122,15 @@
   }
 } // function webform2pdf_help()
 
+/**
+ * Prepares the information for generating the PDF.
+ * @param $node
+ * @param $submission
+ */
 
-function webform2pdf_preprocess_webform_mail_message(&$vars) {
-global $webform2pdf_send2pdf;
-
-  $webform2pdf = _webform2pdf_get_template($vars['node']->nid);
+function webform2pdf_send2pdf($node, $submission) {
+  
+  $webform2pdf = _webform2pdf_get_template($node->nid);
   if ($webform2pdf['enabled']) {
     $no_mail = unserialize($webform2pdf['no_send_email_addr']);
     $nopdf = array();
@@ -134,12 +138,12 @@
     $no_mail = array_diff($no_mail, array(0));
     if ( !empty($no_mail) ) {
       foreach ($no_mail as $eid) {
-        $email_addresses = $vars['node']->webform['emails'][$eid]['email'];
-        if ( isset($vars['node']->webform['components'][$email_addresses]) ) {
-          $email_addresses = $vars['submission']->data[$eid]['value'];
+        $email_addresses = $node->webform['emails'][$eid]['email'];
+        if ( isset($node->webform['components'][$email_addresses]) ) {
+          $email_addresses = $submission->data[$eid]['value'];
         }
         else {
-          $email_addresses = array_filter(explode(',', check_plain($vars['node']->webform['emails'][$eid]['email'])));
+          $email_addresses = array_filter(explode(',', check_plain($node->webform['emails'][$eid]['email'])));
         }
         $nopdf = array_merge($nopdf, $email_addresses);
         $nopdf = array_map("trim", $nopdf);
@@ -147,8 +151,10 @@
     }
 
     // Check for a multi-page form that is not yet complete.
-    $webform2pdf_send2pdf = array('nid' => $vars['node']->nid, 'sid' => $vars['submission']->sid, 'nopdf' => $nopdf);
+    $webform2pdf_send2pdf = array('nid' => $node->nid, 'sid' => $submission->sid, 'nopdf' => $nopdf);
   }
+  
+  return $webform2pdf_send2pdf;
 }
 
 
@@ -1818,7 +1824,8 @@
  * webform2pdf_mail_alter: hook_mail_alter
  */
 function webform2pdf_mail_alter(&$message) {
-  global $webform2pdf_send2pdf;
+  
+  $webform2pdf_send2pdf = webform2pdf_send2pdf($message['params']['node'], $message['params']['submission']);
 
   if ( ($message['id'] == 'webform_submission') && (isset($webform2pdf_send2pdf['nid'])) ) {
     $attach_pdf = 1;