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 9acb302d0..0f1c0da0d 100644
--- a/lib/features/composer/presentation/extensions/email_action_type_extension.dart
+++ b/lib/features/composer/presentation/extensions/email_action_type_extension.dart
@@ -75,11 +75,11 @@ extension EmailActionTypeExtension on EmailActionType {
 
         final subject = presentationEmail.subject?.escapeLtGtHtmlString() ?? '';
         final receivedAt = presentationEmail.receivedAt;
-        final fromEmailAddress = presentationEmail.from.listEmailAddressToString(isFullEmailAddress: true);
-        final toEmailAddress = presentationEmail.to.listEmailAddressToString(isFullEmailAddress: true);
-        final ccEmailAddress = presentationEmail.cc.listEmailAddressToString(isFullEmailAddress: true);
-        final bccEmailAddress = presentationEmail.bcc.listEmailAddressToString(isFullEmailAddress: true);
-        final replyToEmailAddress = presentationEmail.replyTo.listEmailAddressToString(isFullEmailAddress: true);
+        final fromEmailAddress = presentationEmail.from.toEscapeHtmlStringUseCommaSeparator();
+        final toEmailAddress = presentationEmail.to.toEscapeHtmlStringUseCommaSeparator();
+        final ccEmailAddress = presentationEmail.cc.toEscapeHtmlStringUseCommaSeparator();
+        final bccEmailAddress = presentationEmail.bcc.toEscapeHtmlStringUseCommaSeparator();
+        final replyToEmailAddress = presentationEmail.replyTo.toEscapeHtmlStringUseCommaSeparator();
 
         if (subject.isNotEmpty) {
           headerQuoted = headerQuoted