diff --git a/apps/web/app/(app)/admin/GmailUrlConverter.tsx b/apps/web/app/(app)/admin/GmailUrlConverter.tsx
index da7c7381e5..281e34b354 100644
--- a/apps/web/app/(app)/admin/GmailUrlConverter.tsx
+++ b/apps/web/app/(app)/admin/GmailUrlConverter.tsx
@@ -19,6 +19,7 @@ import {
   convertGmailUrlBody,
   type ConvertGmailUrlBody,
 } from "@/utils/actions/admin.validation";
+import { internalDateToDate } from "@/utils/date";
 
 export function GmailUrlConverter() {
   const {
@@ -90,10 +91,19 @@ export function GmailUrlConverter() {
               <code className="text-sm">{result.data.threadId}</code>
             </div>
             <div>
-              <span className="text-sm font-medium">Message IDs: </span>
-              <code className="text-sm">
-                {result.data.messageIds.join(", ")}
-              </code>
+              <span className="text-sm font-medium">Messages: </span>
+              <div className="space-y-1">
+                {result.data.messages.map((msg) => (
+                  <div key={msg.id} className="text-sm">
+                    <code>{msg.id}</code>
+                    {msg.date && (
+                      <span className="ml-2 text-muted-foreground">
+                        ({internalDateToDate(msg.date).toLocaleString()})
+                      </span>
+                    )}
+                  </div>
+                ))}
+              </div>
             </div>
           </div>
         )}
diff --git a/apps/web/app/api/google/webhook/process-history.ts b/apps/web/app/api/google/webhook/process-history.ts
index 75d85d6f42..96300cc91d 100644
--- a/apps/web/app/api/google/webhook/process-history.ts
+++ b/apps/web/app/api/google/webhook/process-history.ts
@@ -162,7 +162,16 @@ async function processHistory(options: ProcessHistoryOptions, logger: Logger) {
 
     const allEvents = [
       ...(h.messagesAdded || [])
-        .filter(isInboxOrSentMessage)
+        .filter((m) => {
+          const isRelevant = isInboxOrSentMessage(m);
+          if (!isRelevant) {
+            logger.info("Skipping message not in inbox or sent", {
+              messageId: m.message?.id,
+              labelIds: m.message?.labelIds,
+            });
+          }
+          return isRelevant;
+        })
         .map((m) => ({ type: HistoryEventType.MESSAGE_ADDED, item: m })),
       ...(h.labelsAdded || []).map((m) => ({
         type: HistoryEventType.LABEL_ADDED,
diff --git a/apps/web/utils/actions/admin.ts b/apps/web/utils/actions/admin.ts
index d95fa98d22..0cd13a4d6d 100644
--- a/apps/web/utils/actions/admin.ts
+++ b/apps/web/utils/actions/admin.ts
@@ -248,11 +248,15 @@ export const adminConvertGmailUrlAction = adminActionClient
       throw new SafeError("Could not find thread for message");
     }
 
-    const messageIds = thread.messages?.map((m) => m.id) || [];
+    const messages =
+      thread.messages?.map((m) => ({
+        id: m.id,
+        date: m.internalDate || null,
+      })) || [];
 
     return {
       threadId: thread.id,
-      messageIds: messageIds,
+      messages: messages,
       rfc822MessageId: cleanMessageId,
     };
   });
diff --git a/version.txt b/version.txt
index 5f4826611e..788e35e9fe 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.20.20
+v2.20.21