From e10ebff34f49e14c4ea0109463d9045eb2dc8ab0 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Mon, 14 Jan 2019 15:40:00 -0500
Subject: [PATCH] Fix display of Bcc header

Fixes #4642
---
 NEWS                                          |  3 ++-
 UI/Templates/MailerUI/UIxMailViewTemplate.wox | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index c2973d638..9fb6f9d5f 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,8 @@ Enhancements
 - [web] create card from sender or recipient address (#3002, #4610)
 
 Bug fixes
-- [web] Fix all-day event dates with different timezone
+- [web] fixed all-day event dates with different timezone
+- [web] fixed display of Bcc header (#4642)
 
 4.0.5 (2019-01-09)
 ------------------
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index fb49f0296..1f2bf190f 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -141,6 +141,7 @@
                 </div>
               </div>
             </div>
+            <!-- to -->
             <div class="msg-recipients" layout="column" flex="50" flex-xs="100">
               <div class="pseudo-input-container--compact">
                 <label class="pseudo-input-label">
@@ -165,6 +166,7 @@
                   </md-chips>
                 </div>
               </div>
+              <!-- cc -->
               <div class="pseudo-input-container--compact" ng-show="viewer.$showDetailedRecipients">
                 <label class="pseudo-input-label" ng-show="::viewer.message.cc.length > 0">
                   <var:string label:value="Cc"/>
@@ -183,6 +185,26 @@
                     </md-chip-template>
                   </md-chips>
                 </div>
+              </div>
+              <!-- bcc -->
+              <div class="pseudo-input-container--compact" ng-show="viewer.$showDetailedRecipients">
+                <label class="pseudo-input-label" ng-show="::viewer.message.bcc.length > 0">
+                  <var:string label:value="Bcc"/>
+                </label>
+                <div class="pseudo-input-field" ng-show="::viewer.message.bcc.length > 0">
+                  <md-chips
+                      class="sg-dense sg-readonly"
+                      ng-model="::viewer.message.bcc"
+                      md-removable="::false"
+                      readonly="::true">
+                    <md-chip-template
+                        ng-click="viewer.selectRecipient($chip, $event)"
+                        ng-focus="viewer.focusChip($event)"
+                        ng-blur="viewer.blurChip($event)">
+                      {{ $chip.name || $chip.email }}
+                    </md-chip-template>
+                  </md-chips>
+                </div>
                 <md-button
                     ng-hide="viewer.$alwaysShowDetailedRecipients || !viewer.$showDetailedRecipients"
                     style="float: right"