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 0f1c0da0d..95551ce06 100644
--- a/lib/features/composer/presentation/extensions/email_action_type_extension.dart
+++ b/lib/features/composer/presentation/extensions/email_action_type_extension.dart
@@ -19,7 +19,7 @@ extension EmailActionTypeExtension on EmailActionType {
         } else {
           return context != null
             ? '${AppLocalizations.of(context).prefix_reply_email} $subject'
-            : subject;
+            : 'Re: $subject';
         }
       case EmailActionType.forward:
         if (subject.toLowerCase().startsWith('fwd:')) {
@@ -27,7 +27,7 @@ extension EmailActionTypeExtension on EmailActionType {
         } else {
           return context != null
             ? '${AppLocalizations.of(context).prefix_forward_email} $subject'
-            : subject;
+            : 'Fwd: $subject';
         }
       case EmailActionType.editDraft:
       case EmailActionType.editSendingEmail:
diff --git a/lib/features/composer/presentation/extensions/setup_email_subject_extension.dart b/lib/features/composer/presentation/extensions/setup_email_subject_extension.dart
index ff5a8c505..6c963a9b4 100644
--- a/lib/features/composer/presentation/extensions/setup_email_subject_extension.dart
+++ b/lib/features/composer/presentation/extensions/setup_email_subject_extension.dart
@@ -37,8 +37,8 @@ extension SetupEmailSubjectExtension on ComposerController {
     );
 
     if (newSubject.isNotEmpty) {
-      setSubjectEmail(subject);
-      subjectEmailInputController.text = subject;
+      setSubjectEmail(newSubject);
+      subjectEmailInputController.text = newSubject;
     }
   }
 }
\ No newline at end of file