diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index 632785b9a..277ef6019 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -608,18 +608,19 @@ class ComposerController extends BaseController
       );
 
       switch(arguments.emailActionType) {
-        case EmailActionType.composeFromPresentationEmail:
+        case EmailActionType.editAsNewEmail:
           _initEmailAddress(
             presentationEmail: arguments.presentationEmail!,
-            actionType: EmailActionType.composeFromPresentationEmail
+            actionType: EmailActionType.editAsNewEmail
           );
           _initSubjectEmail(
             presentationEmail: arguments.presentationEmail!,
-            actionType: EmailActionType.composeFromPresentationEmail
+            actionType: EmailActionType.editAsNewEmail
           );
           _getEmailContentOfEmailDrafts(
             emailId: arguments.presentationEmail!.id!,
           );
+          isMarkAsImportant.value = arguments.presentationEmail!.isMarkAsImportant;
           break;
         case EmailActionType.editDraft:
           _initEmailAddress(
diff --git a/lib/features/composer/presentation/extensions/email_action_type_extension.dart b/lib/features/composer/presentation/extensions/email_action_type_extension.dart
index bb773b8d1..9acb302d0 100644
--- a/lib/features/composer/presentation/extensions/email_action_type_extension.dart
+++ b/lib/features/composer/presentation/extensions/email_action_type_extension.dart
@@ -32,7 +32,7 @@ extension EmailActionTypeExtension on EmailActionType {
       case EmailActionType.editDraft:
       case EmailActionType.editSendingEmail:
       case EmailActionType.reopenComposerBrowser:
-      case EmailActionType.composeFromPresentationEmail:
+      case EmailActionType.editAsNewEmail:
         return subject;
       default:
         return '';
@@ -146,7 +146,7 @@ extension EmailActionTypeExtension on EmailActionType {
         return imagePaths.icMailboxArchived;
       case EmailActionType.downloadMessageAsEML:
         return imagePaths.icDownloadAttachment;
-      case EmailActionType.composeFromPresentationEmail:
+      case EmailActionType.editAsNewEmail:
         return imagePaths.icEdit;
       default:
         return '';
@@ -169,7 +169,7 @@ extension EmailActionTypeExtension on EmailActionType {
         return AppLocalizations.of(context).archiveMessage;
       case EmailActionType.downloadMessageAsEML:
         return AppLocalizations.of(context).downloadMessageAsEML;
-      case EmailActionType.composeFromPresentationEmail:
+      case EmailActionType.editAsNewEmail:
         return AppLocalizations.of(context).editAsNewEmail;
       default:
         return '';
diff --git a/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart b/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart
index f1f59577f..bb0640baf 100644
--- a/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart
+++ b/lib/features/composer/presentation/view/mobile/mobile_editor_view.dart
@@ -50,7 +50,7 @@ class MobileEditorView extends StatelessWidget with EditorViewMixin {
       case EmailActionType.reopenComposerBrowser:
       case EmailActionType.composeFromMailtoUri:
       case EmailActionType.composeFromUnsubscribeMailtoLink:
-      case EmailActionType.composeFromPresentationEmail:
+      case EmailActionType.editAsNewEmail:
         if (contentViewState == null) {
           return const SizedBox.shrink();
         }
diff --git a/lib/features/composer/presentation/view/web/web_editor_view.dart b/lib/features/composer/presentation/view/web/web_editor_view.dart
index 22d7e77f2..0cf333227 100644
--- a/lib/features/composer/presentation/view/web/web_editor_view.dart
+++ b/lib/features/composer/presentation/view/web/web_editor_view.dart
@@ -91,7 +91,7 @@ class WebEditorView extends StatelessWidget with EditorViewMixin {
       case EmailActionType.reopenComposerBrowser:
       case EmailActionType.composeFromUnsubscribeMailtoLink:
       case EmailActionType.composeFromMailtoUri:
-      case EmailActionType.composeFromPresentationEmail:
+      case EmailActionType.editAsNewEmail:
         if (contentViewState == null) {
           return const SizedBox.shrink();
         }
diff --git a/lib/features/email/presentation/controller/single_email_controller.dart b/lib/features/email/presentation/controller/single_email_controller.dart
index eb4e13679..9edd158a7 100644
--- a/lib/features/email/presentation/controller/single_email_controller.dart
+++ b/lib/features/email/presentation/controller/single_email_controller.dart
@@ -1422,8 +1422,8 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
       case EmailActionType.downloadMessageAsEML:
         _downloadMessageAsEML(presentationEmail);
         break;
-      case EmailActionType.composeFromPresentationEmail:
-        _composeFromPresentationEmail(presentationEmail);
+      case EmailActionType.editAsNewEmail:
+        _editAsNewEmail(presentationEmail);
         break;
       default:
         break;
@@ -2145,11 +2145,11 @@ class SingleEmailController extends BaseController with AppLoaderMixin {
     downloadAttachmentForWeb(emlAttachment);
   }
 
-  void _composeFromPresentationEmail(PresentationEmail presentationEmail) {
+  void _editAsNewEmail(PresentationEmail presentationEmail) {
     if (accountId == null || session == null) return;
 
     mailboxDashBoardController.goToComposer(
-      ComposerArguments.fromPresentationEmail(presentationEmail),
+      ComposerArguments.editAsNewEmail(presentationEmail),
     );
   }
 
diff --git a/lib/features/email/presentation/email_view.dart b/lib/features/email/presentation/email_view.dart
index f31e0585c..bd7b4658c 100644
--- a/lib/features/email/presentation/email_view.dart
+++ b/lib/features/email/presentation/email_view.dart
@@ -507,7 +507,7 @@ class EmailView extends GetWidget<SingleEmailController> {
         EmailActionType.archiveMessage,
       if (PlatformInfo.isWeb && PlatformInfo.isCanvasKit)
         EmailActionType.downloadMessageAsEML,
-      EmailActionType.composeFromPresentationEmail,
+      EmailActionType.editAsNewEmail,
     ];
 
     if (position == null) {
diff --git a/lib/features/email/presentation/model/composer_arguments.dart b/lib/features/email/presentation/model/composer_arguments.dart
index d270eb4cd..74736ebd5 100644
--- a/lib/features/email/presentation/model/composer_arguments.dart
+++ b/lib/features/email/presentation/model/composer_arguments.dart
@@ -105,9 +105,9 @@ class ComposerArguments extends RouterArguments {
       presentationEmail: presentationEmail,
     );
   
-  factory ComposerArguments.fromPresentationEmail(PresentationEmail presentationEmail) =>
+  factory ComposerArguments.editAsNewEmail(PresentationEmail presentationEmail) =>
     ComposerArguments(
-      emailActionType: EmailActionType.composeFromPresentationEmail,
+      emailActionType: EmailActionType.editAsNewEmail,
       presentationEmail: presentationEmail,
     );
 
diff --git a/lib/features/thread/presentation/mixin/email_action_controller.dart b/lib/features/thread/presentation/mixin/email_action_controller.dart
index a18d7aa19..7b3499f36 100644
--- a/lib/features/thread/presentation/mixin/email_action_controller.dart
+++ b/lib/features/thread/presentation/mixin/email_action_controller.dart
@@ -45,7 +45,7 @@ mixin EmailActionController {
 
   void editAsNewEmail(PresentationEmail presentationEmail) {
     mailboxDashBoardController.goToComposer(
-      ComposerArguments.fromPresentationEmail(presentationEmail),
+      ComposerArguments.editAsNewEmail(presentationEmail),
     );
   }
 
diff --git a/model/lib/email/email_action_type.dart b/model/lib/email/email_action_type.dart
index 2edcc80e2..ecbed93d3 100644
--- a/model/lib/email/email_action_type.dart
+++ b/model/lib/email/email_action_type.dart
@@ -16,7 +16,7 @@ enum EmailActionType {
   composeFromFileShared,
   composeFromEmailAddress,
   composeFromMailtoUri,
-  composeFromPresentationEmail,
+  editAsNewEmail,
   reopenComposerBrowser,
   moveToTrash,
   deletePermanently,