diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 6d0758f93..bce051211 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -6,7 +6,6 @@ import 'package:collection/collection.dart';
 import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:desktop_drop/desktop_drop.dart';
-import 'package:device_info_plus/device_info_plus.dart';
 import 'package:dio/dio.dart';
 import 'package:dropdown_button2/dropdown_button2.dart';
 import 'package:file_picker/file_picker.dart';
@@ -78,7 +77,6 @@ import 'package:tmail_ui_user/features/manage_account/presentation/extensions/id
 import 'package:tmail_ui_user/features/network_connection/presentation/network_connection_controller.dart'
   if (dart.library.html) 'package:tmail_ui_user/features/network_connection/presentation/web_network_connection_controller.dart';
 import 'package:tmail_ui_user/features/sending_queue/domain/model/sending_email.dart';
-import 'package:tmail_ui_user/features/sending_queue/presentation/model/sending_email_arguments.dart';
 import 'package:tmail_ui_user/features/server_settings/domain/state/get_always_read_receipt_setting_state.dart';
 import 'package:tmail_ui_user/features/server_settings/domain/usecases/get_always_read_receipt_setting_interactor.dart';
 import 'package:tmail_ui_user/features/upload/domain/exceptions/pick_file_exception.dart';
@@ -212,7 +210,7 @@ class ComposerController extends BaseController with DragDropFileMixin {
     _listenStreamEvent();
     if (PlatformInfo.isWeb) {
       WidgetsBinding.instance.addPostFrameCallback((_) {
-        _listenBrowserEventAction();
+        _listenBrowserTabRefresh();
       });
     }
     _getAlwaysReadReceiptSetting();
diff --git a/lib/features/composer/presentation/composer_view_web.dart b/lib/features/composer/presentation/composer_view_web.dart
index a7c7b0e18..5433d5740 100644
--- a/lib/features/composer/presentation/composer_view_web.dart
+++ b/lib/features/composer/presentation/composer_view_web.dart
@@ -455,8 +455,8 @@ class ComposerView extends GetWidget<ComposerController> {
                               insertImageAction: () => controller.insertImage(context, constraints.maxWidth),
                               showCodeViewAction: controller.richTextWebController.toggleCodeView,
                               deleteComposerAction: () => controller.handleClickDeleteComposer(context),
-                              saveToDraftAction: () => controller.saveToDraftAction(context),
-                              sendMessageAction: () => controller.validateInformationBeforeSending(context),
+                              saveToDraftAction: () => controller.handleClickSaveAsDraftsButton(context),
+                              sendMessageAction: () => controller.handleClickSendButton(context),
                               requestReadReceiptAction: (position) {
                                 controller.openPopupMenuAction(
                                     context,
diff --git a/lib/features/email/presentation/utils/email_utils.dart b/lib/features/email/presentation/utils/email_utils.dart
index f75e85f7a..63877adc2 100644
--- a/lib/features/email/presentation/utils/email_utils.dart
+++ b/lib/features/email/presentation/utils/email_utils.dart
@@ -1,6 +1,9 @@
 import 'package:collection/collection.dart';
+import 'package:core/presentation/state/failure.dart';
+import 'package:core/presentation/state/success.dart';
+import 'package:core/utils/app_logger.dart';
+import 'package:core/utils/mail/mail_address.dart';
 import 'package:get/get_utils/src/get_utils/get_utils.dart';
-import 'package:core/core.dart';
 import 'package:dartz/dartz.dart';
 import 'package:jmap_dart_client/jmap/account_id.dart';
 import 'package:jmap_dart_client/jmap/core/capability/capability_identifier.dart';