From 10076bea09a2cbc2cd6c0ed7148d536ae2230061 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 11 Feb 2022 10:02:08 -0500
Subject: [PATCH] fix(mail(js)): show the recipient when in the Drafts mailbox

---
 UI/WebServerResources/js/Mailer/Mailbox.service.js           | 5 +++--
 .../js/Mailer/sgMessageListItemMain.directive.js             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index d1db3f583..5dc38f86a 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -105,11 +105,12 @@
         // Local recursive function
         createMailboxes = function(level, mailbox) {
           mailbox.isSentFolder = mailbox.isSentFolder || mailbox.type == 'sent';
+          mailbox.isDraftsFolder = mailbox.isDraftsFolder || mailbox.type == 'draft';
           for (var i = 0; i < mailbox.children.length; i++) {
             mailbox.children[i].level = level;
             mailbox.children[i] = new Mailbox(account, mailbox.children[i]);
-            if (mailbox.isSentFolder)
-              mailbox.children[i].isSentFolder = true;
+            mailbox.children[i].isSentFolder = mailbox.isSentFolder;
+            mailbox.children[i].isDraftsFolder = mailbox.isDraftsFolder;
             createMailboxes(level+1, mailbox.children[i]);
           }
         };
diff --git a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
index 971c3c808..960b3eef0 100644
--- a/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
+++ b/UI/WebServerResources/js/Mailer/sgMessageListItemMain.directive.js
@@ -142,8 +142,8 @@
           if ($ctrl.mailboxNameElement)
             $ctrl.mailboxNameElement.innerHTML = $ctrl.message.$mailbox.$displayName;
 
-          // Sender or recipient when in
-          if ($ctrl.MailboxService.selectedFolder.isSentFolder)
+          // Sender or recipient when in Sent or Draft mailbox
+          if ($ctrl.MailboxService.selectedFolder.isSentFolder || $ctrl.MailboxService.selectedFolder.isDraftsFolder)
             $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('to').encodeEntities();
           else
             $ctrl.senderElement.innerHTML = $ctrl.message.$shortAddress('from').encodeEntities();