diff --git a/frontend/src/__tests__/mail/ComposeModal.test.tsx b/frontend/src/__tests__/mail/ComposeModal.test.tsx
index 6d7232b..0522c32 100644
--- a/frontend/src/__tests__/mail/ComposeModal.test.tsx
+++ b/frontend/src/__tests__/mail/ComposeModal.test.tsx
@@ -4,6 +4,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 
 vi.mock('@/api/mail', () => ({
+  decodeMimeHeader: (s: string) => s,
   fetchTemplates: vi.fn().mockResolvedValue([
     { id: 't1', name: 'Welcome', subject: 'Welcome!', body: '<p>Welcome {{name}}</p>', variables: ['name'] },
   ]),
@@ -57,7 +58,7 @@ describe('ComposeModal', () => {
 
   it('renders editor', () => {
     renderModal();
-    expect(screen.getByTestId('compose-editor')).toBeInTheDocument();
+    expect(screen.getByTestId('rich-text-editor-container')).toBeInTheDocument();
   });
 
   it('renders send button', () => {
diff --git a/frontend/src/__tests__/mail/MailPage.test.tsx b/frontend/src/__tests__/mail/MailPage.test.tsx
index 3a22d3d..91736a2 100644
--- a/frontend/src/__tests__/mail/MailPage.test.tsx
+++ b/frontend/src/__tests__/mail/MailPage.test.tsx
@@ -4,6 +4,7 @@ import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 
 vi.mock('@/api/mail', () => ({
+  decodeMimeHeader: (s: string) => s,
   fetchAccounts: vi.fn().mockResolvedValue([
     { id: 'acc1', email: 'test@example.com', display_name: 'Test User', is_shared: false, is_active: true, imap_host: '', imap_port: 993, smtp_host: '', smtp_port: 587 },
   ]),
@@ -100,8 +101,8 @@ describe('MailPage', () => {
   it('renders folders after loading', async () => {
     renderWithRouter();
     await waitFor(() => {
-      expect(screen.getByText('INBOX')).toBeInTheDocument();
-      expect(screen.getByText('Sent')).toBeInTheDocument();
+      expect(screen.getAllByText('INBOX').length).toBeGreaterThan(0);
+      expect(screen.getAllByText('Sent').length).toBeGreaterThan(0);
     });
   });
 
@@ -145,7 +146,7 @@ describe('MailPage', () => {
     });
     fireEvent.click(screen.getByText('Test Subject'));
     await waitFor(() => {
-      expect(screen.getByTestId('mail-detail')).toBeInTheDocument();
+      expect(screen.getAllByTestId('mail-detail').length).toBeGreaterThan(0);
     });
   });
 
@@ -156,7 +157,7 @@ describe('MailPage', () => {
     });
     fireEvent.click(screen.getByText('Test Subject'));
     await waitFor(() => {
-      expect(screen.getByTestId('mail-detail-toolbar')).toBeInTheDocument();
+      expect(screen.getAllByTestId('mail-detail-toolbar').length).toBeGreaterThan(0);
     });
   });
 });
diff --git a/frontend/src/__tests__/settings/SettingsRoles.test.tsx b/frontend/src/__tests__/settings/SettingsRoles.test.tsx
index 26f4ead..5489beb 100644
--- a/frontend/src/__tests__/settings/SettingsRoles.test.tsx
+++ b/frontend/src/__tests__/settings/SettingsRoles.test.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { describe, it, expect, vi } from 'vitest';
-import { render, screen, fireEvent } from '@testing-library/react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { SettingsRolesPage } from '@/pages/SettingsRoles';
 
@@ -8,6 +8,66 @@ vi.mock('@/components/ui/Toast', () => ({
   useToast: () => ({ success: vi.fn(), error: vi.fn(), info: vi.fn() }),
 }));
 
+const { mockRoles, forceUpdateRef } = vi.hoisted(() => {
+  const forceUpdateRef: { current: () => void } = { current: () => {} };
+  const mockRoles = [
+    { id: '1', name: 'Administrator', permissions: { all: true }, denied_permissions: [], field_permissions: {} },
+    { id: '2', name: 'Mitarbeiter', permissions: { 'companies.read': true, 'contacts.read': true }, denied_permissions: [], field_permissions: {} },
+    { id: '3', name: 'Gast', permissions: {}, denied_permissions: [], field_permissions: {} },
+  ];
+  return { mockRoles, forceUpdateRef };
+});
+
+vi.mock('@/api/hooks', () => ({
+  useRoles: () => {
+    const [, setUpdate] = React.useState({});
+    forceUpdateRef.current = () => setUpdate({});
+    return {
+      data: {
+        items: mockRoles.map(r => ({ ...r })),
+        total: mockRoles.length,
+      },
+      isLoading: false,
+      isError: false,
+      error: null,
+      refetch: () => forceUpdateRef.current(),
+    };
+  },
+  useCreateRole: () => ({
+    mutateAsync: async (data: any) => {
+      const newRole = { id: String(mockRoles.length + 1), name: data.name, permissions: data.permissions || {}, denied_permissions: data.denied_permissions || [], field_permissions: data.field_permissions || {} };
+      mockRoles.push(newRole);
+      forceUpdateRef.current();
+      return newRole;
+    },
+    isPending: false,
+  }),
+  useUpdateRole: () => ({
+    mutateAsync: async (payload: any) => {
+      const idx = mockRoles.findIndex(r => r.id === payload.id);
+      if (idx >= 0) {
+        mockRoles[idx] = { ...mockRoles[idx], ...payload.data };
+      }
+      forceUpdateRef.current();
+      return undefined;
+    },
+    isPending: false,
+  }),
+  useDeleteRole: () => ({ mutateAsync: vi.fn().mockResolvedValue(undefined), isPending: false }),
+  usePermissions: () => ({
+    data: {
+      all: [
+        { key: 'companies.read', label: 'Firmen lesen', category: 'system' },
+        { key: 'companies.write', label: 'Firmen schreiben', category: 'system' },
+        { key: 'contacts.read', label: 'Kontakte lesen', category: 'system' },
+        { key: 'contacts.write', label: 'Kontakte schreiben', category: 'system' },
+      ],
+      field_definitions: [],
+    },
+    isLoading: false,
+  }),
+}));
+
 describe('SettingsRolesPage', () => {
   it('renders roles page', () => {
     render(<MemoryRouter><SettingsRolesPage /></MemoryRouter>);
@@ -52,13 +112,15 @@ describe('SettingsRolesPage', () => {
     expect(checkboxes.length).toBeGreaterThan(0);
   });
 
-  it('can enter role name and save', () => {
+  it('can enter role name and save', async () => {
     render(<MemoryRouter><SettingsRolesPage /></MemoryRouter>);
     fireEvent.click(screen.getByTestId('create-role-btn'));
     const nameInput = screen.getByTestId('new-role-name');
     fireEvent.change(nameInput, { target: { value: 'Vertrieb' } });
     fireEvent.click(screen.getByTestId('save-role-btn'));
-    expect(screen.getByText('Vertrieb')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByText('Vertrieb')).toBeInTheDocument();
+    });
   });
 
   it('opens edit modal for existing role', () => {
@@ -67,13 +129,15 @@ describe('SettingsRolesPage', () => {
     expect(screen.getByTestId('edit-role-form')).toBeInTheDocument();
   });
 
-  it('can update role name via edit modal', () => {
+  it('can update role name via edit modal', async () => {
     render(<MemoryRouter><SettingsRolesPage /></MemoryRouter>);
     fireEvent.click(screen.getByTestId('edit-role-1'));
     const inputs = screen.getByTestId('edit-role-form').querySelectorAll('input:not([type="checkbox"])');
     fireEvent.change(inputs[0], { target: { value: 'Super Admin' } });
     fireEvent.click(screen.getByTestId('update-role-btn'));
-    expect(screen.getByText('Super Admin')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.getByText('Super Admin')).toBeInTheDocument();
+    });
   });
 
   it('renders permission badges for roles', () => {
diff --git a/frontend/src/__tests__/settings/SettingsUsers.test.tsx b/frontend/src/__tests__/settings/SettingsUsers.test.tsx
index f3e4839..5abab6c 100644
--- a/frontend/src/__tests__/settings/SettingsUsers.test.tsx
+++ b/frontend/src/__tests__/settings/SettingsUsers.test.tsx
@@ -11,6 +11,7 @@ const mockUsers = [
 ];
 
 vi.mock('@/api/hooks', () => ({
+  useRoles: () => ({ data: { items: [] }, isLoading: false }),
   useUsers: () => ({
     data: { items: mockUsers, total: 3 },
     isLoading: false,
diff --git a/frontend/src/__tests__/shell/AppShell.test.tsx b/frontend/src/__tests__/shell/AppShell.test.tsx
index 77f4384..ee29bc5 100644
--- a/frontend/src/__tests__/shell/AppShell.test.tsx
+++ b/frontend/src/__tests__/shell/AppShell.test.tsx
@@ -3,6 +3,7 @@ import { describe, it, expect, vi } from 'vitest';
 import { render, screen, within } from '@testing-library/react';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { AppShell } from '@/components/layout/AppShell';
+import { useAuthStore } from '@/store/authStore';
 
 vi.mock('@/api/hooks', () => ({
   useLogout: () => ({ mutateAsync: vi.fn(), isPending: false }),
@@ -21,6 +22,24 @@ function renderWithRouter(initialPath = '/dashboard') {
 }
 
 describe('AppShell', () => {
+  beforeEach(() => {
+    useAuthStore.setState({
+      isAuthenticated: true,
+      user: {
+        id: '1',
+        email: 'max@test.de',
+        first_name: 'Max',
+        last_name: 'Mustermann',
+        role: 'admin',
+        avatar_url: null,
+        tenants: [
+          { id: 't1', name: 'Firma Alpha', slug: 'alpha' },
+          { id: 't2', name: 'Firma Beta', slug: 'beta' },
+        ],
+      },
+      currentTenant: { id: 't1', name: 'Firma Alpha', slug: 'alpha' },
+    });
+  });
   it('renders sidebar, topbar, and content area', () => {
     renderWithRouter();
     expect(screen.getByTestId('app-shell')).toBeInTheDocument();
diff --git a/frontend/src/components/ai/SuggestionBadge.tsx b/frontend/src/components/ai/SuggestionBadge.tsx
index bdabaa5..ccf1464 100644
--- a/frontend/src/components/ai/SuggestionBadge.tsx
+++ b/frontend/src/components/ai/SuggestionBadge.tsx
@@ -30,7 +30,7 @@ export function SuggestionBadge({ onClick }: SuggestionBadgeProps) {
     return (
       <button
         onClick={onClick}
-        className="relative p-2 text-gray-500 hover:text-gray-700 transition-colors"
+        className="relative p-2 text-gray-500 hover:text-gray-700 transition-colors min-h-touch min-w-touch"
         title="KI Vorschläge"
       >
         🤖
@@ -41,7 +41,7 @@ export function SuggestionBadge({ onClick }: SuggestionBadgeProps) {
   return (
     <button
       onClick={onClick}
-      className={`relative p-2 text-gray-500 hover:text-gray-700 transition-colors ${
+      className={`relative p-2 text-gray-500 hover:text-gray-700 transition-colors min-h-touch min-w-touch ${
         pulsing ? 'animate-pulse' : ''
       }`}
       title={`${count} KI Vorschläge`}
diff --git a/frontend/src/components/layout/Sidebar.tsx b/frontend/src/components/layout/Sidebar.tsx
index a7a5fec..6b0f606 100644
--- a/frontend/src/components/layout/Sidebar.tsx
+++ b/frontend/src/components/layout/Sidebar.tsx
@@ -24,6 +24,7 @@ const navItems: NavItem[] = [
   { to: '/dms', labelKey: 'nav.files', icon: navIcon('M7 21h10a2 2 0 002-2V9.414a1 1 0 00-.293-.707l-5.414-5.414A1 1 0 0012.586 3H7a2 2 0 00-2 2v14a2 2 0 002 2z') },
   { to: '/mail', labelKey: 'nav.email', icon: navIcon('M3 8l7.89 5.26a2 2 0 002.22 0L21 8M5 19h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z') },
   { to: '/ai-assistant', labelKey: 'nav.aiAssistant', icon: navIcon('M9.75 17L9 20l-1 1h8l-1-1-.75-3M3 13h18M5 17h14a2 2 0 002-2V5a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z') },
+  { to: '/settings', labelKey: 'nav.settings', icon: navIcon('M10.325 4.317c.426-1.756 2.924-1.756 3.35 0a1.724 1.724 0 002.573 1.066c1.543-.94 3.31.826 2.37 2.37a1.724 1.724 0 001.065 2.572c1.756.426 1.756 2.924 0 3.35a1.724 1.724 0 00-1.066 2.573c.94 1.543-.826 3.31-2.37 2.37a1.724 1.724 0 00-2.572 1.065c-.426 1.756-2.924 1.756-3.35 0a1.724 1.724 0 00-2.573-1.066c-1.543.94-3.31-.826-2.37-2.37a1.724 1.724 0 00-1.065-2.572c-1.756-.426-1.756-2.924 0-3.35a1.724 1.724 0 001.066-2.573c-.94-1.543.826-3.31 2.37-2.37.996.608 2.296.07 2.572-1.065z') },
   { to: '/audit-log', labelKey: 'nav.auditLog', icon: navIcon('M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z') },
 ];
 
diff --git a/frontend/src/components/layout/TopBar.tsx b/frontend/src/components/layout/TopBar.tsx
index e4abad9..4cdc6df 100644
--- a/frontend/src/components/layout/TopBar.tsx
+++ b/frontend/src/components/layout/TopBar.tsx
@@ -13,7 +13,8 @@ import { SuggestionBadge } from '@/components/ai/SuggestionBadge';
 export function TopBar() {
   const { t } = useTranslation();
   const navigate = useNavigate();
-  const { user } = useAuthStore();
+  const { user, currentTenant } = useAuthStore();
+  const tenants = user?.tenants || [];
   const { toggleSidebar, openAISidebarProactive } = useUIStore();
   const logoutMutation = useLogout();
 
@@ -60,6 +61,24 @@ export function TopBar() {
           </svg>
         </button>
 
+        {/* Tenant switcher */}
+        {tenants && tenants.length > 0 && (
+          <div className="relative">
+            <button
+              className="flex items-center gap-1.5 px-2 py-1 rounded-md hover:bg-secondary-100 min-h-touch text-sm font-medium text-secondary-700 focus:outline-none focus-visible:ring-2 focus-visible:ring-primary-500"
+              aria-label={t('topbar.switchTenant')}
+            >
+              <svg className="w-4 h-4 text-secondary-500" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" />
+              </svg>
+              {currentTenant?.name || tenants[0]?.name || ''}
+              <svg className="w-3 h-3 text-secondary-400" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
+              </svg>
+            </button>
+          </div>
+        )}
+
         {/* Search */}
         <div className="hidden md:block">
           <SearchDropdown placeholder={t('topbar.search')} />
diff --git a/frontend/src/components/mail/MailDetail.tsx b/frontend/src/components/mail/MailDetail.tsx
index 605dff6..65f5b78 100644
--- a/frontend/src/components/mail/MailDetail.tsx
+++ b/frontend/src/components/mail/MailDetail.tsx
@@ -131,6 +131,18 @@ export function MailDetail({
         </div>
       </div>
 
+      {/* Action toolbar */}
+      <div className="flex items-center gap-2 px-3 py-2 md:px-4 md:py-2 border-b border-secondary-200" data-testid="mail-detail-toolbar">
+        <button onClick={() => onReply(mail)} className="inline-flex items-center gap-1 px-3 py-1.5 rounded text-sm text-secondary-700 hover:bg-secondary-100 min-h-touch" aria-label={t('mail.reply')}>
+          <svg className="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 10h10a8 8 0 018 8v2M3 10l6 6m-6-6l6-6" /></svg>
+          {t('mail.reply')}
+        </button>
+        <button onClick={() => onForward(mail)} className="inline-flex items-center gap-1 px-3 py-1.5 rounded text-sm text-secondary-700 hover:bg-secondary-100 min-h-touch" aria-label={t('mail.forward')}>
+          <svg className="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M7 16l-4-4m0 0l4-4m-4 4h18" /></svg>
+          {t('mail.forward')}
+        </button>
+      </div>
+
       {/* Body + Attachments — scrollable together */}
       <div className="flex-1 overflow-y-auto" data-testid="mail-detail-body">
         <div className="px-3 py-3 md:px-4 md:py-4">
diff --git a/frontend/src/components/tags/BulkTagDialog.tsx b/frontend/src/components/tags/BulkTagDialog.tsx
index e48f693..fc2c6cb 100644
--- a/frontend/src/components/tags/BulkTagDialog.tsx
+++ b/frontend/src/components/tags/BulkTagDialog.tsx
@@ -104,7 +104,7 @@ export function BulkTagDialog({
     >
       <div className="space-y-4">
         <p className="text-sm text-secondary-500">
-          {entityIds.length} {t('tags.selectedEntities')}
+          {t('tags.selectedEntities', { count: entityIds.length })}
         </p>
 
         <Input
@@ -149,7 +149,7 @@ export function BulkTagDialog({
 
         {selectedTagIds.size > 0 && (
           <p className="text-sm text-primary-600">
-            {selectedTagIds.size} {t('tags.selectTags')}
+            {t('tags.selectTags', { count: selectedTagIds.size })}
           </p>
         )}
 
diff --git a/frontend/src/i18n/locales/de.json b/frontend/src/i18n/locales/de.json
index 6b3f92d..a219350 100644
--- a/frontend/src/i18n/locales/de.json
+++ b/frontend/src/i18n/locales/de.json
@@ -575,5 +575,80 @@
       "mail": "E-Mail",
       "general": "Allgemein"
     }
+  },
+  "calendar": {
+    "weekdays": [
+      "Mo",
+      "Di",
+      "Mi",
+      "Do",
+      "Fr",
+      "Sa",
+      "So"
+    ],
+    "months": [
+      "Januar",
+      "Februar",
+      "März",
+      "April",
+      "Mai",
+      "Juni",
+      "Juli",
+      "August",
+      "September",
+      "Oktober",
+      "November",
+      "Dezember"
+    ]
+  },
+  "dms": {
+    "title": "Dateien",
+    "trash": "Papierkorb",
+    "newFolder": "Neuer Ordner",
+    "upload": "Hochladen",
+    "search": "Dateien durchsuchen",
+    "searchPlaceholder": "Suchen...",
+    "folders": "Ordner",
+    "files": "Dateien",
+    "uploadDropHere": "Dateien hierher ziehen oder klicken zum Auswaehlen",
+    "shareWith": "Freigaben",
+    "addShare": "Freigabe hinzufuegen",
+    "userOrGroup": "Benutzer oder Gruppe",
+    "userId": "Benutzer-ID",
+    "groupId": "Gruppen-ID",
+    "permissionLevel": "Berechtigungsstufe",
+    "shareLink": "Oeffentlicher Link",
+    "password": "Passwort",
+    "expiryDate": "Ablaufdatum",
+    "createShareLink": "Link erstellen",
+    "loading": "Wird geladen",
+    "shared": "Freigabe erstellt",
+    "linkCopied": "Link kopiert",
+    "uploadError": "Upload fehlgeschlagen"
+  },
+  "permissions": {
+    "user": "Benutzer",
+    "group": "Gruppe",
+    "permissionRead": "Lesen",
+    "permissionWrite": "Schreiben",
+    "filePermissions": "Dateiberechtigungen",
+    "noPermissions": "Keine Berechtigungen",
+    "revoked": "Berechtigung widerrufen",
+    "linkCreated": "Link erstellt",
+    "linkRevoked": "Link widerrufen"
+  },
+  "tags": {
+    "bulkAssignTitle": "Tags zuweisen",
+    "selectedEntities": "{{count}} ausgewaehlte Eintraege",
+    "search": "Tag suchen",
+    "loading": "Wird geladen",
+    "cancel": "Abbrechen",
+    "bulkAssign": "Tags zuweisen",
+    "assignedTags": "Zugewiesene Tags",
+    "noTagsAssigned": "Keine Tags zugewiesen",
+    "availableTags": "Verfuegbare Tags",
+    "addTag": "Tag hinzufuegen",
+    "create": "Neues Tag",
+    "selectTags": "{{count}} Tags auswaehlen"
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/i18n/locales/en.json b/frontend/src/i18n/locales/en.json
index 1bb471d..bc7e57b 100644
--- a/frontend/src/i18n/locales/en.json
+++ b/frontend/src/i18n/locales/en.json
@@ -575,5 +575,80 @@
       "mail": "Mail",
       "general": "General"
     }
+  },
+  "calendar": {
+    "weekdays": [
+      "Mon",
+      "Tue",
+      "Wed",
+      "Thu",
+      "Fri",
+      "Sat",
+      "Sun"
+    ],
+    "months": [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December"
+    ]
+  },
+  "dms": {
+    "title": "Files",
+    "trash": "Trash",
+    "newFolder": "New Folder",
+    "upload": "Upload",
+    "search": "Search files",
+    "searchPlaceholder": "Search...",
+    "folders": "Folders",
+    "files": "Files",
+    "uploadDropHere": "Drag files here or click to select",
+    "shareWith": "Shares",
+    "addShare": "Add share",
+    "userOrGroup": "User or Group",
+    "userId": "User ID",
+    "groupId": "Group ID",
+    "permissionLevel": "Permission level",
+    "shareLink": "Public link",
+    "password": "Password",
+    "expiryDate": "Expiry date",
+    "createShareLink": "Create link",
+    "loading": "Loading",
+    "shared": "Share created",
+    "linkCopied": "Link copied",
+    "uploadError": "Upload failed"
+  },
+  "permissions": {
+    "user": "User",
+    "group": "Group",
+    "permissionRead": "Read",
+    "permissionWrite": "Write",
+    "filePermissions": "File permissions",
+    "noPermissions": "No permissions",
+    "revoked": "Permission revoked",
+    "linkCreated": "Link created",
+    "linkRevoked": "Link revoked"
+  },
+  "tags": {
+    "bulkAssignTitle": "Assign tags",
+    "selectedEntities": "{{count}} selected entries",
+    "search": "Search tags",
+    "loading": "Loading",
+    "cancel": "Cancel",
+    "bulkAssign": "Assign tags",
+    "assignedTags": "Assigned tags",
+    "noTagsAssigned": "No tags assigned",
+    "availableTags": "Available tags",
+    "addTag": "Add tag",
+    "create": "New tag",
+    "selectTags": "Select {{count}} tags"
   }
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/Mail.tsx b/frontend/src/pages/Mail.tsx
index b32706d..2fce580 100644
--- a/frontend/src/pages/Mail.tsx
+++ b/frontend/src/pages/Mail.tsx
@@ -703,6 +703,22 @@ export function MailPage() {
         </div>
       )}
 
+      {/* Mail toolbar */}
+      <div className="flex items-center gap-2 px-3 py-2 border-b border-secondary-200 bg-white">
+        <Button onClick={handleCompose} size="sm" data-testid="compose-btn">
+          {t('mail.compose')}
+        </Button>
+        <MailSearchBar
+          onSearch={(q) => { setSearchQuery(q); setMailsPage(1); }}
+          value={searchQuery}
+        />
+        <SharedMailboxSelector
+          accounts={accounts.filter(a => a.is_shared)}
+          selectedAccountId={selectedAccountId}
+          onSelect={(id) => { setSelectedAccountId(id); setSelectedFolderId(null); }}
+        />
+      </div>
+
       {/* Desktop: three-pane layout with resizable panels */}
       <div className="hidden md:flex flex-1 overflow-hidden">
         {/* Folder tree — resizable */}
diff --git a/frontend/src/test/setup.ts b/frontend/src/test/setup.ts
index 883421c..02f4b6e 100644
--- a/frontend/src/test/setup.ts
+++ b/frontend/src/test/setup.ts
@@ -47,9 +47,28 @@ Object.defineProperty(window, 'ResizeObserver', {
   value: MockResizeObserver,
 });
 
+
+// Mock EventSource for jsdom
+class MockEventSource {
+  constructor(url: string) {
+    this.url = url;
+    this.readyState = 0;
+  }
+  url: string;
+  readyState: number;
+  onopen: any = null;
+  onmessage: any = null;
+  onerror: any = null;
+  addEventListener = vi.fn();
+  removeEventListener = vi.fn();
+  close = vi.fn();
+}
+Object.defineProperty(window, 'EventSource', { writable: true, configurable: true, value: MockEventSource });
+
 // Mock scrollTo
 window.scrollTo = vi.fn() as any;
 
+
 // Initialize i18n before all tests
 beforeAll(async () => {
   await i18n.changeLanguage('de');