diff --git a/app/courrier/page.tsx b/app/courrier/page.tsx
index 6779f235..3aaebc03 100644
--- a/app/courrier/page.tsx
+++ b/app/courrier/page.tsx
@@ -398,8 +398,6 @@ function getReplyBody(email: Email, type: 'reply' | 'reply-all' | 'forward'): st
   
   if (type === 'forward') {
     return `
-      <br/>
-      <br/>
       <div class="prose max-w-none" 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>
@@ -411,8 +409,6 @@ function getReplyBody(email: Email, type: 'reply' | 'reply-all' | 'forward'): st
     `;
   } else {
     return `
-      <br/>
-      <br/>
       <div class="prose max-w-none" style="border-left: 2px solid #ccc; padding-left: 1em; margin-left: 0.5em;">
         <p>On ${date}, ${email.from} wrote:</p>
         <div class="prose max-w-none">${content}</div>
diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 3a6b3311..4b94128d 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -227,6 +227,7 @@ export default function ComposeEmail({
                   lineHeight: 'inherit',
                 }}
                 onInput={handleInput}
+                dangerouslySetInnerHTML={{ __html: composeBody }}
               />
             </div>
           </div>