Index: webform2pdf.module
===================================================================
--- webform2pdf.module	(revision 1315)
+++ webform2pdf.module	(working copy)
@@ -722,52 +722,55 @@
  * webform2pdf_mail_alter: hook_mail_alter
  */
 function webform2pdf_mail_alter(&$message) {
-  $webform2pdf_send2pdf = webform2pdf_send2pdf($message['params']['node'], $message['params']['submission']);
+  if ($message['id'] == 'webform_submission') {
+    $webform2pdf_send2pdf = webform2pdf_send2pdf($message['params']['node'], $message['params']['submission']);
 
-  if ( ($message['id'] == 'webform_submission') && (isset($webform2pdf_send2pdf['nid'])) ) {
-    $attach_pdf = 1;
+    if ( isset($webform2pdf_send2pdf['nid']) ) {
+      $attach_pdf = 1;
 
-    if ( !empty($webform2pdf_send2pdf['nopdf']) ) {
-      if (in_array($message['to'], $webform2pdf_send2pdf['nopdf'])) {
-          $attach_pdf = 0;
+      if ( !empty($webform2pdf_send2pdf['nopdf']) ) {
+        if (in_array($message['to'], $webform2pdf_send2pdf['nopdf'])) {
+            $attach_pdf = 0;
+        }
       }
-    }
 
-    if ( $attach_pdf ) {
-      if (module_exists('mimemail')) {
-        $a->filecontent = theme('webform2pdf_mail2pdf', $mail_params['node']->nid, $mail_params['submission']->sid);
-        $a->filename = theme('webform2pdf_filename', $mail_params['node'], $mail_params['submission']->sid);
-        $a->filemime = 'application/pdf';
-        $message['attachments'][] = $a;
-      }
-      else {
-        $trenner  = '------------' . md5(uniqid(time()));
+      if ( $attach_pdf ) {
+        if (module_exists('mimemail')) {
+          $node = node_load($webform2pdf_send2pdf['nid']);
+          $attachments->filecontent = theme('webform2pdf_mail2pdf', $webform2pdf_send2pdf['nid'], $webform2pdf_send2pdf['sid']);
+          $attachments->filename = theme('webform2pdf_filename', $node, $webform2pdf_send2pdf['sid']);
+          $attachments->filemime = 'application/pdf';
+          $message['params']['attachments'][] = $attachments;
+        }
+        else {
+          $trenner  = '------------' . md5(uniqid(time()));
 
-        $content_type = $message['headers']['Content-Type'];
-        $message['headers']['Content-Type'] = 'multipart/mixed; boundary="' . $trenner . '"';
-        unset($message['headers']['Content-Transfer-Encoding']);
+          $content_type = $message['headers']['Content-Type'];
+          $message['headers']['Content-Type'] = 'multipart/mixed; boundary="' . $trenner . '"';
+          unset($message['headers']['Content-Transfer-Encoding']);
 
-        $body = "\n--" . $trenner . "\n" .
-              "Content-Type: " . $content_type . "\n" .
-              "Content-Transfer-Encoding: 8bit\n\n";
-        $body .= is_array($message['body']) ? drupal_wrap_mail(implode("\n\n", $message['body'])) : drupal_wrap_mail($message['body']);
+          $body = "\n--" . $trenner . "\n" .
+                "Content-Type: " . $content_type . "\n" .
+                "Content-Transfer-Encoding: 8bit\n\n";
+          $body .= is_array($message['body']) ? drupal_wrap_mail(implode("\n\n", $message['body'])) : drupal_wrap_mail($message['body']);
 
-        unset($message['body']);
+          unset($message['body']);
 
-        $message['body'] = $body;
-        unset($body);
+          $message['body'] = $body;
+          unset($body);
 
-        $node = node_load($webform2pdf_send2pdf['nid']);
-        $filename = theme('webform2pdf_filename', $node, $webform2pdf_send2pdf['sid']);
-        unset($node);
+          $node = node_load($webform2pdf_send2pdf['nid']);
+          $filename = theme('webform2pdf_filename', $node, $webform2pdf_send2pdf['sid']);
+          unset($node);
 
-        $message['body'] .= "\n\n--" . $trenner . "\n";
-        $message['body'] .= "Content-Type: application/pdf; name=\"" . $filename . "\"\n";
-        $message['body'] .= "Content-Transfer-Encoding: base64\n";
-        $message['body'] .= "Content-Disposition: attachment; filename=\"" . $filename . "\"\n\n";
-        $message['body'] .= chunk_split( base64_encode( theme('webform2pdf_mail2pdf', $webform2pdf_send2pdf['nid'], $webform2pdf_send2pdf['sid']) ) );
-        $message['body'] .= "\n\n";
-        $message['body'] .= "--" . $trenner . "--";
+          $message['body'] .= "\n\n--" . $trenner . "\n";
+          $message['body'] .= "Content-Type: application/pdf; name=\"" . $filename . "\"\n";
+          $message['body'] .= "Content-Transfer-Encoding: base64\n";
+          $message['body'] .= "Content-Disposition: attachment; filename=\"" . $filename . "\"\n\n";
+          $message['body'] .= chunk_split( base64_encode( theme('webform2pdf_mail2pdf', $webform2pdf_send2pdf['nid'], $webform2pdf_send2pdf['sid']) ) );
+          $message['body'] .= "\n\n";
+          $message['body'] .= "--" . $trenner . "--";
+        }
       }
     }
   }