diff --git a/components/email/ComposeEmail.tsx b/components/email/ComposeEmail.tsx index f95211a0..f825c940 100644 --- a/components/email/ComposeEmail.tsx +++ b/components/email/ComposeEmail.tsx @@ -200,16 +200,34 @@ export default function ComposeEmail(props: ComposeEmailProps) { // Provide a basic template if the content is empty const { fromStr, toStr, ccStr, dateStr, subject } = getFormattedInfoForEmail(initialEmail); const fallbackContent = ` -
+
---------------------------- Forwarded Message ----------------------------
-
From: ${fromStr}
-
Date: ${dateStr}
-
Subject: ${subject || ''}
-
To: ${toStr}
- ${ccStr ? `
Cc: ${ccStr}
` : ''} -
+ + + + + + + + + + + + + + + + + + ${ccStr ? ` + + + + ` : ''} +
From:${fromStr}
Date:${dateStr}
Subject:${subject || ''}
To:${toStr}
Cc:${ccStr}
+
----------------------------------------------------------------------
diff --git a/lib/utils/email-utils.ts b/lib/utils/email-utils.ts index 058058ec..c7a2ab8a 100644 --- a/lib/utils/email-utils.ts +++ b/lib/utils/email-utils.ts @@ -338,16 +338,34 @@ export function formatForwardedEmail(originalEmail: EmailMessage | LegacyEmailMe // Create a traditional forward format with dashed separator const forwardHeader = ` -
+
---------------------------- Forwarded Message ----------------------------
-
From: ${fromStr}
-
Date: ${dateStr}
-
Subject: ${subject || ''}
-
To: ${toStr}
- ${ccStr ? `
Cc: ${ccStr}
` : ''} -
+ + + + + + + + + + + + + + + + + + ${ccStr ? ` + + + + ` : ''} +
From:${fromStr}
Date:${dateStr}
Subject:${subject || ''}
To:${toStr}
Cc:${ccStr}
+
----------------------------------------------------------------------
@@ -358,7 +376,7 @@ export function formatForwardedEmail(originalEmail: EmailMessage | LegacyEmailMe const cleanHtml = `${forwardHeader}${contentHtml}`; - // Plain text version + // Plain text version - with clearer formatting const plainText = ` ---------------------------- Forwarded Message ---------------------------- From: ${fromStr}