diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx index 9e84e056..c01cdb05 100644 --- a/app/courrier/page.tsx +++ b/app/courrier/page.tsx @@ -1638,25 +1638,56 @@ export default function CourrierPage() { folder: email.folder }; - // Rest of the function stays the same + // Format appropriate content with headers for reply/forward + let formattedContent = ''; + const formattedDate = formatDate(new Date(email.date)); + + if (type === 'reply' || type === 'reply-all') { + // Create reply quote header + formattedContent = ` +
+
+
+
On ${formattedDate}, ${email.fromName ? `${email.fromName} <${email.from}>` : email.from} wrote:
+
+
+
+ ${email.content || '

No content available

'} +
+
+
+ `; + } else if (type === 'forward') { + // Create forward header + formattedContent = ` +
+
+

---------- Forwarded message ---------

+

From: ${email.fromName ? `${email.fromName} <${email.from}>` : email.from}

+

Date: ${formattedDate}

+

Subject: ${email.subject || ''}

+

To: ${email.to || ''}

+
+
+ ${email.content || '

No content available

'} +
+
+ `; + } + + // Set state for compose form setIsReplying(true); setIsForwarding(type === 'forward'); setShowCompose(true); - const originalEmailContent = ` -
- ${email.content} -
- `; - if (type === 'reply' || type === 'reply-all') { setComposeTo(type === 'reply' ? email.from : `${email.from}; ${email.to}`); setComposeSubject(email.subject.startsWith('Re:') ? email.subject : `Re: ${email.subject}`); - setComposeBody(originalEmailContent); + setComposeBody(formattedContent); } else if (type === 'forward') { setComposeTo(''); setComposeSubject(email.subject.startsWith('Fwd:') ? email.subject : `Fwd: ${email.subject}`); - setComposeBody(originalEmailContent); + setComposeBody(formattedContent); } };