x

@@ -387,9 +387,11 @@ class Body {
         if (!empty($result[0])){
             $data['content-id'] = explode(' ',trim($result[0]));
             $data['content-id'] = $data['content-id'][1];
-            $data['content-id'] = @trim($data['content-id']);
-            $data['content-id'] = @trim($data['content-id'],'>');
-            $data['content-id'] = @trim($data['content-id'],'<');
+            if($data['content-id']){
+                $data['content-id'] = @trim($data['content-id']);
+                $data['content-id'] = @trim($data['content-id'],'>');
+                $data['content-id'] = @trim($data['content-id'],'<');
+            }
 
             $item['body'] = str_replace($result[0],'',$item['body']);
         }

@@ -316,7 +316,7 @@ class Mail {
 
                     $data   =   [
                         'uid'   =>  $result['UID'],
-                        'subject'   =>  $header['subject'],
+                        'subject'   =>  $header['subject']??($header['Subject']??($header['SUBJECT']??'')),
                         'cc'    =>  $cc,
                         'bcc'    =>  $bcc,
                         'from'   =>  $header['from'][0]['email']??'',