diff --git a/lib/features/download/data/datasource_impl/download_datasource_impl.dart b/lib/features/download/data/datasource_impl/download_datasource_impl.dart
index cbc789f2b..2608b6b27 100644
--- a/lib/features/download/data/datasource_impl/download_datasource_impl.dart
+++ b/lib/features/download/data/datasource_impl/download_datasource_impl.dart
@@ -40,10 +40,7 @@ class DownloadDatasourceImpl extends DownloadDatasource {
         onReceiveController: onReceiveController,
         cancelToken: cancelToken,
       );
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 
   @override
@@ -67,9 +64,6 @@ class DownloadDatasourceImpl extends DownloadDatasource {
         onReceiveController: onReceiveController,
         cancelToken: cancelToken,
       );
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 }
diff --git a/lib/features/labels/data/datasource_impl/label_datasource_impl.dart b/lib/features/labels/data/datasource_impl/label_datasource_impl.dart
index 22ad004c4..22351bbc3 100644
--- a/lib/features/labels/data/datasource_impl/label_datasource_impl.dart
+++ b/lib/features/labels/data/datasource_impl/label_datasource_impl.dart
@@ -14,19 +14,13 @@ class LabelDatasourceImpl extends LabelDatasource {
   Future<List<Label>> getAllLabels(AccountId accountId) {
     return Future.sync(() async {
       return await _labelApi.getAllLabels(accountId);
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 
   @override
   Future<Label> createNewLabel(AccountId accountId, Label labelData) {
     return Future.sync(() async {
       return await _labelApi.createNewLabel(accountId, labelData);
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 }
diff --git a/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart b/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart
index 0132c85b4..3d8454d14 100644
--- a/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart
+++ b/lib/features/login/data/datasource_impl/authentication_oidc_datasource_impl.dart
@@ -180,9 +180,6 @@ class AuthenticationOIDCDataSourceImpl extends AuthenticationOIDCDataSource {
   Future<OidcUserInfo> fetchUserInfo(String userInfoEndpoint) {
     return Future.sync(() async {
       return await _oidcHttpClient.fetchUserInfo(userInfoEndpoint);
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 }
\ No newline at end of file
diff --git a/lib/features/login/domain/usecases/delete_authority_oidc_interactor.dart b/lib/features/login/domain/usecases/delete_authority_oidc_interactor.dart
index b3f22abed..92d576f3a 100644
--- a/lib/features/login/domain/usecases/delete_authority_oidc_interactor.dart
+++ b/lib/features/login/domain/usecases/delete_authority_oidc_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/login/domain/usecases/delete_credential_interactor.dart b/lib/features/login/domain/usecases/delete_credential_interactor.dart
index 3033f6d5c..7b3d71681 100644
--- a/lib/features/login/domain/usecases/delete_credential_interactor.dart
+++ b/lib/features/login/domain/usecases/delete_credential_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:tmail_ui_user/features/login/domain/repository/credential_repository.dart';
diff --git a/lib/features/login/domain/usecases/get_credential_interactor.dart b/lib/features/login/domain/usecases/get_credential_interactor.dart
index 5b7154805..cadaff882 100644
--- a/lib/features/login/domain/usecases/get_credential_interactor.dart
+++ b/lib/features/login/domain/usecases/get_credential_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart
index 8f3672d90..18e8c9b27 100644
--- a/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart
+++ b/lib/features/mailbox/data/datasource_impl/mailbox_datasource_impl.dart
@@ -187,9 +187,6 @@ class MailboxDataSourceImpl extends MailboxDataSource {
           onProgressController: onProgressController,
         );
       }
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart b/lib/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart
index b9cddef63..1921cfb96 100644
--- a/lib/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart
+++ b/lib/features/mailbox_dashboard/domain/usecases/get_all_recent_search_latest_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
diff --git a/lib/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart b/lib/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart
index 92ef1aada..255b14698 100644
--- a/lib/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart
+++ b/lib/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
diff --git a/lib/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart b/lib/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart
index 9c3a26ff6..3b95e4f81 100644
--- a/lib/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart
+++ b/lib/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart
@@ -82,22 +82,16 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
 
   @override
   Future<bool> getLabelVisibility() {
-    return Future.sync(() async {
-      return await _settingCacheManager.getLabelVisibility();
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    return Future.sync(() {
+      return _settingCacheManager.getLabelVisibility();
+    }).catchError(_exceptionThrower.throwException);
   }
 
   @override
   Future<void> saveLabelVisibility(bool visible) {
     return Future.sync(() async {
       return await _settingCacheManager.saveLabelVisibility(visible);
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 
   @override
@@ -105,9 +99,6 @@ class ManageAccountDataSourceImpl extends ManageAccountDataSource {
     return Future.sync(() async {
       final labelConfig = await _preferencesSettingManager.getLabelConfig();
       return labelConfig.isEnabled;
-    }).catchError((error, stackTrace) async {
-      await _exceptionThrower.throwException(error, stackTrace);
-      throw error;
-    });
+    }).catchError(_exceptionThrower.throwException);
   }
 }
\ No newline at end of file
diff --git a/lib/features/manage_account/data/local/setting_cache_manager.dart b/lib/features/manage_account/data/local/setting_cache_manager.dart
index 2720e76e9..1c7c584bc 100644
--- a/lib/features/manage_account/data/local/setting_cache_manager.dart
+++ b/lib/features/manage_account/data/local/setting_cache_manager.dart
@@ -7,8 +7,7 @@ class SettingCacheManager {
 
   final SharedPreferences _sharedPreferences;
 
-  Future<bool> getLabelVisibility() async {
-    await _sharedPreferences.reload();
+  bool getLabelVisibility() {
     return _sharedPreferences.getBool(_labelVisibilitySettingKey) ?? false;
   }
 
diff --git a/lib/features/manage_account/domain/usecases/create_new_default_identity_interactor.dart b/lib/features/manage_account/domain/usecases/create_new_default_identity_interactor.dart
index 8bf97ac25..e735df0a2 100644
--- a/lib/features/manage_account/domain/usecases/create_new_default_identity_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/create_new_default_identity_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/create_new_email_rule_filter_interactor.dart b/lib/features/manage_account/domain/usecases/create_new_email_rule_filter_interactor.dart
index 45904d6d9..8aaef67f3 100644
--- a/lib/features/manage_account/domain/usecases/create_new_email_rule_filter_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/create_new_email_rule_filter_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/create_new_identity_interactor.dart b/lib/features/manage_account/domain/usecases/create_new_identity_interactor.dart
index e1beafd50..bf51a6c7d 100644
--- a/lib/features/manage_account/domain/usecases/create_new_identity_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/create_new_identity_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
diff --git a/lib/features/manage_account/domain/usecases/delete_email_rule_interactor.dart b/lib/features/manage_account/domain/usecases/delete_email_rule_interactor.dart
index e10c70098..48c58c98b 100644
--- a/lib/features/manage_account/domain/usecases/delete_email_rule_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/delete_email_rule_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
diff --git a/lib/features/manage_account/domain/usecases/delete_identity_interactor.dart b/lib/features/manage_account/domain/usecases/delete_identity_interactor.dart
index cf2833df2..1ee7a4a58 100644
--- a/lib/features/manage_account/domain/usecases/delete_identity_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/delete_identity_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/edit_default_identity_interactor.dart b/lib/features/manage_account/domain/usecases/edit_default_identity_interactor.dart
index 37ecd6fff..a3cdbdbc7 100644
--- a/lib/features/manage_account/domain/usecases/edit_default_identity_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/edit_default_identity_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
diff --git a/lib/features/manage_account/domain/usecases/edit_email_rule_filter_interactor.dart b/lib/features/manage_account/domain/usecases/edit_email_rule_filter_interactor.dart
index 5402b3ce5..466ef759c 100644
--- a/lib/features/manage_account/domain/usecases/edit_email_rule_filter_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/edit_email_rule_filter_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart b/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart
index c4d9216ef..505904049 100644
--- a/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/edit_identity_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/get_all_identities_interactor.dart b/lib/features/manage_account/domain/usecases/get_all_identities_interactor.dart
index f7389cd50..6a10d0a46 100644
--- a/lib/features/manage_account/domain/usecases/get_all_identities_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_all_identities_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/get_all_rules_interactor.dart b/lib/features/manage_account/domain/usecases/get_all_rules_interactor.dart
index 18f7a0889..adcaa92c8 100644
--- a/lib/features/manage_account/domain/usecases/get_all_rules_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_all_rules_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
diff --git a/lib/features/manage_account/domain/usecases/get_all_vacation_interactor.dart b/lib/features/manage_account/domain/usecases/get_all_vacation_interactor.dart
index e8f0392fa..ab1fb14a5 100644
--- a/lib/features/manage_account/domain/usecases/get_all_vacation_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_all_vacation_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/get_forward_interactor.dart b/lib/features/manage_account/domain/usecases/get_forward_interactor.dart
index bd8235828..6e55b8206 100644
--- a/lib/features/manage_account/domain/usecases/get_forward_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_forward_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/get_label_setting_state_interactor.dart b/lib/features/manage_account/domain/usecases/get_label_setting_state_interactor.dart
index a5f7ff5db..40a6c1fca 100644
--- a/lib/features/manage_account/domain/usecases/get_label_setting_state_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_label_setting_state_interactor.dart
@@ -13,8 +13,8 @@ class GetLabelSettingStateInteractor {
   Stream<Either<Failure, Success>> execute(AccountId accountId) async* {
     try {
       yield Right(GettingLabelSettingState());
-      final isEnable = await _manageAccountRepository.getLabelSettingState();
-      yield Right(GetLabelSettingStateSuccess(isEnable, accountId));
+      final isEnabled = await _manageAccountRepository.getLabelSettingState();
+      yield Right(GetLabelSettingStateSuccess(isEnabled, accountId));
     } catch (e) {
       yield Left(GetLabelSettingStateFailure(e));
     }
diff --git a/lib/features/manage_account/domain/usecases/get_label_visibility_interactor.dart b/lib/features/manage_account/domain/usecases/get_label_visibility_interactor.dart
index e3606b2cf..0c171a40e 100644
--- a/lib/features/manage_account/domain/usecases/get_label_visibility_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/get_label_visibility_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/save_label_visibility_interactor.dart b/lib/features/manage_account/domain/usecases/save_label_visibility_interactor.dart
index 5defe732f..7c0d80b6b 100644
--- a/lib/features/manage_account/domain/usecases/save_label_visibility_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/save_label_visibility_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/domain/usecases/save_language_interactor.dart b/lib/features/manage_account/domain/usecases/save_language_interactor.dart
index c547a09da..af17a5062 100644
--- a/lib/features/manage_account/domain/usecases/save_language_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/save_language_interactor.dart
@@ -1,4 +1,3 @@
-import 'dart:core';
 import 'dart:ui';
 
 import 'package:core/presentation/state/failure.dart';
diff --git a/lib/features/manage_account/domain/usecases/transform_list_signature_interactor.dart b/lib/features/manage_account/domain/usecases/transform_list_signature_interactor.dart
index 80c78686c..1a13c87be 100644
--- a/lib/features/manage_account/domain/usecases/transform_list_signature_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/transform_list_signature_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:core/utils/app_logger.dart';
diff --git a/lib/features/manage_account/domain/usecases/update_vacation_interactor.dart b/lib/features/manage_account/domain/usecases/update_vacation_interactor.dart
index f090227a2..c18223bfc 100644
--- a/lib/features/manage_account/domain/usecases/update_vacation_interactor.dart
+++ b/lib/features/manage_account/domain/usecases/update_vacation_interactor.dart
@@ -1,5 +1,3 @@
-import 'dart:core';
-
 import 'package:core/presentation/state/failure.dart';
 import 'package:core/presentation/state/success.dart';
 import 'package:dartz/dartz.dart';
diff --git a/lib/features/manage_account/presentation/extensions/handle_setup_label_visibility_in_setting_extension.dart b/lib/features/manage_account/presentation/extensions/handle_setup_label_visibility_in_setting_extension.dart
index 5c3e2a217..e083f42b8 100644
--- a/lib/features/manage_account/presentation/extensions/handle_setup_label_visibility_in_setting_extension.dart
+++ b/lib/features/manage_account/presentation/extensions/handle_setup_label_visibility_in_setting_extension.dart
@@ -18,7 +18,7 @@ extension HandleSetupLabelVisibilityInSettingExtension
   }
 
   void enableLabelVisibility() {
-    isLabelVisibility.value = true;
+    isLabelVisibilityEnabled.value = true;
 
     saveLabelVisibilityInteractor = getBinding<SaveLabelVisibilityInteractor>();
     if (saveLabelVisibilityInteractor != null) {
@@ -41,6 +41,6 @@ extension HandleSetupLabelVisibilityInSettingExtension
   }
 
   void handleGetLabelVisibilitySuccess(bool visible) {
-    isLabelVisibility.value = visible;
+    isLabelVisibilityEnabled.value = visible;
   }
 }
diff --git a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
index 65f9275c6..46013004f 100644
--- a/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
+++ b/lib/features/manage_account/presentation/manage_account_dashboard_controller.dart
@@ -77,7 +77,7 @@ class ManageAccountDashBoardController extends ReloadableController
   final vacationResponse = Rxn<VacationResponse>();
   final dashboardSettingAction = Rxn<UIAction>();
   final octetsQuota = Rxn<Quota>();
-  final isLabelVisibility = RxBool(false);
+  final isLabelVisibilityEnabled = RxBool(false);
 
   Uri? previousUri;
   AccountMenuItem? selectedMenu;
diff --git a/lib/features/manage_account/presentation/menu/settings/settings_view.dart b/lib/features/manage_account/presentation/menu/settings/settings_view.dart
index cf276ad06..c2294acb5 100644
--- a/lib/features/manage_account/presentation/menu/settings/settings_view.dart
+++ b/lib/features/manage_account/presentation/menu/settings/settings_view.dart
@@ -32,7 +32,7 @@ class SettingsView extends GetWidget<SettingsController> {
         Obx(() {
           final labelVisibility = controller
               .manageAccountDashboardController
-              .isLabelVisibility
+              .isLabelVisibilityEnabled
               .value;
           final isLabelCapabilitySupported = controller
               .manageAccountDashboardController
diff --git a/lib/features/manage_account/presentation/preferences/preferences_view.dart b/lib/features/manage_account/presentation/preferences/preferences_view.dart
index 492861ad2..3c93562f7 100644
--- a/lib/features/manage_account/presentation/preferences/preferences_view.dart
+++ b/lib/features/manage_account/presentation/preferences/preferences_view.dart
@@ -55,7 +55,7 @@ class PreferencesView extends GetWidget<PreferencesController> with AppLoaderMix
                     Obx(
                       () {
                         final labelVisibility = controller
-                            .accountDashboardController.isLabelVisibility.value;
+                            .accountDashboardController.isLabelVisibilityEnabled.value;
 
                         final isLabelCapabilitySupported = controller
                             .accountDashboardController
@@ -79,7 +79,7 @@ class PreferencesView extends GetWidget<PreferencesController> with AppLoaderMix
                     final localSettingOption = controller.localSettings.value;
                     final isLabelVisibility = controller
                         .accountDashboardController
-                        .isLabelVisibility;
+                        .isLabelVisibilityEnabled;
 
                     if (settingOption == null &&
                         localSettingOption.configs.isEmpty) {