diff --git a/apps/web/utils/ai/actions.ts b/apps/web/utils/ai/actions.ts
index af5917d329..c1de460d8e 100644
--- a/apps/web/utils/ai/actions.ts
+++ b/apps/web/utils/ai/actions.ts
@@ -114,6 +114,7 @@ const draft: ActionFunction<{
       labelIds: [],
     },
     draftArgs,
+    executedRule,
   );
   return { draftId: result.draftId };
 };
diff --git a/apps/web/utils/email/provider.ts b/apps/web/utils/email/provider.ts
index f9c08a9a55..959617dd78 100644
--- a/apps/web/utils/email/provider.ts
+++ b/apps/web/utils/email/provider.ts
@@ -440,10 +440,10 @@ export class GmailProvider implements EmailProvider {
           logger,
         }),
       ]);
-      return { draftId: result.data.message?.id || "" };
+      return { draftId: result.data.id || "" };
     } else {
       const result = await gmailDraftEmail(this.client, email, args);
-      return { draftId: result.data.message?.id || "" };
+      return { draftId: result.data.id || "" };
     }
   }
 
diff --git a/apps/web/utils/gmail/draft.ts b/apps/web/utils/gmail/draft.ts
index a272bd2c86..acde493c6c 100644
--- a/apps/web/utils/gmail/draft.ts
+++ b/apps/web/utils/gmail/draft.ts
@@ -28,7 +28,7 @@ export async function deleteDraft(gmail: gmail_v1.Gmail, draftId: string) {
       userId: "me",
       id: draftId,
     });
-    if (response.status !== 200) {
+    if (response.status !== 200 && response.status !== 204) {
       logger.error("Failed to delete draft", { draftId, response });
     }
     logger.info("Successfully deleted draft", { draftId });