diff --git a/components/ComposeEmail.tsx b/components/ComposeEmail.tsx
index 8f9023c2..82cd88be 100644
--- a/components/ComposeEmail.tsx
+++ b/components/ComposeEmail.tsx
@@ -206,12 +206,14 @@ export default function ComposeEmail({
                 className="prose max-w-none min-h-[200px] p-4 focus:outline-none border rounded-md bg-white"
                 suppressContentEditableWarning
                 onInput={(e: React.FormEvent<HTMLDivElement>) => {
-                  const content = (e.target as HTMLDivElement).innerHTML;
+                  const content = (e.target as HTMLDivElement).innerText;
                   setComposeBody(content);
                 }}
-                onBlur={(e: React.FocusEvent<HTMLDivElement>) => {
-                  const content = e.currentTarget.innerHTML;
-                  setComposeBody(content);
+                onKeyDown={(e: React.KeyboardEvent<HTMLDivElement>) => {
+                  if (e.key === 'Enter') {
+                    e.preventDefault();
+                    document.execCommand('insertLineBreak');
+                  }
                 }}
                 style={{ 
                   outline: 'none',
@@ -219,9 +221,7 @@ export default function ComposeEmail({
                   whiteSpace: 'pre-wrap',
                   wordBreak: 'break-word'
                 }}
-              >
-                {composeBody}
-              </div>
+              />
             </div>
           </div>
         </div>