diff --git a/apps/web/app/(app)/[emailAccountId]/assistant/ProcessRules.tsx b/apps/web/app/(app)/[emailAccountId]/assistant/ProcessRules.tsx
index af29b52e2c..ea8d100743 100644
--- a/apps/web/app/(app)/[emailAccountId]/assistant/ProcessRules.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/assistant/ProcessRules.tsx
@@ -356,17 +356,19 @@ function ProcessRulesRow({
       }
     >
       <TableCell>
-        <div className="flex items-center justify-between">
-          <EmailMessageCell
-            sender={message.headers.from}
-            subject={message.headers.subject}
-            snippet={message.snippet}
-            userEmail={userEmail}
-            threadId={message.threadId}
-            messageId={message.id}
-            labelIds={message.labelIds}
-          />
-          <div className="ml-4 flex items-center gap-1">
+        <div className="flex items-center justify-between gap-4">
+          <div className="min-w-0 flex-1">
+            <EmailMessageCell
+              sender={message.headers.from}
+              subject={message.headers.subject}
+              snippet={message.snippet}
+              userEmail={userEmail}
+              threadId={message.threadId}
+              messageId={message.id}
+              labelIds={message.labelIds}
+            />
+          </div>
+          <div className="ml-4 flex shrink-0 items-center gap-1">
             {results ? (
               <>
                 <ResultsDisplay results={results} />
diff --git a/apps/web/app/(app)/[emailAccountId]/cold-email-blocker/TestRules.tsx b/apps/web/app/(app)/[emailAccountId]/cold-email-blocker/TestRules.tsx
index d0841961f1..b7f0f2f7e4 100644
--- a/apps/web/app/(app)/[emailAccountId]/cold-email-blocker/TestRules.tsx
+++ b/apps/web/app/(app)/[emailAccountId]/cold-email-blocker/TestRules.tsx
@@ -149,17 +149,19 @@ function TestRulesContentRow({
       }
     >
       <TableCell>
-        <div className="flex items-center justify-between">
-          <EmailMessageCell
-            sender={message.headers.from}
-            subject={message.headers.subject}
-            snippet={message.snippet}
-            userEmail={userEmail}
-            threadId={message.threadId}
-            messageId={message.id}
-            labelIds={message.labelIds}
-          />
-          <div className="ml-4">
+        <div className="flex items-center justify-between gap-4">
+          <div className="min-w-0 flex-1">
+            <EmailMessageCell
+              sender={message.headers.from}
+              subject={message.headers.subject}
+              snippet={message.snippet}
+              userEmail={userEmail}
+              threadId={message.threadId}
+              messageId={message.id}
+              labelIds={message.labelIds}
+            />
+          </div>
+          <div className="ml-4 shrink-0">
             <Button
               color="white"
               loading={testing}
diff --git a/apps/web/app/(landing)/components/page.tsx b/apps/web/app/(landing)/components/page.tsx
index 66ec96fdef..44a1f33632 100644
--- a/apps/web/app/(landing)/components/page.tsx
+++ b/apps/web/app/(landing)/components/page.tsx
@@ -17,6 +17,7 @@ import { Button } from "@/components/Button";
 import { Button as ShadButton } from "@/components/ui/button";
 import { Badge } from "@/components/Badge";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { Table, TableBody, TableRow, TableCell } from "@/components/ui/table";
 import { AlertBasic } from "@/components/Alert";
 import { Notice } from "@/components/Notice";
 import { TestErrorButton } from "@/app/(landing)/components/TestError";
@@ -749,6 +750,13 @@ export default function Components() {
           </div>
         </div>
 
+        <div>
+          <div className="underline">Email Row Truncation</div>
+          <div className="mt-4">
+            <EmailRowExample />
+          </div>
+        </div>
+
         <div className="flex gap-2">
           <TestErrorButton />
           <TestActionButton />
@@ -826,3 +834,39 @@ function getActivityLogEntries(): ActivityLogEntry[] {
     },
   ];
 }
+
+function EmailRowExample() {
+  return (
+    <div className="border rounded-md overflow-hidden">
+      <Table>
+        <TableBody>
+          <TableRow>
+            <TableCell>
+              <div className="flex items-center justify-between gap-4">
+                <div className="min-w-0 flex-1">
+                  <MessageText className="flex items-center">
+                    <span className="max-w-[300px] truncate">
+                      Extremely Long Sender Name That Should Definitely Be
+                      Truncated
+                    </span>
+                  </MessageText>
+                  <MessageText className="mt-1 truncate font-bold">
+                    This is an extremely long subject line that used to cause
+                    the table to grow horizontally
+                  </MessageText>
+                  <MessageText className="mt-1 line-clamp-2 break-all">
+                    This snippet contains a very long URL that does not break:
+                    https://www.this-is-a-very-long-url-that-goes-on-and-on-and-on-and-on-and-on-and-on-and-on-and-on-and-on-and-on.com/test
+                  </MessageText>
+                </div>
+                <div className="ml-4 shrink-0">
+                  <ShadButton size="sm">Test</ShadButton>
+                </div>
+              </div>
+            </TableCell>
+          </TableRow>
+        </TableBody>
+      </Table>
+    </div>
+  );
+}
diff --git a/apps/web/components/EmailMessageCell.tsx b/apps/web/components/EmailMessageCell.tsx
index f8aed2ae66..84aebc7e66 100644
--- a/apps/web/components/EmailMessageCell.tsx
+++ b/apps/web/components/EmailMessageCell.tsx
@@ -123,8 +123,8 @@ export function EmailMessageCell({
           </span>
         )}
       </MessageText>
-      <MessageText className="mt-1 font-bold">{subject}</MessageText>
-      <MessageText className="mt-1">
+      <MessageText className="mt-1 truncate font-bold">{subject}</MessageText>
+      <MessageText className="mt-1 line-clamp-2 break-all">
         {snippetRemoveReply(decodeSnippet(snippet)).trim()}
       </MessageText>
     </div>
diff --git a/apps/web/utils/actions/cold-email.ts b/apps/web/utils/actions/cold-email.ts
index 4c10cb9b5a..ef633f29dc 100644
--- a/apps/web/utils/actions/cold-email.ts
+++ b/apps/web/utils/actions/cold-email.ts
@@ -14,6 +14,7 @@ import { createEmailProvider } from "@/utils/email/provider";
 import type { EmailProvider } from "@/utils/email/types";
 import { getColdEmailRule } from "@/utils/cold-email/cold-email-rule";
 import { getRuleLabel } from "@/utils/rule/consts";
+import { internalDateToDate } from "@/utils/date";
 
 export const markNotColdEmailAction = actionClient
   .metadata({ name: "markNotColdEmail" })
@@ -143,7 +144,7 @@ export const testColdEmailAction = actionClient
           to: "",
           subject,
           content,
-          date: date ? new Date(date) : undefined,
+          date: date ? internalDateToDate(String(date)) : undefined,
           threadId: threadId || undefined,
           id: messageId || "",
         },