--- a/program/lib/Roundcube/rcube_result_thread.php	Tue Oct 07 11:20:40 2025 -0400
+++ b/program/lib/Roundcube/rcube_result_thread.php	Wed Oct 08 08:50:44 2025 -0400
@@ -109,9 +109,9 @@
      */
     public function count()
     {
-        if ($this->meta['count'] !== null)
+      if (!empty($this->meta['count'])) {
             return $this->meta['count'];
-
+      }
         if (empty($this->raw_data)) {
             $this->meta['count'] = 0;
         }
@@ -603,7 +603,12 @@
             foreach ($messages as $msg) {
                 if ($msg) {
                     $node .= ($depth ? self::SEPARATOR_ITEM.$depth.self::SEPARATOR_LEVEL : '').$msg;
-                    $this->meta['messages']++;
+                    if (isset($this->meta['messages'])) {
+                        $this->meta['messages']++;
+                    }
+                    else {
+                        $this->meta['messages'] = 1;
+		    }
                     $depth++;
                 }
             }