diff --git a/apps/web/app/(app)/compose/ComposeEmailForm.tsx b/apps/web/app/(app)/compose/ComposeEmailForm.tsx
index 1f18e6344f..d040bee436 100644
--- a/apps/web/app/(app)/compose/ComposeEmailForm.tsx
+++ b/apps/web/app/(app)/compose/ComposeEmailForm.tsx
@@ -116,6 +116,7 @@ export const ComposeEmailForm = ({
   );
 
   const [searchQuery, setSearchQuery] = React.useState("");
+  const [searchQueryCc, setSearchQueryCc] = React.useState("");
   const { data } = useSWR<ContactsResponse, { error: string }>(
     env.NEXT_PUBLIC_CONTACTS_ENABLED
       ? `/api/google/contacts?query=${searchQuery}`
@@ -126,23 +127,28 @@ export const ComposeEmailForm = ({
   );
 
   // TODO not in love with how this was implemented
-  const selectedEmailAddressses = watch("to", "").split(",").filter(Boolean);
+  const selectedEmailAddresses = watch("to", "").split(",").filter(Boolean);
+  const selectedCcAddresses = (watch("cc") || "").split(",").filter(Boolean);
 
-  const onRemoveSelectedEmail = (emailAddress: string) => {
-    const filteredEmailAddresses = selectedEmailAddressses.filter(
-      (email) => email !== emailAddress,
-    );
-    setValue("to", filteredEmailAddresses.join(","));
+  const onRemoveSelectedEmail = (emailAddress: string, field: "to" | "cc") => {
+    const filteredEmailAddresses = (
+      field === "to" ? selectedEmailAddresses : selectedCcAddresses
+    ).filter((email) => email !== emailAddress);
+    setValue(field, filteredEmailAddresses.join(","));
   };
 
-  const handleComboboxOnChange = (values: string[]) => {
-    // this assumes last value given by combobox is user typed value
+  // this assumes last value given by combobox is user typed value
+  const handleComboboxOnChange = (values: string[], field: "to" | "cc") => {
     const lastValue = values[values.length - 1];
 
     const { success } = z.string().email().safeParse(lastValue);
     if (success) {
-      setValue("to", values.join(","));
-      setSearchQuery("");
+      setValue(field, values.join(","));
+      if (field === "to") {
+        setSearchQuery("");
+      } else {
+        setSearchQueryCc("");
+      }
     }
   };
 
@@ -188,129 +194,266 @@ export const ComposeEmailForm = ({
       ) : (
         <>
           {env.NEXT_PUBLIC_CONTACTS_ENABLED ? (
-            <div className="flex space-x-2">
-              <div className="mt-2">
-                <Label name="to" label="To" />
+            <>
+              <div className="flex space-x-2">
+                <div className="mt-2">
+                  <Label name="to" label="To" />
+                </div>
+                <Combobox
+                  value={selectedEmailAddresses}
+                  onChange={(values) => handleComboboxOnChange(values, "to")}
+                  multiple
+                >
+                  <div className="flex min-h-10 w-full flex-1 flex-wrap items-center gap-1.5 rounded-md text-sm disabled:cursor-not-allowed disabled:bg-slate-50 disabled:text-muted-foreground">
+                    {selectedEmailAddresses.map((emailAddress) => (
+                      <Badge
+                        key={emailAddress}
+                        variant="secondary"
+                        className="cursor-pointer rounded-md"
+                        onClick={() => {
+                          onRemoveSelectedEmail(emailAddress, "to");
+                          setSearchQuery(emailAddress);
+                        }}
+                      >
+                        {extractNameFromEmail(emailAddress)}
+
+                        <button
+                          type="button"
+                          onClick={() =>
+                            onRemoveSelectedEmail(emailAddress, "to")
+                          }
+                        >
+                          <XIcon className="ml-1.5 size-3" />
+                        </button>
+                      </Badge>
+                    ))}
+
+                    <div className="relative flex-1">
+                      <ComboboxInput
+                        value={searchQuery}
+                        className="w-full border-none bg-background p-0 text-sm focus:border-none focus:ring-0"
+                        onChange={(event) => setSearchQuery(event.target.value)}
+                        onKeyUp={(event) => {
+                          if (event.key === "Enter") {
+                            event.preventDefault();
+                            setValue(
+                              "to",
+                              [...selectedEmailAddresses, searchQuery].join(
+                                ",",
+                              ),
+                            );
+                            setSearchQuery("");
+                          }
+                        }}
+                      />
+
+                      {!!data?.result?.length && (
+                        <ComboboxOptions
+                          className={
+                            "absolute z-10 mt-1 max-h-60 overflow-auto rounded-md bg-popover py-1 text-base shadow-lg ring-1 ring-border focus:outline-none sm:text-sm"
+                          }
+                        >
+                          <ComboboxOption
+                            className="h-0 w-0 overflow-hidden"
+                            value={searchQuery}
+                          />
+                          {data?.result.map((contact) => {
+                            const person = {
+                              emailAddress:
+                                contact.person?.emailAddresses?.[0].value,
+                              name: contact.person?.names?.[0].displayName,
+                              profilePictureUrl:
+                                contact.person?.photos?.[0].url,
+                            };
+
+                            return (
+                              <ComboboxOption
+                                className={({ focus }) =>
+                                  `cursor-default select-none px-4 py-1 text-foreground ${
+                                    focus && "bg-accent"
+                                  }`
+                                }
+                                key={person.emailAddress}
+                                value={person.emailAddress}
+                              >
+                                {({ selected }) => (
+                                  <div className="my-2 flex items-center">
+                                    {selected ? (
+                                      <div className="flex h-12 w-12 items-center justify-center rounded-full">
+                                        <CheckCircleIcon className="h-6 w-6" />
+                                      </div>
+                                    ) : (
+                                      <Avatar>
+                                        <AvatarImage
+                                          src={person.profilePictureUrl!}
+                                          alt={
+                                            person.emailAddress ||
+                                            "Profile picture"
+                                          }
+                                        />
+                                        <AvatarFallback>
+                                          {person.emailAddress?.[0] || "A"}
+                                        </AvatarFallback>
+                                      </Avatar>
+                                    )}
+                                    <div className="ml-4 flex flex-col justify-center">
+                                      <div className="text-foreground">
+                                        {person.name}
+                                      </div>
+                                      <div className="text-sm font-semibold text-muted-foreground">
+                                        {person.emailAddress}
+                                      </div>
+                                    </div>
+                                  </div>
+                                )}
+                              </ComboboxOption>
+                            );
+                          })}
+                        </ComboboxOptions>
+                      )}
+                    </div>
+                  </div>
+                </Combobox>
               </div>
-              <Combobox
-                value={selectedEmailAddressses}
-                onChange={handleComboboxOnChange}
-                multiple
-              >
-                <div className="flex min-h-10 w-full flex-1 flex-wrap items-center gap-1.5 rounded-md text-sm disabled:cursor-not-allowed disabled:bg-slate-50 disabled:text-muted-foreground">
-                  {selectedEmailAddressses.map((emailAddress) => (
-                    <Badge
-                      key={emailAddress}
-                      variant="secondary"
-                      className="cursor-pointer rounded-md"
-                      onClick={() => {
-                        onRemoveSelectedEmail(emailAddress);
-                        setSearchQuery(emailAddress);
-                      }}
-                    >
-                      {extractNameFromEmail(emailAddress)}
 
-                      <button
-                        type="button"
-                        onClick={() => onRemoveSelectedEmail(emailAddress)}
+              <div className="flex space-x-2">
+                <div className="mt-2">
+                  <Label name="cc" label="CC" />
+                </div>
+                <Combobox
+                  value={selectedCcAddresses}
+                  onChange={(values) => handleComboboxOnChange(values, "cc")}
+                  multiple
+                >
+                  <div className="flex min-h-10 w-full flex-1 flex-wrap items-center gap-1.5 rounded-md text-sm disabled:cursor-not-allowed disabled:bg-slate-50 disabled:text-muted-foreground">
+                    {selectedCcAddresses.map((emailAddress) => (
+                      <Badge
+                        key={emailAddress}
+                        variant="secondary"
+                        className="cursor-pointer rounded-md"
+                        onClick={() => {
+                          onRemoveSelectedEmail(emailAddress, "cc");
+                          setSearchQueryCc(emailAddress);
+                        }}
                       >
-                        <XIcon className="ml-1.5 size-3" />
-                      </button>
-                    </Badge>
-                  ))}
+                        {extractNameFromEmail(emailAddress)}
 
-                  <div className="relative flex-1">
-                    <ComboboxInput
-                      value={searchQuery}
-                      className="w-full border-none bg-background p-0 text-sm focus:border-none focus:ring-0"
-                      onChange={(event) => setSearchQuery(event.target.value)}
-                      onKeyUp={(event) => {
-                        if (event.key === "Enter") {
-                          event.preventDefault();
-                          setValue(
-                            "to",
-                            [...selectedEmailAddressses, searchQuery].join(","),
-                          );
-                          setSearchQuery("");
-                        }
-                      }}
-                    />
+                        <button
+                          type="button"
+                          onClick={() =>
+                            onRemoveSelectedEmail(emailAddress, "cc")
+                          }
+                        >
+                          <XIcon className="ml-1.5 size-3" />
+                        </button>
+                      </Badge>
+                    ))}
 
-                    {!!data?.result?.length && (
-                      <ComboboxOptions
-                        className={
-                          "absolute z-10 mt-1 max-h-60 overflow-auto rounded-md bg-popover py-1 text-base shadow-lg ring-1 ring-border focus:outline-none sm:text-sm"
+                    <div className="relative flex-1">
+                      <ComboboxInput
+                        value={searchQueryCc}
+                        className="w-full border-none bg-background p-0 text-sm focus:border-none focus:ring-0"
+                        onChange={(event) =>
+                          setSearchQueryCc(event.target.value)
                         }
-                      >
-                        <ComboboxOption
-                          className="h-0 w-0 overflow-hidden"
-                          value={searchQuery}
-                        />
-                        {data?.result.map((contact) => {
-                          const person = {
-                            emailAddress:
-                              contact.person?.emailAddresses?.[0].value,
-                            name: contact.person?.names?.[0].displayName,
-                            profilePictureUrl: contact.person?.photos?.[0].url,
-                          };
+                        onKeyUp={(event) => {
+                          if (event.key === "Enter") {
+                            event.preventDefault();
+                            setValue(
+                              "cc",
+                              [...selectedCcAddresses, searchQueryCc].join(","),
+                            );
+                            setSearchQueryCc("");
+                          }
+                        }}
+                      />
 
-                          return (
-                            <ComboboxOption
-                              className={({ focus }) =>
-                                `cursor-default select-none px-4 py-1 text-foreground ${
-                                  focus && "bg-accent"
-                                }`
-                              }
-                              key={person.emailAddress}
-                              value={person.emailAddress}
-                            >
-                              {({ selected }) => (
-                                <div className="my-2 flex items-center">
-                                  {selected ? (
-                                    <div className="flex h-12 w-12 items-center justify-center rounded-full">
-                                      <CheckCircleIcon className="h-6 w-6" />
-                                    </div>
-                                  ) : (
-                                    <Avatar>
-                                      <AvatarImage
-                                        src={person.profilePictureUrl!}
-                                        alt={
-                                          person.emailAddress ||
-                                          "Profile picture"
-                                        }
-                                      />
-                                      <AvatarFallback>
-                                        {person.emailAddress?.[0] || "A"}
-                                      </AvatarFallback>
-                                    </Avatar>
-                                  )}
-                                  <div className="ml-4 flex flex-col justify-center">
-                                    <div className="text-foreground">
-                                      {person.name}
-                                    </div>
-                                    <div className="text-sm font-semibold text-muted-foreground">
-                                      {person.emailAddress}
+                      {!!data?.result?.length && (
+                        <ComboboxOptions
+                          className={
+                            "absolute z-10 mt-1 max-h-60 overflow-auto rounded-md bg-popover py-1 text-base shadow-lg ring-1 ring-border focus:outline-none sm:text-sm"
+                          }
+                        >
+                          <ComboboxOption
+                            className="h-0 w-0 overflow-hidden"
+                            value={searchQueryCc}
+                          />
+                          {data?.result.map((contact) => {
+                            const person = {
+                              emailAddress:
+                                contact.person?.emailAddresses?.[0].value,
+                              name: contact.person?.names?.[0].displayName,
+                              profilePictureUrl:
+                                contact.person?.photos?.[0].url,
+                            };
+
+                            return (
+                              <ComboboxOption
+                                className={({ focus }) =>
+                                  `cursor-default select-none px-4 py-1 text-foreground ${
+                                    focus && "bg-accent"
+                                  }`
+                                }
+                                key={person.emailAddress}
+                                value={person.emailAddress}
+                              >
+                                {({ selected }) => (
+                                  <div className="my-2 flex items-center">
+                                    {selected ? (
+                                      <div className="flex h-12 w-12 items-center justify-center rounded-full">
+                                        <CheckCircleIcon className="h-6 w-6" />
+                                      </div>
+                                    ) : (
+                                      <Avatar>
+                                        <AvatarImage
+                                          src={person.profilePictureUrl!}
+                                          alt={
+                                            person.emailAddress ||
+                                            "Profile picture"
+                                          }
+                                        />
+                                        <AvatarFallback>
+                                          {person.emailAddress?.[0] || "A"}
+                                        </AvatarFallback>
+                                      </Avatar>
+                                    )}
+                                    <div className="ml-4 flex flex-col justify-center">
+                                      <div className="text-foreground">
+                                        {person.name}
+                                      </div>
+                                      <div className="text-sm font-semibold text-muted-foreground">
+                                        {person.emailAddress}
+                                      </div>
                                     </div>
                                   </div>
-                                </div>
-                              )}
-                            </ComboboxOption>
-                          );
-                        })}
-                      </ComboboxOptions>
-                    )}
+                                )}
+                              </ComboboxOption>
+                            );
+                          })}
+                        </ComboboxOptions>
+                      )}
+                    </div>
                   </div>
-                </div>
-              </Combobox>
-            </div>
+                </Combobox>
+              </div>
+            </>
           ) : (
-            <Input
-              type="text"
-              name="to"
-              label="To"
-              registerProps={register("to", { required: true })}
-              error={errors.to}
-            />
+            <>
+              <Input
+                type="text"
+                name="to"
+                label="To"
+                registerProps={register("to", { required: true })}
+                error={errors.to}
+              />
+              <Input
+                type="text"
+                name="cc"
+                label="CC"
+                registerProps={register("cc")}
+                error={errors.cc}
+              />
+            </>
           )}
 
           <Input
diff --git a/apps/web/components/email-list/EmailMessage.tsx b/apps/web/components/email-list/EmailMessage.tsx
index 10bdba02de..589c64f5df 100644
--- a/apps/web/components/email-list/EmailMessage.tsx
+++ b/apps/web/components/email-list/EmailMessage.tsx
@@ -2,6 +2,7 @@ import { useCallback, useMemo, useState, useRef, useEffect } from "react";
 import {
   ForwardIcon,
   ReplyIcon,
+  ReplyAllIcon,
   ChevronsUpDownIcon,
   ChevronsDownUpIcon,
 } from "lucide-react";
@@ -48,14 +49,17 @@ export function EmailMessage({
   generateNudge?: boolean;
 }) {
   const [showReply, setShowReply] = useState(defaultShowReply || false);
+  const [showReplyAll, setShowReplyAll] = useState(false);
   const [showDetails, setShowDetails] = useState(false);
 
   const onReply = useCallback(() => setShowReply(true), []);
+  const onReplyAll = useCallback(() => setShowReplyAll(true), []);
   const [showForward, setShowForward] = useState(false);
   const onForward = useCallback(() => setShowForward(true), []);
 
   const onCloseCompose = useCallback(() => {
     setShowReply(false);
+    setShowReplyAll(false);
     setShowForward(false);
   }, []);
 
@@ -80,6 +84,7 @@ export function EmailMessage({
         toggleDetails={toggleDetails}
         showReplyButton={showReplyButton}
         onReply={onReply}
+        onReplyAll={onReplyAll}
         onForward={onForward}
       />
 
@@ -95,16 +100,17 @@ export function EmailMessage({
 
           {message.attachments && <EmailAttachments message={message} />}
 
-          {(showReply || showForward) && (
+          {(showReply || showReplyAll || showForward) && (
             <ReplyPanel
               message={message}
               refetch={refetch}
               onSendSuccess={onSendSuccess}
               onCloseCompose={onCloseCompose}
               defaultShowReply={defaultShowReply}
-              showReply={showReply}
+              showReply={showReply || showReplyAll}
               draftMessage={draftMessage}
               generateNudge={generateNudge}
+              replyToAll={showReplyAll}
             />
           )}
         </>
@@ -121,6 +127,7 @@ function TopBar({
   showReplyButton,
   onReply,
   onForward,
+  onReplyAll,
 }: {
   message: ParsedMessage;
   expanded: boolean;
@@ -129,6 +136,7 @@ function TopBar({
   showReplyButton: boolean;
   onReply: () => void;
   onForward: () => void;
+  onReplyAll: () => void;
 }) {
   return (
     <div className="sm:flex sm:items-center sm:justify-between">
@@ -172,6 +180,12 @@ function TopBar({
                 <span className="sr-only">Reply</span>
               </Button>
             </Tooltip>
+            <Tooltip content="Reply to All">
+              <Button variant="ghost" size="icon" onClick={onReplyAll}>
+                <ReplyAllIcon className="h-4 w-4" />
+                <span className="sr-only">Reply to All</span>
+              </Button>
+            </Tooltip>
             <Tooltip content="Forward">
               <Button variant="ghost" size="icon">
                 <ForwardIcon className="h-4 w-4" onClick={onForward} />
@@ -194,6 +208,7 @@ function ReplyPanel({
   showReply,
   draftMessage,
   generateNudge,
+  replyToAll,
 }: {
   message: ParsedMessage;
   refetch: () => void;
@@ -203,11 +218,13 @@ function ReplyPanel({
   showReply: boolean;
   draftMessage?: ThreadMessage;
   generateNudge?: boolean;
+  replyToAll?: boolean;
 }) {
   const replyRef = useRef<HTMLDivElement>(null);
 
   const [isGeneratingNudge, setIsGeneratingNudge] = useState(false);
   const [nudge, setNudge] = useState<string | null>(null);
+
   // scroll to the reply panel when it first opens
   useEffect(() => {
     if (defaultShowReply && replyRef.current) {
@@ -256,7 +273,6 @@ function ReplyPanel({
 
       // use nudge if available
       if (nudge) {
-        // Convert nudge text into HTML paragraphs
         const nudgeHtml = nudge
           ? nudge
               .split("\n")
@@ -265,13 +281,17 @@ function ReplyPanel({
               .join("")
           : "";
 
-        return prepareReplyingToEmail(message, nudgeHtml);
+        return replyToAll
+          ? prepareReplyToAllEmail(message, nudgeHtml)
+          : prepareReplyingToEmail(message, nudgeHtml);
       }
 
-      return prepareReplyingToEmail(message);
+      return replyToAll
+        ? prepareReplyToAllEmail(message)
+        : prepareReplyingToEmail(message);
     }
     return prepareForwardingEmail(message);
-  }, [showReply, message, draftMessage, nudge]);
+  }, [showReply, message, draftMessage, nudge, replyToAll]);
 
   return (
     <>
@@ -312,6 +332,7 @@ function ReplyPanel({
 const prepareReplyingToEmail = (
   message: ParsedMessage,
   content = "",
+  replyToAll = false,
 ): ReplyingToEmail => {
   const sentFromUser = message.labelIds?.includes("SENT");
 
@@ -320,14 +341,41 @@ const prepareReplyingToEmail = (
   return {
     // If following an email from yourself, use original recipients, otherwise reply to sender
     to: sentFromUser ? message.headers.to : message.headers.from,
+    // If replying to all, include CC recipients
+    cc: replyToAll ? message.headers.cc : "",
     // If following an email from yourself, don't add "Re:" prefix
     subject: sentFromUser
       ? message.headers.subject
       : `Re: ${message.headers.subject}`,
     headerMessageId: message.headers["message-id"]!,
     threadId: message.threadId!,
-    // Keep original CC
+    // Keep original BCC if available
+    bcc: sentFromUser ? message.headers.bcc : "",
+    references: message.headers.references,
+    draftHtml: content || "",
+    quotedContentHtml: html,
+  };
+};
+
+const prepareReplyToAllEmail = (
+  message: ParsedMessage,
+  content = "",
+): ReplyingToEmail => {
+  const sentFromUser = message.labelIds?.includes("SENT");
+
+  const { html } = createReplyContent({ message });
+
+  return {
+    // If following an email from yourself, use original recipients, otherwise reply to sender
+    to: sentFromUser ? message.headers.to : message.headers.from,
+    // Include all CC recipients
     cc: message.headers.cc,
+    // If following an email from yourself, don't add "Re:" prefix
+    subject: sentFromUser
+      ? message.headers.subject
+      : `Re: ${message.headers.subject}`,
+    headerMessageId: message.headers["message-id"]!,
+    threadId: message.threadId!,
     // Keep original BCC if available
     bcc: sentFromUser ? message.headers.bcc : "",
     references: message.headers.references,