diff --git a/components/pro/__tests__/pro-email-edit-draft.test.tsx b/components/pro/__tests__/pro-email-edit-draft.test.tsx
index 0edefdb22..1283f2298 100644
--- a/components/pro/__tests__/pro-email-edit-draft.test.tsx
+++ b/components/pro/__tests__/pro-email-edit-draft.test.tsx
@@ -33,9 +33,9 @@ vi.mock('@/lib/popout/window-role', async (importOriginal) => ({
   ...await importOriginal<typeof import('@/lib/popout/window-role')>(),
   isPopoutWindow: () => popout.value,
 }));
-const moveDialog = vi.hoisted(() => ({ current: null as { email: unknown } | null }));
+const moveDialog = vi.hoisted(() => ({ current: null as { emails: unknown[] } | null }));
 vi.mock('@/components/email/move-to-dialog', () => ({
-  MoveToDialog: (props: { email: unknown }) => {
+  MoveToDialog: (props: { emails: unknown[] }) => {
     moveDialog.current = props;
     return null;
   },
@@ -331,11 +331,11 @@ describe('Message > Move to… in a message window', () => {
       const client = { getEmail: vi.fn().mockResolvedValue(DRAFT), getUsername: () => 'userb@example.org', getAccountId: () => 'e' };
       render(<ProEmailView emailId="eaaaaab" client={client as never} onClose={vi.fn()} />);
       await waitFor(() => expect(viewerProps.current?.email).toBeTruthy());
-      expect(moveDialog.current?.email ?? null).toBeNull();
+      expect(moveDialog.current?.emails ?? []).toEqual([]);
       act(() => {
         expect(runDesktopCommand('message.move')).toBe(true);
       });
-      await waitFor(() => expect(moveDialog.current?.email).toMatchObject({ id: 'eaaaaab' }));
+      await waitFor(() => expect(moveDialog.current?.emails?.[0]).toMatchObject({ id: 'eaaaaab' }));
     } finally {
       popout.value = false;
       window.bulwarkDesktop = undefined;
diff --git a/components/pro/pro-email-tab-body.tsx b/components/pro/pro-email-tab-body.tsx
index 8e854bfcc..bc6e882f3 100644
--- a/components/pro/pro-email-tab-body.tsx
+++ b/components/pro/pro-email-tab-body.tsx
@@ -649,7 +649,7 @@ export function ProEmailView({ emailId, client: clientOverride, clientAccountId,
       <ConfirmDialog {...confirmDialogProps} />
       {inOwnWindow && (
         <MoveToDialog
-          email={moveDialogOpen ? email : null}
+          emails={moveDialogOpen && email ? [email] : []}
           mailboxes={mailboxes}
           selectedMailbox=""
           onClose={() => setMoveDialogOpen(false)}