diff --git a/.vscode/settings.json b/.vscode/settings.json
index 181a5311a..215362548 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,7 +7,15 @@
     "dotnet restore": true,
     "git checkout": true,
     "Test-Path": true,
-    "git rev-parse": true
+    "git rev-parse": true,
+    "/^pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild\\.ps1 -SolutionPath TaskMaster\\.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild$/": {
+      "approve": true,
+      "matchCommandLine": true
+    },
+    "/^pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild\\.ps1 -SolutionPath TaskMaster\\.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors$/": {
+      "approve": true,
+      "matchCommandLine": true
+    }
   },
   "koverage.coverageFileNames": [
     "coverage.cobertura.xml"
diff --git a/TaskMaster.Test/AppGlobals/AppOlObjectsTests.cs b/TaskMaster.Test/AppGlobals/AppOlObjectsTests.cs
index 5d2d484e8..cabc0c47b 100644
--- a/TaskMaster.Test/AppGlobals/AppOlObjectsTests.cs
+++ b/TaskMaster.Test/AppGlobals/AppOlObjectsTests.cs
@@ -1,8 +1,14 @@
+using System;
+using System.Collections;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using FluentAssertions;
 using Microsoft.Office.Interop.Outlook;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using UtilitiesCS;
+using UtilitiesCS.Dialogs;
+using OutlookApplication = Microsoft.Office.Interop.Outlook.Application;
 
 namespace TaskMaster.Test.AppGlobals
 {
@@ -126,5 +132,67 @@ public void WriteJunkPotentialSetting_UpdatesJunkPotentialValue()
                 Properties.Settings.Default.JunkPotential = original;
             }
         }
+
+        [TestMethod]
+        public void LoadJunkCertain_KeepsStoredValue_WhenReplacementSelectionIsCancelled()
+        {
+            var originalSetting = Properties.Settings.Default.OlJunkCertain;
+            var dialogInvokerProperty = typeof(MyBox).GetProperty(
+                "DialogInvoker",
+                BindingFlags.Static | BindingFlags.NonPublic
+            )!;
+            var originalDialogInvoker = dialogInvokerProperty.GetValue(null);
+            var expected = "Missing\\Junk Email";
+            var namespaceMapi = mockRepository.Create<NameSpace>();
+            namespaceMapi.Setup(x => x.PickFolder()).Returns((MAPIFolder)null);
+            var application = mockRepository.Create<OutlookApplication>();
+            application.SetupGet(x => x.Application).Returns(application.Object);
+            application.Setup(x => x.GetNamespace("MAPI")).Returns(namespaceMapi.Object);
+            var root = CreateRootFolder();
+            var sut = new AppOlObjects(application.Object, Mock.Of<IApplicationGlobals>());
+            SetPrivateField(sut, "_root", root.Object);
+
+            try
+            {
+                Properties.Settings.Default.OlJunkCertain = expected;
+                dialogInvokerProperty.SetValue(
+                    null,
+                    new Func<MyBoxViewer, System.Windows.Forms.DialogResult>(_ =>
+                        System.Windows.Forms.DialogResult.OK
+                    )
+                );
+
+                sut.LoadJunkCertain().Should().BeNull();
+                AppOlObjects.ReadJunkCertainSetting().Should().Be(expected);
+            }
+            finally
+            {
+                Properties.Settings.Default.OlJunkCertain = originalSetting;
+                dialogInvokerProperty.SetValue(null, originalDialogInvoker);
+            }
+        }
+
+        private Mock<Folder> CreateRootFolder()
+        {
+            var folders = mockRepository.Create<Folders>();
+            folders.SetupGet(x => x.Count).Returns(0);
+            folders
+                .As<IEnumerable>()
+                .Setup(x => x.GetEnumerator())
+                .Returns(Array.Empty<MAPIFolder>().GetEnumerator());
+
+            var root = mockRepository.Create<Folder>();
+            root.SetupGet(x => x.Name).Returns("Mailbox");
+            root.SetupGet(x => x.FolderPath).Returns(@"\\Mailbox");
+            root.SetupGet(x => x.Folders).Returns(folders.Object);
+            return root;
+        }
+
+        private static void SetPrivateField(object target, string fieldName, object value)
+        {
+            typeof(AppOlObjects)
+                .GetField(fieldName, BindingFlags.Instance | BindingFlags.NonPublic)!
+                .SetValue(target, value);
+        }
     }
 }
diff --git a/TaskMaster.Test/TaskMaster.Test.csproj b/TaskMaster.Test/TaskMaster.Test.csproj
index c9f21908f..6b987eb0b 100644
--- a/TaskMaster.Test/TaskMaster.Test.csproj
+++ b/TaskMaster.Test/TaskMaster.Test.csproj
@@ -244,6 +244,7 @@
     <Reference Include="System.ValueTuple" />
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
diff --git a/TaskMaster/AppGlobals/AppOlObjects.cs b/TaskMaster/AppGlobals/AppOlObjects.cs
index 20fca4765..d471a451e 100644
--- a/TaskMaster/AppGlobals/AppOlObjects.cs
+++ b/TaskMaster/AppGlobals/AppOlObjects.cs
@@ -194,12 +194,37 @@ public string InboxPath
         private Folder _junkPotential;
         public Folder JunkPotential => Initializer.GetOrLoad(ref _junkPotential, LoadJunkPotential);
 
+        internal static string ReadJunkCertainSetting() =>
+            Properties.Settings.Default.OlJunkCertain;
+
+        internal static void WriteJunkCertainSetting(string relativePath) =>
+            Properties.Settings.Default.OlJunkCertain = relativePath;
+
         internal static string ReadJunkPotentialSetting() =>
             Properties.Settings.Default.JunkPotential;
 
         internal static void WriteJunkPotentialSetting(string relativePath) =>
             Properties.Settings.Default.JunkPotential = relativePath;
 
+        internal void ApplyJunkFolderSelections(
+            string junkCertainRelativePath,
+            string junkPotentialRelativePath
+        )
+        {
+            WriteJunkCertainSetting(junkCertainRelativePath);
+            WriteJunkPotentialSetting(junkPotentialRelativePath);
+            Properties.Settings.Default.Save();
+            RefreshJunkFolderSelections();
+        }
+
+        internal void RefreshJunkFolderSelections()
+        {
+            _junkCertain = null;
+            _junkPotential = null;
+            _ = JunkCertain;
+            _ = JunkPotential;
+        }
+
         internal Folder LoadJunkPotential()
         {
             var root = new FolderTree(Root).Roots.FirstOrDefault();
@@ -250,7 +275,7 @@ internal Folder LoadJunkPotential()
         internal Folder LoadJunkCertain()
         {
             var root = new FolderTree(Root).Roots.FirstOrDefault();
-            var folderPath = Properties.Settings.Default.OlJunkCertain;
+            var folderPath = ReadJunkCertainSetting();
             if (folderPath.IsNullOrEmpty())
             {
                 return null;
@@ -262,7 +287,7 @@ internal Folder LoadJunkCertain()
             if (folder is null)
             {
                 MyBox.ShowDialog(
-                    "Junk Potential Folder not found. Please select it manually.",
+                    "Junk Folder not found. Please select it manually.",
                     "Error",
                     System.Windows.Forms.MessageBoxButtons.OK,
                     System.Windows.Forms.MessageBoxIcon.Error
@@ -273,7 +298,7 @@ internal Folder LoadJunkCertain()
                     return null;
                 }
                 var wrapper = new FolderWrapper(folder, Root);
-                Properties.Settings.Default.OlJunkCertain = wrapper.RelativePath;
+                WriteJunkCertainSetting(wrapper.RelativePath);
                 Properties.Settings.Default.Save();
             }
             return folder;
diff --git a/TaskMaster/Ribbon/RibbonExplorer.xml b/TaskMaster/Ribbon/RibbonExplorer.xml
index 3693e1471..cb9381e9b 100644
--- a/TaskMaster/Ribbon/RibbonExplorer.xml
+++ b/TaskMaster/Ribbon/RibbonExplorer.xml
@@ -129,6 +129,12 @@
                 label="Current Location"
               />
             </menu>
+            <button
+              id="SpamFolderSettings"
+              imageMso="Folder"
+              onAction="SpamFolderSettings_Click"
+              label="Junk Folder Settings"
+            />
             <checkBox
               id="SpamBayesEnabledToggle"
               getPressed="SpamBayesEnabled_GetPressed"
diff --git a/TaskMaster/Ribbon/RibbonViewer.cs b/TaskMaster/Ribbon/RibbonViewer.cs
index d77adf03b..d4fb4b996 100644
--- a/TaskMaster/Ribbon/RibbonViewer.cs
+++ b/TaskMaster/Ribbon/RibbonViewer.cs
@@ -251,6 +251,9 @@ public async void SpamSaveLocal_Click(Office.IRibbonControl control) =>
         public void GetSaveLocation_Click(Office.IRibbonControl control) =>
             Controller.Engines.ShowSaveInfo(SpamBayes.GroupName);
 
+        public void SpamFolderSettings_Click(Office.IRibbonControl control) =>
+            Controller.FolderStoresSettings();
+
         #endregion Spam Config
 
         #endregion Spam Manager
diff --git a/UtilitiesCS.Test/OutlookObjects/Store/StoreWrapperControllerTests.cs b/UtilitiesCS.Test/OutlookObjects/Store/StoreWrapperControllerTests.cs
index 1a39b6832..e39ba0a18 100644
--- a/UtilitiesCS.Test/OutlookObjects/Store/StoreWrapperControllerTests.cs
+++ b/UtilitiesCS.Test/OutlookObjects/Store/StoreWrapperControllerTests.cs
@@ -1,6 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Threading.Tasks;
 using FluentAssertions;
+using Microsoft.Office.Interop.Outlook;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using UtilitiesCS;
+using UtilitiesCS.OutlookObjects.Folder;
 using UtilitiesCS.OutlookObjects.Store;
+using OutlookFolder = Microsoft.Office.Interop.Outlook.Folder;
 
 namespace UtilitiesCS.Test.OutlookObjects.Store
 {
@@ -18,5 +28,181 @@ public void Controller_leaves_state_unchanged_when_dialog_is_cancelled()
         {
             StoreWrapperController.RunFolderSelectionDialog(() => false).Should().BeFalse();
         }
+
+        [TestMethod]
+        public void PopulateWithCurrent_ShowsCurrentJunkSelectionsInViewer()
+        {
+            using var viewer = new StoreWrapperViewer();
+            var controller = new StoreWrapperController(null!) { Viewer = viewer };
+            controller.Current = new StoreWrapper(null)
+            {
+                JunkCertain = new FolderMinimalWrapper("Junk", "Inbox\\Junk Email"),
+                JunkPotential = new FolderMinimalWrapper("Potential", "Inbox\\Junk Potential"),
+            };
+
+            controller.PopulateWithCurrent();
+
+            viewer.JunkEmail.Text.Should().Be("Inbox\\Junk Email");
+            viewer.JunkPotential.Text.Should().Be("Inbox\\Junk Potential");
+        }
+
+        [TestMethod]
+        public void SaveChanges_PersistsBothSettingsAndRefreshesActiveJunkFolders()
+        {
+            var olObjects = new RecordingOlObjects();
+            var globals = new Mock<IApplicationGlobals>();
+            globals.SetupGet(x => x.Ol).Returns(olObjects);
+            var controller = new StoreWrapperController(globals.Object)
+            {
+                Model = new StoresWrapper(),
+                Current = new StoreWrapper(null),
+                JunkEmail = new FolderMinimalWrapper("Junk", "Inbox\\Junk Email"),
+                JunkPotential = new FolderMinimalWrapper("Potential", "Inbox\\Junk Potential"),
+            };
+
+            controller.SaveChanges();
+
+            controller.Current.JunkCertain.RelativePath.Should().Be("Inbox\\Junk Email");
+            controller.Current.JunkPotential.RelativePath.Should().Be("Inbox\\Junk Potential");
+            olObjects.ApplyCallCount.Should().Be(1);
+            olObjects.AppliedJunkCertainPath.Should().Be("Inbox\\Junk Email");
+            olObjects.AppliedJunkPotentialPath.Should().Be("Inbox\\Junk Potential");
+            olObjects.JunkCertain.FolderPath.Should().Be("Inbox\\Junk Email");
+            olObjects.JunkPotential.FolderPath.Should().Be("Inbox\\Junk Potential");
+        }
+
+        [TestMethod]
+        public void ButtonCancel_Click_LeavesStoredSettingsAndActiveFoldersUnchanged()
+        {
+            var olObjects = new RecordingOlObjects();
+            olObjects.ApplyJunkFolderSelections("Inbox\\Current Junk", "Inbox\\Current Potential");
+            var currentCertain = olObjects.JunkCertain;
+            var currentPotential = olObjects.JunkPotential;
+            var globals = new Mock<IApplicationGlobals>();
+            globals.SetupGet(x => x.Ol).Returns(olObjects);
+            var viewer = new Mock<IStoreWrapperViewer>();
+            var controller = new StoreWrapperController(globals.Object)
+            {
+                Viewer = viewer.Object,
+                Current = new StoreWrapper(null)
+                {
+                    JunkCertain = new FolderMinimalWrapper("Current", "Inbox\\Current Junk"),
+                    JunkPotential = new FolderMinimalWrapper(
+                        "CurrentPotential",
+                        "Inbox\\Current Potential"
+                    ),
+                },
+                JunkEmail = new FolderMinimalWrapper("New", "Inbox\\New Junk"),
+                JunkPotential = new FolderMinimalWrapper("NewPotential", "Inbox\\New Potential"),
+            };
+
+            controller.ButtonCancel_Click();
+
+            controller.Current.JunkCertain.RelativePath.Should().Be("Inbox\\Current Junk");
+            controller.Current.JunkPotential.RelativePath.Should().Be("Inbox\\Current Potential");
+            olObjects.ApplyCallCount.Should().Be(1);
+            olObjects.JunkCertain.Should().BeSameAs(currentCertain);
+            olObjects.JunkPotential.Should().BeSameAs(currentPotential);
+            viewer.Verify(x => x.Close(), Times.Once);
+        }
+
+        [TestMethod]
+        public void PopulateWithCurrent_WhenInvokeRequired_DelegatesToViewerInvoke()
+        {
+            var viewer = new Mock<IStoreWrapperViewer>();
+            viewer.SetupGet(x => x.InvokeRequired).Returns(true);
+            viewer.Setup(x => x.Invoke(It.IsAny<Delegate>())).Returns((object)null);
+            var controller = new StoreWrapperController(null!) { Viewer = viewer.Object };
+
+            controller.PopulateWithCurrent();
+
+            viewer.Verify(x => x.Invoke(It.IsAny<Delegate>()), Times.Once);
+        }
+
+        [TestMethod]
+        public void PersistJunkFolderSelections_WhenApplyMethodIsMissing_DoesNotThrow()
+        {
+            var globals = new Mock<IApplicationGlobals>();
+            globals.SetupGet(x => x.Ol).Returns(new NoApplyOlObjects());
+            var controller = new StoreWrapperController(globals.Object)
+            {
+                JunkEmail = new FolderMinimalWrapper("Junk", "Inbox\\Junk Email"),
+                JunkPotential = new FolderMinimalWrapper("Potential", "Inbox\\Junk Potential"),
+            };
+
+            var act = () => controller.PersistJunkFolderSelections();
+
+            act.Should().NotThrow();
+        }
+
+        private abstract class OlObjectsStubBase : IOlObjects
+        {
+            public Application App => null!;
+            public string InboxPath => string.Empty;
+            public string ArchiveRootPath => string.Empty;
+            public OutlookFolder ArchiveRoot => null!;
+            public string UserEmailAddress => string.Empty;
+            public string EmailPrefixToStrip => string.Empty;
+            public OutlookFolder Inbox => null!;
+            public IEnumerable<OutlookFolder> Inboxes => [];
+            public NameSpace NamespaceMAPI => null!;
+            public OutlookFolder Root => null!;
+            public StoresWrapper StoresWrapper { get; set; } = new();
+            public Reminders OlReminders => null!;
+            public OutlookFolder ToDoFolder => null!;
+            public StackObjectCS<object> MovedMailsStack { get; set; } = null!;
+            public string ViewWide => string.Empty;
+            public string ViewCompact => string.Empty;
+            public bool DarkMode { get; set; }
+            public TimedDiskWriter<string> EmailMoveWriter => null!;
+            public OutlookFolder JunkCertain { get; private set; } = null!;
+            public OutlookFolder JunkPotential { get; private set; } = null!;
+
+            public int GetExplorerScreenNumber() => 0;
+
+            public System.Windows.Forms.Screen GetExplorerScreen() => null!;
+
+            public Size GetExplorerScreenSize() => default;
+
+            public Task LoadAsync() => Task.CompletedTask;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            protected static OutlookFolder CreateFolder(string folderPath)
+            {
+                var folder = new Mock<OutlookFolder>();
+                folder.SetupGet(x => x.FolderPath).Returns(folderPath);
+                return folder.Object;
+            }
+
+            protected void SetJunkFolders(
+                string junkCertainRelativePath,
+                string junkPotentialRelativePath
+            )
+            {
+                JunkCertain = CreateFolder(junkCertainRelativePath);
+                JunkPotential = CreateFolder(junkPotentialRelativePath);
+            }
+        }
+
+        private sealed class RecordingOlObjects : OlObjectsStubBase
+        {
+            public string AppliedJunkCertainPath { get; private set; } = string.Empty;
+            public string AppliedJunkPotentialPath { get; private set; } = string.Empty;
+            public int ApplyCallCount { get; private set; }
+
+            public void ApplyJunkFolderSelections(
+                string junkCertainRelativePath,
+                string junkPotentialRelativePath
+            )
+            {
+                AppliedJunkCertainPath = junkCertainRelativePath;
+                AppliedJunkPotentialPath = junkPotentialRelativePath;
+                ApplyCallCount++;
+                SetJunkFolders(junkCertainRelativePath, junkPotentialRelativePath);
+            }
+        }
+
+        private sealed class NoApplyOlObjects : OlObjectsStubBase { }
     }
 }
diff --git a/UtilitiesCS/OutlookObjects/Store/StoreWrapperController.cs b/UtilitiesCS/OutlookObjects/Store/StoreWrapperController.cs
index dc834bdce..a70180b58 100644
--- a/UtilitiesCS/OutlookObjects/Store/StoreWrapperController.cs
+++ b/UtilitiesCS/OutlookObjects/Store/StoreWrapperController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -174,12 +175,17 @@ internal void PopulateWithCurrent()
                 return;
             }
 
+            // Mirror the current store into the controller before rendering labels.
+            ArchiveOutlook = Current.ArchiveRoot;
+            ArchiveFS = Current.ArchiveFsRoot;
+            JunkEmail = Current.JunkCertain;
+            JunkPotential = Current.JunkPotential;
+
             // Populate Form
             Viewer.Inbox.Text = Current?.Inbox?.FolderPath ?? "Error Loading";
             Viewer.RootFolder.Text = Current?.RootFolder?.FolderPath ?? "Error Loading";
             Viewer.UserEmail.Text = Current?.UserEmailAddress ?? "Error Loading";
-            Viewer.ArchiveOutlook.Text =
-                Current?.ArchiveRoot?.RelativePath ?? "Please select an archive";
+            Viewer.ArchiveOutlook.Text = ArchiveOutlook?.RelativePath ?? "Please select an archive";
             Viewer.ArchiveFS.Text = GetRelativeFsPath();
             //if (Current.ArchiveFsRoot is not null && !Current.ArchiveFsRoot.FolderPath.IsNullOrEmpty())
             //{
@@ -195,12 +201,6 @@ internal void PopulateWithCurrent()
             //}
             Viewer.JunkEmail.Text = JunkEmail?.RelativePath ?? "Please select a folder";
             Viewer.JunkPotential.Text = JunkPotential?.RelativePath ?? "Please select a folder";
-
-            // Populate Controller
-            ArchiveOutlook = Current.ArchiveRoot;
-            ArchiveFS = Current.ArchiveFsRoot;
-            JunkEmail = Current.JunkCertain;
-            JunkPotential = Current.JunkPotential;
         }
 
         internal void SaveChanges()
@@ -209,9 +209,39 @@ internal void SaveChanges()
             Current.JunkCertain = JunkEmail;
             Current.JunkPotential = JunkPotential;
             Current.ArchiveFsRoot = ArchiveFS;
+            PersistJunkFolderSelections();
             Model.Serialize();
         }
 
+        internal void PersistJunkFolderSelections()
+        {
+            var olObjects = Globals?.Ol;
+            if (olObjects is null)
+            {
+                return;
+            }
+
+            var applyMethod = olObjects
+                .GetType()
+                .GetMethod(
+                    "ApplyJunkFolderSelections",
+                    BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic,
+                    null,
+                    [typeof(string), typeof(string)],
+                    null
+                );
+
+            if (applyMethod is null)
+            {
+                logger.Warn(
+                    "Unable to persist junk-folder selections because the Outlook globals implementation does not expose ApplyJunkFolderSelections."
+                );
+                return;
+            }
+
+            applyMethod.Invoke(olObjects, [JunkEmail?.RelativePath, JunkPotential?.RelativePath]);
+        }
+
         internal virtual FolderMinimalWrapper SelectFolder()
         {
             try
diff --git a/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/issue.md b/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/issue.md
deleted file mode 100644
index 7c668de46..000000000
--- a/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/issue.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# quickfiler-navigation-key-collision (Issue #111)
-
-- Date captured: 2026-03-27
-- Author: Dan Moisan
-- Status: Promoted -> docs/features/active/quickfiler-navigation-key-collision/ (Issue #111)
-
-> Automation note: Keep the section headings below unchanged; the promotion tooling maps each of them into the GitHub bug issue template.
-
-- Issue: #111
-- Issue URL: https://github.com/drmoisan/TaskMaster/issues/111
-- Last Updated: 2026-03-27
-- Work Mode: minor-audit
-
-## Summary
-
-QuickFiler can throw an unhandled `System.ArgumentException` while rebuilding keyboard navigation after collection items are removed or re-registered.
-The failure occurs because `KbdActions` uses `KaStringAsync.KeyEquals` substring matching for stored-key identity, which can treat distinct keys such as `1`, `01`, and `10` as duplicates for the same `SourceId`.
-
-## Environment
-
-- OS/version: Windows
-- Python version: Not applicable
-- Command/flags used: QuickFiler keyboard navigation registration during collection refresh; local MSTest regression plus repository C# QA loop
-- Data source or fixture: `QuickFiler.Controllers.KbdActions<string, KaStringAsync, Func<string, Task>>`
-
-## Steps to Reproduce
-
-1. Create a `KbdActions<string, KaStringAsync, Func<string, Task>>` instance.
-2. Register a navigation action for source `Collection` with stored key `10`.
-3. Register another navigation action for the same source with stored key `1`.
-
-Equivalent production flow: `QfcCollectionController.RegisterNavigation()` re-registers collection navigation actions after item removal and eventually calls `KbdActions.Add` through `RegisterNavigationAsyncAction`.
-
-## Expected Behavior
-
-Distinct stored navigation keys for the same source should coexist when their literal keys differ.
-Only an exact duplicate stored key for the same `SourceId` should be rejected.
-
-## Actual Behavior
-
-QuickFiler throws an unhandled exception during navigation rebuild:
-
-- `System.ArgumentException: Cannot add key because it already exists. Key 1 SourceId Collection`
-- Stack origin includes `QuickFiler.Controllers.KbdActions.Add`, `QfcCollectionController.RegisterNavigationAsyncAction`, `QfcCollectionController.RegisterNavigation`, and `QfcCollectionController.RemovedItemMonitor`.
-
-## Logs / Screenshots
-
-- [ ] Attached minimal logs or screenshot
-- Snippet:
-
-	`System.ArgumentException: Cannot add key because it already exists. Key 1 SourceId Collection`
-
-## Impact / Severity
-
-- [ ] Blocker
-- [x] High
-- [ ] Medium
-- [ ] Low
-
-## Suspected Cause / Notes
-
-`KaStringAsync.KeyEquals` uses substring matching via `Key.Contains(other)` to support live keyboard filtering.
-That behavior is appropriate for runtime keyboard-input matching, but `KbdActions` originally reused it for stored-key identity checks in `Add` and `Remove`, allowing literal keys such as `1`, `01`, and `10` to collide.
-Investigation confirmed that `QfcCollectionController.cs` does not need a compatibility change for this fix; the minimal production change is in `QuickFiler/Controllers/KbdActions.cs`.
-
-## Proposed Fix / Validation Ideas
-
-- [x] Unit coverage areas
-- [x] Integration scenario to retest
-- [x] Manual verification notes
-
-- Add a regression test proving stored keys `10` and `1` can coexist for source `Collection`.
-- Keep an exact-duplicate regression proving a second stored key `1` for the same source still throws `ArgumentException`.
-- Preserve runtime keyboard matching semantics by keeping substring-based `KeyEquals` behavior available for `ContainsKey` and `FilterKeys`.
-
-## Acceptance Criteria
-
-- [x] `KbdActions<string, KaStringAsync, Func<string, Task>>` no longer treats distinct stored keys `1`, `01`, and `10` as duplicates for the same `SourceId` during storage operations.
-- [x] An exact duplicate stored key for the same `SourceId` still throws `ArgumentException`.
-- [x] Runtime keyboard-input matching semantics based on `KaStringAsync.KeyEquals` remain available for filtering and lookup behavior.
-- [x] The repository C# QA loop passes for the change: format, analyzer build, nullable/type-check build, and MSTest with coverage.
-
-## Next Step
-
-- [x] Promote to GitHub issue (bug-report template)
-- [x] Move to active fix folder / branch
\ No newline at end of file
diff --git a/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/plan.2026-03-27T12-45.md b/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/plan.2026-03-27T12-45.md
deleted file mode 100644
index 773061752..000000000
--- a/docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/plan.2026-03-27T12-45.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# 2026-03-27-quickfiler-navigation-key-collision-111 (Plan)
-
-- **Issue:** #111
-- **Owner:** drmoisan
-- **Last Updated:** 2026-03-27
-- **Status:** Phase 2 QA complete; awaiting refreshed audit
-- **Work Mode:** minor-audit
-- **Directive:** MINIMAL-AUDIT PLAN REQUIRED
-- **Requirements Source:** `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/issue.md` is the sole requirements source for this plan.
-- **Plan Path Continuity:** Update only `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/plan.2026-03-27T12-45.md`; do not create sibling plan files.
-- **Scope Guardrails:** Limit production edits to `QuickFiler/Controllers/KbdActions.cs` and, only if required for navigation-registration compatibility, `QuickFiler/Controllers/QfcCollectionController.cs`. Limit test edits to `QuickFiler.Test/Controllers/KbdActionsTests.cs`.
-- **Bug Context Captured for Execution:** The reported failure is `System.ArgumentException: Cannot add key because it already exists. Key 1 SourceId Collection` from `QuickFiler.Controllers.KbdActions.Add` during `QfcCollectionController.RegisterNavigationAsyncAction`, `RegisterNavigation`, or `RemovedItemMonitor`. Investigation has already confirmed that `KaStringAsync.KeyEquals` uses substring matching via `Key.Contains(other)`, so storage operations in `KbdActions` must preserve keyboard-input matching behavior while no longer treating distinct stored keys such as `"1"`, `"01"`, and `"10"` as identical.
-- **Change-Plan Note:** This in-place plan update is the required documented change plan before any code edits begin.
-
-### Phase 0 — Baseline Capture
-
-- [x] [P0-T1] Verify the minor-audit requirements boundary before execution begins.
-  - Acceptance: The feature folder contains `issue.md` and `plan.2026-03-27T12-45.md`; `spec.md`, `user-story.md`, and `research.md` are absent; this plan header states `Work Mode: minor-audit` and identifies `issue.md` as the sole requirements source.
-
-- [x] [P0-T2] Record policy-read evidence in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/baseline/phase0-instructions-read.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, `Policy Order:`, and an explicit read list that includes `.github/copilot-instructions.md`, `.github/instructions/general-code-change.instructions.md`, `.github/instructions/general-unit-test.instructions.md`, `.github/instructions/csharp-code-change.instructions.md`, and `.github/instructions/csharp-unit-test.instructions.md`.
-
-- [x] [P0-T3] Capture the C# formatting baseline with the exact plan command `dotnet tool run csharpier .` and save the result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/baseline/p0-t3-format.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: dotnet tool run csharpier .`, `EXIT_CODE:`, and `Output Summary:` recording the environment-specific command behavior.
-
-- [x] [P0-T4] Capture the analyzer-build baseline with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild` and save the result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/baseline/p0-t4-analyzers.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE:`, and `Output Summary:`.
-
-- [x] [P0-T5] Capture the nullable/type-check baseline with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors` and save the result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/baseline/p0-t5-nullable.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE:`, and `Output Summary:`.
-
-- [x] [P0-T6] Capture the coverage-enabled test baseline with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug` and save the result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/baseline/p0-t6-tests-with-coverage.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE:`, and `Output Summary:` with numeric coverage headline values.
-
-### Phase 1 — Constrained Small-Path Implementation Placeholder
-
-Phase 1 execution note: Regression and verification tests must target `KbdActions` storage identity compatibility with existing keyboard-input matching behavior. Storage must distinguish registered keys such as `"1"`, `"01"`, and `"10"` by exact stored identity, while runtime keyboard matching may continue to flow through `KaStringAsync.KeyEquals`.
-
-- [x] [P1-T1] Use this updated plan as the approved pre-edit change plan and lock the small-path scope before touching code.
-  - Acceptance: This file contains the scope guardrails above, explicitly names `QuickFiler/Controllers/KbdActions.cs`, conditionally allows `QuickFiler/Controllers/QfcCollectionController.cs`, and names `QuickFiler.Test/Controllers/KbdActionsTests.cs` as the only planned test file.
-
-- [x] [P1-T2] [expect-fail] Add an MSTest regression in `QuickFiler.Test/Controllers/KbdActionsTests.cs` for `KbdActions<string, KaStringAsync, Func<string, Task>>.Add` proving that `SourceId = "Collection"` can register `"1"` and `"10"` as distinct stored keys.
-  - Acceptance: The new test uses MSTest with FluentAssertions; running `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTest.ps1 -SearchRoot QuickFiler.Test -Configuration Debug` produces a non-zero exit code for the pre-fix state; and `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/regression-testing/p1-t2-kbdactions-distinct-keys.{yyyy-MM-ddTHH-mm}.md` exists with `Timestamp:`, the exact `Command:`, `EXIT_CODE:`, and `Output Summary:` that names the intended failing test, including the direct test-platform fallback used when the repository script aborts before dispatch.
-
-- [x] [P1-T3] Add an MSTest scenario in `QuickFiler.Test/Controllers/KbdActionsTests.cs` proving that `KbdActions<string, KaStringAsync, Func<string, Task>>.Add` still throws `ArgumentException` for an exact duplicate `SourceId = "Collection"` and key `"1"`.
-  - Acceptance: The test uses MSTest with FluentAssertions and passes after the implementation in [P1-T4].
-
-- [x] [P1-T4] Implement the minimal targeted storage-identity fix in `QuickFiler/Controllers/KbdActions.cs`, touching `QuickFiler/Controllers/QfcCollectionController.cs` only if a navigation-registration compatibility adjustment is required for `RegisterNavigationAsyncAction`, `RegisterNavigation`, or `RemovedItemMonitor`.
-  - Acceptance: Duplicate detection in `KbdActions.Add` no longer relies on `KeyEquals`; [P1-T2] and [P1-T3] pass after the fix; no production file outside the scope guardrails is edited.
-
-- [x] [P1-T5] Add an MSTest compatibility scenario in `QuickFiler.Test/Controllers/KbdActionsTests.cs` confirming that stored keys `"1"` and `"10"` can coexist while keyboard-input matching still routes through `KaStringAsync.KeyEquals` for filtering or lookup behavior.
-  - Acceptance: The test uses MSTest with FluentAssertions and passes after [P1-T4], demonstrating storage identity compatibility without changing the expected keyboard-input matching contract.
-
-### Phase 2 — Final QC Loop
-
-Phase 2 execution note: Run the commands below in order and restart from [P2-T1] whenever any step changes files or fails. Keep the final clean-pass artifacts under `evidence/qa-gates/`.
-
-- [x] [P2-T1] Run the final formatting pass with the environment-equivalent safe invocation `dotnet tool run csharpier format .` and save the clean-pass result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/qa-gates/p2-t1-format.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: dotnet tool run csharpier format .`, `EXIT_CODE: 0`, and `Output Summary:` from the clean pass.
-
-- [x] [P2-T2] Run the final analyzer build with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild` and save the clean-pass result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/qa-gates/p2-t2-analyzers.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE: 0`, and `Output Summary:` from the clean pass.
-
-- [x] [P2-T3] Run the final nullable/type-check build with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors` and save the clean-pass result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/qa-gates/p2-t3-nullable.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE: 0`, and `Output Summary:` from the clean pass.
-
-- [x] [P2-T4] Run the final coverage-enabled MSTest pass with `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug` and save the clean-pass result in `docs/features/active/2026-03-27-quickfiler-navigation-key-collision-111/evidence/qa-gates/p2-t4-tests-with-coverage.{yyyy-MM-ddTHH-mm}.md`.
-  - Acceptance: The artifact exists and contains `Timestamp:`, the exact `Command:`, `EXIT_CODE: 0`, and `Output Summary:` with numeric coverage headline values from the clean pass.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t3-csharpier.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t3-csharpier.md
new file mode 100644
index 000000000..14c2968a9
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t3-csharpier.md
@@ -0,0 +1,7 @@
+Timestamp: 2026-04-05T17-30
+Command: dotnet tool run csharpier format .
+EXIT_CODE: 0
+Output Summary:
+- Warning: `TaskMaster/TaskMaster_BACKUP_1250.csproj` failed to load because the file is invalid XML.
+- Warning: `TaskMaster/TaskMaster_BACKUP_1250.csproj` was skipped and not formatted.
+- Formatter result: `Formatted 1031 files in 3986ms.`
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t4-analyzers.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t4-analyzers.md
new file mode 100644
index 000000000..8c7ffe4bc
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t4-analyzers.md
@@ -0,0 +1,8 @@
+Timestamp: 2026-04-05T17-30
+Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild
+EXIT_CODE: 0
+Output Summary:
+- Analyzer-enabled build completed successfully.
+- Result summary: `45 Warning(s)`, `0 Error(s)`.
+- Example warnings observed: nullable annotation context warnings (`CS8632`) and unused event warnings (`CS0067`) in `UtilitiesCS.Test`.
+- Time Elapsed: `00:00:05.54`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t5-nullable.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t5-nullable.md
new file mode 100644
index 000000000..fdacbb196
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t5-nullable.md
@@ -0,0 +1,7 @@
+Timestamp: 2026-04-05T17-31
+Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors
+EXIT_CODE: 0
+Output Summary:
+- Nullable/warnings-as-errors build completed successfully.
+- Result summary: `Build succeeded.`, `0 Warning(s)`, `0 Error(s)`.
+- Time Elapsed: `00:00:01.29`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t6-mstest-coverage.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t6-mstest-coverage.md
new file mode 100644
index 000000000..ae060a7d3
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t6-mstest-coverage.md
@@ -0,0 +1,12 @@
+Timestamp: 2026-04-05T17-33
+Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-baseline.cobertura.xml
+EXIT_CODE: 0
+Output Summary:
+- Test Run Successful.
+- Total tests: 3910
+- Passed: 3908
+- Failed: 0
+- Skipped: 2
+- Overall line coverage: 78.05%
+- Coverage artifact path: coverage\select-junk-folders-baseline.cobertura.xml
+- Reported total time: 49.2116 seconds.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-feature-folder-scope.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-feature-folder-scope.md
new file mode 100644
index 000000000..a3eaeeb8e
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-feature-folder-scope.md
@@ -0,0 +1,4 @@
+Timestamp: 2026-04-05T17-29
+SearchScope: docs/features/active/2026-04-05-select-junk-folders-119/
+SearchPatterns: spec.md, user-story.md, research.md
+SearchResult: none
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-instructions-read.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-instructions-read.md
new file mode 100644
index 000000000..013edcc5b
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-instructions-read.md
@@ -0,0 +1,15 @@
+Timestamp: 2026-04-05T17-29
+Policy Order:
+1. .github/copilot-instructions.md
+2. .github/instructions/general-code-change.instructions.md
+3. .github/instructions/general-unit-test.instructions.md
+4. .github/instructions/csharp-code-change.instructions.md
+5. .github/instructions/csharp-unit-test.instructions.md
+Files Read:
+- c:\Users\DanMoisan\repos\TaskMaster\.github\copilot-instructions.md
+- c:\Users\DanMoisan\repos\TaskMaster\.github\instructions\general-code-change.instructions.md
+- c:\Users\DanMoisan\repos\TaskMaster\.github\instructions\general-unit-test.instructions.md
+- c:\Users\DanMoisan\repos\TaskMaster\.github\instructions\csharp-code-change.instructions.md
+- c:\Users\DanMoisan\repos\TaskMaster\.github\instructions\csharp-unit-test.instructions.md
+- c:\Users\DanMoisan\repos\TaskMaster\docs\features\active\2026-04-05-select-junk-folders-119\issue.md
+Requirements Source: issue.md only
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md
new file mode 100644
index 000000000..462bda26b
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md
@@ -0,0 +1,8 @@
+Timestamp: 2026-04-06T00:00:00-04:00
+Selected Launch Chain: RibbonViewer.SpamFolderSettings_Click -> RibbonController.FolderStoresSettings() -> StoreWrapperController.Launch()
+Launch Chain Type: narrower existing hook
+Production File Count: 2
+Test File Count: 2
+Production Files CSV: UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs, TaskMaster\AppGlobals\AppOlObjects.cs
+Test Files CSV: UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs, TaskMaster.Test\AppGlobals\AppOlObjectsTests.cs
+Public API Changes: none
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t1-csharpier.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t1-csharpier.md
new file mode 100644
index 000000000..4e1865821
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t1-csharpier.md
@@ -0,0 +1,9 @@
+## [P2-T1] CSharpier
+
+- Timestamp: `2026-04-06T11:56:53-04:00`
+- Command: `dotnet tool run csharpier format .`
+- EXIT_CODE: `0`
+- Output Summary:
+  - CSharpier emitted the existing warning for `TaskMaster\TaskMaster_BACKUP_1250.csproj` invalid XML and skipped formatting that backup project file.
+  - Final formatter pass output: `Formatted 1031 files in 670ms.`
+  - Follow-up idempotence check on the touched files reported `TOUCHED_FILE_HASHES_UNCHANGED`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t2-analyzers.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t2-analyzers.md
new file mode 100644
index 000000000..71facd098
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t2-analyzers.md
@@ -0,0 +1,9 @@
+## [P2-T2] Analyzer Build
+
+- Timestamp: `2026-04-06T11:57:13-04:00`
+- Command: `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild`
+- EXIT_CODE: `0`
+- Output Summary:
+  - The wrapper script emitted existing dependency-resolution warnings for `SVGControl.Test`.
+  - The wrapper script also emitted the existing `TaskMaster` merge-marker skip warning before the successful build.
+  - Build result: `0 Warning(s)`, `0 Error(s)`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t3-nullable.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t3-nullable.md
new file mode 100644
index 000000000..65ee8fe6b
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t3-nullable.md
@@ -0,0 +1,9 @@
+## [P2-T3] Nullable Build
+
+- Timestamp: `2026-04-06T11:57:26-04:00`
+- Command: `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors`
+- EXIT_CODE: `0`
+- Output Summary:
+  - The wrapper script emitted existing dependency-resolution warnings for `SVGControl.Test`.
+  - The wrapper script also emitted the existing `TaskMaster` merge-marker skip warning before the successful build.
+  - Build result: `0 Warning(s)`, `0 Error(s)`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md
new file mode 100644
index 000000000..36619d441
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md
@@ -0,0 +1,9 @@
+## [P2-T4] MSTest Coverage
+
+- Timestamp: `2026-04-06T11:58:37-04:00`
+- Command: `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-final.cobertura.xml`
+- EXIT_CODE: `0`
+- Output Summary:
+  - Test result: `3916` total, `3914` passed, `2` skipped, `0` failed.
+  - Overall line coverage: `78.11%`.
+  - Coverage artifact: `coverage\select-junk-folders-final.cobertura.xml`.
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md
new file mode 100644
index 000000000..7ccbed9ac
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md
@@ -0,0 +1,11 @@
+## [P2-T5] Coverage Delta
+
+- Timestamp: `2026-04-06T12:00:05-04:00`
+- Command: `pwsh -NoProfile -Command "$scope = Get-Content 'docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md' -Raw; $csv = ([regex]::Match($scope, 'Production Files CSV:\s*(.+)')).Groups[1].Value; if ([string]::IsNullOrWhiteSpace($csv)) { exit 1 }; $files = $csv.Split(',') | ForEach-Object { $_.Trim() } | Where-Object { $_ }; [xml]$baseline = Get-Content 'coverage/select-junk-folders-baseline.cobertura.xml'; [xml]$final = Get-Content 'coverage/select-junk-folders-final.cobertura.xml'; $baselineRepo = [math]::Round([double]$baseline.coverage.'line-rate' * 100, 2); $finalRepo = [math]::Round([double]$final.coverage.'line-rate' * 100, 2); Write-Output \"Baseline Repo Line Coverage: $baselineRepo%\"; Write-Output \"Final Repo Line Coverage: $finalRepo%\"; foreach ($file in $files) { $baselineClass = $baseline.SelectNodes('//class') | Where-Object { $_.filename -eq $file } | Select-Object -First 1; $finalClass = $final.SelectNodes('//class') | Where-Object { $_.filename -eq $file } | Select-Object -First 1; if (-not $finalClass) { exit 1 }; $baselineRate = if ($baselineClass) { [math]::Round([double]$baselineClass.'line-rate' * 100, 2) } else { -1 }; $finalRate = [math]::Round([double]$finalClass.'line-rate' * 100, 2); if ($baselineRate -lt 0) { $threshold = if ($finalRate -ge 90) { 'PASS' } else { 'FAIL' }; Write-Output \"FILE $file | BASELINE NEW | FINAL $finalRate% | New File Coverage Threshold: $threshold\" } else { $threshold = if ($finalRate -ge $baselineRate) { 'PASS' } else { 'FAIL' }; Write-Output \"FILE $file | BASELINE $baselineRate% | FINAL $finalRate% | Existing File No-Regression: $threshold\" } }; Write-Output \"Repo Coverage Threshold: $(if ($finalRepo -ge 80) { 'PASS' } else { 'FAIL' })\""`
+- EXIT_CODE: `0`
+- Output Summary:
+  - Baseline Repo Line Coverage: `78.05%`
+  - Final Repo Line Coverage: `78.11%`
+  - FILE `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs` | BASELINE `90.34%` | FINAL `93.41%` | Existing File No-Regression: `PASS`
+  - FILE `TaskMaster\AppGlobals\AppOlObjects.cs` | BASELINE `13.2%` | FINAL `25%` | Existing File No-Regression: `PASS`
+  - Repo Coverage Threshold: `FAIL`
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t6-end-state.md b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t6-end-state.md
new file mode 100644
index 000000000..8e9cba110
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t6-end-state.md
@@ -0,0 +1,61 @@
+## [P2-T6] Minor-Audit End State
+
+- Timestamp: `2026-04-06T12:03:00-04:00`
+- Final Touched Production Files:
+  - `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs`
+  - `TaskMaster\AppGlobals\AppOlObjects.cs`
+- Final Touched Test Files:
+  - `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs`
+  - `TaskMaster.Test\AppGlobals\AppOlObjectsTests.cs`
+- Phase 0 Artifacts:
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-instructions-read.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-feature-folder-scope.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t3-csharpier.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t4-analyzers.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t5-nullable.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t6-mstest-coverage.md`
+- Phase 2 Artifacts:
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t1-csharpier.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t2-analyzers.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t3-nullable.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md`
+  - `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t6-end-state.md`
+- Final QC Summary:
+  - Formatter: pass
+  - Analyzer build: pass
+  - Nullable build: pass
+  - MSTest coverage run: `3916` total, `3914` passed, `2` skipped, `0` failed
+  - Coverage delta: touched production files passed no-regression; repo coverage threshold remained `FAIL` at `78.11%`
+
+### Acceptance Criteria Coverage
+
+- `[x]` The add-in exposes a clear UI entry point where the user can review the current `Junk Email` and `Junk Potential` folder selections without waiting for a folder-resolution failure.
+  - Evidence: `docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md`; `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs`; `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs` (`PopulateWithCurrent_ShowsCurrentJunkSelectionsInViewer`)
+- `[x]` The user can change the confirmed junk folder and the potential junk folder independently, using the standard Outlook folder picker for each field.
+  - Evidence: `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs`
+- `[x]` Choosing `Save` persists the selected folders to the existing settings keys used by `AppOlObjects` (`OlJunkCertain` and `JunkPotential`) in the relative-path format expected by the current folder-loading logic.
+  - Evidence: `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs`; `TaskMaster\AppGlobals\AppOlObjects.cs`; `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs` (`SaveChanges_PersistsBothSettingsAndRefreshesActiveJunkFolders`)
+- `[x]` After saving, subsequent junk or potential-junk operations use the updated folder selections without requiring the user to trigger the existing "folder not found" recovery path first.
+  - Evidence: `TaskMaster\AppGlobals\AppOlObjects.cs`; `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs` (`SaveChanges_PersistsBothSettingsAndRefreshesActiveJunkFolders`)
+- `[x]` Choosing `Cancel` leaves both stored settings and active folder selections unchanged.
+  - Evidence: `UtilitiesCS\OutlookObjects\Store\StoreWrapperController.cs`; `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs` (`ButtonCancel_Click_LeavesStoredSettingsAndActiveFoldersUnchanged`)
+- `[x]` If a previously saved folder no longer exists or cannot be resolved, the UI shows a clear re-selection path and does not overwrite the stored value with an invalid selection.
+  - Evidence: `TaskMaster\AppGlobals\AppOlObjects.cs`; `TaskMaster.Test\AppGlobals\AppOlObjectsTests.cs` (`LoadJunkCertain_KeepsStoredValue_WhenReplacementSelectionIsCancelled`)
+- `[x]` Unit coverage areas: reading existing settings into the UI model, saving updated `OlJunkCertain` and `JunkPotential` values, cancel behavior, cache refresh/reset behavior, and invalid or empty selection guards.
+  - Evidence: `UtilitiesCS.Test\OutlookObjects\Store\StoreWrapperControllerTests.cs`; `TaskMaster.Test\AppGlobals\AppOlObjectsTests.cs`; `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md`; `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md`
+- `[ ]` Integration scenarios: open the entry point with valid existing folders, change only one folder, change both folders, save and reopen to confirm persistence, and recover after one of the saved folders is deleted, renamed, or moved.
+  - Evidence: No dedicated integration execution artifact was added in this minor-audit plan; remains unchecked.
+- `[ ]` CLI/API examples: none expected for this feature unless a diagnostic or developer-only command is added later; the primary surface is an in-add-in UI flow.
+  - Evidence: No CLI/API surface was introduced; remains unchecked.
+- `[ ]` Promote to GitHub issue (feature request template)
+  - Evidence: Administrative workflow item; not part of this execution plan.
+- `[ ]` Create `docs/features/active/select-junk-folders/` folder from the template
+  - Evidence: Administrative workflow item; not part of this execution plan.
+
+### Acceptance Criteria Status
+
+- Source: `docs/features/active/2026-04-05-select-junk-folders-119/issue.md`
+- Total AC items: `6`
+- Checked off (delivered): `6`
+- Remaining (unchecked): `0`
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/issue.md b/docs/features/active/2026-04-05-select-junk-folders-119/issue.md
new file mode 100644
index 000000000..d3f368f17
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/issue.md
@@ -0,0 +1,49 @@
+# select-junk-folders (Issue #119)
+
+- Date captured: 2026-04-05
+- Author: Dan Moisan
+- Status: Promoted -> docs/features/active/select-junk-folders/ (Issue #119)
+- Issue: #119
+- Issue URL: https://github.com/drmoisan/TaskMaster/issues/119
+- Last Updated: 2026-04-05
+- Work Mode: minor-audit
+
+## Problem / Why
+
+TaskMaster already stores separate Outlook folder settings for confirmed junk (`OlJunkCertain`) and potential junk (`JunkPotential`), but the current user experience is mostly reactive. Users only get a folder picker after a saved folder can no longer be resolved, which means there is no clear, intentional place to review or change these destinations before something breaks.
+
+This creates friction when a mailbox is renamed, a folder is moved, a new store becomes primary, or the user simply wants to tune SpamBayes routing behavior. A dedicated UI entry point would make the junk-folder configuration discoverable, reduce error-driven prompts, and let users correct both settings without waiting for a failed lookup path.
+
+## Proposed Behavior
+
+Add a user-visible configuration entry point in the add-in UI for selecting the Outlook folders used for confirmed junk and potential junk. The screen should display the current selections, allow each folder to be changed independently through the Outlook folder picker, and save the chosen folders back to the existing settings fields using the same relative-path storage model that `AppOlObjects` already expects.
+
+Saving should persist both values, refresh any cached junk-folder references, and let the rest of the add-in use the updated selections without relying on the current error-first fallback. Canceling should leave existing settings unchanged, and the UI should handle missing or invalid folders by guiding the user to reselect them instead of failing silently.
+
+## Acceptance Criteria (early draft)
+
+- [x] The add-in exposes a clear UI entry point where the user can review the current `Junk Email` and `Junk Potential` folder selections without waiting for a folder-resolution failure.
+- [x] The user can change the confirmed junk folder and the potential junk folder independently, using the standard Outlook folder picker for each field.
+- [x] Choosing `Save` persists the selected folders to the existing settings keys used by `AppOlObjects` (`OlJunkCertain` and `JunkPotential`) in the relative-path format expected by the current folder-loading logic.
+- [x] After saving, subsequent junk or potential-junk operations use the updated folder selections without requiring the user to trigger the existing "folder not found" recovery path first.
+- [x] Choosing `Cancel` leaves both stored settings and active folder selections unchanged.
+- [x] If a previously saved folder no longer exists or cannot be resolved, the UI shows a clear re-selection path and does not overwrite the stored value with an invalid selection.
+
+## Constraints & Risks
+
+- The existing folder settings are cached in `AppOlObjects` (`_junkCertain` and `_junkPotential`), so the feature must define how those cached references are refreshed after the user saves new values.
+- The current implementation stores folder paths relative to the Outlook root folder. That keeps settings portable within a store, but folder renames, mailbox changes, and store migrations can still invalidate saved paths.
+- Outlook folder pickers and folder objects are COM-backed UI interactions, so the new entry point must remain compatible with the add-in's current threading and Outlook session assumptions.
+- The repository already contains reactive recovery behavior in `LoadJunkCertain()` and `LoadJunkPotential()`. The new entry point should complement that fallback, not create a second inconsistent persistence path.
+- Scope should stay limited to selecting and persisting junk-folder destinations; broader spam-manager redesign, classifier logic changes, or mailbox-provisioning workflows are out of scope for this feature.
+
+## Test Conditions to Consider
+
+- [x] Unit coverage areas: reading existing settings into the UI model, saving updated `OlJunkCertain` and `JunkPotential` values, cancel behavior, cache refresh/reset behavior, and invalid or empty selection guards.
+- [ ] Integration scenarios: open the entry point with valid existing folders, change only one folder, change both folders, save and reopen to confirm persistence, and recover after one of the saved folders is deleted, renamed, or moved.
+- [ ] CLI/API examples: none expected for this feature unless a diagnostic or developer-only command is added later; the primary surface is an in-add-in UI flow.
+
+## Next Step
+
+- [ ] Promote to GitHub issue (feature request template)
+- [ ] Create `docs/features/active/select-junk-folders/` folder from the template
diff --git a/docs/features/active/2026-04-05-select-junk-folders-119/plan.2026-04-05T17-15.md b/docs/features/active/2026-04-05-select-junk-folders-119/plan.2026-04-05T17-15.md
new file mode 100644
index 000000000..3720b6014
--- /dev/null
+++ b/docs/features/active/2026-04-05-select-junk-folders-119/plan.2026-04-05T17-15.md
@@ -0,0 +1,89 @@
+# 2026-04-05-select-junk-folders - Plan
+
+- **Issue:** #119
+- **Owner:** drmoisan
+- **Branch:** `feature/select-junk-folders-119`
+- **Work Mode:** `minor-audit`
+- **Requirements Source:** `docs/features/active/2026-04-05-select-junk-folders-119/issue.md` only
+- **Last Updated:** 2026-04-05T17-15
+- **Status:** Draft
+
+## Directives
+
+- `DIRECTIVE: MINIMAL-AUDIT PLAN REQUIRED`
+- `DIRECTIVE: PREFLIGHT VALIDATION ONLY AFTER PLAN UPDATE UNTIL ALL CLEAR`
+
+## Overview
+
+Create a small-scope C# change that adds a discoverable UI entry point for selecting the Outlook folders used for confirmed junk and potential junk, persists those selections through the existing `AppOlObjects` settings keys, refreshes cached folder references after Save, and preserves current state on Cancel. Keep implementation limited to the existing UI entry point plus the minimum persistence and cache-refresh work needed to satisfy the issue acceptance criteria.
+
+## Policy Inputs
+
+- `.github/copilot-instructions.md`
+- `.github/instructions/general-code-change.instructions.md`
+- `.github/instructions/general-unit-test.instructions.md`
+- `.github/instructions/csharp-code-change.instructions.md`
+- `.github/instructions/csharp-unit-test.instructions.md`
+
+### Phase 0 — Baseline Capture
+
+- [x] [P0-T1] Read the policy files listed in `## Policy Inputs` plus `docs/features/active/2026-04-05-select-junk-folders-119/issue.md`, then save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-instructions-read.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Policy Order:`, `Files Read:`, and `Requirements Source: issue.md only`.
+- [x] [P0-T2] Verify that `docs/features/active/2026-04-05-select-junk-folders-119/` does not contain `spec.md`, `user-story.md`, or `research.md`, then save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/phase0-feature-folder-scope.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `SearchScope: docs/features/active/2026-04-05-select-junk-folders-119/`, `SearchPatterns: spec.md, user-story.md, research.md`, and `SearchResult: none`.
+- [x] [P0-T3] Run `dotnet tool run csharpier format .` from the repository root and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t3-csharpier.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: dotnet tool run csharpier format .`, `EXIT_CODE:`, and `Output Summary:`.
+- [x] [P0-T4] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild` from the repository root and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t4-analyzers.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild`, `EXIT_CODE:`, and `Output Summary:`.
+- [x] [P0-T5] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors` from the repository root and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t5-nullable.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors`, `EXIT_CODE:`, and `Output Summary:`.
+- [x] [P0-T6] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-baseline.cobertura.xml` from the repository root and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/baseline/p0-t6-mstest-coverage.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-baseline.cobertura.xml`, `EXIT_CODE:`, and `Output Summary:` including numeric total, passed, failed, and skipped test counts, numeric overall line coverage from `coverage/select-junk-folders-baseline.cobertura.xml`, and the coverage artifact path.
+
+### Phase 1 — Constrained Small-Path Implementation
+
+- [x] [P1-T1] Record the selected small-path production files, selected MSTest files, and the existing UI launch chain for this feature in `docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md`.
+  - Acceptance: The artifact exists, names the selected launch chain, identifies whether the implementation extends `RibbonViewer.FolderSettings_Click` -> `RibbonController.FolderStoresSettings()` -> `StoreWrapperController.Launch()` or a narrower existing hook, states `Production File Count:` with a value from 1 through 3, states `Test File Count:` with a value from 1 through 3, includes `Production Files CSV:` with a comma-separated repo-relative list of the touched production `.cs` files, includes `Test Files CSV:` with a comma-separated repo-relative list of the touched MSTest `.cs` files, and states `Public API Changes: none` unless a specific existing API adjustment is explicitly listed.
+- [x] [P1-T2] Update the selected existing UI launch chain from `p1-t1-scope.md` so the user can intentionally open the junk-folder selector without waiting for the current folder-resolution failure path.
+  - Acceptance: The changed UI path is traceable from the launch chain named in `p1-t1-scope.md` to the junk-folder selection flow, and the implementation stays within the file-count limits recorded in `p1-t1-scope.md`.
+- [x] [P1-T3] Update `StoreWrapperController.PopulateWithCurrent()` or the narrower selected UI-population method from `p1-t1-scope.md` so the current confirmed-junk and potential-junk selections are visible when the selector opens.
+  - Acceptance: Opening the selector shows the current `Junk Email` and `Junk Potential` selections drawn from the existing settings-backed state.
+- [x] [P1-T4] Update `StoreWrapperController.SaveChanges()` or the selected save method from `p1-t1-scope.md` so Save persists `OlJunkCertain` and `JunkPotential` through the existing relative-path storage path.
+  - Acceptance: Save writes both junk-folder settings through the existing persistence path, stores relative paths, and does not introduce a parallel persistence mechanism.
+- [x] [P1-T5] Refresh the cached `AppOlObjects` junk-folder references after Save through the selected save pipeline from `p1-t1-scope.md`.
+  - Acceptance: Subsequent junk or potential-junk resolution uses the updated selections without requiring the existing reactive recovery prompt first.
+- [x] [P1-T6] Update `StoreWrapperController.ButtonCancel_Click()` or the selected cancel method from `p1-t1-scope.md` so Cancel leaves the stored settings and active folder selections unchanged.
+  - Acceptance: Cancel returns without changing `OlJunkCertain`, `JunkPotential`, or the active cached folder selections.
+- [x] [P1-T7] Update `AppOlObjects.LoadJunkCertain()`, `AppOlObjects.LoadJunkPotential()`, or the selected unresolved-folder helper from `p1-t1-scope.md` so the user gets a clear re-selection path without an invalid overwrite.
+  - Acceptance: The unresolved-folder path keeps the stored value unchanged until the user chooses a valid replacement and exposes a clear route back to folder selection.
+- [x] [P1-T8] Add an MSTest for `StoreWrapperController.PopulateWithCurrent()` or the selected UI-population method showing the current `Junk Email` and `Junk Potential` selections in the selected test file from `p1-t1-scope.md`.
+  - Acceptance: The new test fails if the selector opens without the current junk-folder selections populated and passes once the implementation is complete.
+- [x] [P1-T9] Add an MSTest for `StoreWrapperController.SaveChanges()` or the selected save method persisting both settings keys and refreshing active junk-folder state in the selected test file from `p1-t1-scope.md`.
+  - Acceptance: The new test fails if Save does not persist both settings or does not refresh the active junk-folder state and passes once the implementation is complete.
+- [x] [P1-T10] Add an MSTest for `StoreWrapperController.ButtonCancel_Click()` or the selected cancel method leaving stored settings and active folder state unchanged in the selected test file from `p1-t1-scope.md`.
+  - Acceptance: The new test fails if Cancel changes persisted settings or active folder state and passes once the implementation is complete.
+- [x] [P1-T11] Add an MSTest for `AppOlObjects.LoadJunkCertain()`, `AppOlObjects.LoadJunkPotential()`, or the selected unresolved-folder helper keeping the stored value until a valid replacement is chosen in the selected test file from `p1-t1-scope.md`.
+  - Acceptance: The new test fails if an invalid or unresolved folder overwrites the stored value and passes once the implementation is complete.
+
+### Phase 2 — Final QC Loop
+
+- [x] [P2-T1] Run `dotnet tool run csharpier format .`, restart Phase 2 from `P2-T1` if the formatter changes files or exits non-zero, and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t1-csharpier.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: dotnet tool run csharpier format .`, `EXIT_CODE: 0`, and `Output Summary:` from the clean final pass.
+- [x] [P2-T2] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild`, restart Phase 2 from `P2-T1` if the command exits non-zero, and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t2-analyzers.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNETAnalyzers -EnforceCodeStyleInBuild`, `EXIT_CODE: 0`, and `Output Summary:` from the clean final pass.
+- [x] [P2-T3] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors`, restart Phase 2 from `P2-T1` if the command exits non-zero, and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t3-nullable.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-VSBuild.ps1 -SolutionPath TaskMaster.sln -Configuration Debug -Platform 'Any CPU' -EnableNullable -TreatWarningsAsErrors`, `EXIT_CODE: 0`, and `Output Summary:` from the clean final pass.
+- [x] [P2-T4] Run `pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-final.cobertura.xml`, restart Phase 2 from `P2-T1` if the command exits non-zero, and save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t4-mstest-coverage.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -ExecutionPolicy Bypass -File scripts/vscode/Invoke-MSTestWithCoverage.ps1 -SearchRoot . -Configuration Debug -CoverageOutput coverage\select-junk-folders-final.cobertura.xml`, `EXIT_CODE: 0`, and `Output Summary:` including numeric total, passed, failed, and skipped test counts, numeric overall line coverage from `coverage/select-junk-folders-final.cobertura.xml`, and the coverage artifact path.
+- [x] [P2-T5] Compare `coverage/select-junk-folders-baseline.cobertura.xml` and `coverage/select-junk-folders-final.cobertura.xml` for the touched production files listed in `docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md`, then save `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t5-coverage-delta.md`.
+  - Acceptance: The artifact exists and contains `Timestamp:`, `Command: pwsh -NoProfile -Command "$scope = Get-Content 'docs/features/active/2026-04-05-select-junk-folders-119/evidence/other/p1-t1-scope.md' -Raw; $csv = ([regex]::Match($scope, 'Production Files CSV:\s*(.+)')).Groups[1].Value; if ([string]::IsNullOrWhiteSpace($csv)) { exit 1 }; $files = $csv.Split(',') | ForEach-Object { $_.Trim() } | Where-Object { $_ }; [xml]$baseline = Get-Content 'coverage/select-junk-folders-baseline.cobertura.xml'; [xml]$final = Get-Content 'coverage/select-junk-folders-final.cobertura.xml'; $baselineRepo = [math]::Round([double]$baseline.coverage.'line-rate' * 100, 2); $finalRepo = [math]::Round([double]$final.coverage.'line-rate' * 100, 2); Write-Output \"Baseline Repo Line Coverage: $baselineRepo%\"; Write-Output \"Final Repo Line Coverage: $finalRepo%\"; foreach ($file in $files) { $baselineClass = $baseline.SelectNodes('//class') | Where-Object { $_.filename -eq $file } | Select-Object -First 1; $finalClass = $final.SelectNodes('//class') | Where-Object { $_.filename -eq $file } | Select-Object -First 1; if (-not $finalClass) { exit 1 }; $baselineRate = if ($baselineClass) { [math]::Round([double]$baselineClass.'line-rate' * 100, 2) } else { -1 }; $finalRate = [math]::Round([double]$finalClass.'line-rate' * 100, 2); if ($baselineRate -lt 0) { $threshold = if ($finalRate -ge 90) { 'PASS' } else { 'FAIL' }; Write-Output \"FILE $file | BASELINE NEW | FINAL $finalRate% | New File Coverage Threshold: $threshold\" } else { $threshold = if ($finalRate -ge $baselineRate) { 'PASS' } else { 'FAIL' }; Write-Output \"FILE $file | BASELINE $baselineRate% | FINAL $finalRate% | Existing File No-Regression: $threshold\" } }; Write-Output \"Repo Coverage Threshold: $(if ($finalRepo -ge 80) { 'PASS' } else { 'FAIL' })\""`, `EXIT_CODE: 0`, and `Output Summary:` including numeric baseline overall line coverage, numeric final overall line coverage, each touched production file with numeric baseline and final line coverage, a `Repo Coverage Threshold:` result, a `New File Coverage Threshold:` result for any new production file, and an `Existing File No-Regression:` result for every previously existing touched production file.
+- [x] [P2-T6] Record the minor-audit end-state summary in `docs/features/active/2026-04-05-select-junk-folders-119/evidence/qa-gates/p2-t6-end-state.md`.
+  - Acceptance: The artifact exists and lists the final touched production files, the final touched test files, the paths to every Phase 0 and Phase 2 artifact, and an `Acceptance Criteria Coverage:` section mapping each checkbox in `issue.md` to the implementing code or test evidence.
+
+## Test Plan
+
+- Confirm the selected UI entry point displays the current confirmed-junk and potential-junk folder selections drawn from the existing settings state.
+- Confirm Save updates `OlJunkCertain` and `JunkPotential` independently, uses the current relative-path storage model, and refreshes cached `AppOlObjects` folder references before the next junk-routing operation.
+- Confirm Cancel leaves the stored settings and active folder selections unchanged.
+- Confirm an unresolved saved folder presents a clear re-selection path and does not overwrite the stored value until the user picks a valid folder.
+- Confirm the final MSTest coverage run records numeric overall coverage and numeric per-file coverage for the touched production files.
diff --git a/docs/features/potential/2026-03-13-utilities-coverage.md b/docs/features/potential/2026-03-13-utilities-coverage.md
deleted file mode 100644
index eab0e7e20..000000000
--- a/docs/features/potential/2026-03-13-utilities-coverage.md
+++ /dev/null
@@ -1,68 +0,0 @@
----
-title: "utilities-coverage - Plan"
-issue: "TBD"
-parent: "none"
-owner: "Dan Moisan"
-last_updated: "2026-03-13T22-06"
-status: "Draft"
-status_color: "lightgrey"
-version: "0.1"
----
-
-# utilities-coverage (Potential)
-
-- Date captured: 2026-03-13
-- Author: Dan Moisan
-- Status: Draft
-
-## Problem / Why
-
-The UtilitiesCS library is a critical shared utility project used across the TaskMaster solution, providing extensions, helper classes, threading utilities, serialization converters, reusable type classes, and more. Current unit test coverage sits at approximately 13%, leaving the vast majority of public APIs untested. This creates risk for regressions, makes refactoring dangerous, and violates the repository policy requiring ≥80% line coverage. Increasing coverage to ≥80% per file will establish a safety net for ongoing development, improve confidence in the library's correctness, and bring the project into compliance with repo policy.
-
-## Proposed Behavior
-
-Add comprehensive MSTest unit tests within `UtilitiesCS.Test` to bring per-file line coverage of `UtilitiesCS` production code to at least 80%. Tests will:
-
-1. Mirror the directory structure of `UtilitiesCS` (e.g., `Extensions/`, `HelperClasses/`, `Threading/`, `ReusableTypeClasses/`, `NewtonsoftHelpers/`).
-2. Use MSTest as the framework, Moq for mocking, and FluentAssertions for assertions (per repo policy).
-3. Follow Arrange–Act–Assert pattern with descriptive test names documenting intent.
-4. Cover positive flows, negative flows, edge cases, boundary conditions, and error-handling behavior for each public method.
-5. Mock external dependencies (Outlook COM interop, file system, network) to keep tests isolated and deterministic.
-6. Target ≥90% coverage for newly tested classes per repo policy for new test modules.
-
-## Acceptance Criteria (early draft)
-
-- [ ] Every public class/method in `UtilitiesCS/Extensions/` has corresponding tests in `UtilitiesCS.Test/Extensions/`
-- [ ] Every public class/method in `UtilitiesCS/HelperClasses/` has corresponding tests in `UtilitiesCS.Test/HelperClasses/`
-- [ ] Every public class/method in `UtilitiesCS/Threading/` has corresponding tests in `UtilitiesCS.Test/Threading/`
-- [ ] Every public class/method in `UtilitiesCS/ReusableTypeClasses/` has corresponding tests in `UtilitiesCS.Test/ReusableTypeClasses/`
-- [ ] Every public class/method in `UtilitiesCS/NewtonsoftHelpers/` has corresponding tests in `UtilitiesCS.Test/NewtonsoftHelpers/`
-- [ ] Per-file line coverage ≥80% for each testable UtilitiesCS source file
-- [ ] All tests pass with zero failures
-- [ ] Tests are independent, isolated, fast, and deterministic
-- [ ] No external dependencies (no file I/O, no network, no COM interop) in tests—all mocked
-- [ ] Tests mirror the production directory structure in `UtilitiesCS.Test`
-- [ ] Full C# toolchain passes: format → analyzers → nullable build → test
-
-## Constraints & Risks
-
-- **COM Interop:** Many classes in `OutlookObjects/` and `EmailIntelligence/` depend heavily on Outlook COM interop. These require significant Moq interface mocking and may have portions that are impractical to unit test without integration test infrastructure. Focus on testable logic paths first.
-- **UI Dependencies:** Classes in `Dialogs/` and `WinFormsExtensions` depend on Windows Forms UI. Tests must isolate logic from UI rendering. Some dialog classes may require UI thread simulation.
-- **Static Classes:** Several utility classes are static (e.g., `YesNoToAll`, `InputBox`, `MyBox`), making them harder to mock. Focus on testing their deterministic logic paths.
-- **.NET Framework 4.8.1:** Target framework constrains available testing patterns (no top-level statements, limited pattern matching).
-- **Scope Management:** 75+ production files means careful phased planning to avoid overwhelming single PRs.
-
-## Test Conditions to Consider
-
-- [ ] Extension methods: null inputs, empty collections, single-element, large collections, type mismatches
-- [ ] Helper classes: boundary values, invalid arguments, concurrent access patterns
-- [ ] Threading utilities: thread-safety verification, timeout behavior, cancellation
-- [ ] Serialization converters: round-trip serialize/deserialize, malformed JSON, missing properties, type discrimination
-- [ ] Reusable collections: add/remove/clear/enumerate, concurrent modification, serialization persistence
-- [ ] Bayesian classifiers: training with empty corpus, single token, edge probability values
-
-## Next Step
-
-- [ ] Promote to GitHub issue (feature request template)
-- [ ] Create `docs/features/active/utilities-coverage/` folder from the template
-
diff --git a/docs/features/potential/2026-03-19-utilities-coverage-part-three.md b/docs/features/potential/2026-03-19-utilities-coverage-part-three.md
deleted file mode 100644
index 13f2ae93b..000000000
--- a/docs/features/potential/2026-03-19-utilities-coverage-part-three.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# utilities-coverage-part-three (Potential)
-
-- Date captured: 2026-03-19
-- Author: Dan Moisan
-- Status: Draft
-
-## Problem / Why
-
-The UtilitiesCS library has 292 classes tracked by coverage tooling, but 196 of them (67%) are below the repository-wide 80% line-coverage floor mandated by general-unit-test.instructions.md. Many files sit at 0% coverage — including helpers, extension methods, threading utilities, serialization infrastructure, email intelligence modules, and Newtonsoft JSON converters. This gap means regressions in core shared code go undetected and the library cannot pass the repo-wide >=80% coverage gate.
-
-Previous feature work (issue #82, utilities-coverage-part-two) raised OutlookObjects/Folder to >=80%. This third part extends coverage to **every remaining file and subfolder** in UtilitiesCS.
-
-## Proposed Behavior
-
-Add or extend MSTest unit tests in UtilitiesCS.Test so that every production .cs file compiled by UtilitiesCS.csproj reaches at least 80% line coverage. Tests must follow the repo's general and C#-specific unit test policies (MSTest + Moq + FluentAssertions, Arrange-Act-Assert, deterministic, no external dependencies, no temp files).
-
-Coverage categories requiring uplift include:
-- Extensions (StringExtensions, ArrayExtensions, IEnumerableExtensions, ImageExtensions, AsyncSerialization, WinFormsExtensions, DfDeedle, DfMLNet, DrawingExtensions, etc.)
-- HelperClasses (PrettyPrint, Tokenizer, Initializer, DeepCompare, DispatchUtility, FilePathHelper, FileInfoWrapper, DirectoryInfoWrapper, ThemeHelpers, Logging, etc.)
-- ReusableTypeClasses (LockingLinkedList, SerializableList, AsyncLazy, LazyTry, Matrices, TimedActions, SmartSerializable, SCO collections, Observable collections, etc.)
-- Threading (TimeOutTask, ThreadSafeFunctions, ProgressTracker, AsyncMultiTasker, IdleActionQueue, UiThread, etc.)
-- NewtonsoftHelpers (converters, binders, wrappers, SDIL reader, MonoExtension)
-- EmailIntelligence (Bayesian, Ctf, Flags, SubjectMap, EmailParsingSorting, ClassifierGroups, OlFolderTools, People, Recents, etc.)
-- OutlookObjects (Item, MailItem, Store, Table, Recipient, Attachment, Calendar, Category, Conversation, etc.)
-- Dialogs (ActionButton, DelegateButton, MyBox, InputBox, YesNoToAll, FolderNotFound, etc.)
-- OneDriveHelpers, Interfaces with implementation, WindowsAPI
-
-## Acceptance Criteria (early draft)
-
-- [ ] Every .cs file compiled by UtilitiesCS.csproj has >=80% line coverage as reported by Cobertura
-- [ ] No pre-existing tests are broken or removed
-- [ ] All new tests follow MSTest + Moq + FluentAssertions conventions
-- [ ] All new tests are deterministic, isolated, and use no external dependencies
-- [ ] All new test files are registered in UtilitiesCS.Test.csproj (explicit Compile Include)
-- [ ] The C# toolchain loop passes clean: format, analyzer build, nullable build, test run
-- [ ] Repository-wide line coverage does not regress below the pre-work baseline
-
-## Constraints & Risks
-
-- Many classes have deep Outlook COM interop dependencies requiring extensive Moq seams
-- WinForms UI classes (Designer.cs, viewers, dialogs) may require special treatment for testability
-- Some files may be dead code or commented stubs (e.g., ObservableDictionary.cs, ConcurrentObservableBag.cs in UtilitiesCS are stubs; live implementations are in UtilitiesSwordfish)
-- Serialization classes have complex generic type constraints
-- EmailIntelligence modules depend on domain-specific types and may require significant mock scaffolding
-- The large number of files (196 below 80%) means this work should be phased carefully
-
-## Test Conditions to Consider
-
-- [ ] Unit coverage for each of the 196 files currently below 80%
-- [ ] Positive and negative flows for extension methods
-- [ ] Edge cases and boundary conditions for collection/threading utilities
-- [ ] Error-handling paths in serialization helpers
-- [ ] Mocked COM interop for Outlook-dependent classes
-- [ ] Thread-safety verification for concurrent collections and threading utilities
-
-## Next Step
-
-- [ ] Promote to GitHub issue (feature request template)
-- [ ] Create `docs/features/active/utilities-coverage-part-three/` folder from the template
-
diff --git a/docs/features/potential/2026-03-20-triage-null-classifier-group.md b/docs/features/potential/2026-03-20-triage-null-classifier-group.md
deleted file mode 100644
index 8f3b364e3..000000000
--- a/docs/features/potential/2026-03-20-triage-null-classifier-group.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# triage-null-classifier-group (Potential Bug)
-
-- Date captured: 2026-03-20
-- Author: Dan Moisan
-- Status: Draft
-
-> Automation note: Keep the section headings below unchanged; the promotion tooling maps each of them into the GitHub bug issue template.
-
-## Summary
-
-`Triage.CreateNewTriageClassifierGroupAsync()` creates a `new BayesianClassifierGroup()` with an empty `Classifiers` dictionary and serializes it without seeding classifiers A, B, and C. On next startup, `HasValidTriageManagerAsync()` fails validation, `CreateAsync()` returns null, `AppItemEngines.InitAsync()` stores the null engine, and any Triage click handler (e.g., `TriageSetA_Click`) throws `NullReferenceException`.
-
-## Environment
-
-- OS/version: Windows
-- .NET framework: 4.x (Outlook VSTO add-in)
-- Trigger: Click "Clear Triage" button, then restart Outlook; click any Triage Set A/B/C button.
-
-## Steps to Reproduce
-
-1. Click the "Clear Triage" ribbon button (calls `ClearTriageAync()`).
-2. Restart the Outlook add-in (or trigger engine re-initialization).
-3. Click "Triage Set A" ribbon button.
-
-## Expected Behavior
-
-After clearing triage, the persisted classifier group should contain empty but valid classifiers A, B, and C so that subsequent load/train operations succeed.
-
-## Actual Behavior
-
-`System.NullReferenceException` at `RibbonViewer.TriageSetA_Click` (line 264) because `_controller.Triage` is null. Startup log shows: "Triage classifier group cannot find classifier named A. Skipping load."
-
-## Logs / Screenshots
-
-- [x] Attached minimal logs or screenshot
-- Snippet:
-```
-System.NullReferenceException
-  HResult=0x80004003
-  Message=Object reference not set to an instance of an object.
-  Source=TaskMaster
-  StackTrace:
-   at TaskMaster.RibbonViewer.<TriageSetA_Click>d__56.MoveNext() in RibbonViewer.cs:line 264
-```
-
-## Impact / Severity
-
-- [ ] Blocker
-- [x] High
-- [ ] Medium
-- [ ] Low
-
-## Suspected Cause / Notes
-
-`CreateNewTriageClassifierGroupAsync()` in `Triage.cs` (line ~286) uses `new BayesianClassifierGroup()` instead of `CreateClassifier()` (line ~199) which properly seeds classifiers A, B, C. The existing `CreateClassifier()` static method already does the right thing.
-
-## Proposed Fix / Validation Ideas
-
-- [x] Unit coverage areas: Test that `CreateNewTriageClassifierGroupAsync` produces a group containing classifiers A, B, C.
-- [x] Integration scenario to retest: Clear triage → re-init engine → verify non-null Triage engine with valid classifiers.
-- [ ] Manual verification notes
-
-## Next Step
-
-- [ ] Promote to GitHub issue (bug-report template)
-- [ ] Move to active fix folder / branch
diff --git a/docs/features/potential/2026-03-25-quickfiler-gui-not-expanding.md b/docs/features/potential/2026-03-25-quickfiler-gui-not-expanding.md
deleted file mode 100644
index 08c0b4604..000000000
--- a/docs/features/potential/2026-03-25-quickfiler-gui-not-expanding.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# quickfiler-gui-not-expanding (Potential Bug)
-
-- Date captured: 2026-03-25
-- Author: Dan Moisan
-- Status: Draft
-
-> Automation note: Keep the section headings below unchanged; the promotion tooling maps each of them into the GitHub bug issue template.
-
-## Summary
-
-Pressing the Right arrow key while QuickFiler keyboard navigation is active does not expand the conversation messages beneath the selected item; instead it activates the sender's mailto: address on the focused control.
-
-## Environment
-
-- OS/version: Windows (any)
-- Python version: N/A (C# / WinForms VSTO add-in)
-- Command/flags used: Press Alt to activate QuickFiler keyboard interface; navigate with Up/Down; press Right on an item with >1 conversation member
-- Data source or fixture: Any Outlook mailbox with at least one threaded email conversation
-
-## Steps to Reproduce
-
-1. Open Outlook with the QuickFiler add-in loaded.
-2. Press Alt to activate the QuickFiler keyboard interface.
-3. Use Up/Down arrows to navigate to an email that has more than one message in a conversation (LblConvCt > 0).
-4. Press the Right arrow key.
-
-## Expected Behavior
-
-The selected item should expand to reveal all the conversation messages beneath it (equivalent to clicking the expand/collapse widget or pressing 'E').
-
-## Actual Behavior
-
-The Right arrow key press falls through to the focused WinForms control (a label or link showing the sender's email address). The mailto: address of the sender is displayed or activated instead of the conversation expanding.
-
-## Logs / Screenshots
-
-- [ ] Attached minimal logs or screenshot
-- Snippet: No error is logged; the key press is silently misrouted.
-
-## Impact / Severity
-
-- [ ] Blocker
-- [x] High
-- [ ] Medium
-- [ ] Low
-
-## Suspected Cause / Notes
-
-Root cause identified: `QfcItemController.RegisterFocusAsyncActions()` does not register a `Keys.Right` handler in `_kbdHandler.KeyActionsAsync`. The handler was commented out when the codebase migrated from the sync `RegisterFocusActions()` path to the async `RegisterFocusAsyncActions()` path, and was never re-implemented. Because no handler suppresses the key press, WinForms routes the Right arrow event to whatever control holds focus, which renders or activates the sender's mailto: link.
-
-Files to inspect:
-- `QuickFiler/Controllers/QfcItemController.cs` — `RegisterFocusAsyncActions()` (line ~1335) and `UnregisterFocusAsyncActions()` (line ~1465)
-- `QuickFiler/Controllers/KeyboardHandler.cs` — `KeyDownTaskAsync()` for the key-dispatch chain
-
-## Proposed Fix / Validation Ideas
-
-- [x] Add `_kbdHandler.KeyActionsAsync.Add(ItemHelper.EntryId, Keys.Right, (x) => this.ToggleExpansionAsync(Enums.ToggleState.On))` to `RegisterFocusAsyncActions()`.
-- [x] Uncomment `_kbdHandler.KeyActionsAsync.Remove(ItemHelper.EntryId, Keys.Right)` in `UnregisterFocusAsyncActions()`.
-- [x] Unit coverage areas: `QfcItemControllerTests.cs` — add tests asserting that `Keys.Right` is present in `KeyActionsAsync` after `RegisterFocusAsyncActions()` and absent after `UnregisterFocusAsyncActions()`.
-- [ ] Integration scenario to retest: manually reproduce in Outlook after deploying the fix.
-- [ ] Manual verification notes: confirm Right arrow expands conversation and that mailto: is no longer triggered.
-
-## Next Step
-
-- [x] Promote to GitHub issue (bug-report template)
-- [ ] Move to active fix folder / branch