From a1e320091843cda59d61d67f26e18a228c6c4aa6 Mon Sep 17 00:00:00 2001
From: bcbetterninja <327058824+bcbetterninja@users.noreply.github.com>
Date: Thu, 24 Sep 2026 21:23:53 +0000
Subject: [PATCH 1/4] Add original email export and authenticated message links

---
 README.md                                     | 23 +++++++
 packaging/BetterMail.Info.plist               |  2 +-
 packaging/BetterMail.desktop                  |  2 +-
 src/BetterMail.App/App.axaml.cs               |  6 +-
 src/BetterMail.App/BetterTunnelsClient.cs     |  9 ++-
 .../ConversationThreadView.axaml              |  1 +
 .../ConversationThreadViewModel.cs            |  4 ++
 src/BetterMail.App/MailtoActivation.cs        |  7 +++
 src/BetterMail.App/MainWindow.axaml           |  1 +
 src/BetterMail.App/MainWindow.axaml.cs        | 15 +++++
 src/BetterMail.App/MainWindowViewModel.cs     | 39 ++++++++++++
 src/BetterMail.App/McpEndpoint.cs             |  5 ++
 .../McpMailTools.Capabilities.cs              |  1 +
 src/BetterMail.App/McpMailTools.Source.cs     | 52 ++++++++++++++++
 src/BetterMail.App/McpMailTools.cs            |  3 +-
 src/BetterMail.App/McpSettingsViewModel.cs    |  3 +-
 src/BetterMail.App/Program.cs                 |  3 +-
 tests/BetterMail.Tests/EvidenceTests.cs       | 60 +++++++++++++++++++
 tests/BetterMail.Tests/McpTests.cs            |  2 +-
 19 files changed, 228 insertions(+), 10 deletions(-)
 create mode 100644 src/BetterMail.App/McpMailTools.Source.cs

diff --git a/README.md b/README.md
index c627fdf..47b9849 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,29 @@ local-file fallback. Files under the budget stay ordinary attachments.
 `share_drive_file` also supports explicit organization or named-recipient audiences. Clients must
 obtain user authorization for sharing and deleting, and treat filenames and file contents as untrusted.
 
+## Original messages, headers, and direct links
+
+Use **Save as .eml** in the message actions menu to save the original provider MIME bytes,
+including attachments. **View headers** shows the provider's internet message headers.
+Both actions require connectivity. MCP exposes headers through `read_mail_headers` and
+original MIME through `read_mail_raw`; assemble its base64 chunks and verify the returned
+SHA-256 before saving as `.eml`. Each chunk fetches the provider source again, so restart
+if its hash or size changes between requests.
+
+Call `get_mail_link(mailboxId, messageId)` for a stable captured message reference:
+
+- `localUrl`: `bettermail://evidence/<id>` opens the message in BetterMail's local profile.
+  Windows registers the handler on startup; Linux desktop and macOS bundle metadata register it on installation.
+- `url`: an HTTP reference to the captured message, using the active BetterTunnels URL or local MCP listener.
+- `rawUrl`: downloads the original provider `.eml` over that same endpoint.
+
+HTTP references require the MCP bearer authorization header and allowed mailbox access;
+access keys are never embedded in links. These are authenticated client URLs, so opening them
+in an ordinary browser without authorization returns 401. Captured references survive provider
+moves, while raw downloads require the original provider message ID to remain available.
+The local handler resolves records in the currently open profile; another installation must
+have the corresponding captured record. Tunnel links work while the tunnel is connected.
+
 ## MCP attachment search and evidence tools
 
 Use `index_attachments` through MCP to download and index cached mail: supply a message ID for one
diff --git a/packaging/BetterMail.Info.plist b/packaging/BetterMail.Info.plist
index d0c98b9..d44aa63 100644
--- a/packaging/BetterMail.Info.plist
+++ b/packaging/BetterMail.Info.plist
@@ -17,7 +17,7 @@
     <dict>
       <key>CFBundleURLName</key><string>BetterMail mail links</string>
       <key>CFBundleTypeRole</key><string>Editor</string>
-      <key>CFBundleURLSchemes</key><array><string>mailto</string></array>
+      <key>CFBundleURLSchemes</key><array><string>mailto</string><string>bettermail</string></array>
     </dict>
   </array>
 </dict>
diff --git a/packaging/BetterMail.desktop b/packaging/BetterMail.desktop
index efa5e82..c18fcad 100644
--- a/packaging/BetterMail.desktop
+++ b/packaging/BetterMail.desktop
@@ -5,5 +5,5 @@ Comment=Fast local-first Microsoft 365 mail
 Exec=BetterMail %u
 Icon=BetterMail
 Categories=Network;Email;
-MimeType=x-scheme-handler/mailto;
+MimeType=x-scheme-handler/mailto;x-scheme-handler/bettermail;
 Terminal=false
diff --git a/src/BetterMail.App/App.axaml.cs b/src/BetterMail.App/App.axaml.cs
index 280198d..42ae3ad 100644
--- a/src/BetterMail.App/App.axaml.cs
+++ b/src/BetterMail.App/App.axaml.cs
@@ -230,7 +230,11 @@ private async Task HandleActivationAsync(string activation)
             _mainWindow.Show();
         }
         _mainWindow.Activate();
-        if (MailtoParser.TryParse(activation, out var request))
+        if (BetterMail.Core.EvidenceLink.TryParse(activation, out var recordId))
+        {
+            await _viewModel.OpenEvidenceLinkAsync(recordId);
+        }
+        else if (MailtoParser.TryParse(activation, out var request))
         {
             await _viewModel.OpenComposeAsync(request);
         }
diff --git a/src/BetterMail.App/BetterTunnelsClient.cs b/src/BetterMail.App/BetterTunnelsClient.cs
index 84a629b..4b05393 100644
--- a/src/BetterMail.App/BetterTunnelsClient.cs
+++ b/src/BetterMail.App/BetterTunnelsClient.cs
@@ -246,12 +246,15 @@ async Task ForwardAsync(TunnelFrame frame, CancellationTokenSource requestLifeti
 
     internal static HttpRequestMessage CreateLocalRequest(TunnelFrame frame, Uri endpoint)
     {
-        // Exact private endpoint only. Never resolve attacker-provided paths into a local URL.
-        if (frame.Path != endpoint.AbsolutePath || frame.Method is not ("GET" or "POST" or "DELETE"))
+        // Only the private MCP endpoint and explicit read-only evidence routes may be forwarded.
+        var evidencePath = frame.Path?.StartsWith(endpoint.AbsolutePath + "/evidence/", StringComparison.Ordinal) == true
+            && System.Text.RegularExpressions.Regex.IsMatch(frame.Path[endpoint.AbsolutePath.Length..],
+                @"\A/evidence/(?:records/(?:[a-fA-F0-9]{32}|[a-fA-F0-9]{64})(?:/raw)?|files/(?:[a-fA-F0-9]{32}|[a-fA-F0-9]{64})|exports/(?:[a-fA-F0-9]{32}|[a-fA-F0-9]{64}))\z");
+        if (!(frame.Path == endpoint.AbsolutePath && frame.Method is ("GET" or "POST" or "DELETE") || evidencePath && frame.Method == "GET"))
             throw new InvalidDataException("Invalid MCP request target.");
         var body = Convert.FromBase64String(frame.Body ?? "");
         if (body.Length > 1024 * 1024) throw new InvalidDataException("MCP request is too large.");
-        var request = new HttpRequestMessage(new HttpMethod(frame.Method), endpoint) { Content = new ByteArrayContent(body) };
+        var request = new HttpRequestMessage(new HttpMethod(frame.Method!), new Uri(endpoint.GetLeftPart(UriPartial.Authority) + frame.Path)) { Content = new ByteArrayContent(body) };
         foreach (var (name, value) in frame.Headers ?? [])
         {
             if (name.Equals("Authorization", StringComparison.OrdinalIgnoreCase) || name.Equals("Accept", StringComparison.OrdinalIgnoreCase) ||
diff --git a/src/BetterMail.App/ConversationThreadView.axaml b/src/BetterMail.App/ConversationThreadView.axaml
index fe0af92..e72ce4a 100644
--- a/src/BetterMail.App/ConversationThreadView.axaml
+++ b/src/BetterMail.App/ConversationThreadView.axaml
@@ -60,6 +60,7 @@
                     <Button Classes="command" Content="{Binding ToggleFlagText}" HorizontalContentAlignment="Left" Command="{Binding ToggleFlagCommand}" />
                     <Button Classes="command" Content="{Binding TogglePinText}" HorizontalContentAlignment="Left" Command="{Binding TogglePinCommand}" />
                     <Button Classes="command" Content="{Binding ToggleReadText}" HorizontalContentAlignment="Left" Command="{Binding ToggleReadCommand}" />
+                    <Button Classes="command" Content="Save as .eml" HorizontalContentAlignment="Left" Command="{Binding ExportMailCommand}" />
                     <Button Classes="command" Content="View headers" HorizontalContentAlignment="Left" Command="{Binding ViewHeadersCommand}" />
                   </StackPanel>
                 </Flyout>
diff --git a/src/BetterMail.App/ConversationThreadViewModel.cs b/src/BetterMail.App/ConversationThreadViewModel.cs
index 1c860e6..95596eb 100644
--- a/src/BetterMail.App/ConversationThreadViewModel.cs
+++ b/src/BetterMail.App/ConversationThreadViewModel.cs
@@ -17,6 +17,7 @@ public enum ConversationAction
     ToggleFlag,
     TogglePin,
     ViewHeaders,
+    ExportMail,
     Move,
     CreateEvent
 }
@@ -95,6 +96,7 @@ public ConversationThreadViewModel(
         ToggleReadCommand = new AsyncCommand(() => RunActionAsync(ConversationAction.ToggleRead), CanRunAction, allowConcurrent: true);
         ToggleFlagCommand = new AsyncCommand(() => RunActionAsync(ConversationAction.ToggleFlag), CanRunAction, allowConcurrent: true);
         TogglePinCommand = new AsyncCommand(() => RunActionAsync(ConversationAction.TogglePin), CanRunAction, allowConcurrent: true);
+        ExportMailCommand = new AsyncCommand(() => RunActionAsync(ConversationAction.ExportMail), CanRunAction, allowConcurrent: true);
         ViewHeadersCommand = new AsyncCommand(() => RunActionAsync(ConversationAction.ViewHeaders), CanRunAction, allowConcurrent: true);
         MoveToFolderCommand = new AsyncCommand<MailFolderItem>(MoveToFolderAsync, CanMoveToFolder, allowConcurrent: true);
         OpenDraftCommand = new AsyncCommand<LocalDraft>(draft => _openDraft?.Invoke(draft) ?? Task.CompletedTask);
@@ -118,6 +120,7 @@ public ConversationThreadViewModel(
     public ICommand ToggleReadCommand { get; }
     public ICommand ToggleFlagCommand { get; }
     public ICommand TogglePinCommand { get; }
+    public ICommand ExportMailCommand { get; }
     public ICommand ViewHeadersCommand { get; }
     public ICommand MoveToFolderCommand { get; }
     public ICommand OpenDraftCommand { get; }
@@ -471,6 +474,7 @@ private void RefreshActionCommands()
         ((AsyncCommand)ToggleReadCommand).Refresh();
         ((AsyncCommand)ToggleFlagCommand).Refresh();
         ((AsyncCommand)TogglePinCommand).Refresh();
+        ((AsyncCommand)ExportMailCommand).Refresh();
         ((AsyncCommand)ViewHeadersCommand).Refresh();
         ((AsyncCommand<MailFolderItem>)MoveToFolderCommand).Refresh();
     }
diff --git a/src/BetterMail.App/MailtoActivation.cs b/src/BetterMail.App/MailtoActivation.cs
index 36dbc60..e1ba1a3 100644
--- a/src/BetterMail.App/MailtoActivation.cs
+++ b/src/BetterMail.App/MailtoActivation.cs
@@ -211,6 +211,12 @@ public static void Register()
                 protocol.CreateSubKey(@"shell\open\command").SetValue(
                     "", $"{quote}{executable}{quote} {quote}%1{quote}");
             }
+            using (var link = Registry.CurrentUser.CreateSubKey(@"Software\Classes\bettermail"))
+            {
+                link.SetValue("", "URL:BetterMail Protocol");
+                link.SetValue("URL Protocol", "");
+                link.CreateSubKey(@"shell\open\command").SetValue("", $"\"{executable}\" \"%1\"");
+            }
             using (var capabilities = Registry.CurrentUser.CreateSubKey(CapabilitiesPath))
             {
                 capabilities.SetValue("ApplicationName", ApplicationName);
@@ -235,6 +241,7 @@ public static void Unregister()
 
         try
         {
+            Registry.CurrentUser.DeleteSubKeyTree(@"Software\Classes\bettermail", false);
             Registry.CurrentUser.DeleteSubKeyTree($@"Software\Classes\{ProgId}", false);
             Registry.CurrentUser.DeleteSubKeyTree(@"Software\BetterCorp\BetterMail", false);
             using var registered = Registry.CurrentUser.OpenSubKey(@"Software\RegisteredApplications", writable: true);
diff --git a/src/BetterMail.App/MainWindow.axaml b/src/BetterMail.App/MainWindow.axaml
index 29d066c..fc13475 100644
--- a/src/BetterMail.App/MainWindow.axaml
+++ b/src/BetterMail.App/MainWindow.axaml
@@ -309,6 +309,7 @@
                   <Button Classes="command" Content="{Binding ToggleFlagText}" HorizontalContentAlignment="Left" Click="MessageFlagClicked" AutomationProperties.Name="{Binding ToggleFlagText}" />
                   <Button Classes="command" Content="{Binding TogglePinText}" HorizontalContentAlignment="Left" Command="{Binding TogglePinCommand}" AutomationProperties.Name="{Binding TogglePinText}" />
                   <Button Classes="command" Content="{Binding ToggleReadText}" HorizontalContentAlignment="Left" Click="MessageReadClicked" AutomationProperties.Name="{Binding ToggleReadText}" />
+                  <Button Classes="command" Content="Save as .eml" HorizontalContentAlignment="Left" Command="{Binding ExportMailCommand}" AutomationProperties.Name="Save original email as .eml" />
                   <Button Classes="command" Content="View headers" HorizontalContentAlignment="Left" Command="{Binding ViewHeadersCommand}" AutomationProperties.Name="View internet message headers" />
                 </StackPanel>
               </Flyout>
diff --git a/src/BetterMail.App/MainWindow.axaml.cs b/src/BetterMail.App/MainWindow.axaml.cs
index 9231722..94f2947 100644
--- a/src/BetterMail.App/MainWindow.axaml.cs
+++ b/src/BetterMail.App/MainWindow.axaml.cs
@@ -1028,6 +1028,7 @@ private void BindViewModel(MainWindowViewModel? viewModel)
             _viewModel.ComposeRequested -= OpenCompose;
             _viewModel.SharedMailboxRequested -= OpenSharedMailbox;
             _viewModel.SearchFocusRequested -= FocusMailSearch;
+            _viewModel.SaveRawMailRequested = null;
             _viewModel.HeadersRequested -= OpenHeaders;
             _viewModel.AttachmentPreviewRequested -= PreviewAttachment;
             _viewModel.SaveAttachmentsRequested -= SaveAllAttachments;
@@ -1046,6 +1047,7 @@ private void BindViewModel(MainWindowViewModel? viewModel)
             _viewModel.ComposeRequested += OpenCompose;
             _viewModel.SharedMailboxRequested += OpenSharedMailbox;
             _viewModel.SearchFocusRequested += FocusMailSearch;
+            _viewModel.SaveRawMailRequested = SaveRawMailAsync;
             _viewModel.HeadersRequested += OpenHeaders;
             _viewModel.AttachmentPreviewRequested += PreviewAttachment;
             _viewModel.SaveAttachmentsRequested += SaveAllAttachments;
@@ -1185,6 +1187,19 @@ private void OpenSharedMailbox(MailAccount account)
         IndependentWindow.Show(window);
     }
 
+    private async Task SaveRawMailAsync(byte[] bytes)
+    {
+        var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+        {
+            Title = "Save original message", SuggestedFileName = "message.eml", DefaultExtension = "eml",
+            FileTypeChoices = [new FilePickerFileType("Email message") { Patterns = ["*.eml"] }]
+        });
+        if (file is null) return;
+        await using var stream = await file.OpenWriteAsync();
+        stream.SetLength(0);
+        await stream.WriteAsync(bytes);
+    }
+
     private void OpenHeaders(MailHeadersDocument document) =>
         IndependentWindow.Show(new MailHeadersWindow(document));
 
diff --git a/src/BetterMail.App/MainWindowViewModel.cs b/src/BetterMail.App/MainWindowViewModel.cs
index 70fb0ff..9c9c67b 100644
--- a/src/BetterMail.App/MainWindowViewModel.cs
+++ b/src/BetterMail.App/MainWindowViewModel.cs
@@ -265,6 +265,7 @@ public MainWindowViewModel(
         ReplyCommand = new AsyncCommand(ReplyAsync, CanReplyToSelectedMessage);
         ReplyAllCommand = new AsyncCommand(ReplyAllAsync, CanReplyToSelectedMessage);
         ForwardCommand = new AsyncCommand(ForwardAsync, CanReplyToSelectedMessage);
+        ExportMailCommand = new AsyncCommand(ExportSelectedMailAsync, CanViewHeaders);
         ViewHeadersCommand = new AsyncCommand(ViewHeadersAsync, CanViewHeaders);
         SelectNextMessageCommand = new AsyncCommand(
             () => SelectAdjacentMessageAsync(1),
@@ -496,6 +497,8 @@ public string NextCalendarEventTime
     public ICommand ReplyCommand { get; }
     public ICommand ReplyAllCommand { get; }
     public ICommand ForwardCommand { get; }
+    public ICommand ExportMailCommand { get; }
+    public Func<byte[], Task>? SaveRawMailRequested { get; set; }
     public ICommand ViewHeadersCommand { get; }
     public ICommand SelectNextMessageCommand { get; }
     public ICommand SelectPreviousMessageCommand { get; }
@@ -4206,9 +4209,44 @@ private void RefreshMailActionCommands()
         ((AsyncCommand)ToggleFlagCommand).Refresh();
         ((AsyncCommand)TogglePinCommand).Refresh();
         ((AsyncCommand<MailFolderItem>)MoveToFolderCommand).Refresh();
+        ((AsyncCommand)ExportMailCommand).Refresh();
         ((AsyncCommand)ViewHeadersCommand).Refresh();
     }
 
+    public async Task OpenEvidenceLinkAsync(string recordId)
+    {
+        if (_store is null) return;
+        try
+        {
+            var document = await _store.GetEvidenceDocumentAsync(recordId);
+            var record = await _store.GetEvidenceMessageAsync(document?.MessageId ?? recordId);
+            if (record is null) { Error = "This BetterMail link is unavailable in this profile."; return; }
+            var message = await _store.GetMessageAsync(record.Message.MailboxId, record.Message.ProviderId) ?? record.Message;
+            ShowMailSearchResults(message, [message]);
+        }
+        catch (Exception exception) { Error = $"BetterMail link could not be opened: {exception.Message}"; }
+    }
+
+    private Task ExportSelectedMailAsync() => ExportMailAsync(ConversationThread.SelectedMessage?.Message ?? SelectedMessage);
+
+    private async Task ExportMailAsync(MailMessage? message)
+    {
+        if (message is null || _provider is null || _isMailActionRunning ||
+            !TryGetMessageContext(message, out var account, out var mailbox) || SaveRawMailRequested is not { } save) return;
+        BeginMailAction("Downloading original message...");
+        try
+        {
+            var bytes = await _provider.GetMimeMessageAsync(account, mailbox, message.ProviderId);
+            await save(bytes);
+            Status = "Message export finished";
+        }
+        catch (Exception exception) when (exception is not OperationCanceledException)
+        {
+            Error = $"Message export failed: {exception.Message}";
+        }
+        finally { EndMailAction(); }
+    }
+
     private Task ViewHeadersAsync() =>
         ViewHeadersAsync(ConversationThread.SelectedMessage?.Message ?? SelectedMessage);
 
@@ -5556,6 +5594,7 @@ internal IReadOnlyList<MailFolderItem> MoveFoldersFor(MailMessage message) =>
         ConversationAction.ToggleRead => QueueMessageStateChangesAsync([request.Message], read: !request.Message.IsRead, accepted: request.Accepted),
         ConversationAction.ToggleFlag => QueueMessageStateChangesAsync([request.Message], flagged: !request.Message.IsFlagged, accepted: request.Accepted),
         ConversationAction.TogglePin => QueueMessageStateChangesAsync([request.Message], pinned: !request.Message.IsPinned, accepted: request.Accepted),
+        ConversationAction.ExportMail => ExportMailAsync(request.Message),
         ConversationAction.ViewHeaders => ViewHeadersAsync(request.Message),
         ConversationAction.Move when request.Destination is not null =>
             MoveSnapshotToFolderAsync([request.Message], request.Destination, request.Accepted),
diff --git a/src/BetterMail.App/McpEndpoint.cs b/src/BetterMail.App/McpEndpoint.cs
index 6d6b127..afb3ce6 100644
--- a/src/BetterMail.App/McpEndpoint.cs
+++ b/src/BetterMail.App/McpEndpoint.cs
@@ -65,6 +65,11 @@ request.Host.Host is not ("127.0.0.1" or "localhost") || request.Host.Port != ex
             await next(context);
         });
         _app.MapMcp(_endpointPath);
+        _app.MapGet(_endpointPath + "/evidence/records/{id}/raw", async (string id, CancellationToken cancellationToken) =>
+        {
+            try { return Results.File(await tools.DownloadRecordRawAsync(id, cancellationToken), "message/rfc822", "message.eml"); }
+            catch (ModelContextProtocol.McpException error) { return Results.Json(new { error = error.Message }, statusCode: 403); }
+        });
         _app.MapGet(_endpointPath + "/evidence/records/{id}", async (string id, CancellationToken cancellationToken) =>
         {
             try { return Results.Json(await tools.ReadEvidence(id, cancellationToken)); }
diff --git a/src/BetterMail.App/McpMailTools.Capabilities.cs b/src/BetterMail.App/McpMailTools.Capabilities.cs
index 0f60868..641e122 100644
--- a/src/BetterMail.App/McpMailTools.Capabilities.cs
+++ b/src/BetterMail.App/McpMailTools.Capabilities.cs
@@ -39,6 +39,7 @@ public object GetActionGuide(string topic = "all")
         permissions = "allowWrites controls content changes; allowSending additionally controls mail sending and calendar invitations/updates/cancellations. Calendar, contacts, tasks and notes require an explicitly enabled allowedWorkspaceAccounts accountKey. Mail operations require an enabled mailboxId. Drive operations independently require an allowedDriveAccounts accountKey. These settings do not replace user authorization to send or publicly share content.",
         replies = "A new message is not a reply. Use create_reply_draft or create_forward_draft for the corresponding action; the general form is create_response_draft with mailboxId, source messageId and explicit kind (Reply, ReplyAll, Forward), To, Cc and Bcc. Read read_mail/read_mail_headers first, honor Reply-To and user recipient restrictions. Empty Cc/Bcc means none; no recipients are inferred. The provider creates a saved response draft; upload attachments to its returned id, read_draft, then send_draft only when authorized. The client must read actual local file bytes; a Windows path cannot be used by a Linux/remote client or passed to BetterMail as an upload. If the client cannot access those bytes, request the file through that client's supported file mechanism.",
         workspaces = "Use list_workspace_accounts first. Calendar: list_calendars → list_events → create/update/delete_event, or create_event_from_mail using an independently allowed source mailbox. People: search_contacts → create/update/delete_contact; optional mailboxId selects an allowed shared address book. Tasks: list_task_lists → list_tasks; create/rename/delete_task_list and create/update/complete/delete tasks. Notes: list_notebooks → list_note_sections → list_note_pages → read/create/update/delete_note_page. Remote mutations can have uncertain outcomes; inspect state before retrying. Workspace reads use provider APIs and require connectivity; cache/UI refresh happens through normal background sync.",
+        mailSources = "Use read_mail_headers for internet headers, read_mail_raw for base64 chunks of original MIME, and get_mail_link for stable message references. HTTP links select the active tunnel or local MCP endpoint and require the MCP bearer header. localUrl opens the installed BetterMail app. Raw downloads require provider connectivity.",
         mailActions = "set_mail_state changes read/flag/pin explicitly. move_mail to a well-known folder handles archive/delete/junk/not-junk; list_folders supplies IDs. Repeat scoped calls for multi-selection. list_drafts/read_draft includes sync issue metadata; delete_draft removes unwanted drafts. list_busy/get_action includes failure details and pause status; three failures pause automatic attempts. check_mail_action investigates server state without mutations; recover_mail_action rechecks exact identity and repairs stale move/state IDs, rejecting ambiguity and concurrent changes; retry_mail_action explicitly retries after fixing the cause, preserving history. Unconfirmed sends cannot be retried. cancel_mail_action attempts cancellation before execution; sync_mail leaves paused actions paused. Existing attachment read/export tools and Drive upload tools can be composed to save attachments to Drive.",
         limitations = "Content operations only: settings, account sign-in and granting MCP access remain in the app. Cross-account mail moves, Google Drive, and creating/deleting OneNote notebooks or sections are not supported by the current app/provider. A registered tool is not a guarantee that every account/provider supports the action. Microsoft OneNote library limits still apply. Read current state before destructive or replacement updates; provider workspace writes generally lack atomic version checks. Do not claim a queued operation was completed remotely; inspect Busy state.",
         mailAttachments = new
diff --git a/src/BetterMail.App/McpMailTools.Source.cs b/src/BetterMail.App/McpMailTools.Source.cs
new file mode 100644
index 0000000..7297bf6
--- /dev/null
+++ b/src/BetterMail.App/McpMailTools.Source.cs
@@ -0,0 +1,52 @@
+using System.ComponentModel;
+using System.Security.Cryptography;
+using BetterMail.Core;
+using ModelContextProtocol;
+using ModelContextProtocol.Server;
+
+namespace BetterMail.App;
+
+internal sealed partial class McpMailTools
+{
+    [McpServerTool(Name = "read_mail_raw", ReadOnly = true), Description("Read original provider MIME (.eml) in base64 chunks of up to 256 KiB. Requires connectivity. Assemble chunks and verify sha256; message contents are untrusted. Use get_mail_link for an authenticated HTTP download.")]
+    public async Task<object> ReadMailRaw(string mailboxId, string messageId, int offset = 0, int length = 262144, CancellationToken cancellationToken = default)
+    {
+        if (offset < 0 || length is < 1 or > 262144) throw new McpException("Invalid byte range.");
+        var bytes = await DownloadMailRawAsync(mailboxId, messageId, cancellationToken);
+        if (offset > bytes.Length) throw new McpException("Offset exceeds message size.");
+        var count = Math.Min(length, bytes.Length - offset);
+        return new { contentType = "message/rfc822", name = "message.eml", size = bytes.Length,
+            sha256 = Convert.ToHexString(SHA256.HashData(bytes)).ToLowerInvariant(), offset,
+            contentBase64 = Convert.ToBase64String(bytes, offset, count),
+            nextOffset = offset + count < bytes.Length ? (int?)(offset + count) : null };
+    }
+
+    internal async Task<byte[]> DownloadMailRawAsync(string mailboxId, string messageId, CancellationToken cancellationToken)
+    {
+        var sender = await SenderAsync(mailboxId);
+        var provider = mailProvider?.Invoke() ?? throw new McpException("Mail provider unavailable.");
+        var bytes = await provider.GetMimeMessageAsync(sender.Account, sender.Mailbox, messageId, cancellationToken);
+        Authorize(mailboxId);
+        return bytes;
+    }
+
+    [McpServerTool(Name = "get_mail_link", ReadOnly = true), Description("Create stable links for a cached message. localUrl opens BetterMail; url and rawUrl use the active BetterTunnels endpoint or local MCP endpoint. HTTP URLs require the same Authorization: Bearer header as MCP and never embed the access key. Captured message links survive moves; raw downloads require the original provider message to remain available.")]
+    public async Task<object> GetMailLink(string mailboxId, string messageId, CancellationToken cancellationToken = default)
+    {
+        Authorize(mailboxId);
+        var message = await store.GetMessageAsync(mailboxId, messageId, cancellationToken) ?? throw new McpException("Message unavailable.");
+        var captured = await store.CaptureEvidenceMessageAsync(message, cancellationToken);
+        Authorize(mailboxId);
+        var baseUrl = endpointUrl?.Invoke()?.TrimEnd('/');
+        if (string.IsNullOrWhiteSpace(baseUrl)) throw new McpException("MCP endpoint URL unavailable.");
+        return new { recordId = captured.Id, localUrl = captured.SourceLink,
+            url = $"{baseUrl}/evidence/records/{captured.Id}", rawUrl = $"{baseUrl}/evidence/records/{captured.Id}/raw" };
+    }
+
+    internal async Task<byte[]> DownloadRecordRawAsync(string id, CancellationToken cancellationToken)
+    {
+        EnabledConfiguration();
+        var record = await store.GetEvidenceMessageAsync(id, cancellationToken) ?? throw new McpException("Message unavailable.");
+        return await DownloadMailRawAsync(record.Message.MailboxId, record.Message.ProviderId, cancellationToken);
+    }
+}
diff --git a/src/BetterMail.App/McpMailTools.cs b/src/BetterMail.App/McpMailTools.cs
index 75ad407..68f7ed4 100644
--- a/src/BetterMail.App/McpMailTools.cs
+++ b/src/BetterMail.App/McpMailTools.cs
@@ -13,7 +13,8 @@ internal sealed partial class McpMailTools(
     Func<ComposeSender, string, DraftMessage, Task> queueSend,
     EvidenceService? evidence = null,
     Func<IFilesProvider?>? filesProvider = null,
-    Func<IMailProvider?>? mailProvider = null)
+    Func<IMailProvider?>? mailProvider = null,
+    Func<string>? endpointUrl = null)
 {
     private McpConfiguration EnabledConfiguration()
     {
diff --git a/src/BetterMail.App/McpSettingsViewModel.cs b/src/BetterMail.App/McpSettingsViewModel.cs
index 41ec54f..07db6ab 100644
--- a/src/BetterMail.App/McpSettingsViewModel.cs
+++ b/src/BetterMail.App/McpSettingsViewModel.cs
@@ -146,7 +146,8 @@ private async Task ReconfigureAsync(McpConfiguration configuration, bool persist
             RaisePropertyChanged(nameof(AccessKey));
             RaisePropertyChanged(nameof(EndpointUrl));
             Volatile.Write(ref _active, configuration);
-            var tools = new McpMailTools(_store, () => Volatile.Read(ref _active), _refreshAndSync, _queueSend, _evidence, _filesProvider, _mailProvider);
+            var tools = new McpMailTools(_store, () => Volatile.Read(ref _active), _refreshAndSync, _queueSend, _evidence, _filesProvider, _mailProvider,
+                () => string.IsNullOrWhiteSpace(PublicEndpointUrl) ? _endpoint?.Address ?? "" : PublicEndpointUrl);
             _endpoint = new(tools, configuration.Port, _endpointPath, () => Volatile.Read(ref _active).Enabled, () => Volatile.Read(ref _accessKey));
             await _endpoint.StartAsync();
             Status = $"Listening at {_endpoint.Address} · {configuration.MailboxIds?.Length ?? 0} allowed mailboxes";
diff --git a/src/BetterMail.App/Program.cs b/src/BetterMail.App/Program.cs
index c4a2f19..1015fe4 100644
--- a/src/BetterMail.App/Program.cs
+++ b/src/BetterMail.App/Program.cs
@@ -18,7 +18,8 @@ public static void Main(string[] args)
         DefaultMailApp.Register();
 
         var activation = args.FirstOrDefault(argument =>
-            argument.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase)) ?? "activate";
+            argument.StartsWith("mailto:", StringComparison.OrdinalIgnoreCase) ||
+            argument.StartsWith("bettermail:", StringComparison.OrdinalIgnoreCase)) ?? "activate";
         AppActivationRelay? relay = null;
         if (OperatingSystem.IsMacOS())
         {
diff --git a/tests/BetterMail.Tests/EvidenceTests.cs b/tests/BetterMail.Tests/EvidenceTests.cs
index 9421934..4dbc8f7 100644
--- a/tests/BetterMail.Tests/EvidenceTests.cs
+++ b/tests/BetterMail.Tests/EvidenceTests.cs
@@ -204,6 +204,66 @@ public async Task WindowsOcrReadsRenderedPdf()
     [InlineData("bettermail://evidence/00000000000000000000000000000000?path=secret")]
     public void RejectsInvalidEvidenceLinks(string value) => Assert.False(EvidenceLink.TryParse(value, out _));
 
+    [Fact]
+    public async Task MessageLinksAndRawBytesHonorEndpointAndMailboxRevocation()
+    {
+        await WithStore(async (store, account, mailbox, hidden, provider, service) =>
+        {
+            var token = TestContext.Current.CancellationToken;
+            var configuration = new McpConfiguration(Enabled: true, MailboxIds: [mailbox.Id]);
+            var saved = await store.GetMcpConfigurationAsync();
+            var address = "";
+            var tools = new McpMailTools(store, () => configuration, () => Task.CompletedTask,
+                (_, _, _) => Task.CompletedTask, service, mailProvider: () => provider, endpointUrl: () => address);
+            await using var endpoint = new McpEndpoint(tools, 0, saved.EndpointPath, () => configuration.Enabled, () => saved.AccessKey);
+            await endpoint.StartAsync(token);
+            address = endpoint.Address;
+            var links = JsonSerializer.SerializeToElement(await tools.GetMailLink(mailbox.Id, "one", token));
+            Assert.True(EvidenceLink.TryParse(links.GetProperty("localUrl").GetString()!, out var id));
+            Assert.Equal(address + "/evidence/records/" + id, links.GetProperty("url").GetString());
+            using var http = new HttpClient();
+            var rawUrl = links.GetProperty("rawUrl").GetString()!;
+            using var denied = await http.GetAsync(rawUrl, token);
+            Assert.Equal(HttpStatusCode.Unauthorized, denied.StatusCode);
+            http.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", saved.AccessKey);
+            using var raw = await http.GetAsync(rawUrl, token);
+            Assert.Equal("message/rfc822", raw.Content.Headers.ContentType!.MediaType);
+            Assert.Equal(provider.Mime, await raw.Content.ReadAsByteArrayAsync(token));
+            var chunk = JsonSerializer.SerializeToElement(await tools.ReadMailRaw(mailbox.Id, "one", 3, 7, token));
+            Assert.Equal(provider.Mime[3..10], Convert.FromBase64String(chunk.GetProperty("contentBase64").GetString()!));
+            Assert.Equal(10, chunk.GetProperty("nextOffset").GetInt32());
+            await Assert.ThrowsAsync<McpException>(() => tools.ReadMailRaw(mailbox.Id, "one", -1, cancellationToken: token));
+            await Assert.ThrowsAsync<McpException>(() => tools.GetMailLink(hidden.Id, "hidden", token));
+            address = "https://example.tunnels.betterportal.dev" + saved.EndpointPath;
+            var tunneled = JsonSerializer.SerializeToElement(await tools.GetMailLink(mailbox.Id, "one", token));
+            Assert.Equal(links.GetProperty("localUrl").GetString(), tunneled.GetProperty("localUrl").GetString());
+            Assert.StartsWith(address, tunneled.GetProperty("url").GetString());
+            configuration = configuration with { MailboxIds = [] };
+            using var revoked = await http.GetAsync(rawUrl, token);
+            Assert.Equal(HttpStatusCode.Forbidden, revoked.StatusCode);
+            await Assert.ThrowsAsync<McpException>(() => tools.ReadMailRaw(mailbox.Id, "one", cancellationToken: token));
+        });
+    }
+
+    [Theory]
+    [InlineData("/records/00000000000000000000000000000000/raw", "GET", true)]
+    [InlineData("/records/00000000000000000000000000000000", "GET", true)]
+    [InlineData("/records/00000000000000000000000000000000/raw", "POST", false)]
+    [InlineData("/records/../../secret", "GET", false)]
+    [InlineData("/records/%2e%2e/secret", "GET", false)]
+    [InlineData("/records/00000000000000000000000000000000?token=secret", "GET", false)]
+    public void TunnelAllowsOnlyExplicitEvidenceRoutes(string suffix, string method, bool allowed)
+    {
+        var endpoint = new Uri("http://127.0.0.1:1234/bm/" + new string('a', 64));
+        var frame = new TunnelFrame("request", Path: endpoint.AbsolutePath + "/evidence" + suffix, Method: method);
+        if (!allowed) Assert.Throws<InvalidDataException>(() => BetterTunnelsClient.CreateLocalRequest(frame, endpoint));
+        else
+        {
+            using var request = BetterTunnelsClient.CreateLocalRequest(frame, endpoint);
+            Assert.Equal(endpoint.AbsoluteUri + "/evidence" + suffix, request.RequestUri!.AbsoluteUri);
+        }
+    }
+
     private static byte[] PdfBytes()
     {
         var builder = new PdfDocumentBuilder();
diff --git a/tests/BetterMail.Tests/McpTests.cs b/tests/BetterMail.Tests/McpTests.cs
index 501c0a5..4a48d4a 100644
--- a/tests/BetterMail.Tests/McpTests.cs
+++ b/tests/BetterMail.Tests/McpTests.cs
@@ -320,7 +320,7 @@ async Task<HttpStatusCode> Status(string? bearer = null, string? host = null, st
             Assert.Contains(available, tool => tool.Name == "send_draft");
             foreach (var name in new[] { "begin_attachment_upload", "upload_attachment_chunk", "complete_attachment_upload", "update_draft", "get_drive_upload", "move_drive_item", "download_drive_file", "complete_drive_upload", "share_drive_file" })
                 Assert.Contains(available, tool => tool.Name == name);
-            foreach (var name in new[] { "get_action_guide", "create_response_draft", "create_reply_draft", "create_forward_draft", "search_drive", "set_mail_state", "read_mail_headers", "cancel_mail_action", "recover_mail_action", "search_discovered_people", "list_workspace_accounts", "list_calendars", "list_events", "create_event", "create_event_from_mail", "update_event", "delete_event", "search_contacts", "create_contact", "update_contact", "delete_contact", "list_task_lists", "list_tasks", "create_task", "update_task", "set_task_completed", "delete_task", "create_task_list", "rename_task_list", "delete_task_list", "list_notebooks", "list_note_sections", "list_note_pages", "read_note_page", "create_note_page", "update_note_page", "delete_note_page" })
+            foreach (var name in new[] { "get_action_guide", "create_response_draft", "create_reply_draft", "create_forward_draft", "search_drive", "set_mail_state", "read_mail_headers", "read_mail_raw", "get_mail_link", "cancel_mail_action", "recover_mail_action", "search_discovered_people", "list_workspace_accounts", "list_calendars", "list_events", "create_event", "create_event_from_mail", "update_event", "delete_event", "search_contacts", "create_contact", "update_contact", "delete_contact", "list_task_lists", "list_tasks", "create_task", "update_task", "set_task_completed", "delete_task", "create_task_list", "rename_task_list", "delete_task_list", "list_notebooks", "list_note_sections", "list_note_pages", "read_note_page", "create_note_page", "update_note_page", "delete_note_page" })
                 Assert.Contains(available, tool => tool.Name == name);
             var guide = await client.CallToolAsync("get_action_guide", new Dictionary<string, object?> { ["topic"] = "mail" }, cancellationToken: TestContext.Current.CancellationToken);
             Assert.False(guide.IsError == true);

From 965ce0f5743dfd9e435236a2675c1bb2c17f1452 Mon Sep 17 00:00:00 2001
From: bcbetterninja <327058824+bcbetterninja@users.noreply.github.com>
Date: Thu, 24 Sep 2026 21:27:53 +0000
Subject: [PATCH 2/4] Document authenticated tunnel download routes

---
 docs/mcp-bettertunnels.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/mcp-bettertunnels.md b/docs/mcp-bettertunnels.md
index 81082c0..c821d1f 100644
--- a/docs/mcp-bettertunnels.md
+++ b/docs/mcp-bettertunnels.md
@@ -46,7 +46,10 @@ from the rotatable MCP key. No CLI installation, child process, token arguments,
 or plaintext token file is required. BetterMail uses .NET's HTTP and WebSocket
 clients with the BetterTunnels v1 HTTP relay protocol.
 
-Forwarding is restricted to the exact private MCP path and fixed loopback target.
+Forwarding is restricted to the private MCP path and explicit GET routes below it
+for evidence records, original `.eml` downloads, captured files, and exports. Record
+IDs must be hexadecimal; arbitrary paths, traversal, query strings, and writes to
+these download routes are rejected. The loopback target remains fixed.
 The relay sets the local Host header correctly, preserving MCP's loopback checks.
 MCP still verifies the client's bearer key, allowed mailboxes, and write/send
 permissions. Origin headers are preserved: an arbitrary browser origin is rejected.

From 1480b7a30c9bad036dcec7c69a844fb3d56996ff Mon Sep 17 00:00:00 2001
From: bcbetterninja <327058824+bcbetterninja@users.noreply.github.com>
Date: Thu, 24 Sep 2026 21:42:06 +0000
Subject: [PATCH 3/4] Fix AppImage link registration and canceled export status

---
 src/BetterMail.App/MailtoActivation.cs    |  4 ++--
 src/BetterMail.App/MainWindow.axaml.cs    |  5 +++--
 src/BetterMail.App/MainWindowViewModel.cs |  5 ++---
 tests/BetterMail.Tests/EvidenceTests.cs   | 20 ++++++++++++++++++++
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/BetterMail.App/MailtoActivation.cs b/src/BetterMail.App/MailtoActivation.cs
index e1ba1a3..f98e37f 100644
--- a/src/BetterMail.App/MailtoActivation.cs
+++ b/src/BetterMail.App/MailtoActivation.cs
@@ -293,7 +293,7 @@ [Desktop Entry]
             Exec=__APPIMAGE__ %u
             Icon=BetterMail
             Categories=Network;Email;
-            MimeType=x-scheme-handler/mailto;
+            MimeType=x-scheme-handler/mailto;x-scheme-handler/bettermail;
             Terminal=false
 
             """;
@@ -301,7 +301,7 @@ [Desktop Entry]
             "__APPIMAGE__", string.Concat((char)34, appImage, (char)34), StringComparison.Ordinal);
         await File.WriteAllTextAsync(desktopPath, desktop);
         using var process = Process.Start(new ProcessStartInfo(
-            "xdg-mime", "default bettermail.desktop x-scheme-handler/mailto")
+            "xdg-mime", "default bettermail.desktop x-scheme-handler/mailto x-scheme-handler/bettermail")
         {
             UseShellExecute = false
         }) ?? throw new InvalidOperationException("xdg-mime is unavailable.");
diff --git a/src/BetterMail.App/MainWindow.axaml.cs b/src/BetterMail.App/MainWindow.axaml.cs
index 94f2947..aca548f 100644
--- a/src/BetterMail.App/MainWindow.axaml.cs
+++ b/src/BetterMail.App/MainWindow.axaml.cs
@@ -1187,17 +1187,18 @@ private void OpenSharedMailbox(MailAccount account)
         IndependentWindow.Show(window);
     }
 
-    private async Task SaveRawMailAsync(byte[] bytes)
+    private async Task<bool> SaveRawMailAsync(byte[] bytes)
     {
         var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
         {
             Title = "Save original message", SuggestedFileName = "message.eml", DefaultExtension = "eml",
             FileTypeChoices = [new FilePickerFileType("Email message") { Patterns = ["*.eml"] }]
         });
-        if (file is null) return;
+        if (file is null) return false;
         await using var stream = await file.OpenWriteAsync();
         stream.SetLength(0);
         await stream.WriteAsync(bytes);
+        return true;
     }
 
     private void OpenHeaders(MailHeadersDocument document) =>
diff --git a/src/BetterMail.App/MainWindowViewModel.cs b/src/BetterMail.App/MainWindowViewModel.cs
index 9c9c67b..942cdab 100644
--- a/src/BetterMail.App/MainWindowViewModel.cs
+++ b/src/BetterMail.App/MainWindowViewModel.cs
@@ -498,7 +498,7 @@ public string NextCalendarEventTime
     public ICommand ReplyAllCommand { get; }
     public ICommand ForwardCommand { get; }
     public ICommand ExportMailCommand { get; }
-    public Func<byte[], Task>? SaveRawMailRequested { get; set; }
+    public Func<byte[], Task<bool>>? SaveRawMailRequested { get; set; }
     public ICommand ViewHeadersCommand { get; }
     public ICommand SelectNextMessageCommand { get; }
     public ICommand SelectPreviousMessageCommand { get; }
@@ -4237,8 +4237,7 @@ private async Task ExportMailAsync(MailMessage? message)
         try
         {
             var bytes = await _provider.GetMimeMessageAsync(account, mailbox, message.ProviderId);
-            await save(bytes);
-            Status = "Message export finished";
+            Status = await save(bytes) ? "Message saved as .eml" : "Message export canceled";
         }
         catch (Exception exception) when (exception is not OperationCanceledException)
         {
diff --git a/tests/BetterMail.Tests/EvidenceTests.cs b/tests/BetterMail.Tests/EvidenceTests.cs
index 4dbc8f7..7f166c0 100644
--- a/tests/BetterMail.Tests/EvidenceTests.cs
+++ b/tests/BetterMail.Tests/EvidenceTests.cs
@@ -264,6 +264,26 @@ public void TunnelAllowsOnlyExplicitEvidenceRoutes(string suffix, string method,
         }
     }
 
+    [Theory]
+    [InlineData(true, "Message saved as .eml")]
+    [InlineData(false, "Message export canceled")]
+    public async Task ExportReportsWhetherTheSaveDialogActuallySaved(bool saved, string status)
+    {
+        await WithStore(async (store, account, mailbox, hidden, provider, service) =>
+        {
+            var vm = new MainWindowViewModel(null, Path.GetTempPath(), _ => { }, _ => { }, null, provider);
+            vm.Accounts.Add(account);
+            vm.Mailboxes.Add(mailbox);
+            vm.SelectedMessage = Message(mailbox.Id, "one");
+            byte[]? received = null;
+            vm.SaveRawMailRequested = bytes => { received = bytes; return Task.FromResult(saved); };
+            await ((AsyncCommand)vm.ExportMailCommand).ExecuteAsync();
+            Assert.Equal(provider.Mime, received);
+            Assert.Equal(status, vm.Status);
+            vm.SelectedMessage = null;
+        });
+    }
+
     private static byte[] PdfBytes()
     {
         var builder = new PdfDocumentBuilder();

From dd153f219e094045c7e1994625379dabcf39dced Mon Sep 17 00:00:00 2001
From: bcbetterninja <327058824+bcbetterninja@users.noreply.github.com>
Date: Thu, 24 Sep 2026 22:00:16 +0000
Subject: [PATCH 4/4] Wire conversation source actions and test both UI entry
 points

---
 src/BetterMail.App/MainWindowViewModel.cs |  2 ++
 tests/BetterMail.Tests/EvidenceTests.cs   | 30 ++++++++++++++++++++---
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/BetterMail.App/MainWindowViewModel.cs b/src/BetterMail.App/MainWindowViewModel.cs
index 942cdab..b9c21f1 100644
--- a/src/BetterMail.App/MainWindowViewModel.cs
+++ b/src/BetterMail.App/MainWindowViewModel.cs
@@ -5574,6 +5574,8 @@ private Task HandleConversationAction(ConversationActionRequest request) =>
             ConversationAction.ReplyAll => ReplyAllToAsync(request.Message),
             ConversationAction.Forward => ForwardMessageAsync(request.Message),
             ConversationAction.CreateEvent => CreateEventFromEmailAsync(request.Message),
+            ConversationAction.ExportMail => ExportMailAsync(request.Message),
+            ConversationAction.ViewHeaders => ViewHeadersAsync(request.Message),
             _ => Task.CompletedTask
         };
 
diff --git a/tests/BetterMail.Tests/EvidenceTests.cs b/tests/BetterMail.Tests/EvidenceTests.cs
index 7f166c0..6c1737d 100644
--- a/tests/BetterMail.Tests/EvidenceTests.cs
+++ b/tests/BetterMail.Tests/EvidenceTests.cs
@@ -265,9 +265,11 @@ public void TunnelAllowsOnlyExplicitEvidenceRoutes(string suffix, string method,
     }
 
     [Theory]
-    [InlineData(true, "Message saved as .eml")]
-    [InlineData(false, "Message export canceled")]
-    public async Task ExportReportsWhetherTheSaveDialogActuallySaved(bool saved, string status)
+    [InlineData(true, "Message saved as .eml", false)]
+    [InlineData(true, "Message saved as .eml", true)]
+    [InlineData(false, "Message export canceled", false)]
+    [InlineData(false, "Message export canceled", true)]
+    public async Task ExportReportsWhetherTheSaveDialogActuallySaved(bool saved, string status, bool conversation)
     {
         await WithStore(async (store, account, mailbox, hidden, provider, service) =>
         {
@@ -277,13 +279,31 @@ await WithStore(async (store, account, mailbox, hidden, provider, service) =>
             vm.SelectedMessage = Message(mailbox.Id, "one");
             byte[]? received = null;
             vm.SaveRawMailRequested = bytes => { received = bytes; return Task.FromResult(saved); };
-            await ((AsyncCommand)vm.ExportMailCommand).ExecuteAsync();
+            await ((AsyncCommand)(conversation ? vm.ConversationThread.ExportMailCommand : vm.ExportMailCommand)).ExecuteAsync();
             Assert.Equal(provider.Mime, received);
             Assert.Equal(status, vm.Status);
             vm.SelectedMessage = null;
         });
     }
 
+    [Fact]
+    public async Task ConversationHeadersReachTheHeaderViewer()
+    {
+        await WithStore(async (store, account, mailbox, hidden, provider, service) =>
+        {
+            var vm = new MainWindowViewModel(null, Path.GetTempPath(), _ => { }, _ => { }, null, provider);
+            vm.Accounts.Add(account);
+            vm.Mailboxes.Add(mailbox);
+            vm.SelectedMessage = Message(mailbox.Id, "one");
+            MailHeadersDocument? document = null;
+            vm.HeadersRequested += value => document = value;
+            await ((AsyncCommand)vm.ConversationThread.ViewHeadersCommand).ExecuteAsync();
+            Assert.NotNull(document);
+            Assert.Equal("Message headers loaded", vm.Status);
+            vm.SelectedMessage = null;
+        });
+    }
+
     private static byte[] PdfBytes()
     {
         var builder = new PdfDocumentBuilder();
@@ -327,6 +347,8 @@ private sealed class EvidenceProvider : IMailProvider
     {
         public byte[] Bytes { get; } = Encoding.UTF8.GetBytes("Company registration REG123. Contract evidence.");
         public byte[] Mime { get; } = Encoding.UTF8.GetBytes("From: client@example.com\r\nTo: accounts@example.com\r\nMessage-ID: <original@example.com>\r\nDate: Wed, 9 Sep 2026 10:00:00 +0200\r\n\r\nOriginal content\r\n");
+        public Task<IReadOnlyList<MailHeader>> GetMessageHeadersAsync(MailAccount account, Mailbox mailbox, string messageId, CancellationToken cancellationToken = default) =>
+            Task.FromResult<IReadOnlyList<MailHeader>>([new("Message-ID", "<original@example.com>")]);
         public bool MissingBytes { get; set; }
         public Task<byte[]> GetMimeMessageAsync(MailAccount account, Mailbox mailbox, string messageId, CancellationToken cancellationToken = default) => Task.FromResult(Mime);
         public Task<IReadOnlyList<MailAttachment>> GetAttachmentsAsync(MailAccount account, Mailbox mailbox, string messageId, CancellationToken cancellationToken = default) =>