diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 27c860d56..f84e97e38 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -42,11 +42,11 @@ import 'package:tmail_ui_user/features/composer/domain/state/get_device_contact_
 import 'package:tmail_ui_user/features/composer/domain/state/save_email_as_drafts_state.dart';
 import 'package:tmail_ui_user/features/composer/domain/state/update_email_drafts_state.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/download_image_as_base64_interactor.dart';
-import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/get_all_autocomplete_interactor.dart';
+import 'package:tmail_ui_user/features/composer/domain/usecases/get_autocomplete_interactor.dart';
 import 'package:tmail_ui_user/features/composer/domain/usecases/get_device_contact_suggestions_interactor.dart';
-import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_web_controller.dart';
 import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_mobile_tablet_controller.dart';
+import 'package:tmail_ui_user/features/composer/presentation/controller/rich_text_web_controller.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/email_action_type_extension.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/file_upload_extension.dart';
 import 'package:tmail_ui_user/features/composer/presentation/extensions/list_identities_extension.dart';
@@ -1222,7 +1222,7 @@ class ComposerController extends BaseController {
     return false;
   }
 
-  void saveToDraftAndClose(BuildContext context, {bool canPop = true}) async {
+  void saveToDraftAndClose(BuildContext context) async {
     log('ComposerController::saveToDraftAndClose:');
     clearFocusEditor(context);
 
diff --git a/lib/features/composer/presentation/composer_view.dart b/lib/features/composer/presentation/composer_view.dart
index 11935f3bc..12101a8d4 100644
--- a/lib/features/composer/presentation/composer_view.dart
+++ b/lib/features/composer/presentation/composer_view.dart
@@ -37,7 +37,7 @@ class ComposerView extends GetWidget<ComposerController> {
       responsiveUtils: controller.responsiveUtils,
       mobile: MobileContainerView(
         keyboardRichTextController: controller.keyboardRichTextController,
-        onCloseViewAction: () => controller.saveToDraftAndClose(context, canPop: false),
+        onCloseViewAction: () => controller.saveToDraftAndClose(context),
         onClearFocusAction: () => controller.clearFocusEditor(context),
         onAttachFileAction: () => controller.isNetworkConnectionAvailable
           ? controller.openPickAttachmentMenu(
@@ -222,7 +222,7 @@ class ComposerView extends GetWidget<ComposerController> {
       ),
       tablet: TabletContainerView(
         keyboardRichTextController: controller.keyboardRichTextController,
-        onCloseViewAction: () => controller.saveToDraftAndClose(context, canPop: false),
+        onCloseViewAction: () => controller.saveToDraftAndClose(context),
         onClearFocusAction: () => controller.clearFocusEditor(context),
         onAttachFileAction: () => controller.isNetworkConnectionAvailable
           ? controller.openPickAttachmentMenu(
diff --git a/lib/features/composer/presentation/view/mobile/mobile_container_view.dart b/lib/features/composer/presentation/view/mobile/mobile_container_view.dart
index 3ba955d0d..3975a6558 100644
--- a/lib/features/composer/presentation/view/mobile/mobile_container_view.dart
+++ b/lib/features/composer/presentation/view/mobile/mobile_container_view.dart
@@ -37,7 +37,7 @@ class MobileContainerView extends StatelessWidget {
     return WillPopScope(
       onWillPop: () async {
         onCloseViewAction.call();
-        return true;
+        return false;
       },
       child: GestureDetector(
         onTap: onClearFocusAction,
diff --git a/lib/features/composer/presentation/view/mobile/tablet_container_view.dart b/lib/features/composer/presentation/view/mobile/tablet_container_view.dart
index 95b1f78f5..b2db0dd26 100644
--- a/lib/features/composer/presentation/view/mobile/tablet_container_view.dart
+++ b/lib/features/composer/presentation/view/mobile/tablet_container_view.dart
@@ -34,7 +34,7 @@ class TabletContainerView extends StatelessWidget {
     return WillPopScope(
       onWillPop: () async {
         onCloseViewAction.call();
-        return true;
+        return false;
       },
       child: GestureDetector(
         onTap: onClearFocusAction,