fix(updater): invoke VSTOInstaller.exe directly so Chrome doesn't hijack the .vsto

v1.2.3 changed the updater to Process.Start the .vsto URL with
UseShellExecute=true. On any browser-as-default-handler (Chrome / Edge)
that downloads the file to disk instead of handing it to VSTOInstaller,
and re-opening the local copy then fails with InvalidDeploymentException
"לפריסה וליישום אין אזורי אבטחה תואמים" — the downloaded file lives in
the Local Machine zone while the manifest declares the Internet zone.

The reliable path is to invoke VSTOInstaller.exe directly with /I and
the manifest URL. The URL is then processed in the Internet zone,
matching what's declared in the manifest. FindVstoInstaller() looks at
the canonical VSTO 4.0 path and falls back to the HKCR registration of
the .vsto extension. If even that fails, we tell the user to close and
reopen Outlook — the VSTO runtime picks up the new manifest on its own
during startup, so the worst case is just an extra restart, not a stuck
install.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

.gitattributes

@@ -0,0 +1,15 @@
+* text=auto
+
+# ClickOnce publish output must be byte-identical to the hashes recorded
+# in dll.manifest at publish time. Treat everything under Publish/ as
+# binary so git's CRLF/LF normalization can't change the bytes between
+# what VS published and what end-users download via setup.exe.
+Publish/** -text
+
+# Defense in depth — apply the same rule to ClickOnce extensions
+# regardless of where they live.
+*.deploy      binary
+*.manifest    binary
+*.vsto        binary
+*.application binary
+*.pfx         binary

.gitignore

@@ -24,16 +24,22 @@ project.lock.json
 project.fragment.lock.json
 
 # Publish output (ClickOnce / MSIX)
-publish/
+# NOTE: Publish/ itself is COMMITTED so end-users can fetch the ClickOnce
+# bundle via Gitea raw URLs (https://gitea.dev.marcus-law.co.il/.../raw/
+# branch/main/Publish/). VS dumps build output there on every Publish.
 PublishProfiles/
 *.pubxml.user
 
-# VSTO build output
+# VSTO build output — these wildcards exclude intermediate bin/obj
+# artifacts. Re-include everything under Publish/ which is the
+# ClickOnce distribution root (must contain .vsto/.application/.deploy
+# /.manifest files for the installer to work).
 *_TemporaryKey.pfx
 *.vsto
 *.application
 *.deploy
 *.manifest
+!Publish/**
 
 # Code signing — NEVER commit private keys
 *.pfx

docs/PROJECT-BRIEFING.md

@@ -268,14 +268,47 @@ If the session is on the Linux dev server (`/home/chaim/espocrm-extensions/Outlo
 
 ---
 
+## How releases work (current, 2026-05-24)
+
+**Production install URL:** `https://platform.dev.marcus-law.co.il/outlook-addin/OutlookAddin.vsto`
+
+**Release flow:**
+
+1. Code change merged to `main` (push or PR-merge — no CI fires yet)
+2. Bump `<ApplicationVersion>` in `src/OutlookAddin/OutlookAddin.csproj` and `AssemblyVersion` + `AssemblyFileVersion` in `src/OutlookAddin/Properties/AssemblyInfo.cs` to the next 4-part version (e.g. `1.2.1.0`). CI overrides `ApplicationVersion` from the tag at build time, but leaves AssemblyInfo alone — keep them in sync manually so the bundled DLL's FileVersion matches the manifest.
+3. `git tag -a v1.2.1 -m "..." && git push --tags`
+4. Gitea Actions workflow (`.gitea/workflows/build.yml`) fires:
+   - Imports the **real** codesign cert from secrets `CODESIGN_CERT_PFX_BASE64` + `CODESIGN_THUMBPRINT` (publicKeyToken `c68d2b4c25051c5b`, `CN=Marcus-Law OutlookAddin`)
+   - Patches csproj to swap the dev self-signed thumbprint (`2399E9BF…`) for the real one
+   - `msbuild /t:Publish` with `/p:InstallUrl=https://platform.dev.marcus-law.co.il/outlook-addin/` and `/p:ApplicationVersion=<tag>.0`
+   - Uploads `publish.tar.gz` to Gitea generic registry (`outlook-addin-publish/<version>/publish.tar.gz`)
+   - Linux job downloads the tar.gz, builds a Docker image `outlook-addin-cdn:latest`, pushes to Gitea registry, calls Coolify to redeploy the CDN container
+   - Posts to Mattermost channel `git-verelasim` with the install URL on success / a failure link on failure
+5. Lawyers' installed Add-in checks the deployment manifest at the install URL every 7 days (configured in csproj `<UpdateInterval>7</UpdateInterval>`) or whenever they click "בדוק עדכונים" in Settings → אודות.
+
+**Semver policy:** PATCH for bug fixes (unilateral), MINOR for visible features (unilateral when warranted), MAJOR only with Chaim's explicit approval.
+
+**Branding (`KlearBranding` repo):** the product is presented to lawyers as **Klear** — title bars, MessageBox titles, ribbon group label, About header all say "Klear". The logo is mirrored from `espocrm-extensions/KlearBranding/files/client/custom/img/logo-klear.png` into `src/OutlookAddin.UI/Resources/logo-klear.png` and embedded as a WPF Resource. Brand accent color: `#121d2e` (dark navy).
+
+**What stays MarcusLaw under the hood (deliberate — preserves auto-update across the rebrand):**
+- ClickOnce app identity (`AssemblyName=MarcusLaw.OutlookAddin`)
+- `%APPDATA%\MarcusLaw\OutlookAddin\settings.json` and `creds.dat`
+- `%LOCALAPPDATA%\MarcusLaw\OutlookAddin\logs\`
+- `DpapiCredentialStore.EntropySeed = "MarcusLaw.OutlookAddin.v1"`
+- Code namespaces `MarcusLaw.OutlookAddin.*`
+- Named pipe `MarcusLaw.OutlookAddin`
+
+Changing any of these would orphan all existing installs and require a coordinated uninstall+reinstall on every lawyer's PC plus an entropy migration for DPAPI-encrypted credentials. See the LegalCRM rebrand misadventure in git history for what *not* to do.
+
+**Known traps when releasing:**
+- VS Publish wizard (Project Properties → Publish) **rewrites** csproj at every click — flips `<AutoIncrementApplicationRevision>` back to `true`, resets `<ApplicationVersion>` to whatever's in the UI, sometimes deletes prior `Application Files/<...>/` bundles. **Don't use it.** Tag and let CI do it.
+- There's an old `Publish/` directory in git history that was a parallel manual-release channel via `gitea.../raw/branch/main/Publish/`. It's **not the production install URL** — that's platform.dev. The folder was dropped in v1.2.0.
+
 ## Things deliberately deferred
 
 | What | When | Why deferred |
 |---|---|---|
-| Windows CI runner on Coolify | Until ClickOnce publish becomes useful | Local builds on dev's VS 2022 suffice through week 5 |
-| Code signing cert (self-signed) + GPO push to 10 PCs | Week 6 (before release) | IT task; cert isn't useful until we have something to sign |
-| ClickOnce hosting setup at `platform.dev.marcus-law.co.il/outlook-addin/` | Week 6 | No build artifacts yet |
-| Mattermost release notification webhook in CI | Week 6 | Coupled to CI runner |
+| Identity-level rebrand to a pure Klear product (AssemblyName, namespaces, DPAPI entropy, AppData paths) | Until there's another reason to force-reinstall on all 10 PCs | Visible rebrand already done in v1.2.0 without disrupting users; full rename trades aesthetic cleanliness for a day of IT coordination + lost credentials |
 
 ---
 

src/OutlookAddin.Core/Models/CaseEntity.cs

@@ -23,6 +23,13 @@ namespace MarcusLaw.OutlookAddin.Core.Models
         [JsonPropertyName("status")]
         public string? Status { get; set; }
 
+        // Marcus-Law custom field on Case — court file/docket number.
+        // Field name guessed from EspoCRM "c-prefixed PascalCase" convention;
+        // adjust if the admin used a different name.
+        [JsonPropertyName("cCourtCaseNumber")]
+        [JsonConverter(typeof(FlexibleStringConverter))]
+        public string? CourtCaseNumber { get; set; }
+
         [JsonPropertyName("accountId")]
         public string? AccountId { get; set; }
 

src/OutlookAddin.Core/Models/MatchResult.cs

@@ -17,6 +17,13 @@ namespace MarcusLaw.OutlookAddin.Core.Models
 
         public int CandidateCount { get; set; }
 
+        /// <summary>
+        /// When <see cref="IsAmbiguous"/> is true, holds the candidate
+        /// contacts that share the sender's email so the sidebar can show
+        /// a picker instead of bouncing the user into manual search.
+        /// </summary>
+        public List<ContactEntity> Candidates { get; set; } = new List<ContactEntity>();
+
         public DateTimeOffset RetrievedAt { get; set; } = DateTimeOffset.UtcNow;
     }
 }

src/OutlookAddin.Core/Services/AttachmentSaveService.cs

@@ -46,35 +46,17 @@ namespace MarcusLaw.OutlookAddin.Core.Services
                     continue;
                 }
 
+                string? attachmentId = null;
+                Exception? uploadException = null;
+
+                // Step 1: create the EspoCRM Attachment (binary stored in
+                // data/upload/<id>; not yet on the network share). Auth
+                // failures here are terminal — skip remaining items.
                 try
                 {
-                    // Step 1: create the EspoCRM Attachment (binary stored
-                    // in data/upload/<id>; not yet on the network share).
                     var uploaded = await _client.UploadAttachmentAsync(
                         att.Name, att.ContentType, att.ContentBase64, cancellationToken).ConfigureAwait(false);
-
-                    // Step 2: ask Marcus-Law's NetworkStorageIntegration
-                    // to place the uploaded blob under <targetFolderPath>.
-                    // The integration appends the filename to the path.
-                    await _client.UploadAttachmentToNetworkStorageAsync(
-                        uploaded.Id, trimmedFolder, cancellationToken).ConfigureAwait(false);
-
-                    // Step 3: verify the file actually landed on the share —
-                    // the server can return 200 yet leave nothing on disk
-                    // when a downstream WebDAV proxy silently fails. Read
-                    // the folder back and look for our filename.
-                    await VerifyArrivedAsync(att.Name, trimmedFolder, cancellationToken).ConfigureAwait(false);
-
-                    _logger.Information(
-                        "Saved attachment {Name} → {Path} (attachmentId={AttachmentId})",
-                        att.Name, trimmedFolder, uploaded.Id);
-
-                    summary.Items.Add(new AttachmentSaveItemResult
-                    {
-                        FileName = att.Name,
-                        Outcome = AttachmentSaveOutcome.Saved,
-                        AttachmentId = uploaded.Id
-                    });
+                    attachmentId = uploaded.Id;
                 }
                 catch (EspoCrmAuthorizationException ex)
                 {
@@ -86,20 +68,85 @@ namespace MarcusLaw.OutlookAddin.Core.Services
                         Outcome = AttachmentSaveOutcome.AuthRequired,
                         ErrorMessage = ex.Message
                     });
+                    continue;
                 }
-                catch (OperationCanceledException)
-                {
-                    throw;
-                }
+                catch (OperationCanceledException) { throw; }
                 catch (Exception ex)
                 {
-                    _logger.Warning(ex, "Attachment save failed for {Name}", att.Name);
+                    // No attachment ID means we have nothing on the share —
+                    // a hard fail.
+                    _logger.Warning(ex, "Attachment upload (Step 1) failed for {Name}", att.Name);
                     summary.Items.Add(new AttachmentSaveItemResult
                     {
                         FileName = att.Name,
                         Outcome = AttachmentSaveOutcome.Failed,
                         ErrorMessage = ex.Message
                     });
+                    continue;
+                }
+
+                // Step 2: ask the NetworkStorageIntegration to place the
+                // uploaded blob under <targetFolderPath>. The 15s Polly
+                // timeout sometimes fires while the server is still
+                // writing the file — capture the exception but don't
+                // decide the outcome yet.
+                try
+                {
+                    await _client.UploadAttachmentToNetworkStorageAsync(
+                        attachmentId, trimmedFolder, cancellationToken).ConfigureAwait(false);
+                }
+                catch (EspoCrmAuthorizationException ex)
+                {
+                    _logger.Warning(ex, "Attachment save aborted on Step 2: EspoCRM rejected credentials");
+                    summary.AuthRequired = true;
+                    summary.Items.Add(new AttachmentSaveItemResult
+                    {
+                        FileName = att.Name,
+                        Outcome = AttachmentSaveOutcome.AuthRequired,
+                        ErrorMessage = ex.Message
+                    });
+                    continue;
+                }
+                catch (OperationCanceledException) { throw; }
+                catch (Exception ex)
+                {
+                    uploadException = ex;
+                    _logger.Warning(ex,
+                        "Attachment NetworkStorage upload (Step 2) reported failure for {Name}; will verify disk before declaring failure",
+                        att.Name);
+                }
+
+                // Step 3: verify on disk. Authoritative — if the file is
+                // there, the save succeeded regardless of what Step 2
+                // reported (Polly timeouts during large writes are common).
+                var verified = await VerifyArrivedWithRetryAsync(
+                    att.Name, trimmedFolder, uploadException != null, cancellationToken).ConfigureAwait(false);
+
+                if (verified)
+                {
+                    _logger.Information(
+                        "Saved attachment {Name} → {Path} (attachmentId={AttachmentId}, uploadException={HadException})",
+                        att.Name, trimmedFolder, attachmentId, uploadException != null);
+                    summary.Items.Add(new AttachmentSaveItemResult
+                    {
+                        FileName = att.Name,
+                        Outcome = AttachmentSaveOutcome.Saved,
+                        AttachmentId = attachmentId
+                    });
+                }
+                else
+                {
+                    var message = uploadException?.Message
+                                  ?? "Server reported success but the file is not on the share.";
+                    _logger.Warning(
+                        "Attachment save Failed for {Name}: not present after verify (uploadException={Msg})",
+                        att.Name, message);
+                    summary.Items.Add(new AttachmentSaveItemResult
+                    {
+                        FileName = att.Name,
+                        Outcome = AttachmentSaveOutcome.Failed,
+                        ErrorMessage = message
+                    });
                 }
             }
 
@@ -107,51 +154,60 @@ namespace MarcusLaw.OutlookAddin.Core.Services
         }
 
         /// <summary>
-        /// Post-upload sanity check: list the folder we just wrote into
-        /// and confirm a file with the same (possibly sanitized) name
-        /// shows up. Diagnostic only — does not change the outcome. If
-        /// the file isn't there, log a WARNING with everything that IS
-        /// in the folder so we can spot the actual server-side path.
+        /// Authoritative post-upload check. Returns true if the file is on
+        /// disk under <paramref name="folderPath"/>. When the upload call
+        /// raised (typically Polly's 15s timeout on a still-writing server),
+        /// we retry the listing a few times so the server gets a chance
+        /// to finish.
         /// </summary>
-        private async Task VerifyArrivedAsync(string expectedName, string folderPath, CancellationToken ct)
+        private async Task<bool> VerifyArrivedWithRetryAsync(string expectedName, string folderPath, bool afterFailure, CancellationToken ct)
+        {
+            // When the upload appeared to succeed, one check is plenty — the
+            // file is already there. When it appeared to fail, the server
+            // may still be writing; give it a few extra seconds.
+            var attempts = afterFailure ? 4 : 1;
+            var delay = TimeSpan.FromSeconds(2);
+
+            for (int i = 0; i < attempts; i++)
+            {
+                ct.ThrowIfCancellationRequested();
+                if (i > 0) await Task.Delay(delay, ct).ConfigureAwait(false);
+
+                if (await IsPresentAsync(expectedName, folderPath, ct).ConfigureAwait(false))
+                {
+                    if (i > 0)
+                    {
+                        _logger.Information(
+                            "Post-upload verify: '{Expected}' appeared under '{Path}' on attempt {Attempt}/{Total} despite upload exception",
+                            expectedName, folderPath, i + 1, attempts);
+                    }
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        private async Task<bool> IsPresentAsync(string expectedName, string folderPath, CancellationToken ct)
         {
             try
             {
                 var items = await _client.ListNetworkStorageFolderAsync(folderPath, ct).ConfigureAwait(false);
                 var trimmedExpected = expectedName.Trim().TrimStart('-', ' ').TrimEnd('-', ' ');
-                bool found = false;
                 foreach (var it in items)
                 {
                     if (it.IsFolder) continue;
                     if (string.Equals(it.Name, expectedName, StringComparison.Ordinal) ||
                         string.Equals(it.Name, trimmedExpected, StringComparison.Ordinal))
                     {
-                        found = true;
-                        break;
+                        return true;
                     }
                 }
-                if (!found)
-                {
-                    var names = new List<string>();
-                    foreach (var it in items)
-                    {
-                        if (it.IsFolder) continue;
-                        names.Add(it.Name);
-                    }
-                    _logger.Warning(
-                        "Post-upload verify: expected '{Expected}' under '{Path}' but it's NOT in the listing. " +
-                        "Server reported the upload as successful but the file is not on the share. " +
-                        "Files currently in that folder: [{Files}]",
-                        expectedName, folderPath, string.Join(", ", names));
-                }
-                else
-                {
-                    _logger.Information("Post-upload verify: '{Expected}' present under '{Path}'", expectedName, folderPath);
-                }
+                return false;
             }
             catch (Exception ex)
             {
-                _logger.Warning(ex, "Post-upload verify failed for '{Expected}' under '{Path}'", expectedName, folderPath);
+                _logger.Warning(ex, "Post-upload listing under '{Path}' failed", folderPath);
+                return false;
             }
         }
     }

src/OutlookAddin.Core/Services/IMatchingService.cs

@@ -13,6 +13,15 @@ namespace MarcusLaw.OutlookAddin.Core.Services
         /// </summary>
         Task<MatchResult?> LookupAsync(string senderEmail, CancellationToken cancellationToken = default);
 
+        /// <summary>
+        /// Loads the full contact + account + recent-cases bundle for a
+        /// specific contact id. Used when the sender's email matches
+        /// multiple contacts and the user picks one from the candidate
+        /// list — we then drill into that contact's cases without
+        /// dropping back to manual search.
+        /// </summary>
+        Task<MatchResult?> LookupContactAsync(string contactId, string? senderEmail = null, CancellationToken cancellationToken = default);
+
         void Invalidate(string senderEmail);
     }
 }

src/OutlookAddin.Core/Services/MatchingService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using MarcusLaw.OutlookAddin.Core.Models;
@@ -44,60 +45,51 @@ namespace MarcusLaw.OutlookAddin.Core.Services
                     return null;
                 }
 
-                if (matches.Count > 1)
+                // EspoCRM's /EmailAddress/search can return the same Contact
+                // more than once when the contact has the searched-for
+                // address registered under multiple emailAddressData rows.
+                // Dedupe by Id so the sidebar shows one row per unique person.
+                var distinctIds = matches
+                    .Where(m => !string.IsNullOrWhiteSpace(m.Id))
+                    .Select(m => m.Id)
+                    .Distinct(StringComparer.Ordinal)
+                    .Take(20)
+                    .ToList();
+
+                if (distinctIds.Count == 0)
                 {
-                    var ambiguous = new MatchResult
-                    {
-                        SenderEmail = senderEmail,
-                        IsAmbiguous = true,
-                        CandidateCount = matches.Count
-                    };
-                    _cache.Set<MatchResult?>(key, ambiguous, CacheExpiry);
-                    return ambiguous;
+                    _cache.Set(key, (MatchResult?)null, CacheExpiry);
+                    return null;
                 }
 
-                var contactRef = matches[0];
-                var contact = await _client.GetContactAsync(contactRef.Id, ContactSelect, cancellationToken).ConfigureAwait(false);
-
-                AccountEntity? account = null;
-                if (!string.IsNullOrWhiteSpace(contact.AccountId))
+                if (distinctIds.Count == 1)
                 {
-                    try
-                    {
-                        account = await _client.GetAccountAsync(contact.AccountId!, "id,name,emailAddress", cancellationToken).ConfigureAwait(false);
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.Warning(ex, "MatchingService: failed to load account {AccountId} for {Email}", contact.AccountId, senderEmail);
-                    }
+                    var single = await LoadContactBundleAsync(distinctIds[0], senderEmail, cancellationToken).ConfigureAwait(false);
+                    _cache.Set<MatchResult?>(key, single, CacheExpiry);
+                    return single;
                 }
 
-                var cases = new System.Collections.Generic.List<CaseEntity>();
-                try
-                {
-                    // Pull up to 50 cases per contact so the sidebar can show the
-                    // whole list, not just the 5 most recent. 50 is well below the
-                    // EspoCRM default page limit and large enough for any realistic
-                    // attorney/contact relationship.
-                    var list = await _client.ListCasesForContactAsync(contact.Id, 50, cancellationToken).ConfigureAwait(false);
-                    cases.AddRange(list.List);
-                }
-                catch (Exception ex)
-                {
-                    _logger.Warning(ex, "MatchingService: failed to list cases for {ContactId}", contact.Id);
-                }
+                // Two or more genuinely distinct contacts. Fetch each one's
+                // full record (in parallel) so the picker can show real
+                // name + account, not just the bare email payload.
+                var fetched = await Task.WhenAll(
+                    distinctIds.Select(id => SafeGetContactAsync(id, cancellationToken))
+                ).ConfigureAwait(false);
 
-                var result = new MatchResult
+                var candidates = fetched
+                    .Where(c => c != null && !string.IsNullOrWhiteSpace(c!.Id))
+                    .Select(c => c!)
+                    .ToList();
+
+                var ambiguous = new MatchResult
                 {
                     SenderEmail = senderEmail,
-                    Contact = contact,
-                    Account = account,
-                    RecentCases = cases,
-                    CandidateCount = 1
+                    IsAmbiguous = true,
+                    CandidateCount = candidates.Count,
+                    Candidates = candidates
                 };
-
-                _cache.Set<MatchResult?>(key, result, CacheExpiry);
-                return result;
+                _cache.Set<MatchResult?>(key, ambiguous, CacheExpiry);
+                return ambiguous;
             }
             catch (EspoCrmAuthorizationException)
             {
@@ -114,6 +106,86 @@ namespace MarcusLaw.OutlookAddin.Core.Services
             }
         }
 
+        public async Task<MatchResult?> LookupContactAsync(string contactId, string? senderEmail = null, CancellationToken cancellationToken = default)
+        {
+            if (string.IsNullOrWhiteSpace(contactId)) return null;
+
+            try
+            {
+                return await LoadContactBundleAsync(contactId, senderEmail ?? string.Empty, cancellationToken).ConfigureAwait(false);
+            }
+            catch (EspoCrmAuthorizationException)
+            {
+                throw;
+            }
+            catch (OperationCanceledException)
+            {
+                throw;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "MatchingService: LookupContactAsync failed for {ContactId}", contactId);
+                return null;
+            }
+        }
+
+        private async Task<MatchResult> LoadContactBundleAsync(string contactId, string senderEmail, CancellationToken cancellationToken)
+        {
+            var contact = await _client.GetContactAsync(contactId, ContactSelect, cancellationToken).ConfigureAwait(false);
+
+            AccountEntity? account = null;
+            if (!string.IsNullOrWhiteSpace(contact.AccountId))
+            {
+                try
+                {
+                    account = await _client.GetAccountAsync(contact.AccountId!, "id,name,emailAddress", cancellationToken).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _logger.Warning(ex, "MatchingService: failed to load account {AccountId} for contact {ContactId}", contact.AccountId, contactId);
+                }
+            }
+
+            var cases = new System.Collections.Generic.List<CaseEntity>();
+            try
+            {
+                // Pull up to 50 cases per contact so the sidebar can show the
+                // whole list, not just the 5 most recent. 50 is well below the
+                // EspoCRM default page limit and large enough for any realistic
+                // attorney/contact relationship.
+                var list = await _client.ListCasesForContactAsync(contact.Id, 50, cancellationToken).ConfigureAwait(false);
+                cases.AddRange(list.List);
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "MatchingService: failed to list cases for {ContactId}", contact.Id);
+            }
+
+            return new MatchResult
+            {
+                SenderEmail = senderEmail,
+                Contact = contact,
+                Account = account,
+                RecentCases = cases,
+                CandidateCount = 1
+            };
+        }
+
+        private async Task<ContactEntity?> SafeGetContactAsync(string contactId, CancellationToken cancellationToken)
+        {
+            try
+            {
+                return await _client.GetContactAsync(contactId, ContactSelect, cancellationToken).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) { throw; }
+            catch (EspoCrmAuthorizationException) { throw; }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "MatchingService: candidate contact fetch failed for {Id}", contactId);
+                return null;
+            }
+        }
+
         public void Invalidate(string senderEmail)
         {
             if (string.IsNullOrWhiteSpace(senderEmail)) return;

src/OutlookAddin.UI/Converters/EntityTypeToHebrewConverter.cs

@@ -84,6 +84,10 @@ namespace MarcusLaw.OutlookAddin.UI.Converters
                 ["New"] = "חדש",
                 ["Assigned"] = "הוקצה",
                 ["Pending"] = "ממתין",
+                ["PendingHearing"] = "ממתין לדיון",
+                ["Pending Hearing"] = "ממתין לדיון",
+                ["PendingDecision"] = "ממתין להחלטה",
+                ["Pending Decision"] = "ממתין להחלטה",
                 ["In Progress"] = "בטיפול",
                 ["InProgress"] = "בטיפול",
                 ["Open"] = "פתוח",

src/OutlookAddin.UI/Dialogs/SaveAttachmentsDialog.xaml

@@ -1,6 +1,7 @@
 <Window x:Class="MarcusLaw.OutlookAddin.UI.Dialogs.SaveAttachmentsDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:conv="clr-namespace:MarcusLaw.OutlookAddin.UI.Converters"
         Title="שמור קבצים מצורפים ל-Klear"
         Height="560" Width="620"
         MinHeight="420" MinWidth="500"
@@ -11,6 +12,9 @@
         Background="#F8FAFC"
         FontFamily="Segoe UI, David, Frank Ruehl, Arial">
     <Window.Resources>
+        <conv:CaseStatusToHebrewConverter x:Key="CaseStatusHe" />
+        <BooleanToVisibilityConverter x:Key="BoolToVis" />
+
         <SolidColorBrush x:Key="Primary"      Color="#2563EB" />
         <SolidColorBrush x:Key="PrimaryHover" Color="#1D4ED8" />
         <SolidColorBrush x:Key="Border"       Color="#E2E8F0" />
@@ -80,32 +84,28 @@
             </Setter>
         </Style>
 
-        <Style x:Key="CaseItem" TargetType="ListBoxItem">
-            <Setter Property="Padding" Value="0" />
-            <Setter Property="Margin" Value="0" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="ListBoxItem">
-                        <Border x:Name="Bd" Background="{TemplateBinding Background}" CornerRadius="4"
-                                Margin="2,1" Padding="8,6">
-                            <ContentPresenter />
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource HoverBg}" />
-                            </Trigger>
-                            <Trigger Property="IsSelected" Value="True">
-                                <Setter TargetName="Bd" Property="Background" Value="{StaticResource SelectedBg}" />
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
     </Window.Resources>
 
-    <Grid Margin="16">
+    <Grid Margin="16" x:Name="RootGrid">
+        <Grid.Resources>
+            <Style x:Key="CaseGrid" TargetType="DataGrid">
+                <Setter Property="AutoGenerateColumns" Value="False" />
+                <Setter Property="HeadersVisibility" Value="Column" />
+                <Setter Property="GridLinesVisibility" Value="Horizontal" />
+                <Setter Property="HorizontalGridLinesBrush" Value="#E2E8F0" />
+                <Setter Property="RowBackground" Value="White" />
+                <Setter Property="AlternatingRowBackground" Value="#F8FAFC" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="CanUserAddRows" Value="False" />
+                <Setter Property="CanUserDeleteRows" Value="False" />
+                <Setter Property="CanUserResizeRows" Value="False" />
+                <Setter Property="CanUserReorderColumns" Value="False" />
+                <Setter Property="SelectionMode" Value="Single" />
+                <Setter Property="SelectionUnit" Value="FullRow" />
+                <Setter Property="IsReadOnly" Value="True" />
+                <Setter Property="RowHeight" Value="30" />
+            </Style>
+        </Grid.Resources>
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
@@ -130,32 +130,38 @@
 
         <!-- Cases -->
         <Border Grid.Row="1" Style="{StaticResource Card}">
-            <ListBox ItemsSource="{Binding Cases}"
-                     SelectedItem="{Binding SelectedCase}"
-                     BorderThickness="0"
-                     Background="Transparent"
-                     ItemContainerStyle="{StaticResource CaseItem}"
-                     Padding="4">
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <StackPanel>
-                            <TextBlock FontSize="13">
-                                <Run Text="[" /><Run Text="{Binding Number, Mode=OneWay}" /><Run Text="] " />
-                                <Run Text="{Binding Name, Mode=OneWay}" FontWeight="SemiBold" />
-                            </TextBlock>
-                        </StackPanel>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+            <DataGrid ItemsSource="{Binding Cases}"
+                      SelectedItem="{Binding SelectedCase}"
+                      Style="{StaticResource CaseGrid}">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="מס׳ תיק" Binding="{Binding Number}" Width="80" />
+                    <DataGridTextColumn Header="שם" Binding="{Binding Name}" Width="*" />
+                    <DataGridTextColumn Header="מס׳ בבית משפט" Binding="{Binding CourtCaseNumber}" Width="140" />
+                    <DataGridTextColumn Header="סטטוס" Binding="{Binding Status, Converter={StaticResource CaseStatusHe}}" Width="110" />
+                </DataGrid.Columns>
+            </DataGrid>
         </Border>
 
         <!-- Folder -->
         <DockPanel Grid.Row="2" Margin="0,10,0,0" LastChildFill="True">
             <TextBlock DockPanel.Dock="Left" Text="תיקייה:" VerticalAlignment="Center"
                        Margin="0,0,8,0" Foreground="{StaticResource Muted}" FontSize="12" />
+            <TextBlock DockPanel.Dock="Right" Text="טוען…" VerticalAlignment="Center"
+                       Margin="8,0,0,0" Foreground="{StaticResource Muted}" FontSize="12"
+                       Visibility="{Binding IsLoadingSubfolders, Converter={StaticResource BoolToVis}}" />
             <ComboBox ItemsSource="{Binding Subfolders}"
                       SelectedItem="{Binding SelectedSubfolder}"
-                      Padding="6,4" />
+                      Padding="6,4">
+                <ComboBox.Style>
+                    <Style TargetType="ComboBox">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding IsLoadingSubfolders}" Value="True">
+                                <Setter Property="IsEnabled" Value="False" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </ComboBox.Style>
+            </ComboBox>
         </DockPanel>
 
         <!-- Attachments header -->
@@ -178,10 +184,20 @@
                                            FontSize="11"
                                            VerticalAlignment="Center"
                                            Margin="8,0,0,0" />
-                                <TextBlock Text="{Binding FileName}"
+                                <TextBlock Text="{Binding Extension}"
+                                           DockPanel.Dock="Left"
+                                           Foreground="{StaticResource Muted}"
+                                           FontSize="12"
                                            VerticalAlignment="Center"
-                                           TextTrimming="CharacterEllipsis"
-                                           Margin="8,0,0,0" />
+                                           Margin="6,0,0,0" />
+                                <TextBox Text="{Binding BaseName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                                         IsEnabled="{Binding IsSelected}"
+                                         VerticalAlignment="Center"
+                                         BorderThickness="1"
+                                         BorderBrush="{StaticResource Border}"
+                                         Padding="6,3"
+                                         Margin="8,0,0,0"
+                                         ToolTip="לחץ כדי לערוך את שם הקובץ (הסיומת נשמרת אוטומטית)" />
                             </DockPanel>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>

src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml

@@ -98,8 +98,19 @@
 
             <TabItem Header="אודות">
                 <StackPanel Margin="16">
-                    <TextBlock Text="Marcus-Law OutlookAddin" FontWeight="Bold" FontSize="16" />
-                    <TextBlock Text="תוסף Klear ל-Microsoft Outlook" Margin="0,4,0,12" />
+                    <Border Background="#121d2e" CornerRadius="6" Padding="14,12" Margin="0,0,0,12">
+                        <DockPanel LastChildFill="True">
+                            <Image DockPanel.Dock="Right"
+                                   Source="pack://application:,,,/MarcusLaw.OutlookAddin.UI;component/Resources/logo-klear.png"
+                                   Height="36"
+                                   Margin="12,0,0,0"
+                                   VerticalAlignment="Center" />
+                            <StackPanel VerticalAlignment="Center">
+                                <TextBlock Text="Klear" Foreground="White" FontWeight="Bold" FontSize="18" />
+                                <TextBlock Text="תוסף ל-Microsoft Outlook" Foreground="#CBD5E1" FontSize="12" />
+                            </StackPanel>
+                        </DockPanel>
+                    </Border>
                     <DockPanel LastChildFill="False" Margin="0,0,0,4">
                         <TextBlock DockPanel.Dock="Left" Text="{Binding VersionLine}" Foreground="Gray" VerticalAlignment="Center" />
                         <Button DockPanel.Dock="Right"
@@ -112,10 +123,22 @@
                                Foreground="{Binding UpdateStatusBrush}"
                                TextWrapping="Wrap"
                                Margin="0,4,0,0" />
-                    <TextBlock Margin="0,16,0,0" TextWrapping="Wrap"
-                               Text="לוגים: %LOCALAPPDATA%\MarcusLaw\OutlookAddin\logs" />
-                    <TextBlock TextWrapping="Wrap"
-                               Text="הגדרות: %APPDATA%\MarcusLaw\OutlookAddin\settings.json" />
+                    <TextBlock Margin="0,16,0,0" TextWrapping="Wrap">
+                        <Run Text="לוגים: " />
+                        <Hyperlink Tag="%LOCALAPPDATA%\MarcusLaw\OutlookAddin\logs"
+                                   Click="OnOpenFolderHyperlink"
+                                   ToolTip="פתח את התיקייה ב-Explorer">
+                            <Run Text="%LOCALAPPDATA%\MarcusLaw\OutlookAddin\logs" />
+                        </Hyperlink>
+                    </TextBlock>
+                    <TextBlock TextWrapping="Wrap">
+                        <Run Text="הגדרות: " />
+                        <Hyperlink Tag="%APPDATA%\MarcusLaw\OutlookAddin"
+                                   Click="OnOpenFolderHyperlink"
+                                   ToolTip="פתח את התיקייה ב-Explorer">
+                            <Run Text="%APPDATA%\MarcusLaw\OutlookAddin\settings.json" />
+                        </Hyperlink>
+                    </TextBlock>
                 </StackPanel>
             </TabItem>
         </TabControl>

src/OutlookAddin.UI/Dialogs/SettingsDialog.xaml.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Diagnostics;
+using System.IO;
 using System.Windows;
+using System.Windows.Documents;
 using MarcusLaw.OutlookAddin.UI.ViewModels;
 
 namespace MarcusLaw.OutlookAddin.UI.Dialogs
@@ -40,5 +43,23 @@ namespace MarcusLaw.OutlookAddin.UI.Dialogs
             DialogResult = _viewModel?.DialogResult;
             Close();
         }
+
+        private void OnOpenFolderHyperlink(object sender, RoutedEventArgs e)
+        {
+            if (!(sender is Hyperlink h) || !(h.Tag is string raw)) return;
+            try
+            {
+                var path = Environment.ExpandEnvironmentVariables(raw);
+                // Create the folder lazily so the link works even on the very
+                // first run, before any log has been written.
+                if (!Directory.Exists(path)) Directory.CreateDirectory(path);
+                Process.Start(new ProcessStartInfo("explorer.exe", "\"" + path + "\"") { UseShellExecute = true });
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("פתיחת התיקייה נכשלה: " + ex.Message, "Klear",
+                    MessageBoxButton.OK, MessageBoxImage.Warning);
+            }
+        }
     }
 }

src/OutlookAddin.UI/OutlookAddin.UI.csproj

@@ -25,4 +25,8 @@
     <ProjectReference Include="..\OutlookAddin.Core\OutlookAddin.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Resource Include="Resources\logo-klear.png" />
+  </ItemGroup>
+
 </Project>

src/OutlookAddin.UI/ViewModels/AttachmentRowViewModel.cs

@@ -1,3 +1,4 @@
+using System.IO;
 using CommunityToolkit.Mvvm.ComponentModel;
 using MarcusLaw.OutlookAddin.Core.Models;
 
@@ -10,6 +11,34 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         [ObservableProperty]
         private bool isSelected = true;
 
+        /// <summary>
+        /// Frozen at construction from the original filename. The user
+        /// edits only the base name; the extension always tags along.
+        /// </summary>
+        public string Extension { get; }
+
+        /// <summary>
+        /// Editable base name without the extension. Setting this rewrites
+        /// <see cref="EspoAttachment.Name"/> as &lt;basename&gt;&lt;Extension&gt;.
+        /// </summary>
+        public string BaseName
+        {
+            get => Path.GetFileNameWithoutExtension(Data.Name) ?? string.Empty;
+            set
+            {
+                var newBase = (value ?? string.Empty).Trim();
+                var newFull = newBase + Extension;
+                if (Data.Name == newFull) return;
+                Data.Name = newFull;
+                OnPropertyChanged();
+                OnPropertyChanged(nameof(FileName));
+            }
+        }
+
+        /// <summary>
+        /// Full filename including extension — what actually goes to the
+        /// server. Read-only mirror of <see cref="EspoAttachment.Name"/>.
+        /// </summary>
         public string FileName => Data.Name;
 
         public string SizeDisplay { get; }
@@ -17,6 +46,7 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         public AttachmentRowViewModel(EspoAttachment data)
         {
             Data = data;
+            Extension = Path.GetExtension(data.Name) ?? string.Empty;
             SizeDisplay = ComputeSize(data.ContentBase64);
         }
 

src/OutlookAddin.UI/ViewModels/ReadingPaneViewModel.cs

@@ -30,6 +30,9 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         private readonly IMatchingService _matchingService;
         private readonly ILogger _logger;
         private CancellationTokenSource? _activeLookup;
+        // Stashes the ambiguous MatchResult while the user is drilling into
+        // one of its candidates, so the "→ חזור" button can restore it.
+        private MatchResult? _ambiguousReturnTarget;
 
         [ObservableProperty]
         private ReadingPaneState state = ReadingPaneState.Empty;
@@ -51,6 +54,8 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
 
         public ObservableCollection<CaseEntity> RecentCases { get; } = new ObservableCollection<CaseEntity>();
 
+        public ObservableCollection<ContactEntity> Candidates { get; } = new ObservableCollection<ContactEntity>();
+
         public Visibility EmptyVisibility => Vis(State == ReadingPaneState.Empty);
         public Visibility LoadingVisibility => Vis(State == ReadingPaneState.Loading);
         public Visibility MatchVisibility => Vis(State == ReadingPaneState.Match);
@@ -61,6 +66,22 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         public Visibility NoCasesVisibility => Vis(State == ReadingPaneState.Match && RecentCases.Count == 0);
         public Visibility ActionsVisibility => Vis(State == ReadingPaneState.Match);
 
+        /// <summary>
+        /// True when the matched contact has 2+ linked cases. The sidebar
+        /// uses this to hide the bottom "תייק לתיק הזה" button (which is
+        /// ambiguous in that scenario) and to surface the per-row "תייק"
+        /// buttons that let the user pick which case to file to.
+        /// </summary>
+        public Visibility MultiCaseHintVisibility => Vis(State == ReadingPaneState.Match && RecentCases.Count >= 2);
+        public Visibility SingleCaseFileVisibility => Vis(State == ReadingPaneState.Match && RecentCases.Count == 1);
+
+        /// <summary>
+        /// "→ חזור לרשימת אנשי קשר" is only shown when the user drilled
+        /// into a candidate from the ambiguous picker; not in a normal
+        /// single-match lookup.
+        /// </summary>
+        public Visibility BackToCandidatesVisibility => Vis(State == ReadingPaneState.Match && _ambiguousReturnTarget != null);
+
         /// <summary>
         /// Raised when the user clicks "File to this case" (carries the chosen
         /// MatchResult.Contact / RecentCases pick) or "File elsewhere" (null).
@@ -89,6 +110,9 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             OnPropertyChanged(nameof(ErrorVisibility));
             OnPropertyChanged(nameof(ActionsVisibility));
             OnPropertyChanged(nameof(NoCasesVisibility));
+            OnPropertyChanged(nameof(MultiCaseHintVisibility));
+            OnPropertyChanged(nameof(SingleCaseFileVisibility));
+            OnPropertyChanged(nameof(BackToCandidatesVisibility));
             FileToThisCommand.NotifyCanExecuteChanged();
             FileElsewhereCommand.NotifyCanExecuteChanged();
             OpenInEspoCrmCommand.NotifyCanExecuteChanged();
@@ -101,8 +125,16 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             {
                 foreach (var c in value.RecentCases) RecentCases.Add(c);
             }
+            Candidates.Clear();
+            if (value?.Candidates != null)
+            {
+                foreach (var c in value.Candidates) Candidates.Add(c);
+            }
             OnPropertyChanged(nameof(AccountVisibility));
             OnPropertyChanged(nameof(NoCasesVisibility));
+            OnPropertyChanged(nameof(MultiCaseHintVisibility));
+            OnPropertyChanged(nameof(SingleCaseFileVisibility));
+            OnPropertyChanged(nameof(BackToCandidatesVisibility));
         }
 
         public void Reset()
@@ -112,6 +144,7 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             Match = null;
             ErrorMessage = null;
             AmbiguousMessage = null;
+            _ambiguousReturnTarget = null;
             State = ReadingPaneState.Empty;
         }
 
@@ -125,6 +158,8 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             }
 
             SenderEmail = senderEmail;
+            // New email selection — drop any stashed candidate-list state.
+            _ambiguousReturnTarget = null;
             State = ReadingPaneState.Loading;
 
             var cts = new CancellationTokenSource();
@@ -182,7 +217,28 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             FileRequested?.Invoke(this, new FileFromSidebarEventArgs(Match!));
         }
 
-        private bool CanFileToThis() => State == ReadingPaneState.Match && Match?.Contact != null;
+        // Bottom "תייק לתיק הזה" only makes sense with exactly one linked
+        // case. 0 cases → nothing to file to; 2+ cases → ambiguous, the
+        // per-row "תייק" buttons handle the pick.
+        private bool CanFileToThis() => State == ReadingPaneState.Match && Match?.Contact != null && RecentCases.Count == 1;
+
+        [RelayCommand]
+        private void FileToCase(CaseEntity? caseEntity)
+        {
+            if (caseEntity == null || string.IsNullOrWhiteSpace(caseEntity.Id) || Match == null) return;
+            // Build a synthetic MatchResult so the host's
+            // TryResolveSidebarAutoTarget path sees exactly one case and
+            // auto-files without re-opening the search dialog.
+            var synthetic = new MatchResult
+            {
+                SenderEmail = Match.SenderEmail,
+                Contact = Match.Contact,
+                Account = Match.Account,
+                RecentCases = new System.Collections.Generic.List<CaseEntity> { caseEntity },
+                CandidateCount = 1
+            };
+            FileRequested?.Invoke(this, new FileFromSidebarEventArgs(synthetic));
+        }
 
         [RelayCommand(CanExecute = nameof(CanFileElsewhere))]
         private void FileElsewhere()
@@ -202,12 +258,88 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
 
         private bool CanOpenInCrm() => State == ReadingPaneState.Match && Match?.Contact != null;
 
+        [RelayCommand]
+        private void OpenCaseInCrm(CaseEntity? caseEntity)
+        {
+            if (string.IsNullOrWhiteSpace(EspoCrmBaseUrl) || caseEntity == null || string.IsNullOrWhiteSpace(caseEntity.Id)) return;
+            var url = EspoCrmBaseUrl!.TrimEnd('/') + "/#Case/view/" + caseEntity.Id;
+            OpenInBrowserRequested?.Invoke(this, url);
+        }
+
         [RelayCommand]
         private void OpenManualSearch()
         {
             FileRequested?.Invoke(this, new FileFromSidebarEventArgs(null));
         }
 
+        [RelayCommand]
+        private void BackToCandidates()
+        {
+            if (_ambiguousReturnTarget == null) return;
+            var stash = _ambiguousReturnTarget;
+            // Clear stash before we re-enter Ambiguous so visibility refresh
+            // (triggered by OnMatchChanged) sees the cleared state and hides
+            // the back button until the user drills in again.
+            _ambiguousReturnTarget = null;
+            Match = stash;
+            AmbiguousMessage = $"נמצאו {stash.CandidateCount} אנשי קשר עם הכתובת הזו.";
+            State = ReadingPaneState.Ambiguous;
+        }
+
+        /// <summary>
+        /// User picked one of the ambiguous candidates from the sidebar.
+        /// Load that contact's full bundle (account + cases) and transition
+        /// to the Match state so the user can pick a case or file.
+        /// </summary>
+        [RelayCommand]
+        private async Task SelectCandidateAsync(ContactEntity? candidate)
+        {
+            if (candidate == null || string.IsNullOrWhiteSpace(candidate.Id)) return;
+
+            CancelInFlight();
+            var cts = new CancellationTokenSource();
+            _activeLookup = cts;
+
+            var rememberedEmail = SenderEmail;
+            // Stash the ambiguous result so "→ חזור" can restore it.
+            if (Match?.IsAmbiguous == true)
+            {
+                _ambiguousReturnTarget = Match;
+            }
+            State = ReadingPaneState.Loading;
+
+            try
+            {
+                var result = await _matchingService.LookupContactAsync(candidate.Id, rememberedEmail, cts.Token).ConfigureAwait(true);
+                if (cts.IsCancellationRequested) return;
+
+                if (result == null || result.Contact == null)
+                {
+                    ErrorMessage = "טעינת איש הקשר נכשלה.";
+                    State = ReadingPaneState.Error;
+                    return;
+                }
+
+                Match = result;
+                State = ReadingPaneState.Match;
+            }
+            catch (OperationCanceledException)
+            {
+                // Selection changed before lookup finished — ignore.
+            }
+            catch (EspoCrmAuthorizationException)
+            {
+                ErrorMessage = "מפתח ה-API נדחה. עדכן בהגדרות.";
+                State = ReadingPaneState.Error;
+            }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "ReadingPaneViewModel.SelectCandidateAsync failed for {ContactId}", candidate.Id);
+                ErrorMessage = "שגיאת התחברות לשרת.";
+                State = ReadingPaneState.Error;
+            }
+        }
+
         private static Visibility Vis(bool show) => show ? Visibility.Visible : Visibility.Collapsed;
     }
 

src/OutlookAddin.UI/ViewModels/SaveAttachmentsViewModel.cs

@@ -45,6 +45,9 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         [ObservableProperty]
         private string? statusMessage;
 
+        [ObservableProperty]
+        private bool isLoadingSubfolders;
+
         /// <summary>
         /// Resolved server-side case folder path for the currently
         /// selected case (e.g. "47-אריאל מונאס"). Populated by
@@ -140,6 +143,19 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             var c = SelectedCase;
             if (c == null || string.IsNullOrEmpty(c.Id)) return;
 
+            IsLoadingSubfolders = true;
+            try
+            {
+                await RefreshSubfoldersCoreAsync(c).ConfigureAwait(true);
+            }
+            finally
+            {
+                IsLoadingSubfolders = false;
+            }
+        }
+
+        private async Task RefreshSubfoldersCoreAsync(CaseEntity c)
+        {
             try { await _client.EnsureCaseSubfoldersAsync(c.Id).ConfigureAwait(true); }
             catch (Exception ex) { _logger.Warning(ex, "EnsureCaseSubfolders failed; subfolders may be missing on disk"); }
 
@@ -237,6 +253,27 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             return name.Trim(' ', '-');
         }
 
+        private async Task<CaseEntity?> LoadCaseRowAsync(EspoEntityRef hit, CancellationToken ct)
+        {
+            var row = new CaseEntity { Id = hit.Id, Name = hit.Name };
+            if (string.IsNullOrEmpty(hit.Id)) return row;
+            try
+            {
+                var detail = await _client.GetCaseAsync(
+                    hit.Id, "id,name,number,status,cCourtCaseNumber", ct).ConfigureAwait(false);
+                row.Number = detail.Number;
+                row.Status = detail.Status;
+                row.CourtCaseNumber = detail.CourtCaseNumber;
+                if (!string.IsNullOrEmpty(detail.Name)) row.Name = detail.Name;
+            }
+            catch (OperationCanceledException) { throw; }
+            catch (Exception ex)
+            {
+                _logger.Warning(ex, "Hydrating case {CaseId} for picker failed", hit.Id);
+            }
+            return row;
+        }
+
         private async Task SearchAsync(string query, CancellationToken ct)
         {
             try
@@ -255,20 +292,32 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
                 ct.ThrowIfCancellationRequested();
 
                 Cases.Clear();
-                int kept = 0;
+                var caseHits = new List<EspoEntityRef>();
                 foreach (var hit in search.List)
                 {
-                    if (!string.Equals(hit.EntityType, "Case", StringComparison.OrdinalIgnoreCase)) continue;
-                    Cases.Add(new CaseEntity
-                    {
-                        Id = hit.Id,
-                        Name = hit.Name
-                    });
-                    kept++;
+                    if (string.Equals(hit.EntityType, "Case", StringComparison.OrdinalIgnoreCase))
+                        caseHits.Add(hit);
                 }
-                StatusMessage = kept == 0
-                    ? "אין תוצאות מסוג תיק (Case)"
-                    : $"נמצאו {kept} תיקים";
+
+                if (caseHits.Count == 0)
+                {
+                    StatusMessage = "אין תוצאות מסוג תיק (Case)";
+                    return;
+                }
+
+                var detailTasks = new List<Task<CaseEntity?>>(caseHits.Count);
+                foreach (var hit in caseHits)
+                {
+                    detailTasks.Add(LoadCaseRowAsync(hit, ct));
+                }
+                var details = await Task.WhenAll(detailTasks).ConfigureAwait(true);
+                ct.ThrowIfCancellationRequested();
+
+                foreach (var row in details)
+                {
+                    if (row != null) Cases.Add(row);
+                }
+                StatusMessage = $"נמצאו {Cases.Count} תיקים";
             }
             catch (OperationCanceledException) { /* superseded */ }
             catch (EspoCrmAuthorizationException)

src/OutlookAddin.UI/ViewModels/SettingsViewModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Windows.Media;
@@ -91,12 +92,13 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
         /// </summary>
         private static string ResolveDisplayVersion()
         {
+            Version? v = null;
             try
             {
                 if (System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed)
                 {
-                    return System.Deployment.Application.ApplicationDeployment
-                        .CurrentDeployment.CurrentVersion.ToString();
+                    v = System.Deployment.Application.ApplicationDeployment
+                        .CurrentDeployment.CurrentVersion;
                 }
             }
             catch
@@ -104,7 +106,30 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
                 // Not running under ClickOnce (dev / F5), or System.Deployment
                 // is not available — fall through to the AssemblyVersion.
             }
-            return typeof(SettingsViewModel).Assembly.GetName().Version?.ToString() ?? "1.0.0";
+            // The host VSTO assembly is where versioning policy lives
+            // (csproj + AssemblyInfo). The UI assembly is SDK-style with
+            // no <Version>, so it always reports 1.0.0.0 — don't fall back
+            // to it. Walk loaded assemblies for the host by name suffix.
+            if (v == null)
+            {
+                foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
+                {
+                    var name = asm.GetName().Name;
+                    if (name != null && name.EndsWith(".OutlookAddin", StringComparison.Ordinal))
+                    {
+                        v = asm.GetName().Version;
+                        break;
+                    }
+                }
+            }
+            v ??= typeof(SettingsViewModel).Assembly.GetName().Version;
+            if (v == null) return "1.0.0";
+
+            // ClickOnce stores 4 components; project policy is MAJOR.MINOR.PATCH —
+            // hide the trailing revision when it's 0.
+            return v.Revision == 0
+                ? $"{v.Major}.{v.Minor}.{v.Build}"
+                : v.ToString();
         }
 
         /// <summary>
@@ -154,18 +179,78 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
                 }
 
                 var deployment = System.Deployment.Application.ApplicationDeployment.CurrentDeployment;
-                var info = await Task.Run(() => deployment.CheckForDetailedUpdate(false)).ConfigureAwait(true);
-                if (!info.UpdateAvailable)
+                var currentVersion = deployment.CurrentVersion;
+                var manifestUri = deployment.UpdateLocation;
+
+                // ApplicationDeployment.CheckForDetailedUpdate triggers a
+                // TrustManager re-evaluation which throws TrustNotGranted
+                // inside a hosted VSTO process even when the publisher and
+                // permissions are unchanged. Bypass it by fetching the
+                // deployment manifest directly and reading the version.
+                Version? availableVersion = null;
+                try
                 {
-                    UpdateStatusBrush = SuccessBrush;
-                    UpdateStatus = "אתה על הגרסה האחרונה (" + deployment.CurrentVersion + ").";
+                    availableVersion = await Task.Run(() => FetchManifestVersion(manifestUri)).ConfigureAwait(true);
+                }
+                catch (Exception fetchEx)
+                {
+                    _logger.Warning(fetchEx, "CheckForUpdate: manifest fetch failed");
+                    UpdateStatusBrush = ErrorBrush;
+                    UpdateStatus = "שגיאה בבדיקת השרת: " + fetchEx.Message;
                     return;
                 }
 
-                UpdateStatus = $"זמינה גרסה {info.AvailableVersion} — מוריד…";
-                var result = await Task.Run(() => deployment.Update()).ConfigureAwait(true);
-                UpdateStatusBrush = SuccessBrush;
-                UpdateStatus = $"הותקנה גרסה {info.AvailableVersion}. סגור ופתח את Outlook כדי לטעון אותה.";
+                if (availableVersion == null)
+                {
+                    UpdateStatusBrush = ErrorBrush;
+                    UpdateStatus = "לא ניתן לקרוא את גרסת השרת מ-" + manifestUri;
+                    return;
+                }
+
+                if (availableVersion <= currentVersion)
+                {
+                    UpdateStatusBrush = SuccessBrush;
+                    UpdateStatus = "אתה על הגרסה האחרונה (" + currentVersion + ").";
+                    return;
+                }
+
+                // VSTO add-ins cannot be updated programmatically from inside
+                // a running Outlook — ApplicationDeployment.Update() throws.
+                // Don't shell-launch the .vsto URL either: Chrome / Edge will
+                // download it to disk, and the resulting file has a different
+                // security zone than the deployment manifest, which fails with
+                // InvalidDeploymentException ("no matching security zones").
+                // Call VSTOInstaller.exe directly so the URL is processed in
+                // the Internet zone, matching the manifest.
+                var installerPath = FindVstoInstaller();
+                if (installerPath != null)
+                {
+                    try
+                    {
+                        System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo(
+                            installerPath, "/I \"" + manifestUri + "\"")
+                        {
+                            UseShellExecute = false
+                        });
+                        UpdateStatusBrush = SuccessBrush;
+                        UpdateStatus = $"זמינה גרסה {availableVersion} — אשר את ההתקנה בחלון שנפתח, ואז סגור ופתח את Outlook.";
+                    }
+                    catch (Exception launchEx)
+                    {
+                        _logger.Warning(launchEx, "CheckForUpdate: VSTOInstaller launch failed");
+                        UpdateStatusBrush = ErrorBrush;
+                        UpdateStatus = $"זמינה גרסה {availableVersion} — סגור ופתח את Outlook כדי להתקין אוטומטית.";
+                    }
+                }
+                else
+                {
+                    // VSTOInstaller not at the canonical path — VSTO runtime
+                    // still picks up new manifests on Outlook startup, so
+                    // ask the user to restart instead of attempting a hack.
+                    UpdateStatusBrush = SuccessBrush;
+                    UpdateStatus = $"זמינה גרסה {availableVersion} — סגור ופתח את Outlook כדי להתקין אוטומטית.";
+                }
+                return;
             }
             catch (System.Deployment.Application.DeploymentDownloadException ex)
             {
@@ -191,6 +276,77 @@ namespace MarcusLaw.OutlookAddin.UI.ViewModels
             }
         }
 
+        /// <summary>
+        /// Reads the top-level &lt;assemblyIdentity&gt; version from the
+        /// .vsto deployment manifest at <paramref name="manifestUri"/>.
+        /// Returns null if the document doesn't look like a deployment
+        /// manifest. Runs on a worker thread (synchronous HTTP).
+        /// </summary>
+        private static Version? FetchManifestVersion(Uri manifestUri)
+        {
+            // The .vsto manifest is small (≈6KB). Keep this synchronous —
+            // no point pulling in HttpClient and its lifecycle just for one
+            // GET. WebRequest works fine on .NET FW 4.8 and through proxies.
+            var req = System.Net.WebRequest.Create(manifestUri);
+            req.Timeout = 10_000;
+            using (var response = req.GetResponse())
+            using (var stream = response.GetResponseStream())
+            {
+                var doc = System.Xml.Linq.XDocument.Load(stream);
+                System.Xml.Linq.XNamespace asmv1 = "urn:schemas-microsoft-com:asm.v1";
+                var identity = doc.Root?
+                    .Elements()
+                    .FirstOrDefault(e => e.Name.LocalName == "assemblyIdentity" && e.Name.Namespace == asmv1);
+                var versionAttr = identity?.Attribute("version")?.Value;
+                if (string.IsNullOrWhiteSpace(versionAttr)) return null;
+                return Version.TryParse(versionAttr, out var v) ? v : null;
+            }
+        }
+
+        /// <summary>
+        /// Locates VSTOInstaller.exe on the machine. The path is stable
+        /// for VSTO 4.0 (Office 2010+) — falls back to a registry lookup
+        /// if the default install location was customised.
+        /// </summary>
+        private static string? FindVstoInstaller()
+        {
+            string[] candidates =
+            {
+                @"C:\Program Files (x86)\Common Files\Microsoft Shared\VSTO\10.0\VSTOInstaller.exe",
+                @"C:\Program Files\Common Files\Microsoft Shared\VSTO\10.0\VSTOInstaller.exe"
+            };
+            foreach (var p in candidates)
+            {
+                if (System.IO.File.Exists(p)) return p;
+            }
+
+            // Registry fallback: HKCR\VstoFile\shell\Open\command stores
+            // the verb VSTOInstaller registers for the .vsto extension.
+            try
+            {
+                using (var key = Microsoft.Win32.Registry.ClassesRoot.OpenSubKey(@"VstoFile\shell\Open\command"))
+                {
+                    var cmd = key?.GetValue(null) as string;
+                    if (!string.IsNullOrEmpty(cmd))
+                    {
+                        // Value looks like: "C:\...\VSTOInstaller.exe" "%1"
+                        var firstQuote = cmd!.IndexOf('"');
+                        if (firstQuote == 0)
+                        {
+                            var endQuote = cmd.IndexOf('"', 1);
+                            if (endQuote > 1)
+                            {
+                                var exe = cmd.Substring(1, endQuote - 1);
+                                if (System.IO.File.Exists(exe)) return exe;
+                            }
+                        }
+                    }
+                }
+            }
+            catch { /* registry access denied or schema differs — fall through */ }
+            return null;
+        }
+
         private bool CanCheckForUpdate() => !IsCheckingForUpdate;
 
         partial void OnIsCheckingForUpdateChanged(bool value)

src/OutlookAddin.UI/Views/ReadingPaneView.xaml

@@ -62,6 +62,29 @@
                 <!-- Ambiguous -->
                 <StackPanel Visibility="{Binding AmbiguousVisibility}">
                     <TextBlock Text="{Binding AmbiguousMessage}" Foreground="DarkOrange" />
+                    <TextBlock Style="{StaticResource LabelStyle}" Text="בחר איש קשר:" Margin="0,8,0,2" />
+                    <ItemsControl ItemsSource="{Binding Candidates}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Border BorderBrush="#EEE" BorderThickness="0,0,0,1" Padding="0,4">
+                                    <Button Command="{Binding DataContext.SelectCandidateCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+                                            CommandParameter="{Binding}"
+                                            Background="Transparent"
+                                            BorderThickness="0"
+                                            Padding="0"
+                                            Cursor="Hand"
+                                            HorizontalContentAlignment="Right"
+                                            HorizontalAlignment="Stretch">
+                                        <StackPanel HorizontalAlignment="Stretch">
+                                            <TextBlock Text="{Binding Name}" FontWeight="SemiBold" Foreground="#0066CC" />
+                                            <TextBlock Text="{Binding AccountName}" Foreground="DimGray" FontSize="11" />
+                                            <TextBlock Text="{Binding EmailAddress}" Foreground="Gray" FontSize="10" />
+                                        </StackPanel>
+                                    </Button>
+                                </Border>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
                     <Button Content="פתח חיפוש ידני"
                             Command="{Binding OpenManualSearchCommand}"
                             Style="{StaticResource LinkButtonStyle}"
@@ -70,8 +93,20 @@
 
                 <!-- Match -->
                 <StackPanel Visibility="{Binding MatchVisibility}">
+                    <Button Content="→ חזור לרשימת אנשי קשר"
+                            Command="{Binding BackToCandidatesCommand}"
+                            Style="{StaticResource LinkButtonStyle}"
+                            HorizontalAlignment="Right"
+                            Margin="0,0,0,4"
+                            Visibility="{Binding BackToCandidatesVisibility}" />
                     <TextBlock Style="{StaticResource LabelStyle}" Text="איש קשר" />
-                    <TextBlock Text="{Binding Match.Contact.Name}" FontSize="14" FontWeight="Bold" />
+                    <TextBlock FontSize="14" FontWeight="Bold">
+                        <Hyperlink Command="{Binding OpenInEspoCrmCommand}"
+                                   TextDecorations="{x:Null}"
+                                   Foreground="#0066CC">
+                            <Run Text="{Binding Match.Contact.Name, Mode=OneWay}" />
+                        </Hyperlink>
+                    </TextBlock>
                     <TextBlock Text="{Binding Match.Contact.EmailAddress}" Foreground="Gray" />
 
                     <TextBlock Style="{StaticResource LabelStyle}" Text="לקוח/חברה" Visibility="{Binding AccountVisibility}" />
@@ -82,14 +117,33 @@
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
                                 <Border BorderBrush="#EEE" BorderThickness="0,0,0,1" Padding="0,4">
-                                    <StackPanel>
-                                        <TextBlock>
-                                            <Run Text="["/><Run Text="{Binding Number, Mode=OneWay}"/><Run Text="] " />
-                                            <Run Text="{Binding Name, Mode=OneWay}" FontWeight="SemiBold" />
-                                        </TextBlock>
-                                        <TextBlock Text="{Binding Status, Converter={StaticResource HebrewStatus}}"
-                                                   Foreground="Gray" FontSize="10" />
-                                    </StackPanel>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <StackPanel Grid.Column="0">
+                                            <TextBlock>
+                                                <Hyperlink Command="{Binding DataContext.OpenCaseInCrmCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+                                                           CommandParameter="{Binding}"
+                                                           TextDecorations="{x:Null}"
+                                                           Foreground="#0066CC">
+                                                    <Run Text="["/><Run Text="{Binding Number, Mode=OneWay}"/><Run Text="] " />
+                                                    <Run Text="{Binding Name, Mode=OneWay}" FontWeight="SemiBold" />
+                                                </Hyperlink>
+                                            </TextBlock>
+                                            <TextBlock Text="{Binding Status, Converter={StaticResource HebrewStatus}}"
+                                                       Foreground="Gray" FontSize="10" />
+                                        </StackPanel>
+                                        <Button Grid.Column="1"
+                                                Content="תייק"
+                                                Command="{Binding DataContext.FileToCaseCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
+                                                CommandParameter="{Binding}"
+                                                Padding="8,2"
+                                                Margin="6,0,0,0"
+                                                VerticalAlignment="Top"
+                                                ToolTip="תייק את המייל הנוכחי לתיק הזה" />
+                                    </Grid>
                                 </Border>
                             </DataTemplate>
                         </ItemsControl.ItemTemplate>
@@ -110,7 +164,12 @@
             <Button Content="תייק לתיק הזה"
                     Command="{Binding FileToThisCommand}"
                     Padding="8,4" Margin="0,0,0,4"
-                    HorizontalAlignment="Stretch" />
+                    HorizontalAlignment="Stretch"
+                    Visibility="{Binding SingleCaseFileVisibility}" />
+            <TextBlock Text="יש כמה תיקים מקושרים — בחר תיק מהרשימה למעלה."
+                       Foreground="Gray" FontStyle="Italic" FontSize="10"
+                       Margin="0,0,0,4"
+                       Visibility="{Binding MultiCaseHintVisibility}" />
             <Button Content="תייק למקום אחר…"
                     Command="{Binding FileElsewhereCommand}"
                     Padding="8,4" Margin="0,0,0,4"

src/OutlookAddin/OutlookAddin.csproj

@@ -31,13 +31,13 @@
     <Nullable>enable</Nullable>
     <DefineConstants>VSTO40;UseOfficeInterop</DefineConstants>
     <ResolveComReferenceSilent>true</ResolveComReferenceSilent>
-    <IsWebBootstrapper>False</IsWebBootstrapper>
+    <IsWebBootstrapper>True</IsWebBootstrapper>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <PublishUrl>C:\Users\Chaim\source\repos\OutlookAddin\Publish\</PublishUrl>
-    <InstallUrl>\\192.168.10.97\Projects\LegalCRM\Add-in\</InstallUrl>
+    <InstallUrl>https://gitea.dev.marcus-law.co.il/espocrm-extensions/OutlookAddin/raw/branch/main/Publish/</InstallUrl>
     <TargetCulture>en</TargetCulture>
-    <ApplicationVersion>1.0.0.5</ApplicationVersion>
-    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
+    <ApplicationVersion>1.2.5.0</ApplicationVersion>
+    <AutoIncrementApplicationRevision>false</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>days</UpdateIntervalUnits>

src/OutlookAddin/Properties/AssemblyInfo.cs

@@ -33,6 +33,6 @@ using System.Security;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.5.0")]
+[assembly: AssemblyFileVersion("1.2.5.0")]
 

src/OutlookAddin/Ribbon/ExplorerRibbon.xml

@@ -3,7 +3,7 @@
   <ribbon>
     <tabs>
       <tab idMso="TabMail">
-        <group id="MarcusLawGroup" label="Marcus-Law" insertBeforeMso="GroupMailMove">
+        <group id="MarcusLawGroup" label="Klear" insertBeforeMso="GroupMailMove">
           <button id="FileToEspoCrm"
                   label="Klear"
                   screentip="תייק את המייל הנבחר ל-Klear"

src/OutlookAddin/Ribbon/InspectorRibbon.xml

@@ -3,7 +3,7 @@
   <ribbon>
     <tabs>
       <tab idMso="TabNewMailMessage">
-        <group id="MarcusLawComposeGroup" label="Marcus-Law" insertBeforeMso="GroupClipboard">
+        <group id="MarcusLawComposeGroup" label="Klear" insertBeforeMso="GroupClipboard">
           <button id="ComposeFromCase"
                   label="כתוב מתיק"
                   screentip="פתח את המייל מתיק Klear"

src/OutlookAddin/Services/AddInHost.cs

@@ -404,7 +404,7 @@ namespace OutlookAddin.Services
             {
                 MessageBox.Show(
                     "התוסף עדיין לא מוגדר. פתח את ההגדרות תחילה.",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Information);
                 return;
@@ -425,7 +425,7 @@ namespace OutlookAddin.Services
                 Logger.Error(ex, "LaunchComposeFromCaseAsync failed");
                 MessageBox.Show(
                     "טעינת התיק נכשלה: " + ex.Message,
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
@@ -446,7 +446,7 @@ namespace OutlookAddin.Services
             {
                 var result = MessageBox.Show(
                     "התוסף עדיין לא מוגדר. לפתוח את חלון ההגדרות עכשיו?",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.YesNo,
                     MessageBoxImage.Information);
                 if (result == MessageBoxResult.Yes) LaunchSettings();
@@ -465,7 +465,7 @@ namespace OutlookAddin.Services
                 Logger.Error(ex, "LaunchSaveAttachmentsAsync: extract failed");
                 MessageBox.Show(
                     "קריאת הקבצים המצורפים נכשלה: " + ex.Message,
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
                 return;
@@ -475,7 +475,7 @@ namespace OutlookAddin.Services
             {
                 MessageBox.Show(
                     "אין במייל הזה קבצים מצורפים לשמירה.",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Information);
                 return;
@@ -505,7 +505,7 @@ namespace OutlookAddin.Services
             {
                 MessageBox.Show(
                     "לא ניתן לחשב את נתיב התיקייה של התיק. ייתכן שהתיק עוד לא הוגדר ב-Klear.",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Warning);
                 return;
@@ -535,7 +535,7 @@ namespace OutlookAddin.Services
                 Logger.Error(ex, "LaunchSaveAttachmentsAsync failed");
                 MessageBox.Show(
                     "שמירת הקבצים נכשלה: " + ex.Message,
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
@@ -558,7 +558,7 @@ namespace OutlookAddin.Services
                 message = parts.Count == 0 ? "לא נשמרו פריטים." : string.Join(" · ", parts);
                 icon = summary.FailedCount > 0 ? MessageBoxImage.Warning : MessageBoxImage.Information;
             }
-            MessageBox.Show(message, "Marcus-Law OutlookAddin", MessageBoxButton.OK, icon);
+            MessageBox.Show(message, "Klear", MessageBoxButton.OK, icon);
         }
 
         /// <summary>
@@ -572,7 +572,7 @@ namespace OutlookAddin.Services
             {
                 MessageBox.Show(
                     "התוסף עדיין לא מוגדר. פתח את ההגדרות תחילה.",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Information);
                 return;
@@ -591,7 +591,7 @@ namespace OutlookAddin.Services
                 if (mail != null) try { Marshal.ReleaseComObject(mail); } catch { }
                 MessageBox.Show(
                     "פתיחת המייל מתיק נכשלה: " + ex.Message,
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Error);
             }
@@ -643,13 +643,20 @@ namespace OutlookAddin.Services
         /// current Explorer selection, opens the search dialog, files on success,
         /// and stamps categories on the chosen MailItems.
         /// </summary>
-        public async Task LaunchFileToCaseAsync()
+        public Task LaunchFileToCaseAsync() => LaunchFileToCaseAsync(null);
+
+        /// <summary>
+        /// Same as <see cref="LaunchFileToCaseAsync()"/>, but when the sidebar
+        /// already resolved a single linked case for the sender we skip the
+        /// search dialog and file directly to that case.
+        /// </summary>
+        public async Task LaunchFileToCaseAsync(MatchResult? preselectedMatch)
         {
             if (!IsConfigured)
             {
                 var result = MessageBox.Show(
                     "התוסף עדיין לא מוגדר. לפתוח את חלון ההגדרות עכשיו?",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.YesNo,
                     MessageBoxImage.Information);
                 if (result == MessageBoxResult.Yes)
@@ -664,7 +671,7 @@ namespace OutlookAddin.Services
             {
                 MessageBox.Show(
                     "לא נבחר מייל לתיוק. סמן מייל אחד או יותר ונסה שוב.",
-                    "Marcus-Law OutlookAddin",
+                    "Klear",
                     MessageBoxButton.OK,
                     MessageBoxImage.Information);
                 return;
@@ -673,39 +680,50 @@ namespace OutlookAddin.Services
             try
             {
                 var envelopes = mailItems.Select(MailItemExtractor.Extract).ToList();
-                var firstEnvelope = envelopes[0];
 
-                var vm = new FileToCaseViewModel(CrmClient!, Settings, Logger)
+                FilingTarget? target = TryResolveSidebarAutoTarget(preselectedMatch);
+                if (target != null)
                 {
-                    SenderEmail = firstEnvelope.From,
-                    SenderName = TryGetSenderName(mailItems[0])
-                };
-
-                var dialog = new FileToCaseDialog(vm);
-                AttachOwnerToOutlook(dialog);
-                var ok = dialog.ShowDialog();
-                Logger.Information(
-                    "FileToCase dialog closed (ok={Ok}, selected id={Id}, entityType={Type})",
-                    ok, vm.SelectedTarget?.Id, vm.SelectedTarget?.EntityType);
-                if (ok != true) return;
-
-                var target = vm.GetSelectedFilingTarget();
-                if (target == null)
-                {
-                    Logger.Warning(
-                        "Filing skipped — selected EspoEntityRef has no usable Id/EntityType (id={Id}, name={Name}, type={Type})",
-                        vm.SelectedTarget?.Id, vm.SelectedTarget?.Name, vm.SelectedTarget?.EntityType);
-                    MessageBox.Show(
-                        "התיק שנבחר לא הוחזר עם סוג ישות (entityType) תקין. ייתכן ש-Klear שלך מחזיר שדה אחר; הלוג מכיל את הפרטים. שלח לאדמין.",
-                        "Marcus-Law OutlookAddin",
-                        MessageBoxButton.OK,
-                        MessageBoxImage.Warning);
-                    return;
+                    Logger.Information(
+                        "Auto-filing {Count} mail item(s) from sidebar to {Type}/{Id} ({Name})",
+                        envelopes.Count, target.ParentType, target.ParentId, target.ParentName);
                 }
+                else
+                {
+                    var firstEnvelope = envelopes[0];
 
-                Logger.Information(
-                    "Filing {Count} mail item(s) to {Type}/{Id} ({Name})",
-                    envelopes.Count, target.ParentType, target.ParentId, target.ParentName);
+                    var vm = new FileToCaseViewModel(CrmClient!, Settings, Logger)
+                    {
+                        SenderEmail = firstEnvelope.From,
+                        SenderName = TryGetSenderName(mailItems[0])
+                    };
+
+                    var dialog = new FileToCaseDialog(vm);
+                    AttachOwnerToOutlook(dialog);
+                    var ok = dialog.ShowDialog();
+                    Logger.Information(
+                        "FileToCase dialog closed (ok={Ok}, selected id={Id}, entityType={Type})",
+                        ok, vm.SelectedTarget?.Id, vm.SelectedTarget?.EntityType);
+                    if (ok != true) return;
+
+                    target = vm.GetSelectedFilingTarget();
+                    if (target == null)
+                    {
+                        Logger.Warning(
+                            "Filing skipped — selected EspoEntityRef has no usable Id/EntityType (id={Id}, name={Name}, type={Type})",
+                            vm.SelectedTarget?.Id, vm.SelectedTarget?.Name, vm.SelectedTarget?.EntityType);
+                        MessageBox.Show(
+                            "התיק שנבחר לא הוחזר עם סוג ישות (entityType) תקין. ייתכן ש-Klear שלך מחזיר שדה אחר; הלוג מכיל את הפרטים. שלח לאדמין.",
+                            "Klear",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Warning);
+                        return;
+                    }
+
+                    Logger.Information(
+                        "Filing {Count} mail item(s) to {Type}/{Id} ({Name})",
+                        envelopes.Count, target.ParentType, target.ParentId, target.ParentName);
+                }
 
                 var summary = await FilingService!.FileAsync(envelopes, target).ConfigureAwait(true);
 
@@ -722,6 +740,21 @@ namespace OutlookAddin.Services
             }
         }
 
+        // Sidebar's "תייק לתיק הזה" makes a hard promise about which case
+        // gets the mail — only honour it when the match resolved a single
+        // linked case. With 0 or 2+ cases there is no unambiguous "this",
+        // and the caller falls back to the manual search dialog.
+        private static FilingTarget? TryResolveSidebarAutoTarget(MatchResult? match)
+        {
+            if (match?.RecentCases == null || match.RecentCases.Count != 1) return null;
+            var c = match.RecentCases[0];
+            if (string.IsNullOrWhiteSpace(c.Id)) return null;
+            var label = !string.IsNullOrWhiteSpace(c.Number)
+                ? $"[{c.Number}] {c.Name}"
+                : (c.Name ?? c.Id);
+            return new FilingTarget("Case", c.Id, label);
+        }
+
         private List<Outlook.MailItem> ReadCurrentSelection()
         {
             var result = new List<Outlook.MailItem>();
@@ -874,7 +907,7 @@ namespace OutlookAddin.Services
                 icon = summary.FailedCount > 0 ? MessageBoxImage.Warning : MessageBoxImage.Information;
             }
 
-            MessageBox.Show(message, "Marcus-Law OutlookAddin", MessageBoxButton.OK, icon);
+            MessageBox.Show(message, "Klear", MessageBoxButton.OK, icon);
         }
 
         private static string? TryGetSenderName(Outlook.MailItem item)

src/OutlookAddin/Services/SidebarController.cs

@@ -109,7 +109,7 @@ namespace OutlookAddin.Services
 
             vm.FileRequested += async (s, e) =>
             {
-                try { await _host.LaunchFileToCaseAsync().ConfigureAwait(true); }
+                try { await _host.LaunchFileToCaseAsync(e.PreselectedMatch).ConfigureAwait(true); }
                 catch (Exception ex) { _logger.Warning(ex, "Sidebar file-request handler failed"); }
             };
             vm.OpenInBrowserRequested += (s, url) => TryOpenInBrowser(url);

src/OutlookAddin/ThisAddIn.cs

@@ -19,8 +19,8 @@ namespace OutlookAddin
             catch (Exception ex)
             {
                 System.Windows.MessageBox.Show(
-                    "האתחול של תוסף Marcus-Law נכשל: " + ex.Message,
-                    "Marcus-Law OutlookAddin",
+                    "האתחול של תוסף Klear נכשל: " + ex.Message,
+                    "Klear",
                     System.Windows.MessageBoxButton.OK,
                     System.Windows.MessageBoxImage.Error);
             }