From 3d85ca9db66d6659015e27e37cf56ac6abfaf59d Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 11 Nov 2015 12:26:14 +0000
Subject: [PATCH] no need to fetch mail again

---
 mail/inc/class.mail_ui.inc.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 9f733fc1bf..36478b578f 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1910,7 +1910,7 @@ class mail_ui
 
 		$etpl->exec('mail.mail_ui.displayMessage',$content,$sel_options,$readonlys,$preserv,2);
 	}
-	
+
 	/**
 	 * Build actions for display toolbar
 	 */
@@ -1938,7 +1938,7 @@ class mail_ui
 		$actions = array_reverse($actions,true);
 		return $actions;
 	}
-	
+
 	/**
 	 * createAttachmentBlock
 	 * helper function to create the attachment block/table
@@ -2373,7 +2373,6 @@ class mail_ui
 		$this->mail_bo->reopen($mailbox);
 
 		$message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox);
-		$headers = $this->mail_bo->getMessageHeader($uid, $partID, true,false, $mailbox);
 
 		$this->mail_bo->closeConnection();
 		if ($rememberServerID != $this->mail_bo->profileID)
@@ -2385,6 +2384,7 @@ class mail_ui
 		$GLOBALS['egw']->session->commit_session();
 		if (!$display)
 		{
+			$headers = Horde_Mime_Headers::parseHeaders($message);
 			$subject = str_replace('$$','__',mail_bo::decode_header($headers['SUBJECT']));
 			html::safe_content_header($message, $subject.".eml", $mime='message/rfc822', $size=0, true, true);
 			echo $message;