From 0faeca045b93c6ceb4934632d392d8cfeb13af1a Mon Sep 17 00:00:00 2001
From: Michael J Rubinsky <mrubinsk@horde.org>
Date: Thu, 6 Aug 2015 21:45:50 -0400
Subject: [PATCH] We explicitly mark signature parts as not attachments.

Move the disposition check after the check for this.
---
 framework/ActiveSync/lib/Horde/ActiveSync/Mime.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php b/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php
index ba60450c328..1988fbd46d0 100644
--- a/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php
+++ b/framework/ActiveSync/lib/Horde/ActiveSync/Mime.php
@@ -126,10 +126,6 @@ public function hasAttachments()
      */
     public function isAttachment($id, $mime_type)
     {
-        if ($this->_base->getPart($id)->getDisposition() == 'attachment') {
-            return true;
-        }
-
         switch ($mime_type) {
         case 'text/plain':
             if (!($this->_base->findBody('plain') == $id)) {
@@ -146,6 +142,10 @@ public function isAttachment($id, $mime_type)
             return false;
         }
 
+        if ($this->_base->getPart($id)->getDisposition() == 'attachment') {
+            return true;
+        }
+
         list($ptype,) = explode('/', $mime_type, 2);
 
         switch ($ptype) {