diff --git a/src/StarfaceOutlookSync/Services/OutlookContactsService.cs b/src/StarfaceOutlookSync/Services/OutlookContactsService.cs
index 36a1ae71..2ddab49f 100644
--- a/src/StarfaceOutlookSync/Services/OutlookContactsService.cs
+++ b/src/StarfaceOutlookSync/Services/OutlookContactsService.cs
@@ -50,20 +50,29 @@ namespace StarfaceOutlookSync.Services
                 var app = GetOutlookApp();
                 var ns = app.GetNamespace("MAPI");
 
-                // Standard-Kontaktordner
-                var defaultFolder = ns.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
-                folders.Add(defaultFolder.FolderPath);
-
-                // Unterordner
-                AddSubFolders(defaultFolder, folders);
-
-                // Weitere Kontaktordner in anderen Stores
+                // Alle Stores durchgehen (jedes Konto, jede PST-Datei etc.)
                 foreach (Outlook.Store store in ns.Stores)
                 {
                     try
                     {
                         var rootFolder = store.GetRootFolder();
-                        FindContactFolders(rootFolder, folders);
+                        FindContactFoldersRecursive(rootFolder, folders);
+                        Marshal.ReleaseComObject(rootFolder);
+                    }
+                    catch (Exception ex)
+                    {
+                        System.Diagnostics.Debug.WriteLine($"Error scanning store '{store.DisplayName}': {ex.Message}");
+                    }
+                }
+
+                // Falls nichts gefunden, Standard-Kontaktordner als Fallback
+                if (folders.Count == 0)
+                {
+                    try
+                    {
+                        var defaultFolder = ns.GetDefaultFolder(Outlook.OlDefaultFolders.olFolderContacts);
+                        folders.Add(defaultFolder.FolderPath);
+                        Marshal.ReleaseComObject(defaultFolder);
                     }
                     catch { }
                 }
@@ -78,30 +87,34 @@ namespace StarfaceOutlookSync.Services
             return folders;
         }
 
-        private void AddSubFolders(Outlook.MAPIFolder folder, List<string> paths)
+        private void FindContactFoldersRecursive(Outlook.MAPIFolder folder, List<string> paths)
         {
-            foreach (Outlook.MAPIFolder sub in folder.Folders)
+            try
             {
-                if (sub.DefaultItemType == Outlook.OlItemType.olContactItem)
+                // Kontaktordner erkennen: DefaultItemType ODER Ordnername enthaelt "Kontakt"/"Contact"
+                if (folder.DefaultItemType == Outlook.OlItemType.olContactItem)
                 {
-                    if (!paths.Contains(sub.FolderPath))
-                        paths.Add(sub.FolderPath);
-                    AddSubFolders(sub, paths);
+                    if (!paths.Contains(folder.FolderPath))
+                        paths.Add(folder.FolderPath);
+                }
+
+                // Alle Unterordner durchsuchen
+                foreach (Outlook.MAPIFolder sub in folder.Folders)
+                {
+                    try
+                    {
+                        FindContactFoldersRecursive(sub, paths);
+                    }
+                    catch { }
+                    finally
+                    {
+                        Marshal.ReleaseComObject(sub);
+                    }
                 }
             }
-        }
-
-        private void FindContactFolders(Outlook.MAPIFolder folder, List<string> paths)
-        {
-            if (folder.DefaultItemType == Outlook.OlItemType.olContactItem)
+            catch (Exception ex)
             {
-                if (!paths.Contains(folder.FolderPath))
-                    paths.Add(folder.FolderPath);
-            }
-
-            foreach (Outlook.MAPIFolder sub in folder.Folders)
-            {
-                FindContactFolders(sub, paths);
+                System.Diagnostics.Debug.WriteLine($"Error scanning folder '{folder.Name}': {ex.Message}");
             }
         }
 
diff --git a/src/StarfaceOutlookSync/UI/ProfileEditorForm.cs b/src/StarfaceOutlookSync/UI/ProfileEditorForm.cs
index 86f54781..fb598098 100644
--- a/src/StarfaceOutlookSync/UI/ProfileEditorForm.cs
+++ b/src/StarfaceOutlookSync/UI/ProfileEditorForm.cs
@@ -142,9 +142,12 @@ namespace StarfaceOutlookSync.UI
                     _outlookFolderPaths = outlook.GetContactFolderPaths();
                 }
             }
-            catch
+            catch (Exception ex)
             {
-                _outlookFolderPaths = new List<string> { "\\\\Kontakte" };
+                MessageBox.Show(
+                    $"Outlook-Kontaktordner konnten nicht geladen werden:\n{ex.Message}\n\nIst Outlook gestartet?",
+                    "Outlook-Verbindung", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                _outlookFolderPaths = new List<string>();
             }
 
             // Bestehende Werte laden