diff --git a/components/layout/__tests__/mailbox-context-menu-order.test.tsx b/components/layout/__tests__/mailbox-context-menu-order.test.tsx
new file mode 100644
index 000000000..947fb0062
--- /dev/null
+++ b/components/layout/__tests__/mailbox-context-menu-order.test.tsx
@@ -0,0 +1,34 @@
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it, vi } from 'vitest';
+import type { Mailbox } from '@/lib/jmap/types';
+
+// R6: destructive entries come last. The folder menu had Refresh after
+// "Delete folder".
+
+vi.mock('@/components/email/rules-menu', () => ({ FolderRulesSubMenu: () => null }));
+
+const { MailboxContextMenu } = await import('../mailbox-context-menu');
+
+const folder = { id: 'p', name: 'Projects', sortOrder: 1, totalEmails: 2, unreadEmails: 0, myRights: {} } as unknown as Mailbox;
+
+describe('MailboxContextMenu', () => {
+  it('ends with Empty folder and Delete folder', () => {
+    render(
+      <MailboxContextMenu
+        target={{ kind: 'mailbox', mailbox: folder, hasChildren: false }}
+        position={{ x: 0, y: 0 }}
+        isOpen
+        onClose={vi.fn()}
+        menuRef={{ current: null }}
+        mailboxes={[folder]}
+        onEmptyFolder={vi.fn()}
+        onDeleteFolder={vi.fn()}
+        onRefresh={vi.fn()}
+        onImportEmail={vi.fn()}
+      />,
+    );
+    const labels = screen.getAllByRole('menuitem').map((item) => item.textContent);
+    expect(labels.slice(-2)).toEqual(['empty_folder_generic', 'delete_folder']);
+    expect(labels).toContain('refresh');
+  });
+});
diff --git a/components/layout/mailbox-context-menu.tsx b/components/layout/mailbox-context-menu.tsx
index bb2f8d34a..afaf59d08 100644
--- a/components/layout/mailbox-context-menu.tsx
+++ b/components/layout/mailbox-context-menu.tsx
@@ -293,7 +293,14 @@ export function MailboxContextMenu({
         onClick={() => handleAction(() => onImportEmail?.(mailbox.id))}
         disabled={!onImportEmail || !canAddItems}
       />
+      <ContextMenuItem
+        icon={RefreshCw}
+        label={t("refresh")}
+        onClick={() => handleAction(onRefresh!)}
+        disabled={!onRefresh}
+      />
 
+      {/* Destructive entries last (R6). */}
       <ContextMenuSeparator />
 
       <ContextMenuItem
@@ -311,15 +318,6 @@ export function MailboxContextMenu({
         destructive
         testId="mailbox-delete"
       />
-
-      <ContextMenuSeparator />
-
-      <ContextMenuItem
-        icon={RefreshCw}
-        label={t("refresh")}
-        onClick={() => handleAction(onRefresh!)}
-        disabled={!onRefresh}
-      />
     </ContextMenu>
   );
 }