diff --git a/include/class.mailer.php b/include/class.mailer.php
index a752d4043f062c83b9388a09a1f12824bd74dd57..f41d0e55a63ea814519aeac09b64749509029779 100644
--- a/include/class.mailer.php
+++ b/include/class.mailer.php
@@ -433,11 +433,10 @@ class Mailer {
                 function($match) use ($domain, $mime, $self) {
                     $file = false;
                     foreach ($self->attachments as $id=>$F) {
+                        if ($F instanceof Attachment)
+                            $F = $F->getFile();
                         if (strcasecmp($F->getKey(), $match[1]) === 0) {
-                            if ($F instanceof Attachment)
-                                $file = $F->getFile();
-                            else
-                                $file = $F;
+                            $file = $F;
                             break;
                         }
                     }