diff --git a/env.file b/env.file
index 71638e979..f915cbf58 100644
--- a/env.file
+++ b/env.file
@@ -1,3 +1,3 @@
-SERVER_URL=http://localhost
+SERVER_URL=https://gateway.upn.integration-open-paas.org
 DOMAIN_REDIRECT_URL=http://localhost:3000
 WEB_OIDC_CLIENT_ID=teammail-web
\ No newline at end of file
diff --git a/lib/features/composer/presentation/composer_bindings.dart b/lib/features/composer/presentation/composer_bindings.dart
index 77149e970..159502945 100644
--- a/lib/features/composer/presentation/composer_bindings.dart
+++ b/lib/features/composer/presentation/composer_bindings.dart
@@ -29,8 +29,8 @@ import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/email/data/repository/email_repository_impl.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource/manage_account_datasource.dart';
 import 'package:tmail_ui_user/features/manage_account/data/datasource_impl/manage_account_datasource_impl.dart';
@@ -143,8 +143,8 @@ class ComposerBindings extends BaseBindings {
         Get.find<UpdateEmailDraftsInteractor>(),
         Get.find<GetAllIdentitiesInteractor>(),
         Get.find<UploadController>(),
-        Get.find<RemoveEmailCacheOnWebInteractor>(),
-        Get.find<SaveEmailCacheOnWebInteractor>(),
+        Get.find<RemoveComposerCacheOnWebInteractor>(),
+        Get.find<SaveComposerCacheOnWebInteractor>(),
     ));
   }
 
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 9aa255083..3717a5633 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -39,8 +39,8 @@ import 'package:tmail_ui_user/features/composer/presentation/model/screen_displa
 import 'package:tmail_ui_user/features/email/domain/state/get_email_content_state.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/get_email_content_interactor.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/state/get_all_identities_state.dart';
 import 'package:tmail_ui_user/features/manage_account/domain/usecases/get_all_identities_interactor.dart';
@@ -85,8 +85,8 @@ class ComposerController extends BaseController {
   final UpdateEmailDraftsInteractor _updateEmailDraftsInteractor;
   final GetAllIdentitiesInteractor _getAllIdentitiesInteractor;
   final UploadController uploadController;
-  final RemoveEmailCacheOnWebInteractor _removeEmailCacheOnWebInteractor;
-  final SaveEmailCacheOnWebInteractor _saveEmailCacheOnWebInteractor;
+  final RemoveComposerCacheOnWebInteractor _removeComposerCacheOnWebInteractor;
+  final SaveComposerCacheOnWebInteractor _saveComposerCacheOnWebInteractor;
 
   List<EmailAddress> listToEmailAddress = <EmailAddress>[];
   List<EmailAddress> listCcEmailAddress = <EmailAddress>[];
@@ -153,8 +153,8 @@ class ComposerController extends BaseController {
     this._updateEmailDraftsInteractor,
     this._getAllIdentitiesInteractor,
     this.uploadController,
-    this._removeEmailCacheOnWebInteractor,
-    this._saveEmailCacheOnWebInteractor,
+    this._removeComposerCacheOnWebInteractor,
+    this._saveComposerCacheOnWebInteractor,
   );
 
   @override
@@ -248,13 +248,13 @@ class ComposerController extends BaseController {
   void _listenBrowserTabRefresh() {
     html.window.onBeforeUnload.listen((event) async {
       final userProfile = mailboxDashBoardController.userProfile.value;
-      _removeEmailCacheOnWebInteractor.execute();
+      _removeComposerCacheOnWebInteractor.execute();
       if (userProfile != null) {
         final draftEmail = await _generateEmail(
           mailboxDashBoardController.mapDefaultMailboxId,
           userProfile,
         );
-        _saveEmailCacheOnWebInteractor.execute(draftEmail);
+        _saveComposerCacheOnWebInteractor.execute(draftEmail);
       }
     });
   }
diff --git a/lib/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart b/lib/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart
new file mode 100644
index 000000000..8bacfa545
--- /dev/null
+++ b/lib/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart
@@ -0,0 +1,10 @@
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/composer_cache.dart';
+
+abstract class ComposerCacheDataSource {
+  void saveComposerCacheOnWeb(Email email);
+
+  ComposerCache? getComposerCacheOnWeb();
+
+  void removeComposerCacheOnWeb();
+}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart b/lib/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart
deleted file mode 100644
index a1a861791..000000000
--- a/lib/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/email_cache.dart';
-
-abstract class EmailCacheDataSource {
-  void saveEmailCacheOnWeb(Email email);
-
-  EmailCache? getEmailCacheOnWeb();
-
-  void removeEmailCacheOnWeb();
-}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/data/datasource_impl/email_cache_datasoure_impl.dart b/lib/features/mailbox_dashboard/data/datasource_impl/composer_cache_datasoure_impl.dart
similarity index 73%
rename from lib/features/mailbox_dashboard/data/datasource_impl/email_cache_datasoure_impl.dart
rename to lib/features/mailbox_dashboard/data/datasource_impl/composer_cache_datasoure_impl.dart
index 2cef41e90..5ebb4e34f 100644
--- a/lib/features/mailbox_dashboard/data/datasource_impl/email_cache_datasoure_impl.dart
+++ b/lib/features/mailbox_dashboard/data/datasource_impl/composer_cache_datasoure_impl.dart
@@ -1,20 +1,20 @@
 import 'dart:convert';
 import 'package:jmap_dart_client/jmap/mail/email/email.dart';
 import 'package:model/model.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/email_cache.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/composer_cache.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart';
 import 'package:universal_html/html.dart' as html;
 
-class EmailCacheDataSourceImpl extends EmailCacheDataSource {
+class ComposerCacheDataSourceImpl extends ComposerCacheDataSource {
 
   @override
-  EmailCache? getEmailCacheOnWeb() {
+  ComposerCache? getComposerCacheOnWeb() {
     final result = html.window.localStorage.entries
         .where((e) => e.key == EmailActionType.edit.name)
         .toList();
     if (result.isNotEmpty) {
       final jsonHandle = json.decode(result.first.value) as Map<String, dynamic>;
-      final emailCache = EmailCache.fromJson(jsonHandle);
+      final emailCache = ComposerCache.fromJson(jsonHandle);
       return emailCache;
     } else {
       return null;
@@ -22,12 +22,12 @@ class EmailCacheDataSourceImpl extends EmailCacheDataSource {
   }
 
   @override
-  void removeEmailCacheOnWeb() {
+  void removeComposerCacheOnWeb() {
     html.window.localStorage.removeWhere((key, value) => key == EmailActionType.edit.name);
   }
 
   @override
-  void saveEmailCacheOnWeb(Email email) {
+  void saveComposerCacheOnWeb(Email email) {
     Map<String,String> entries = { EmailActionType.edit.name: json.encode(email.toJson()) };
     html.window.localStorage.addAll(entries);
   }
diff --git a/lib/features/mailbox_dashboard/data/model/email_cache.dart b/lib/features/mailbox_dashboard/data/model/composer_cache.dart
similarity index 95%
rename from lib/features/mailbox_dashboard/data/model/email_cache.dart
rename to lib/features/mailbox_dashboard/data/model/composer_cache.dart
index dc82d94a8..6d9b1cb26 100644
--- a/lib/features/mailbox_dashboard/data/model/email_cache.dart
+++ b/lib/features/mailbox_dashboard/data/model/composer_cache.dart
@@ -10,7 +10,7 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart';
 import 'package:model/email/email_content.dart';
 import 'package:model/extensions/media_type_extension.dart';
 
-class EmailCache with EquatableMixin {
+class ComposerCache with EquatableMixin {
 
   final EmailId id;
   final Map<MailboxId, bool>? mailboxIds;
@@ -24,7 +24,7 @@ class EmailCache with EquatableMixin {
   final Set<EmailBodyPart>? htmlBody;
   final Map<PartId, EmailBodyValue>? bodyValues;
 
-  EmailCache(
+  ComposerCache(
       this.id,
       {
         this.mailboxIds,
@@ -39,8 +39,8 @@ class EmailCache with EquatableMixin {
         this.bodyValues,
       });
 
-  factory EmailCache.fromJson(Map<String, dynamic> json) {
-    return EmailCache(
+  factory ComposerCache.fromJson(Map<String, dynamic> json) {
+    return ComposerCache(
       EmailId(Id(json['id'])),
       mailboxIds: (json['mailboxIds'] as Map<String, dynamic>?)?.map((key, value) => EmailMailboxIdsConverter().parseEntry(key, value)),
       subject: json['subject'] as String?,
diff --git a/lib/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart b/lib/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart
new file mode 100644
index 000000000..63190dc13
--- /dev/null
+++ b/lib/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart
@@ -0,0 +1,26 @@
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/composer_cache.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
+
+class ComposerCacheRepositoryImpl extends ComposerCacheRepository {
+
+  final ComposerCacheDataSource composerCacheDataSource;
+
+  ComposerCacheRepositoryImpl(this.composerCacheDataSource);
+
+  @override
+  ComposerCache? getComposerCacheOnWeb() {
+    return composerCacheDataSource.getComposerCacheOnWeb();
+  }
+
+  @override
+  void removeComposerCacheOnWeb() {
+    return composerCacheDataSource.removeComposerCacheOnWeb();
+  }
+
+  @override
+  void saveComposerCacheOnWeb(Email email) {
+    return composerCacheDataSource.saveComposerCacheOnWeb(email);
+  }
+}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/data/repository/email_cache_repository_impl.dart b/lib/features/mailbox_dashboard/data/repository/email_cache_repository_impl.dart
deleted file mode 100644
index ae1671bb7..000000000
--- a/lib/features/mailbox_dashboard/data/repository/email_cache_repository_impl.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/email_cache.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/email_cache_repository.dart';
-
-class EmailCacheRepositoryImpl extends EmailCacheRepository {
-
-  final EmailCacheDataSource emailCacheDataSource;
-
-  EmailCacheRepositoryImpl(this.emailCacheDataSource);
-
-  @override
-  EmailCache? getEmailCacheOnWeb() {
-    return emailCacheDataSource.getEmailCacheOnWeb();
-  }
-
-  @override
-  void removeEmailCacheOnWeb() {
-    return emailCacheDataSource.removeEmailCacheOnWeb();
-  }
-
-  @override
-  void saveEmailCacheOnWeb(Email email) {
-    return emailCacheDataSource.saveEmailCacheOnWeb(email);
-  }
-}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart b/lib/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart
new file mode 100644
index 000000000..79f7e2e1b
--- /dev/null
+++ b/lib/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart
@@ -0,0 +1,10 @@
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/composer_cache.dart';
+
+abstract class ComposerCacheRepository {
+  void saveComposerCacheOnWeb(Email email);
+
+  ComposerCache? getComposerCacheOnWeb();
+
+  void removeComposerCacheOnWeb();
+}
diff --git a/lib/features/mailbox_dashboard/domain/repository/email_cache_repository.dart b/lib/features/mailbox_dashboard/domain/repository/email_cache_repository.dart
deleted file mode 100644
index 4cb41e9ea..000000000
--- a/lib/features/mailbox_dashboard/domain/repository/email_cache_repository.dart
+++ /dev/null
@@ -1,10 +0,0 @@
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/email_cache.dart';
-
-abstract class EmailCacheRepository {
-  void saveEmailCacheOnWeb(Email email);
-
-  EmailCache? getEmailCacheOnWeb();
-
-  void removeEmailCacheOnWeb();
-}
diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web.dart
new file mode 100644
index 000000000..d636e640d
--- /dev/null
+++ b/lib/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web.dart
@@ -0,0 +1,12 @@
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/composer_cache.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
+
+class GetComposerCacheOnWebInteractor {
+  final ComposerCacheRepository composerCacheRepository;
+
+  GetComposerCacheOnWebInteractor(this.composerCacheRepository);
+
+  ComposerCache? execute() {
+    return composerCacheRepository.getComposerCacheOnWeb();
+  }
+}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/get_email_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/get_email_cache_on_web.dart
deleted file mode 100644
index 70fbe8e10..000000000
--- a/lib/features/mailbox_dashboard/domain/usecases/get_email_cache_on_web.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/model/email_cache.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/email_cache_repository.dart';
-
-class GetEmailCacheOnWebInteractor {
-  final EmailCacheRepository emailCacheRepository;
-
-  GetEmailCacheOnWebInteractor(this.emailCacheRepository);
-
-  EmailCache? execute() {
-    return emailCacheRepository.getEmailCacheOnWeb();
-  }
-}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart
new file mode 100644
index 000000000..dd568157b
--- /dev/null
+++ b/lib/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart
@@ -0,0 +1,11 @@
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
+
+class RemoveComposerCacheOnWebInteractor {
+  final ComposerCacheRepository composerCacheRepository;
+
+  RemoveComposerCacheOnWebInteractor(this.composerCacheRepository);
+
+  execute() {
+    return composerCacheRepository.removeComposerCacheOnWeb();
+  }
+}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart
deleted file mode 100644
index a7d0b38a6..000000000
--- a/lib/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/email_cache_repository.dart';
-
-class RemoveEmailCacheOnWebInteractor {
-  final EmailCacheRepository emailCacheRepository;
-
-  RemoveEmailCacheOnWebInteractor(this.emailCacheRepository);
-
-  execute() {
-    return emailCacheRepository.removeEmailCacheOnWeb();
-  }
-}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart
new file mode 100644
index 000000000..5917975a6
--- /dev/null
+++ b/lib/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart
@@ -0,0 +1,12 @@
+import 'package:jmap_dart_client/jmap/mail/email/email.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
+
+class SaveComposerCacheOnWebInteractor {
+  final ComposerCacheRepository composerCacheRepository;
+
+  SaveComposerCacheOnWebInteractor(this.composerCacheRepository);
+
+   execute(Email email) {
+    return composerCacheRepository.saveComposerCacheOnWeb(email);
+  }
+}
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart b/lib/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart
deleted file mode 100644
index 98634a589..000000000
--- a/lib/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart
+++ /dev/null
@@ -1,12 +0,0 @@
-import 'package:jmap_dart_client/jmap/mail/email/email.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/email_cache_repository.dart';
-
-class SaveEmailCacheOnWebInteractor {
-  final EmailCacheRepository emailCacheRepository;
-
-  SaveEmailCacheOnWebInteractor(this.emailCacheRepository);
-
-   execute(Email email) {
-    return emailCacheRepository.saveEmailCacheOnWeb(email);
-  }
-}
\ No newline at end of file
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 d67a175ac..eca6b157d 100644
--- a/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart
+++ b/lib/features/mailbox_dashboard/presentation/bindings/mailbox_dashboard_bindings.dart
@@ -19,11 +19,11 @@ import 'package:tmail_ui_user/features/email/data/network/email_api.dart';
 import 'package:tmail_ui_user/features/email/data/repository/email_repository_impl.dart';
 import 'package:tmail_ui_user/features/email/domain/repository/email_repository.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/delete_email_permanently_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/email_cache_datasource.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/email_cache_datasoure_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/email_cache_repository_impl.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/email_cache_repository.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource/composer_cache_datasource.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/datasource_impl/composer_cache_datasoure_impl.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/data/repository/composer_cache_repository_impl.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/repository/composer_cache_repository.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/move_to_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/email/presentation/email_bindings.dart';
 import 'package:tmail_ui_user/features/login/data/datasource/account_datasource.dart';
@@ -63,9 +63,9 @@ import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_all
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_user_profile_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/usecases/mark_as_mailbox_read_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/quick_search_email_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/remove_email_drafts_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/save_recent_search_interactor.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/advanced_filter_controller.dart';
 import 'package:tmail_ui_user/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart';
@@ -104,7 +104,7 @@ class MailboxDashBoardBindings extends BaseBindings {
       Get.find<MoveToMailboxInteractor>(),
       Get.find<DeleteEmailPermanentlyInteractor>(),
       Get.find<MarkAsMailboxReadInteractor>(),
-      Get.find<GetEmailCacheOnWebInteractor>(),
+      Get.find<GetComposerCacheOnWebInteractor>(),
     ));
     Get.put(AdvancedFilterController());
   }
@@ -119,7 +119,7 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut<MailboxDataSource>(() => Get.find<MailboxDataSourceImpl>());
     Get.lazyPut<AccountDatasource>(() => Get.find<HiveAccountDatasourceImpl>());
     Get.lazyPut<AuthenticationOIDCDataSource>(() => Get.find<AuthenticationOIDCDataSourceImpl>());
-    Get.lazyPut<EmailCacheDataSource>(() => Get.find<EmailCacheDataSourceImpl>());
+    Get.lazyPut<ComposerCacheDataSource>(() => Get.find<ComposerCacheDataSourceImpl>());
   }
 
   @override
@@ -142,7 +142,7 @@ class MailboxDashBoardBindings extends BaseBindings {
         Get.find<TokenOidcCacheManager>(),
         Get.find<OidcConfigurationCacheManager>()
     ));
-    Get.lazyPut(() => EmailCacheDataSourceImpl());
+    Get.lazyPut(() => ComposerCacheDataSourceImpl());
   }
 
   @override
@@ -176,9 +176,9 @@ class MailboxDashBoardBindings extends BaseBindings {
         Get.find<GetCredentialInteractor>(),
         Get.find<GetStoredTokenOidcInteractor>(),
     ));
-    Get.lazyPut(() => GetEmailCacheOnWebInteractor(Get.find<EmailCacheRepository>()));
-    Get.lazyPut(() => SaveEmailCacheOnWebInteractor(Get.find<EmailCacheRepository>()));
-    Get.lazyPut(() => RemoveEmailCacheOnWebInteractor(Get.find<EmailCacheRepository>()));
+    Get.lazyPut(() => GetComposerCacheOnWebInteractor(Get.find<ComposerCacheRepository>()));
+    Get.lazyPut(() => SaveComposerCacheOnWebInteractor(Get.find<ComposerCacheRepository>()));
+    Get.lazyPut(() => RemoveComposerCacheOnWebInteractor(Get.find<ComposerCacheRepository>()));
   }
 
   @override
@@ -191,7 +191,7 @@ class MailboxDashBoardBindings extends BaseBindings {
     Get.lazyPut<MailboxRepository>(() => Get.find<MailboxRepositoryImpl>());
     Get.lazyPut<AccountRepository>(() => Get.find<AccountRepositoryImpl>());
     Get.lazyPut<AuthenticationOIDCRepository>(() => Get.find<AuthenticationOIDCRepositoryImpl>());
-    Get.lazyPut<EmailCacheRepository>(() => Get.find<EmailCacheRepositoryImpl>());
+    Get.lazyPut<ComposerCacheRepository>(() => Get.find<ComposerCacheRepositoryImpl>());
   }
 
   @override
@@ -218,6 +218,6 @@ class MailboxDashBoardBindings extends BaseBindings {
     ));
     Get.lazyPut(() => AccountRepositoryImpl(Get.find<AccountDatasource>()));
     Get.lazyPut(() => AuthenticationOIDCRepositoryImpl(Get.find<AuthenticationOIDCDataSource>()));
-    Get.lazyPut(() => EmailCacheRepositoryImpl(Get.find<EmailCacheDataSource>()));
+    Get.lazyPut(() => ComposerCacheRepositoryImpl(Get.find<ComposerCacheDataSource>()));
   }
 }
\ No newline at end of file
diff --git a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
index 57ddd668b..547cf36e2 100644
--- a/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
+++ b/lib/features/mailbox_dashboard/presentation/controller/mailbox_dashboard_controller.dart
@@ -27,7 +27,7 @@ import 'package:tmail_ui_user/features/email/domain/model/move_to_mailbox_reques
 import 'package:tmail_ui_user/features/email/domain/state/delete_email_permanently_state.dart';
 import 'package:tmail_ui_user/features/email/domain/state/move_to_mailbox_state.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/delete_email_permanently_interactor.dart';
-import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_email_cache_on_web.dart';
+import 'package:tmail_ui_user/features/mailbox_dashboard/domain/usecases/get_composer_cache_on_web.dart';
 import 'package:tmail_ui_user/features/email/domain/usecases/move_to_mailbox_interactor.dart';
 import 'package:tmail_ui_user/features/email/presentation/model/composer_arguments.dart';
 import 'package:tmail_ui_user/features/login/domain/usecases/delete_authority_oidc_interactor.dart';
@@ -66,7 +66,7 @@ class MailboxDashBoardController extends ReloadableController {
   final MoveToMailboxInteractor _moveToMailboxInteractor;
   final DeleteEmailPermanentlyInteractor _deleteEmailPermanentlyInteractor;
   final MarkAsMailboxReadInteractor _markAsMailboxReadInteractor;
-  final GetEmailCacheOnWebInteractor _getEmailCacheOnWebInteractor;
+  final GetComposerCacheOnWebInteractor _getEmailCacheOnWebInteractor;
 
   final scaffoldKey = GlobalKey<ScaffoldState>();
   final selectedMailbox = Rxn<PresentationMailbox>();
diff --git a/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart b/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart
index dc82f464a..12f294734 100644
--- a/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart
+++ b/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.2.0 from annotations
 // in tmail_ui_user/test/features/thread/domain/usecases/get_emails_in_mailbox_interactor_test.dart.
 // Do not manually edit this file.
 
@@ -24,6 +24,7 @@ import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dar
 import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart'
     as _i2;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references
diff --git a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart b/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart
index b2a94e9d3..824dfe96a 100644
--- a/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart
+++ b/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.mocks.dart
@@ -1,4 +1,4 @@
-// Mocks generated by Mockito 5.0.17 from annotations
+// Mocks generated by Mockito 5.2.0 from annotations
 // in tmail_ui_user/test/features/thread/domain/usecases/refresh_changes_emails_in_mailbox_interactor_test.dart.
 // Do not manually edit this file.
 
@@ -24,6 +24,7 @@ import 'package:tmail_ui_user/features/thread/domain/model/get_email_request.dar
 import 'package:tmail_ui_user/features/thread/domain/repository/thread_repository.dart'
     as _i2;
 
+// ignore_for_file: type=lint
 // ignore_for_file: avoid_redundant_argument_values
 // ignore_for_file: avoid_setters_without_getters
 // ignore_for_file: comment_references