From 9bc3c57239a0558479cca1368d33c492a1bdc83a Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Wed, 20 Nov 2013 10:00:16 +0000
Subject: [PATCH] make sure the content type map is available on accessing a
 known/wanted attachment part

---
 mail/inc/class.mail_bo.inc.php | 3 ++-
 mail/inc/class.mail_ui.inc.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index 59e1945440..9ad42bf6a0 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -4462,6 +4462,7 @@ class mail_bo
 				if ($_partID != '')
 				{
 					$mailStructureObject = $_headerObject->getStructure();
+					$mailStructureObject->contentTypeMap();
 					$part = $mailStructureObject->getPart($_partID);
 					if ($part->getDisposition()=='attachment')
 					{
@@ -4727,7 +4728,7 @@ class mail_bo
 					}
 					else
 					{
-						$attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID']));
+						$attachments[$num] = array_merge($attachments[$num],$mailClass->getAttachment($uid, $attachment['partID'],0,false,false));
 						if (isset($attachments[$num]['charset'])) {
 							if ($attachments[$num]['charset']===false) $attachments[$num]['charset'] = translation::detect_encoding($attachments[$num]['attachment']);
 							translation::convert($attachments[$num]['attachment'],$attachments[$num]['charset']);
diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 53fa1fd676..d5a612b0c8 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1108,6 +1108,7 @@ unset($query['actions']);
 		$sRToFetch = null;
 		$_folderName=(!empty($query['selectedFolder'])?$query['selectedFolder']:$this->mail_bo->profileID.self::$delimiter.'INBOX');
 		list($_profileID,$folderName) = explode(self::$delimiter,$_folderName,2);
+		if (strpos($folderName,self::$delimiter)!==false) list($app,$_profileID,$folderName) = explode(self::$delimiter,$_folderName,3);
 		if (is_numeric($_profileID))
 		{
 			if ($_profileID && $_profileID != $this->mail_bo->profileID)