From c14550ad6892ca05c3483befd749dcae1ce5f974 Mon Sep 17 00:00:00 2001
From: matidau <65836048+matidau@users.noreply.github.com>
Date: Mon, 15 Jul 2024 21:47:15 +1000
Subject: [PATCH] draft - commit needs fixup

---
 src/backend/imap/imap.php                 | 6 +++---
 src/lib/default/diffbackend/diffstate.php | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/backend/imap/imap.php b/src/backend/imap/imap.php
index 6ea0246f..17dc305c 100644
--- a/src/backend/imap/imap.php
+++ b/src/backend/imap/imap.php
@@ -1111,10 +1111,10 @@ public function GetMessageList($folderid, $cutoffdate) {
                 else {
                     $message["star"] = 0;
                 }
-
-                $isdraftfolder = ($this->GetFolder($this->getFolderIdFromImapId($folderid))->type === SYNC_FOLDER_TYPE_DRAFTS);
-                
+      
                 // 'draft'
+                $isdraftfolder = ($this->GetFolder($this->getFolderIdFromImapId($folderid))->type === SYNC_FOLDER_TYPE_DRAFTS);
+
                 if ((isset($overview->draft) && $overview->draft) || $isdraftfolder) {
                     $message["draft"] = 1;
                     ZLog::Write(LOGLEVEL_WARN, sprintf("GetMessageList() isdraftfolder=%s", $isdraftfolder ));
diff --git a/src/lib/default/diffbackend/diffstate.php b/src/lib/default/diffbackend/diffstate.php
index 85321b8c..5be9beb7 100644
--- a/src/lib/default/diffbackend/diffstate.php
+++ b/src/lib/default/diffbackend/diffstate.php
@@ -186,6 +186,11 @@ protected function getDiffTo($new) {
                     $change["type"] = "change";
                     $changes[] = $change;
                 }
+                elseif(isset($old_item["draft"], $item["draft"]) && $old_item["draft"] != $item["draft"]) {
+                    // 'draft' changed
+                    $change["type"] = "change";
+                    $changes[] = $change;
+                }
                 elseif(isset($old_item['mod'], $item['mod']) && $old_item['mod'] != $item['mod']) {
                     // message modified
                     $change["type"] = "change";