From a04baf6367f4be2479ea2ea5c1af27ff6aa38f6e Mon Sep 17 00:00:00 2001
From: matidau <65836048+matidau@users.noreply.github.com>
Date: Thu, 1 Aug 2024 11:08:12 +1000
Subject: [PATCH] more changes

---
 src/backend/imap/imap.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/backend/imap/imap.php b/src/backend/imap/imap.php
index ce4b05a6..013d3dfd 100644
--- a/src/backend/imap/imap.php
+++ b/src/backend/imap/imap.php
@@ -3126,7 +3126,12 @@ public function saveDraftMail($sm) {
         ZLog::Write(LOGLEVEL_WARN, sprintf("BackendIMAP->SaveDraftMail(): We get the new message"));
         ZLog::Write(LOGLEVEL_WARN, sprintf("BackendIMAP->SaveDraftMail(): sm->mimedata: %s", $sm->mimedata));
         
-        // set $message if there is mimedata 
+        // set $mimedata, if there isn't set with minimum from header 
+        $mimedata = $sm->mimedata;
+        if (isempty($mimedata)) {
+            $mimedata = $sm->from;
+        }
+
         $mobj = new Mail_mimeDecode($sm->mimedata);
         $message = $mobj->decode(array('decode_headers' => 'utf-8', 'decode_bodies' => true, 'include_bodies' => true, 'rfc_822bodies' => true, 'charset' => 'utf-8'));
         unset($mobj);
@@ -3173,7 +3178,7 @@ public function saveDraftMail($sm) {
 
         // if it's a S/MIME message or has VCALENDAR objects I don't do anything with it
         if (is_smime($message) || has_calendar_object($message)) {
-            $mobj = new Mail_mimeDecode($sm->mimedata);
+            $mobj = new Mail_mimeDecode($mimedata);
             // re-using getSendArray() for save drafts
             $parts = $mobj->getSendArray();
             unset($mobj);