diff --git a/lib/features/caching/caching_manager.dart b/lib/features/caching/caching_manager.dart
index e730d83ee..603734a54 100644
--- a/lib/features/caching/caching_manager.dart
+++ b/lib/features/caching/caching_manager.dart
@@ -17,6 +17,7 @@ import 'package:tmail_ui_user/features/caching/clients/state_cache_client.dart';
 import 'package:tmail_ui_user/features/caching/clients/subscription_cache_client.dart';
 import 'package:tmail_ui_user/features/caching/utils/caching_constants.dart';
 import 'package:tmail_ui_user/features/mailbox/data/model/state_type.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/local_spam_report_manager.dart';
 import 'package:tmail_ui_user/features/offline_mode/controller/work_manager_controller.dart';
 import 'package:tmail_ui_user/features/offline_mode/manager/sending_email_cache_manager.dart';
 
@@ -34,6 +35,7 @@ class CachingManager {
   final FileUtils _fileUtils;
   final SendingEmailCacheManager _sendingEmailCacheManager;
   final SessionHiveCacheClient _sessionHiveCacheClient;
+  final LocalSpamReportManager _localSpamReportManager;
 
   CachingManager(
     this._mailboxCacheClient,
@@ -49,6 +51,7 @@ class CachingManager {
     this._fileUtils,
     this._sendingEmailCacheManager,
     this._sessionHiveCacheClient,
+    this._localSpamReportManager,
   );
 
   Future<void> clearAll() async {
@@ -60,6 +63,7 @@ class CachingManager {
       _fcmSubscriptionCacheClient.clearAllData(),
       _recentSearchCacheClient.clearAllData(),
       _accountCacheClient.clearAllData(),
+      _localSpamReportManager.clear(),
       if (PlatformInfo.isMobile)
         ...[
           _sessionHiveCacheClient.clearAllData(),
@@ -78,6 +82,7 @@ class CachingManager {
       _fcmCacheClient.clearAllData(),
       _fcmSubscriptionCacheClient.clearAllData(),
       _recentSearchCacheClient.clearAllData(),
+      _localSpamReportManager.clear(),
       if (PlatformInfo.isMobile)
        ...[
          _newEmailHiveCacheClient.clearAllData(),
diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/spam_report_cache_datasource_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/hive_spam_report_datasource_impl.dart
similarity index 93%
rename from lib/features/mailbox_dashboard/data/datasource_impl/spam_report_cache_datasource_impl.dart
rename to lib/features/mailbox_dashboard/data/datasource_impl/hive_spam_report_datasource_impl.dart
index e9a685b83..5af2c4e1a 100644
--- a/lib/features/mailbox_dashboard/data/datasource_impl/spam_report_cache_datasource_impl.dart
+++ b/lib/features/mailbox_dashboard/data/datasource_impl/hive_spam_report_datasource_impl.dart
@@ -11,11 +11,11 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_repor
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
 import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
 
-class SpamReportCacheDataSourceImpl extends SpamReportDataSource {
+class HiveSpamReportDataSourceImpl extends SpamReportDataSource {
   final MailboxCacheManager _mailboxCacheManager;
   final ExceptionThrower _exceptionThrower;
 
-  SpamReportCacheDataSourceImpl(this._mailboxCacheManager, this._exceptionThrower);
+  HiveSpamReportDataSourceImpl(this._mailboxCacheManager, this._exceptionThrower);
 
   @override
   Future<bool> deleteLastTimeDismissedSpamReported() {
diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/share_preference_spam_report_data_source_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/local_spam_report_datasource_impl.dart
similarity index 71%
rename from lib/features/mailbox_dashboard/data/datasource_impl/share_preference_spam_report_data_source_impl.dart
rename to lib/features/mailbox_dashboard/data/datasource_impl/local_spam_report_datasource_impl.dart
index 990d3cd48..9f064d518 100644
--- a/lib/features/mailbox_dashboard/data/datasource_impl/share_preference_spam_report_data_source_impl.dart
+++ b/lib/features/mailbox_dashboard/data/datasource_impl/local_spam_report_datasource_impl.dart
@@ -5,35 +5,35 @@ import 'package:jmap_dart_client/jmap/core/user_name.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/local_spam_report_manager.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
 import 'package:tmail_ui_user/main/exceptions/exception_thrower.dart';
 
-class SharePreferenceSpamReportDataSourceImpl extends SpamReportDataSource {
-  final SharePreferenceSpamReportDataSource _sharePreferenceSpamReportDataSource;
+class LocalSpamReportDataSourceImpl extends SpamReportDataSource {
+  final LocalSpamReportManager _localSpamReportManager;
   final ExceptionThrower _exceptionThrower;
 
-  SharePreferenceSpamReportDataSourceImpl(this._sharePreferenceSpamReportDataSource, this._exceptionThrower);
+  LocalSpamReportDataSourceImpl(this._localSpamReportManager, this._exceptionThrower);
 
   @override
   Future<DateTime> getLastTimeDismissedSpamReported() async {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.getLastTimeDismissedSpamReported();
+      return await _localSpamReportManager.getLastTimeDismissedSpamReported();
     }).catchError(_exceptionThrower.throwException);
   }
 
   @override
   Future<bool> storeLastTimeDismissedSpamReported(DateTime lastTimeDismissedSpamReported) async {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.storeLastTimeDismissedSpamReported(lastTimeDismissedSpamReported);
+      return await _localSpamReportManager.storeLastTimeDismissedSpamReported(lastTimeDismissedSpamReported);
     }).catchError(_exceptionThrower.throwException);
   }
   
   @override
   Future<bool> deleteLastTimeDismissedSpamReported() {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.deleteLastTimeDismissedSpamReported();
+      return await _localSpamReportManager.deleteLastTimeDismissedSpamReported();
     }).catchError(_exceptionThrower.throwException);
   }
 
@@ -52,21 +52,21 @@ class SharePreferenceSpamReportDataSourceImpl extends SpamReportDataSource {
   @override
   Future<void> deleteSpamReportState() {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.deleteLastTimeDismissedSpamReported();
+      return await _localSpamReportManager.deleteLastTimeDismissedSpamReported();
     }).catchError(_exceptionThrower.throwException);
   }
 
   @override
   Future<SpamReportState> getSpamReportState() {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.getSpamReportState();
+      return await _localSpamReportManager.getSpamReportState();
     }).catchError(_exceptionThrower.throwException);
   }
 
   @override
   Future<void> storeSpamReportState(SpamReportState spamReportState) {
     return Future.sync(() async {
-      return await _sharePreferenceSpamReportDataSource.storeSpamReportState(spamReportState);
+      return await _localSpamReportManager.storeSpamReportState(spamReportState);
     }).catchError(_exceptionThrower.throwException);
   }
 
diff --git a/lib/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart b/lib/features/mailbox_dashboard/data/local/local_spam_report_manager.dart
similarity index 59%
rename from lib/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart
rename to lib/features/mailbox_dashboard/data/local/local_spam_report_manager.dart
index ac36be8e9..bcc7f1ba4 100644
--- a/lib/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart
+++ b/lib/features/mailbox_dashboard/data/local/local_spam_report_manager.dart
@@ -1,69 +1,43 @@
-import 'package:jmap_dart_client/jmap/account_id.dart';
-import 'package:jmap_dart_client/jmap/core/session/session.dart';
-import 'package:jmap_dart_client/jmap/core/unsigned_int.dart';
-import 'package:jmap_dart_client/jmap/core/user_name.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
-import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox_filter_condition.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/spam_report_state.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/model/unread_spam_emails_response.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/utils/mailbox_dashboard_constant.dart';
 
-class SharePreferenceSpamReportDataSource extends SpamReportDataSource {
+class LocalSpamReportManager {
   final SharedPreferences _sharedPreferences;
 
-  SharePreferenceSpamReportDataSource(this._sharedPreferences);
+  LocalSpamReportManager(this._sharedPreferences);
 
-  @override
   Future<DateTime> getLastTimeDismissedSpamReported() async {
     final timeStamp = _sharedPreferences.getInt(MailboxDashboardConstant.keyLastTimeDismissedSpamReported) ?? 0;
     final lastTimeDismissedSpamReported =  DateTime.fromMillisecondsSinceEpoch(timeStamp);
     return lastTimeDismissedSpamReported;
   }
   
-  @override
   Future<bool> storeLastTimeDismissedSpamReported(DateTime lastTimeDismissedSpamReported) async {
     final timeStamp = lastTimeDismissedSpamReported.millisecondsSinceEpoch;
     return await _sharedPreferences.setInt(MailboxDashboardConstant.keyLastTimeDismissedSpamReported,timeStamp);
   }
 
-  @override
   Future<bool> deleteLastTimeDismissedSpamReported() async {
     return await _sharedPreferences.remove(MailboxDashboardConstant.keyLastTimeDismissedSpamReported);
   }
 
-  @override
-  Future<UnreadSpamEmailsResponse> findNumberOfUnreadSpamEmails(
-    Session session,
-    AccountId accountId,
-    {
-      MailboxFilterCondition? mailboxFilterCondition,
-      UnsignedInt? limit
-    }
-  ) {
-    throw UnimplementedError();
-  }
-
-  @override
   Future<bool> deleteSpamReportState() async {
     return await _sharedPreferences.remove(MailboxDashboardConstant.keySpamReportState);
   }
 
-  @override
   Future<SpamReportState> getSpamReportState() async {
     final spamReportState = _sharedPreferences.getString(MailboxDashboardConstant.keySpamReportState) ?? '';
     return spamReportState == SpamReportState.disabled.keyValue ? SpamReportState.disabled : SpamReportState.enabled;
   }
 
-  @override
   Future<bool> storeSpamReportState(SpamReportState spamReportState) async {
     final spamReportState0 = spamReportState.keyValue;
     return await _sharedPreferences.setString(MailboxDashboardConstant.keySpamReportState, spamReportState0);
   }
 
-  @override
-  Future<Mailbox> getSpamMailboxCached(AccountId accountId, UserName userName) {
-    throw UnimplementedError();
+  Future<void> clear() async {
+    await deleteLastTimeDismissedSpamReported();
+    await deleteSpamReportState();
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart b/lib/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart
index e48bec70a..d66aadd00 100644
--- a/lib/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart
+++ b/lib/features/mailbox_dashboard/domain/usecases/get_spam_mailbox_cached_interactor.dart
@@ -1,6 +1,7 @@
 
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
+import 'package:core/utils/app_logger.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/user_name.dart';
@@ -21,7 +22,7 @@ class GetSpamMailboxCachedInteractor {
       final lastTimeDismissedSpamReported = await _spamReportRepository.getLastTimeDismissedSpamReported();
       final timeLast = DateTime.now().difference(lastTimeDismissedSpamReported);
       final checkTimeCondition = timeLast.inHours > MailboxDashboardConstant.spamReportBannerDisplayTimeOut;
-
+      log('GetSpamMailboxCachedInteractor::execute:lastTimeDismissedSpamReported: $lastTimeDismissedSpamReported | timeLast: $timeLast | checkTimeCondition: $checkTimeCondition');
       if (checkTimeCondition) {
         final spamMailbox =  await _spamReportRepository.getSpamMailboxCached(accountId, userName);
         final countUnreadSpamMailbox = spamMailbox.unreadEmails?.value.value.toInt() ?? 0;
diff --git a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart
index 8d231c0fa..c71718a5f 100644
--- a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart
+++ b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart
@@ -46,12 +46,12 @@ import 'package:tmail_ui_user/features/mailbox/presentation/mailbox_controller.d
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/search_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/session_storage_composer_datasource.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/spam_report_datasource.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/hive_spam_report_datasource_impl.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/local_spam_report_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/search_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/session_storage_composer_datasoure_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/share_preference_spam_report_data_source_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/spam_report_cache_datasource_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/spam_report_datasource_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/local_spam_report_manager.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/network/spam_report_api.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/search_repository_impl.dart';
@@ -215,11 +215,11 @@ class MailboxDashBoardBindings extends BaseBindings {
       Get.find<SpamReportApi>(),
       Get.find<RemoteExceptionThrower>(),
     ));    
-    Get.lazyPut(() => SharePreferenceSpamReportDataSourceImpl(
-      Get.find<SharePreferenceSpamReportDataSource>(),
+    Get.lazyPut(() => LocalSpamReportDataSourceImpl(
+      Get.find<LocalSpamReportManager>(),
       Get.find<CacheExceptionThrower>(),
     ));
-    Get.lazyPut(() => SpamReportCacheDataSourceImpl(
+    Get.lazyPut(() => HiveSpamReportDataSourceImpl(
       Get.find<MailboxCacheManager>(),
       Get.find<CacheExceptionThrower>()));
     Get.lazyPut(() => EmailHiveCacheDataSourceImpl(
@@ -354,8 +354,8 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut(() => SpamReportRepositoryImpl(
       {
         DataSourceType.network: Get.find<SpamReportDataSource>(),
-        DataSourceType.local: Get.find<SharePreferenceSpamReportDataSourceImpl>(),
-        DataSourceType.hiveCache: Get.find<SpamReportCacheDataSourceImpl>()
+        DataSourceType.local: Get.find<LocalSpamReportDataSourceImpl>(),
+        DataSourceType.hiveCache: Get.find<HiveSpamReportDataSourceImpl>()
       },
     ));
   }
diff --git a/lib/main/bindings/local/local_bindings.dart b/lib/main/bindings/local/local_bindings.dart
index 158b1367b..8720a78ac 100644
--- a/lib/main/bindings/local/local_bindings.dart
+++ b/lib/main/bindings/local/local_bindings.dart
@@ -29,7 +29,7 @@ import 'package:tmail_ui_user/features/login/data/local/encryption_key_cache_man
 import 'package:tmail_ui_user/features/login/data/local/oidc_configuration_cache_manager.dart';
 import 'package:tmail_ui_user/features/login/data/local/token_oidc_cache_manager.dart';
 import 'package:tmail_ui_user/features/mailbox/data/local/mailbox_cache_manager.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/share_preference_spam_report_data_source.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/local/local_spam_report_manager.dart';
 import 'package:tmail_ui_user/features/manage_account/data/local/language_cache_manager.dart';
 import 'package:tmail_ui_user/features/offline_mode/manager/new_email_cache_manager.dart';
 import 'package:tmail_ui_user/features/offline_mode/manager/new_email_cache_worker_queue.dart';
@@ -82,6 +82,7 @@ class LocalBindings extends Bindings {
     Get.put(SendingEmailHiveCacheClient());
     Get.put(SendingEmailCacheManager(Get.find<SendingEmailHiveCacheClient>()));
     Get.put(SessionHiveCacheClient());
+    Get.put(LocalSpamReportManager(Get.find<SharedPreferences>()));
     Get.put(CachingManager(
       Get.find<MailboxCacheClient>(),
       Get.find<StateCacheClient>(),
@@ -96,8 +97,8 @@ class LocalBindings extends Bindings {
       Get.find<FileUtils>(),
       Get.find<SendingEmailCacheManager>(),
       Get.find<SessionHiveCacheClient>(),
+      Get.find<LocalSpamReportManager>(),
     ));
-    Get.put(SharePreferenceSpamReportDataSource(Get.find<SharedPreferences>()));
   }
 
   void _bindingException() {