diff --git a/lib/features/base/base_controller.dart b/lib/features/base/base_controller.dart
index 52b02c346..52ba7259f 100644
--- a/lib/features/base/base_controller.dart
+++ b/lib/features/base/base_controller.dart
@@ -6,7 +6,6 @@ import 'package:core/presentation/state/success.dart';
 import 'package:core/presentation/utils/app_toast.dart';
 import 'package:core/presentation/views/toast/tmail_toast.dart';
 import 'package:core/utils/app_logger.dart';
-import 'package:core/utils/build_utils.dart';
 import 'package:core/utils/fps_manager.dart';
 import 'package:dartz/dartz.dart';
 import 'package:fcm/model/firebase_capability.dart';
@@ -44,7 +43,6 @@ import 'package:tmail_ui_user/features/push_notification/domain/usecases/get_fcm
 import 'package:tmail_ui_user/features/push_notification/presentation/bindings/fcm_interactor_bindings.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/config/fcm_configuration.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/controller/fcm_message_controller.dart';
-import 'package:tmail_ui_user/features/push_notification/presentation/notification/local_notification_manager.dart';
 import 'package:tmail_ui_user/features/push_notification/presentation/services/fcm_receiver.dart';
 import 'package:tmail_ui_user/main/bindings/network/binding_tag.dart';
 import 'package:tmail_ui_user/main/error/capability_validator.dart';
@@ -312,6 +310,7 @@ abstract class BaseController extends GetxController
       cachingManager.clearAll(),
       languageCacheManager.removeLanguage(),
     ]);
+    cachingManager.clearAllFileInStorage();
     authorizationInterceptors.clear();
     authorizationIsolateInterceptors.clear();
     if (_isFcmEnabled) {
@@ -328,6 +327,7 @@ abstract class BaseController extends GetxController
       cachingManager.clearAll(),
       languageCacheManager.removeLanguage(),
     ]);
+    cachingManager.clearAllFileInStorage();
     authorizationIsolateInterceptors.clear();
     authorizationInterceptors.clear();
     if (_isFcmEnabled) {
diff --git a/lib/features/caching/caching_manager.dart b/lib/features/caching/caching_manager.dart
index 6560c9a29..d7b0859b3 100644
--- a/lib/features/caching/caching_manager.dart
+++ b/lib/features/caching/caching_manager.dart
@@ -1,7 +1,9 @@
 import 'package:core/utils/app_logger.dart';
 import 'package:core/utils/file_utils.dart';
+import 'package:core/utils/platform_info.dart';
 import 'package:tmail_ui_user/features/caching/clients/account_cache_client.dart';
 import 'package:tmail_ui_user/features/caching/clients/detailed_email_hive_cache_client.dart';
+import 'package:tmail_ui_user/features/caching/clients/opened_email_hive_cache_client.dart';
 import 'package:tmail_ui_user/features/caching/config/hive_cache_config.dart';
 import 'package:tmail_ui_user/features/caching/clients/email_cache_client.dart';
 import 'package:tmail_ui_user/features/caching/clients/fcm_cache_client.dart';
@@ -23,6 +25,7 @@ class CachingManager {
   final FCMSubscriptionCacheClient _fcmSubscriptionCacheClient;
   final HiveCacheVersionClient _hiveCacheVersionClient;
   final DetailedEmailHiveCacheClient _detailedEmailHiveCacheClient;
+  final OpenedEmailHiveCacheClient _openedEmailHiveCacheClient;
   final FileUtils _fileUtils;
 
   CachingManager(
@@ -35,6 +38,7 @@ class CachingManager {
     this._fcmSubscriptionCacheClient,
     this._hiveCacheVersionClient,
     this._detailedEmailHiveCacheClient,
+    this._openedEmailHiveCacheClient,
     this._fileUtils,
   );
 
@@ -48,6 +52,7 @@ class CachingManager {
       _recentSearchCacheClient.clearAllData(),
       _accountCacheClient.clearAllData(),
       _detailedEmailHiveCacheClient.clearAllData(),
+      _openedEmailHiveCacheClient.clearAllData(),
     ], eagerError: true);
   }
 
@@ -60,6 +65,7 @@ class CachingManager {
       _fcmSubscriptionCacheClient.clearAllData(),
       _recentSearchCacheClient.clearAllData(),
       _detailedEmailHiveCacheClient.clearAllData(),
+      _openedEmailHiveCacheClient.clearAllData(),
     ], eagerError: true);
   }
 
@@ -92,6 +98,9 @@ class CachingManager {
   }
 
   void clearAllFileInStorage() {
-    _fileUtils.removeFolder(CachingConstants.incomingEmailedContentFolderName);
+    if (PlatformInfo.isMobile) {
+      _fileUtils.removeFolder(CachingConstants.incomingEmailedContentFolderName);
+      _fileUtils.removeFolder(CachingConstants.openedEmailContentFolderName);
+    }
   }
 }
diff --git a/lib/main/bindings/local/local_bindings.dart b/lib/main/bindings/local/local_bindings.dart
index 6ae4079cb..b36fdd129 100644
--- a/lib/main/bindings/local/local_bindings.dart
+++ b/lib/main/bindings/local/local_bindings.dart
@@ -90,6 +90,7 @@ class LocalBindings extends Bindings {
       Get.find<FCMSubscriptionCacheClient>(),
       Get.find<HiveCacheVersionClient>(),
       Get.find<DetailedEmailHiveCacheClient>(),
+      Get.find<OpenedEmailHiveCacheClient>(),
       Get.find<FileUtils>(),
     ));
     Get.put(SharePreferenceSpamReportDataSource(Get.find<SharedPreferences>()));