From a0d6257d1e3706aff51c0ac64caea9e32f45b1fe Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Fri, 11 Jul 2014 13:49:27 +0000
Subject: [PATCH] handle message/rfc822 attachments as display when opened from
 drafted message; properly restore message/rfc822 attachments stored with .eml
 files

---
 mail/inc/class.mail_ui.inc.php | 17 +++++++++--------
 mail/js/app.js                 |  1 +
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 6944229939..be17fe8b31 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -455,10 +455,10 @@ class mail_ui
 				//$content[self::$nm_index]['path'] = self::get_home_dir();
 			}
 		}
-		else if ($content['mailPreview']['mailPreviewHeadersAttachments']['previewAttachmentArea'][0]['save_zip'])
-		{
-			$this->download_zip(current($content[self::$nm_index]['selected']));
-		}
+//		else if ($content['mailPreview']['mailPreviewHeadersAttachments']['previewAttachmentArea'][0]['save_zip'])
+//		{
+//			$this->download_zip(current($content[self::$nm_index]['selected']));
+//		}
 		//$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,'.($toSchema?'toaddress':'fromaddress').',date,size';	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 		$content[self::$nm_index]['default_cols'] = 'status,attachments,subject,address,date,size';	// I  columns to use if there's no user or default pref (! as first char uses all but the named columns), default all columns
 		$content[self::$nm_index]['csv_fields'] = false;
@@ -2100,10 +2100,10 @@ class mail_ui
 			$rowID = $_requesteddata['id'];
 			//unset($_REQUEST);
 		}
-		if($_requesteddata['mail_displayattachments'][0]['save_zip'])
-		{
-			$this->download_zip($_requesteddata['mail_id']);
-		}
+//		if($_requesteddata['mail_displayattachments'][0]['save_zip'])
+//		{
+//			$this->download_zip($_requesteddata['mail_id']);
+//		}
 		$preventRedirect=false;
 		if(isset($_GET['id'])) $rowID	= $_GET['id'];
 		if(isset($_GET['part'])) $partID = $_GET['part'];
@@ -2279,6 +2279,7 @@ class mail_ui
 						$linkData = array
 						(
 							'menuaction'	=> 'mail.mail_ui.displayMessage',
+							//'mode'		=> 'display', //message/rfc822 attachments should be opened in display mode
 							'id'		=> $rowID,
 							'part'		=> $value['partID'],
 							'is_winmail'    => $value['is_winmail']
diff --git a/mail/js/app.js b/mail/js/app.js
index 7c34375633..837047c6fc 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -2012,6 +2012,7 @@ app.classes.mail = AppJS.extend(
 		{
 			case 'MESSAGE/RFC822':
 				url += 'menuaction=mail.mail_ui.displayMessage';	// todo compose for Draft folder
+				url += '&mode=display';//message/rfc822 attachments should be opened in display mode
 				url += '&id='+mailid;
 				url += '&part='+attgrid.partID;
 				url += '&is_winmail='+attgrid.winmailFlag;