From ed32bd4c0104d2d1d0dafaa1e1895fdd137e7034 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 8 Jan 2016 14:47:31 +0000
Subject: [PATCH] fix warning regarding PEAT::isError

---
 mail/inc/class.mail_ui.inc.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 7dc29bcfe7..f4ed325930 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1839,12 +1839,15 @@ class mail_ui
 		}
 		$this->mail_bo->reopen($mailbox);
 		// retrieve the flags of the message, before touching it.
-		$headers	= $this->mail_bo->getMessageHeader($uid, $partID,true,true,$mailbox);
-		if (PEAR::isError($headers)) {
+		try
+		{
+			$headers	= $this->mail_bo->getMessageHeader($uid, $partID,true,true,$mailbox);
+		}
+		catch (egw_exception $e)
+		{
 			$error_msg[] = lang("ERROR: Message could not be displayed.");
 			$error_msg[] = lang("In Mailbox: %1, with ID: %2, and PartID: %3",$mailbox,$uid,$partID);
-			$error_msg[] = $headers->message;
-			$error_msg[] = array2string($headers->backtrace[0]);
+			egw_framework::message($e->getMessage(), 'error');
 		}
 		if (!empty($uid)) $this->mail_bo->getFlags($uid);
 		$envelope	= $this->mail_bo->getMessageEnvelope($uid, $partID,true,$mailbox);