diff --git a/program/include/rcmail_sendmail.php b/program/include/rcmail_sendmail.php
index c6a09c0b4..0b9df0f77 100644
--- a/program/include/rcmail_sendmail.php
+++ b/program/include/rcmail_sendmail.php
@@ -469,12 +469,11 @@ class rcmail_sendmail
                         $msg = $message->mailbody_file;
                     }
                     else {
-                        $mailbody_file = rcube_utils::temp_filename('msg');
-                        $msg           = $message->saveMessageBody($mailbody_file);
+                        $message->mailbody_file = rcube_utils::temp_filename('msg');
+                        $msg = $message->saveMessageBody($message->mailbody_file);
 
                         if (!is_a($msg, 'PEAR_Error')) {
-                            $msg = $mailbody_file;
-                            $message->mailbody_file = $mailbody_file;
+                            $msg = $message->mailbody_file;
                         }
                     }
                 }