From 7256ad2239d5d92638fc22c567bce127209a74b3 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 17 Jan 2014 13:14:40 +0000
Subject: [PATCH] try to catch further errors on structure retrieval

---
 mail/inc/class.mail_bo.inc.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_bo.inc.php b/mail/inc/class.mail_bo.inc.php
index e6f14ff6cf..5bc115c378 100644
--- a/mail/inc/class.mail_bo.inc.php
+++ b/mail/inc/class.mail_bo.inc.php
@@ -3669,7 +3669,16 @@ class mail_bo
 		{
 			$_structure = $this->getStructure($_uid, $_partID, $_folder, $_preserveSeen);
 		}
-
+		if (!is_object($_structure))
+		{
+			return array(
+				array(
+					'body'		=> null,
+					'mimeType'	=> 'text/plain',
+					'charSet'	=> self::$displayCharset,
+				)
+			);
+		}
 		switch($_structure->getPrimaryType())
 		{
 			case 'application':