diff --git a/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php b/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php
index cdee32e07e..6f8e3791af 100644
--- a/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php
+++ b/application/Espo/Core/Mail/Account/Storage/DirectoryTreeStorage.php
@@ -151,6 +151,8 @@ class DirectoryTreeStorage implements Storage
          */
         assert($query instanceof MessageQuery);
 
+        $query->setFetchOrderAsc();
+
         try {
             $query->each(function (MessageInterface $message) use (&$output) {
                 $output[] = $message->uid();
@@ -190,6 +192,8 @@ class DirectoryTreeStorage implements Storage
          */
         assert($query instanceof MessageQuery);
 
+        $query->setFetchOrderAsc();
+
         try {
             $query->each(function (MessageInterface $message) use (&$output) {
                 $output[] = $message->uid();