--- a/program/lib/Roundcube/rcube_imap.php	Tue Oct 07 11:20:40 2025 -0400
+++ b/program/lib/Roundcube/rcube_imap.php	Wed Oct 08 08:50:44 2025 -0400
@@ -74,6 +74,7 @@
     protected $threading = false;
     protected $connect_done;
     protected $sort_folder_collator;
+    protected $msg_uid;
 
     /**
      * Object constructor.
@@ -2039,7 +2040,7 @@
                 }
                 $tmp_part_id = $struct->mime_id ? $struct->mime_id.'.'.($i+1) : $i+1;
                 $struct->parts[] = $this->structure_part($part[$i], ++$count, $struct->mime_id,
-                    $mime_part_headers[$tmp_part_id]);
+		 $mime_part_headers ? $mime_part_headers[$tmp_part_id] : null);
             }
 
             return $struct;
@@ -3742,7 +3743,7 @@
             $headers = array();
         }
 
-        if ($this->messages_caching || $this->options['all_headers']) {
+        if ($this->messages_caching || !empty($this->options['all_headers'])) {
             $headers = array_merge($headers, $this->all_headers);
         }