diff --git a/frontend/src/components/EmailList.test.tsx b/frontend/src/components/EmailList.test.tsx
index 771a4cd85..074ceeb55 100644
--- a/frontend/src/components/EmailList.test.tsx
+++ b/frontend/src/components/EmailList.test.tsx
@@ -88,6 +88,103 @@ describe("EmailList", () => {
     expect(selectedThread?.className).toContain("min-h-20");
   });
 
+  it("updates memoized selection and click handling after prop changes", async () => {
+    const fetchMock = vi.fn(() =>
+      Promise.resolve(
+        jsonResponse({
+          emails: [
+            {
+              id: 21,
+              sender: "기획팀",
+              subject: "첫 번째 메일",
+              date: "2026-05-11T09:30:00Z",
+              snippet: "첫 번째 메일입니다.",
+            },
+            {
+              id: 22,
+              sender: "개발팀",
+              subject: "두 번째 메일",
+              date: "2026-05-11T10:30:00Z",
+              snippet: "두 번째 메일입니다.",
+            },
+          ],
+        }),
+      ),
+    );
+    const firstSelect = vi.fn();
+    const secondSelect = vi.fn();
+    vi.stubGlobal("fetch", fetchMock);
+
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(<EmailList onSelectEmail={firstSelect} selectedEmailId={21} />);
+    });
+    await flushAsyncWork();
+
+    let selectedThread = container.querySelector<HTMLButtonElement>('button[aria-current="true"]');
+    expect(selectedThread?.textContent).toContain("첫 번째 메일");
+
+    await act(async () => {
+      root?.render(<EmailList onSelectEmail={secondSelect} selectedEmailId={22} />);
+    });
+
+    selectedThread = container.querySelector<HTMLButtonElement>('button[aria-current="true"]');
+    expect(selectedThread?.textContent).toContain("두 번째 메일");
+
+    const firstThread = Array.from(container.querySelectorAll<HTMLButtonElement>("button")).find(
+      (button) => button.textContent?.includes("첫 번째 메일"),
+    );
+    expect(firstThread).toBeDefined();
+
+    await act(async () => {
+      firstThread?.click();
+    });
+
+    expect(secondSelect).toHaveBeenCalledWith(21);
+    expect(firstSelect).not.toHaveBeenCalled();
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+  });
+
+  it("does not remap stable emails for an unrelated search-input rerender", async () => {
+    const emailItems = [
+      {
+        id: 31,
+        sender: "운영팀",
+        subject: "안정된 목록",
+        date: "2026-05-11T09:30:00Z",
+        snippet: "목록 재계산 여부를 확인합니다.",
+      },
+    ];
+    const mapSpy = vi.spyOn(emailItems, "map");
+    vi.stubGlobal(
+      "fetch",
+      vi.fn(() => Promise.resolve(jsonResponse({ emails: emailItems }))),
+    );
+
+    container = document.createElement("div");
+    document.body.appendChild(container);
+    root = createRoot(container);
+
+    await act(async () => {
+      root?.render(<EmailList onSelectEmail={vi.fn()} selectedEmailId={31} />);
+    });
+    await flushAsyncWork();
+    expect(mapSpy).toHaveBeenCalledTimes(1);
+
+    const searchInput = container.querySelector<HTMLInputElement>(
+      'input[aria-label="메일 맥락 검색"]',
+    );
+    expect(searchInput).not.toBeNull();
+    await act(async () => {
+      setInputValue(searchInput!, "내부 상태 변경");
+    });
+
+    expect(mapSpy).toHaveBeenCalledTimes(1);
+  });
+
   it("uses the missing-title fallback for blank email subjects", async () => {
     const fetchMock = vi.fn(() =>
       Promise.resolve(
diff --git a/frontend/src/components/EmailList.tsx b/frontend/src/components/EmailList.tsx
index 6dbb722ea..2aacc34ed 100644
--- a/frontend/src/components/EmailList.tsx
+++ b/frontend/src/components/EmailList.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useRef, useState, memo } from 'react';
+import React, { useCallback, useEffect, useRef, useState, memo, useMemo } from 'react';
 import { apiClient } from '@/lib/api-client';
 import { ScrollArea } from "@/components/ui/scroll-area";
 import { Avatar, AvatarFallback } from "@/components/ui/avatar";
@@ -47,9 +47,6 @@ async function fetchFolderEmails(folder: MailFolder) {
 
 
 
-// ⚡ Bolt: Extracted and memoized individual email items
-// 🎯 Why: Previously, selecting a single email caused the entire list of 50+ items to re-render.
-// 💡 Impact: Reduces re-renders to only 2 items per selection change (the old active item and the new one), saving CPU cycles.
 const EmailListItemComponent = memo(function EmailListItemComponent({
 
   email,
@@ -173,6 +170,17 @@ export function EmailList({
       };
   const searchBusy = isSearching || loading;
 
+  const emailListContent = useMemo(() => {
+    return emails.map((email: EmailItem) => (
+      <EmailListItemComponent
+        key={email.id}
+        email={email}
+        selected={selectedEmailId === email.id}
+        onSelectEmail={onSelectEmail}
+      />
+    ));
+  }, [emails, selectedEmailId, onSelectEmail]);
+
   return (
     <div className="flex h-full min-h-0 w-full flex-col border-r border-border/80 bg-card/95">
       <div className="border-b border-border/80 bg-gradient-to-br from-card via-card to-primary/5 p-4">
@@ -259,14 +267,7 @@ export function EmailList({
               <p className="mt-1 text-xs leading-5">{folderCopy.emptyBody}</p>
             </div>
           ) : (
-            emails.map((email: EmailItem) => (
-              <EmailListItemComponent
-                key={email.id}
-                email={email}
-                selected={selectedEmailId === email.id}
-                onSelectEmail={onSelectEmail}
-              />
-            ))
+            emailListContent
           )}
         </div>
       </ScrollArea>