fixed problem with forwarding messages

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index d064ddc2c00660f55d5c49ae1f1694be4dbf29ba..f09a75172aef6e14e81d602e362e41b3539030e5 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -619,15 +619,7 @@ function getAttachments($message, $session, $passed_id, $entities, $imapConnecti
                   $filename = "untitled-".$message->entity_id.'.eml';
                }
            } else {
-               $filename = decodeHeader($message->header->disposition->getProperty('filename'));
-               if ($filename == '') {
-                 $name = decodeHeader($message->header->disposition->getProperty('name'));
-                 if ($name == '') {
-                     $filename = "untitled-".$message->entity_id;
-                 } else {
-                    $filename = $name;
-                 }
-               }
+              $filename = decodeHeader($message->getFilename());
             }
             $localfilename = GenerateRandomString(32, '', 7);
             $full_localfilename = "$hashed_attachment_dir/$localfilename";