diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart
index 5c4282383..00cf385bb 100644
--- a/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart
+++ b/lib/features/mailbox/data/datasource_impl/mailbox_cache_datasource_impl.dart
@@ -5,6 +5,7 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:tmail_ui_user/features/mailbox/data/datasource/mailbox_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox/data/model/mailbox_change_response.dart';
 import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
+import 'package:tmail_ui_user/features/mailbox/data/extensions/mailbox_extension.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/model/mailbox_response.dart';
 
 class MailboxCacheDataSourceImpl extends MailboxDataSource {
@@ -35,7 +36,9 @@ class MailboxCacheDataSourceImpl extends MailboxDataSource {
   @override
   Future<List<Mailbox>> getAllMailboxCache() {
     return Future.sync(() async {
-      return await _mailboxCacheManager.getAllMailbox();
+      final listMailboxes = await _mailboxCacheManager.getAllMailbox();
+      listMailboxes.sort((mailboxA, mailboxB) => mailboxA.compareTo(mailboxB));
+      return listMailboxes;
     }).catchError((error) {
       throw error;
     });
diff --git a/lib/features/mailbox/data/extensions/mailbox_extension.dart b/lib/features/mailbox/data/extensions/mailbox_extension.dart
index c69e19071..291f7767f 100644
--- a/lib/features/mailbox/data/extensions/mailbox_extension.dart
+++ b/lib/features/mailbox/data/extensions/mailbox_extension.dart
@@ -19,4 +19,8 @@ extension MailboxExtension on Mailbox {
       isSubscribed: isSubscribed?.value
     );
   }
+
+  int compareTo(Mailbox other) {
+    return this.sortOrder!.value.value.compareTo(other.sortOrder!.value.value);
+  }
 }
\ No newline at end of file