From 2945021b207ec9705ec2ecd5d9c06e89b8f743c5 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 15 Feb 2018 15:13:47 +0100
Subject: [PATCH] * Mail: Fix spacing issue between grouped toolbars

---
 api/templates/default/etemplate2.css |  3 +++
 mail/inc/class.mail_compose.inc.php  | 36 ++++++++++++++--------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index c892479901..f2c854a73c 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -1925,6 +1925,9 @@ div.ui-dialog div.ui-dialog-content > div[id] {
 	margin: 0 !important;
 	padding: 0 !important;
 }
+.et2_toolbar .et2_toolbar_actionlist span[data-group]:not(:first-child) > button.et2_button:first-child {
+	margin-left: 7px;
+}
 .et2_toolbar .et2_toolbar_actionlist button.et2_button_with_image, .nextmatch_header_row .et2_button {
 	width: 24px;
 	background-position: center;
diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index 06d921c3d1..c6df55e8bf 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -125,15 +125,6 @@ class mail_compose
 				'shortcut' => array('ctrl' => true, 'keyCode' => 83, 'caption' => 'Ctrl + S'),
 				'toolbarDefault' => true
 			),
-			'pgp' => array(
-				'caption' => 'Encrypt',
-				'icon' => 'lock',
-				'group' => ++$group,
-				'onExecute' => 'javaScript:app.mail.togglePgpEncrypt',
-				'hint' => 'Send message PGP encrypted: requires keys from all recipients!',
-				'checkbox' => true,
-				'toolbarDefault' => true
-			),
 			'button[saveAsDraft]' => array(
 				'caption' => 'Save',
 				'icon' => 'save',
@@ -145,10 +136,17 @@ class mail_compose
 			'button[saveAsDraftAndPrint]' => array(
 				'caption' => 'Print',
 				'icon' => 'print',
-				'group' => ++$group,
+				'group' => $group,
 				'onExecute' => 'javaScript:app.mail.saveAsDraft',
 				'hint' => 'Save as Draft and Print'
 			),
+			'save2vfs' => array (
+				'caption' => 'Save to filemanager',
+				'icon' => 'filesave',
+				'group' => $group,
+				'onExecute' => 'javaScript:app.mail.compose_saveDraft2fm',
+				'hint' => 'Save the drafted message as eml file into VFS'
+			),
 			'selectFromVFSForCompose' => array(
 				'caption' => 'VFS',
 				'icon' => 'filemanager',
@@ -160,7 +158,7 @@ class mail_compose
 			'uploadForCompose' => array(
 				'caption' => 'Upload files...',
 				'icon' => 'attach',
-				'group' => ++$group,
+				'group' => $group,
 				'onExecute' => 'javaScript:app.mail.compose_triggerWidget',
 				'hint' => 'Select files to upload',
 				'toolbarDefault' => true
@@ -201,17 +199,19 @@ class mail_compose
 			),
 			'prty' => array(
 				'caption' => 'Priority',
-				'group' => ++$group,
+				'group' => $group,
 				'icon' => 'priority',
 				'children' => array(),
 				'hint' => 'Select the message priority tag',
 			),
-			'save2vfs' => array (
-				'caption' => 'Save to filemanager',
-				'icon' => 'filesave',
+			'pgp' => array(
+				'caption' => 'Encrypt',
+				'icon' => 'lock',
 				'group' => ++$group,
-				'onExecute' => 'javaScript:app.mail.compose_saveDraft2fm',
-				'hint' => 'Save the drafted message as eml file into VFS'
+				'onExecute' => 'javaScript:app.mail.togglePgpEncrypt',
+				'hint' => 'Send message PGP encrypted: requires keys from all recipients!',
+				'checkbox' => true,
+				'toolbarDefault' => true
 			),
 
 		);
@@ -230,7 +230,7 @@ class mail_compose
 				'smime_encrypt' => array (
 					'caption' => 'SMIME Encryption',
 					'icon' => 'smime_encrypt',
-					'group' => ++$group,
+					'group' => $group,
 					'onExecute' => 'javaScript:app.mail.compose_setToggle',
 					'checkbox' => true,
 					'hint' => 'Encrypt your message with smime certificate'