diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 20aee7e0..2fbb338d 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -386,22 +386,23 @@ function getReplyBody(email: Email, type: 'reply' | 'reply-all' | 'forward'): st
     return `
       <br/>
       <br/>
-      ---------- Forwarded message ----------<br/>
-      From: ${email.from}<br/>
-      Date: ${date}<br/>
-      Subject: ${email.subject}<br/>
-      To: ${Array.isArray(email.to) ? email.to.join(', ') : email.to}<br/>
-      <br/>
-      ${content}
+      <div style="border-left: 2px solid #ccc; padding-left: 1em; margin-left: 0.5em;">
+        <p><strong>From:</strong> ${email.from}</p>
+        <p><strong>Date:</strong> ${date}</p>
+        <p><strong>Subject:</strong> ${email.subject}</p>
+        <p><strong>To:</strong> ${Array.isArray(email.to) ? email.to.join(', ') : email.to}</p>
+        <br/>
+        ${content}
+      </div>
     `;
   } else {
     return `
       <br/>
       <br/>
-      On ${date}, ${email.from} wrote:<br/>
-      <blockquote style="border-left: 2px solid #ccc; padding-left: 1em; margin-left: 0.5em;">
+      <div style="border-left: 2px solid #ccc; padding-left: 1em; margin-left: 0.5em;">
+        <p>On ${date}, ${email.from} wrote:</p>
         ${content}
-      </blockquote>
+      </div>
     `;
   }
 }