diff --git a/lib/features/composer/domain/extensions/email_request_extension.dart b/lib/features/composer/domain/extensions/email_request_extension.dart
index f12fbb6e7..41591c0c6 100644
--- a/lib/features/composer/domain/extensions/email_request_extension.dart
+++ b/lib/features/composer/domain/extensions/email_request_extension.dart
@@ -1,4 +1,6 @@
 
+import 'package:jmap_dart_client/jmap/mail/email/individual_header_identifier.dart';
+import 'package:model/model.dart';
 import 'package:tmail_ui_user/features/composer/domain/model/email_request.dart';
 import 'package:tmail_ui_user/features/mailbox/domain/model/create_new_mailbox_request.dart';
 import 'package:tmail_ui_user/features/offline_mode/model/sending_state.dart';
@@ -27,4 +29,19 @@ extension EmailRequestExtension on EmailRequest {
       previousEmailId: previousEmailId
     );
   }
+
+  EmailRequest withUpdatedEmailHeaderMdn(
+    Map<IndividualHeaderIdentifier, String?> value,
+  ) {
+    return EmailRequest(
+      email: email.updateEmailHeaderMdn(value),
+      sentMailboxId: sentMailboxId,
+      emailIdDestroyed: emailIdDestroyed,
+      emailIdAnsweredOrForwarded: emailIdAnsweredOrForwarded,
+      identityId: identityId,
+      emailActionType: emailActionType,
+      storedSendingId: storedSendingId,
+      previousEmailId: previousEmailId,
+    );
+  }
 }
\ No newline at end of file
diff --git a/model/lib/extensions/email_extension.dart b/model/lib/extensions/email_extension.dart
index 5e3a61b42..8bc2423d8 100644
--- a/model/lib/extensions/email_extension.dart
+++ b/model/lib/extensions/email_extension.dart
@@ -180,4 +180,40 @@ extension EmailExtension on Email {
       headerCalendarEvent: headerCalendarEvent
     );
   }
+
+  Email updateEmailHeaderMdn(
+    Map<IndividualHeaderIdentifier, String?> value,
+  ) {
+    return Email(
+      id: id,
+      blobId: blobId,
+      threadId: threadId,
+      mailboxIds: mailboxIds,
+      keywords: keywords,
+      size: size,
+      receivedAt: receivedAt,
+      headers: headers,
+      messageId: messageId,
+      inReplyTo: inReplyTo,
+      references: references,
+      subject: subject,
+      sentAt: sentAt,
+      hasAttachment: hasAttachment,
+      preview: preview,
+      sender: sender,
+      from: from,
+      to: to,
+      cc: cc,
+      bcc: bcc,
+      replyTo: replyTo,
+      textBody: textBody,
+      htmlBody: htmlBody,
+      attachments: attachments,
+      bodyStructure: bodyStructure,
+      bodyValues: bodyValues,
+      headerUserAgent: headerUserAgent,
+      headerMdn: value,
+      headerCalendarEvent: headerCalendarEvent,
+    );
+  }
 }
\ No newline at end of file