From f0656f280f756dc19d1ae9db512aec1a5690a3a3 Mon Sep 17 00:00:00 2001
From: hadi <hnategh@gmail.com>
Date: Mon, 14 Aug 2023 17:19:12 +0200
Subject: [PATCH] Fix mail preview does not show bcc field

---
 mail/inc/class.mail_ui.inc.php   | 6 +++++-
 mail/templates/default/index.xet | 6 ++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/mail/inc/class.mail_ui.inc.php b/mail/inc/class.mail_ui.inc.php
index 96b53ff394..0c91a850be 100644
--- a/mail/inc/class.mail_ui.inc.php
+++ b/mail/inc/class.mail_ui.inc.php
@@ -1794,7 +1794,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 		if (empty($rowsFetched['messages'])) $rowsFetched['messages'] = $rowsFetched['rowsFetched'];
 
 		//error_log(__METHOD__.__LINE__.' Rows fetched:'.$rowsFetched.' Data:'.array2string($sortResult));
-		$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','additionaltoaddress','date','size','modified','bodypreview', 'security');
+		$cols = array('row_id','uid','status','attachments','subject','address','toaddress','fromaddress','ccaddress','bccaddress','additionaltoaddress','date','size','modified','bodypreview', 'security');
 		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode']=='EGW_SELECTMODE_TOGGLE') unset($cols[0]);
 		$rows = $mail_ui->header2gridelements($sortResult['header'],$cols, $_folderName, $folderType=$toSchema);
 
@@ -2102,6 +2102,10 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
 			{
 				$data['ccaddress'] = $header['cc_addresses'];
 			}
+			if (in_array("bccaddress", $cols))
+			{
+				$data['bccaddress'] = $header['bcc_addresses'];
+			}
 			if (in_array("date", $cols))
 			{
 				$data["date"] = $header['date'];
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 29b5411d68..0b3dcd75c7 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -47,6 +47,12 @@
                                                           rows="1" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"
                                                           onTagClick="app.mail.onclickCompose"></et2-select-email>
                                     </et2-hbox>
+                                    <et2-hbox disabled="!@bccaddress" width="100%">
+                                        <et2-description value="Bcc" class="firstColumnTitle"></et2-description>
+                                        <et2-select-email id="bccaddress" readonly="true" multiple="true"
+                                                          rows="1" fullEmail="@emailTag=fullemail" onlyEmail="@emailTag=onlyemail"
+                                                          onTagClick="app.mail.onclickCompose"></et2-select-email>
+                                    </et2-hbox>
                                     <et2-hbox width="100%" disabled="!@attachmentsBlock">
                                         <et2-description value="Attachments" class="firstColumnTitle"></et2-description>
                                         <et2-details overlaySummaryOnOpen="true" toggleAlign="right" toggleOnHover="true" hoist="true" class="attachments" >