From 0df6426c0381e7123522b3f7ebc74df887201786 Mon Sep 17 00:00:00 2001
From: milan <mk@egroupware.org>
Date: Thu, 5 Dec 2024 18:03:09 +0100
Subject: [PATCH] Mail Compose change "To" label to a dropdown to add bcc cc
 etc

---
 mail/js/app.js                     |  3 ++-
 mail/templates/default/compose.xet | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 1427f3e959..3fbe173f18 100755
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -385,7 +385,7 @@ app.classes.mail = AppJS.extend(
 					}
 					else
 					{
-						that.compose_fieldExpander();
+						//that.compose_fieldExpander();
 					}
 				});
 
@@ -4752,6 +4752,7 @@ app.classes.mail = AppJS.extend(
 					}
 					break;
 			}
+			widget.parentElement.hide()
 		}
 		else if (typeof widget == "undefined")
 		{
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index 01ff052a07..1d86af2913 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -30,12 +30,6 @@
 					<row class="mailComposeHeaders" >
 						<et2-description  value="From"></et2-description>
 						<et2-select  id="mailaccount" onchange="app.mail.submitOnChange"></et2-select>
-						<et2-dropdown-button id="cc_expander" label="Cc" class="et2_button_text2" onclick="app.mail.compose_fieldExpander" >
-							<et2-button id="bcc_expander" label="Bcc" onclick="app.mail.compose_fieldExpander"></et2-button>
-							<et2-button id="replyto_expander" label="Reply to" onclick="app.mail.compose_fieldExpander"></et2-button>
-							<et2-button id="folder_expander" label="Folder" onclick="app.mail.compose_fieldExpander"></et2-button>
-
-						</et2-dropdown-button>
 						<et2-vbox class="expanderFirstRow">
 							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="composeID"></et2-textbox>
 							<et2-textbox  class="mail-index_quotaDisplayNone" readonly="true" id="serverID"></et2-textbox>
@@ -61,7 +55,13 @@
 						<et2-description></et2-description>
 					</row>
 					<row class="mailComposeHeaders" >
-						<et2-description  value="To"></et2-description>
+						<et2-dropdown>
+							<et2-button slot="trigger" caret="true" noSubmit="true" >To</et2-button>
+							<et2-button id="cc_expander" label="Cc" onclick="app.mail.compose_fieldExpander"></et2-button>
+							<et2-button id="bcc_expander" label="Bcc" onclick="app.mail.compose_fieldExpander"></et2-button>
+							<et2-button id="replyto_expander" label="Reply to" onclick="app.mail.compose_fieldExpander"></et2-button>
+							<et2-button id="folder_expander" label="Folder" onclick="app.mail.compose_fieldExpander"></et2-button>
+						</et2-dropdown>
                         <et2-email id="to" width="100%" onclick="app.mail.address_click" autofocus="true"
                                    onchange="app.mail.recipients_onchange"
                                    placeholder="select or insert email address" includeLists="true" allowPlaceholder="true"></et2-email>