Index: storminvoice/storminvoice.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/storminvoice/storminvoice.admin.inc,v
retrieving revision 1.2.4.25
diff -u -p -r1.2.4.25 storminvoice.admin.inc
--- storminvoice/storminvoice.admin.inc	28 Oct 2009 22:16:14 -0000	1.2.4.25
+++ storminvoice/storminvoice.admin.inc	20 Mar 2010 13:40:33 -0000
@@ -480,9 +480,8 @@ function storminvoice_send_form_submit($
   $language = $form['#parameters'][4];
   $filedata = theme('storminvoice_report_pdf', $node, $language, 'email');
 
-  $pdffile = variable_get('storminvoice_email_pdf_file_path', '');
   $pdffile_name = variable_get('storminvoice_email_pdf_file_name', '');
-  $pdffile_mime = file_get_mimetype($pdffile);
+  $pdffile_mime = 'application/pdf';
   $params['body']  .= "--$trenner"."\n";
   $params['body']  .= "Content-Type:$pdffile_mime; name='$pdffile_name'\n";
   $params['body']  .= "Content-Disposition: attachment; filename='$pdffile_name'\n";
@@ -492,14 +491,13 @@ function storminvoice_send_form_submit($
 
   drupal_mail('storminvoice', 'invoice', $to, $language, $params, $from , True);
 
-  drupal_set_message(variable_get('storminvoice_sent', t('You have sent invoice to !email.', array('!email' => $to ))));
+  drupal_set_message(variable_get('storminvoice_sent', t('The invoice has been sent')));
 }
 
 /**
  * Implementation of hook_mail().
  */
 function storminvoice_mail($key, &$message, $params) {
-
   $trenner = variable_get('storminvoice_email_pdf_trenner', '');
   $message['subject'] = $params['subject'];
   $message['body'][] = $params['body'];
Index: storminvoice/storminvoice.theme.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/storm/storminvoice/storminvoice.theme.inc,v
retrieving revision 1.2.4.48
diff -u -p -r1.2.4.48 storminvoice.theme.inc
--- storminvoice/storminvoice.theme.inc	20 Mar 2010 13:12:31 -0000	1.2.4.48
+++ storminvoice/storminvoice.theme.inc	20 Mar 2010 13:40:33 -0000
@@ -623,13 +623,13 @@ function theme_storminvoice_report_pdf($
 
   //Close and output PDF document
   if ($output == 'screen') {
+    // Pipe document inline to browser
     $pdf->Output($filename, "I");
   }
   else if ($output == 'email') {
-    $dir = file_directory_path().'/';
-    variable_set('storminvoice_email_pdf_file_path', $dir.$filename);
     variable_set('storminvoice_email_pdf_file_name', $filename);
-    return $pdf->Output($dir.$filename, "S");
+    // Return pdf as string
+    return $pdf->Output(NULL, "S");
   }
 }