diff --git a/components/email/ComposeEmail.tsx b/components/email/ComposeEmail.tsx
index 435aea37..bd1cb453 100644
--- a/components/email/ComposeEmail.tsx
+++ b/components/email/ComposeEmail.tsx
@@ -58,6 +58,12 @@ interface ComposeEmailProps {
   }) => Promise<void>;
 }
 
+// Add a helper to fix table widths in HTML
+function fixTableWidths(html: string): string {
+  if (!html) return html;
+  return html.replace(/<table(?![^>]*width)/g, '<table width="100%"');
+}
+
 export default function ComposeEmail(props: ComposeEmailProps) {
   const { initialEmail, type = 'new', onClose, onSend } = props;
   
@@ -148,7 +154,9 @@ export default function ComposeEmail(props: ComposeEmailProps) {
           setSubject(subject);
           
           // Format the forward content with the original email included directly
-          const content = initialEmail.content || initialEmail.html || initialEmail.text || '';
+          let content = initialEmail.content || initialEmail.html || initialEmail.text || '';
+          // Fix table widths before setting content
+          content = fixTableWidths(content);
           const fromString = formatEmailAddresses(initialEmail.from || []);
           const toString = formatEmailAddresses(initialEmail.to || []);
           const date = initialEmail.date ?