diff --git a/frontend/src/api/hooks.ts b/frontend/src/api/hooks.ts
index 8cd3c5f..bf0c098 100644
--- a/frontend/src/api/hooks.ts
+++ b/frontend/src/api/hooks.ts
@@ -67,7 +67,7 @@ export interface AuditLogEntry {
 }
 
 export interface SearchResult {
-  type: 'company' | 'contact';
+  type: 'company' | 'contact' | 'mail' | 'file' | 'event';
   id: string;
   name: string;
   description?: string;
diff --git a/frontend/src/api/mail.ts b/frontend/src/api/mail.ts
index 0360f8c..ae20c17 100644
--- a/frontend/src/api/mail.ts
+++ b/frontend/src/api/mail.ts
@@ -417,7 +417,7 @@ export function decodeMimeHeader(value: string | undefined | null): string {
           return decodeURIComponent(escape(decoded));
         } else {
           // Q encoding: replace _ with space, then decode =XX hex sequences
-          const qDecoded = encoded.replace(/_/g, ' ').replace(/=([0-9A-F]{2})/gi, (_m, hex) => {
+          const qDecoded = encoded.replace(/_/g, ' ').replace(/=([0-9A-F]{2})/gi, (_m: string, hex: string) => {
             return String.fromCharCode(parseInt(hex, 16));
           });
           return decodeURIComponent(escape(qDecoded));
diff --git a/frontend/src/components/ai/SessionList.tsx b/frontend/src/components/ai/SessionList.tsx
index 05246d8..791b56c 100644
--- a/frontend/src/components/ai/SessionList.tsx
+++ b/frontend/src/components/ai/SessionList.tsx
@@ -95,7 +95,7 @@ function TreeItem({
             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M3 7v10a2 2 0 002 2h14a2 2 0 002-2V9a2 2 0 00-2-2h-6l-2-2H5a2 2 0 00-2 2z" />
           </svg>
           <span className="flex-1 truncate">{node.folder!.name}</span>
-              <button onClick={(e) => { e.stopPropagation(); onContextMenu(e.nativeEvent, 'folder', node.folder!.id); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-primary-600 p-0.5" title="Umbenennen">
+              <button onClick={(e) => { e.stopPropagation(); onContextMenu(e, 'folder', node.folder!.id); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-primary-600 p-0.5" title="Umbenennen">
                 <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" /></svg>
               </button>
               <button onClick={(e) => { e.stopPropagation(); onDelete(node.folder!.id, 'folder'); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-red-600 p-0.5" title="Löschen">
@@ -131,7 +131,7 @@ function TreeItem({
               <span className={clsx('flex-1 truncate', activeSessionId === session.id && 'font-bold text-primary-700')}>
                 {session.title}
               </span>
-              <button onClick={(e) => { e.stopPropagation(); onContextMenu(e.nativeEvent, 'session', session.id); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-primary-600 p-0.5" title="Umbenennen">
+              <button onClick={(e) => { e.stopPropagation(); onContextMenu(e, 'session', session.id); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-primary-600 p-0.5" title="Umbenennen">
                 <svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" /></svg>
               </button>
               <button onClick={(e) => { e.stopPropagation(); onDelete(session.id, 'session'); }} className="opacity-0 group-hover:opacity-100 text-secondary-400 hover:text-red-600 p-0.5" title="Löschen">
diff --git a/frontend/src/components/mail/ComposeModal.tsx b/frontend/src/components/mail/ComposeModal.tsx
index 326c276..b2df94b 100644
--- a/frontend/src/components/mail/ComposeModal.tsx
+++ b/frontend/src/components/mail/ComposeModal.tsx
@@ -92,7 +92,7 @@ export function ComposeModal({
     if (sig) {
       const processedHtml = replaceSignatureVariables(
         sig.body_html,
-        { name: authUser?.name, email: authUser?.email, role: authUser?.role, first_name: authUser?.first_name, last_name: authUser?.last_name },
+        { name: authUser ? `${authUser.first_name} ${authUser.last_name}`.trim() : undefined, email: authUser?.email, role: authUser?.role, first_name: authUser?.first_name, last_name: authUser?.last_name },
         { name: authTenant?.name },
       );
       setBody((prev) => `${prev}<br/><br/>---<br/>${processedHtml}`);
diff --git a/frontend/src/components/mail/MailDetail.tsx b/frontend/src/components/mail/MailDetail.tsx
index 65f5b78..cb35429 100644
--- a/frontend/src/components/mail/MailDetail.tsx
+++ b/frontend/src/components/mail/MailDetail.tsx
@@ -44,6 +44,8 @@ function formatBytes(bytes: number): string {
 export function MailDetail({
   mail,
   loading,
+  onReply,
+  onForward,
   onDownloadAttachment,
   downloadingAttachmentId,
 }: MailDetailProps) {
diff --git a/frontend/src/components/mail/MailSearchBar.tsx b/frontend/src/components/mail/MailSearchBar.tsx
index ce17d94..623d4f0 100644
--- a/frontend/src/components/mail/MailSearchBar.tsx
+++ b/frontend/src/components/mail/MailSearchBar.tsx
@@ -8,6 +8,7 @@ import { Input } from '@/components/ui/Input';
 
 export interface MailSearchBarProps {
   onSearch: (query: string) => void;
+  value?: string;
 }
 
 export function MailSearchBar({ onSearch }: MailSearchBarProps) {
diff --git a/frontend/src/components/mail/RichTextEditor.tsx b/frontend/src/components/mail/RichTextEditor.tsx
index 53deb9f..101ebf1 100644
--- a/frontend/src/components/mail/RichTextEditor.tsx
+++ b/frontend/src/components/mail/RichTextEditor.tsx
@@ -88,7 +88,7 @@ export function RichTextEditor({ content, onChange, placeholder, editable = true
   // Sync external content changes (e.g. template/signature insert, reply/forward/draft load)
   React.useEffect(() => {
     if (editor && content !== editor.getHTML()) {
-      editor.commands.setContent(content, false);
+      editor.commands.setContent(content, { emitUpdate: false });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [content, editor]);
diff --git a/frontend/src/components/ui/Badge.tsx b/frontend/src/components/ui/Badge.tsx
index 3d1133b..d87d820 100644
--- a/frontend/src/components/ui/Badge.tsx
+++ b/frontend/src/components/ui/Badge.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import clsx from 'clsx';
 
-export type BadgeVariant = 'default' | 'primary' | 'success' | 'warning' | 'danger' | 'info';
+export type BadgeVariant = 'default' | 'primary' | 'success' | 'warning' | 'danger' | 'info' | 'secondary';
 
 export interface BadgeProps {
   variant?: BadgeVariant;
@@ -17,6 +17,7 @@ const variantClasses: Record<BadgeVariant, string> = {
   warning: 'bg-warning-100 text-warning-700',
   danger: 'bg-danger-100 text-danger-700',
   info: 'bg-accent-100 text-accent-700',
+  secondary: 'bg-secondary-200 text-secondary-800',
 };
 
 const dotColors: Record<BadgeVariant, string> = {
@@ -26,6 +27,7 @@ const dotColors: Record<BadgeVariant, string> = {
   warning: 'bg-warning-500',
   danger: 'bg-danger-500',
   info: 'bg-accent-500',
+  secondary: 'bg-secondary-500',
 };
 
 export function Badge({ variant = 'default', children, className, dot = false }: BadgeProps) {
diff --git a/frontend/src/components/ui/ConfirmDialog.tsx b/frontend/src/components/ui/ConfirmDialog.tsx
index 14dc6e3..da35b51 100644
--- a/frontend/src/components/ui/ConfirmDialog.tsx
+++ b/frontend/src/components/ui/ConfirmDialog.tsx
@@ -12,6 +12,7 @@ export interface ConfirmDialogProps {
   variant?: 'primary' | 'danger';
   onConfirm: () => void;
   onCancel: () => void;
+  children?: React.ReactNode;
 }
 
 export function ConfirmDialog({
diff --git a/frontend/src/components/ui/EmptyState.tsx b/frontend/src/components/ui/EmptyState.tsx
index 43ee025..b3eac86 100644
--- a/frontend/src/components/ui/EmptyState.tsx
+++ b/frontend/src/components/ui/EmptyState.tsx
@@ -8,6 +8,7 @@ export interface EmptyStateProps {
   icon?: React.ReactNode;
   action?: React.ReactNode;
   className?: string;
+  children?: React.ReactNode;
 }
 
 export function EmptyState({