From 241db52e18a1b21f1961e95c04eb978166c3b440 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Thu, 13 Feb 2014 11:30:05 +0000
Subject: [PATCH] Add some more actions to mail display toolbar

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

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 012ada6f96..8864a9c73a 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1001,7 +1001,7 @@ class mail_ui
 				'group' => $group,
 				'children' => array(
 					'forwardinline' => array(
-						'caption' => 'forward',
+						'caption' => 'Inline',
 						'icon' => 'mail_forward',
 						'group' => $group,
 						'hint' => 'forward inline',
@@ -1010,7 +1010,7 @@ class mail_ui
 						'toolbarDefault' => true
 					),
 					'forwardasattach' => array(
-						'caption' => 'forward',
+						'caption' => 'Attachment',
 						'hint' => 'forward as attachment',
 						'icon' => 'mail_forward',
 						'group' => $group,
@@ -1531,19 +1531,20 @@ unset($query['actions']);
 		$dateToday = date("Y-m-d");
 		$rv = array();
 		$actions = self::get_actions();
-		foreach(array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','save','header') as $a => $act)
+		foreach(array('composeasnew','reply','reply_all','forward','flagged','delete','print','infolog','tracker','save','view') as $a => $act)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$act.'->'.array2string($actions[$act]));
 			switch ($act)
 			{
 				case 'forward':
-					$actionsenabled[$act]=$actions[$act]['children']['forwardinline'];
+					$actionsenabled[$act]=$actions[$act];
 					break;
 				case 'save':
-					$actionsenabled[$act]=$actions[$act]['children']['save2disk'];
+					$actionsenabled[$act]=$actions[$act];
+
 					break;
-				case 'header':
-					$actionsenabled[$act]=$actions['view']['children'][$act];
+				case 'view':
+					$actionsenabled[$act]=$actions[$act];
 					break;
 				case 'flagged':
 					$actionsenabled[$act]= $actions['mark']['children'][$act];