diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index 1132073d08886852ed78d80f2efd57b8eef79eb1..039a48b74be371ed1def64f502cad0db16c8506e 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -201,9 +201,6 @@ class Mail_Parse {
 
     function getAttachments($part=null){
 
-        if($part==null)
-            $part=$this->getStruct();
-
         /* Consider this part as an attachment if
          *   * It has a Content-Disposition header
          *     * AND it is specified as either 'attachment' or 'inline'
@@ -254,6 +251,9 @@ class Mail_Parse {
             return array($file);
         }
 
+        if($part==null)
+            $part=$this->getStruct();
+
         $files=array();
         if($part->parts){
             foreach($part->parts as $k=>$p){