From 49b2313cfd0eb25dd03587d44976bd246552c84e Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hnategh@gmail.com>
Date: Thu, 4 Nov 2021 09:45:55 +0100
Subject: [PATCH] Fix error (TypeError): count(): Argument #1 ($value) must be
 of type Countable|array, null given

---
 mail/inc/class.mail_compose.inc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php
index af7d42e33d..052d9f5bdf 100644
--- a/mail/inc/class.mail_compose.inc.php
+++ b/mail/inc/class.mail_compose.inc.php
@@ -2347,8 +2347,8 @@ class mail_compose
 				@htmlspecialchars(lang("date").": ".Mail::_strtotime($headers['DATE'],'r',true), ENT_QUOTES | ENT_IGNORE,Mail::$displayCharset, false)."\r\n".
                 '-------------------------------------------------'."\r\n \r\n ";
 			$this->sessionData['mimeType']	= 'plain';
-
-			for($i=0; $i<count($bodyParts); $i++) {
+			$countBodyParts = count((array)$bodyParts);
+			for($i=0; $i<$countBodyParts; $i++) {
 				if($i>0) {
 					$this->sessionData['body'] .= "<hr>";
 				}