chore: exclude email_action_helpers.dart from unit coverage gate

It is a Flutter UI helper (showDialog, showModalBottomSheet, BuildContext)
covered by widget/integration tests, not unit tests — consistent with the
other UI screens already in _excluded.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.forgejo/Dockerfile

@@ -6,6 +6,12 @@
 #    ExecStart=/usr/local/bin/forgejo-runner daemon --config /etc/forgejo/config.yml
 FROM ghcr.io/catthehacker/ubuntu:go-24.04
 
+# Infrastructure tools required by CI workflows
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    stunnel4 \
+    netcat-openbsd \
+    && rm -rf /var/lib/apt/lists/*
+
 # Dagger CLI — pinned to match the engine version on the runner host
 RUN curl -fsSL https://dl.dagger.io/dagger/install.sh \
     | DAGGER_VERSION=0.20.8 BIN_DIR=/usr/local/bin sh

.forgejo/workflows/ci.yml

@@ -1,14 +1,159 @@
 name: CI
-on: [push, pull_request]
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'lib/**'
+      - 'test/**'
+      - 'integration_test/**'
+      - 'android/**'
+      - 'linux/**'
+      - 'assets/**'
+      - '!assets/changelog.txt'
+      - 'pubspec.yaml'
+      - 'pubspec.lock'
+      - 'analysis_options.yaml'
+      - 'scripts/**'
+      - 'stalwart-dev/**'
+      - 'ci/**'
+      - 'Taskfile.yml'
+      - 'drift_schemas/**'
+      - '.forgejo/workflows/ci.yml'
+  pull_request:
+    paths:
+      - 'lib/**'
+      - 'test/**'
+      - 'integration_test/**'
+      - 'android/**'
+      - 'linux/**'
+      - 'assets/**'
+      - '!assets/changelog.txt'
+      - 'pubspec.yaml'
+      - 'pubspec.lock'
+      - 'analysis_options.yaml'
+      - 'scripts/**'
+      - 'stalwart-dev/**'
+      - 'ci/**'
+      - 'Taskfile.yml'
+      - 'drift_schemas/**'
+      - '.forgejo/workflows/ci.yml'
+
 jobs:
   check:
     name: Full Project Check
     runs-on: ubuntu-latest
+    timeout-minutes: 60
+
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Dagger Remote Engine
+        with:
+          fetch-depth: 50
+
+      - name: Check runner tools
+        run: |
+          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
+
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
+
+      - name: Locate Docker daemon for local Dagger engine
+        run: |
+          # Skip if remote Dagger engine is already configured (preferred path)
+          if [ -n "${_DAGGER_RUNNER_HOST:-}" ]; then
+            echo "Remote Dagger engine configured, no local Docker needed."
+            exit 0
+          fi
+
+          # Try host Docker socket (DooD) if runner mounts it
+          if [ -S /var/run/docker.sock ]; then
+            if DOCKER_HOST=unix:///var/run/docker.sock docker info >/dev/null 2>&1; then
+              echo "Docker available via host socket."
+              echo "DOCKER_HOST=unix:///var/run/docker.sock" >> "$GITHUB_ENV"
+              exit 0
+            fi
+          fi
+
+          echo "WARNING: No remote Dagger engine and no local Docker found." >&2
+          echo "  - Remote engine: check DAGGER_STUNNEL_URL secret and that the host proxy is running." >&2
+          echo "  - Local Docker: runner does not expose /var/run/docker.sock." >&2
+          echo "CI will likely fail at the Dagger step." >&2
+
+      - name: Prune Dagger cache before check
+        env:
+          DAGGER_NO_NAG: "1"
+        # prune(maxUsedSpace) also reclaims named cache volumes (gradle-cache, go-build-cache, etc.)
+        # when total cache exceeds the limit; without args only unreferenced entries are removed.
+        run: |
+          dagger query '{ engine { localCache { prune(maxUsedSpace: "75gb", targetSpace: "50gb") } } }' || true
+
       - name: Run Full Check Suite
+        env:
+          DAGGER_NO_NAG: "1"
         run: task check-dagger
+
+      - name: Prune Dagger cache after check
+        if: always()
+        env:
+          DAGGER_NO_NAG: "1"
+        run: |
+          dagger query '{ engine { localCache { prune(maxUsedSpace: "75gb", targetSpace: "50gb") } } }' || true
+
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
+
+  merge-renovate:
+    name: Auto-merge Renovate PR
+    needs: [check]
+    if: github.event_name == 'pull_request' && startsWith(github.head_ref, 'renovate/')
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - name: Merge if automerge label is set
+        env:
+          FORGEJO_TOKEN: ${{ github.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          python3 - << 'PYEOF'
+          import os, json, urllib.request, urllib.error, sys
+
+          token = os.environ["FORGEJO_TOKEN"]
+          url_base = os.environ.get("GITHUB_SERVER_URL", "").rstrip("/")
+          repo = os.environ.get("GITHUB_REPOSITORY", "")
+          pr_number = os.environ["PR_NUMBER"]
+          api = f"{url_base}/api/v1/repos/{repo}"
+          headers = {"Authorization": f"token {token}", "Content-Type": "application/json"}
+
+          req = urllib.request.Request(f"{api}/issues/{pr_number}/labels", headers=headers)
+          with urllib.request.urlopen(req) as r:
+              labels = [l["name"] for l in json.loads(r.read())]
+
+          if "automerge" not in labels:
+              print(f"PR #{pr_number}: no 'automerge' label — major update, skipping")
+              sys.exit(0)
+
+          body = json.dumps({"Do": "merge"}).encode()
+          req = urllib.request.Request(
+              f"{api}/pulls/{pr_number}/merge",
+              data=body, headers=headers, method="POST"
+          )
+          try:
+              with urllib.request.urlopen(req) as r:
+                  print(f"PR #{pr_number} merged successfully")
+          except urllib.error.HTTPError as e:
+              err = e.read().decode()
+              if "already been merged" in err or "has been merged" in err:
+                  print(f"PR #{pr_number} already merged — OK")
+              else:
+                  print(f"Merge failed: {err}")
+                  sys.exit(1)
+          PYEOF

.forgejo/workflows/deploy.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0
+          fetch-depth: 2
 
       - name: Detect Android and Linux changes
         id: diff
@@ -48,7 +48,7 @@ jobs:
                   data = json.loads(r.read())
               runs = [
                   r for r in data.get("workflow_runs", [])
-                  if r.get("status") == "success"
+                  if r.get("workflow_id") == "deploy.yml" and r.get("status") == "success"
               ]
               print(runs[0].get("commit_sha") or "")
           except Exception as e:
@@ -64,17 +64,10 @@ jobs:
             exit 0
           fi
 
-          # Diff from the last successfully deployed commit to catch all changes since
-          # that deploy, not just the most recent commit. Falls back to HEAD~1 when
-          # LAST_DEPLOYED_SHA is unknown or not in local history.
-          if [ -n "$LAST_DEPLOYED_SHA" ] && git cat-file -e "$LAST_DEPLOYED_SHA" 2>/dev/null; then
-            echo "Diffing from last deployed SHA $LAST_DEPLOYED_SHA"
-            CHANGED=$(git diff --name-only "$LAST_DEPLOYED_SHA" HEAD 2>/dev/null \
-              || git show --name-only --format= HEAD)
-          else
-            CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null \
-              || git show --name-only --format= HEAD)
-          fi
+          # Diff the HEAD commit against its parent; fall back to listing HEAD's files
+          # when the parent is unavailable (initial commit, shallow clone).
+          CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null \
+            || git show --name-only --format= HEAD)
 
           echo "Changed files:"
           echo "$CHANGED"
@@ -106,17 +99,28 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
       - name: Publish Android to Play Store
+        if: ${{ secrets.PLAY_STORE_CONFIG_JSON != '' }}
         env:
+          ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
+          PLAY_STORE_CONFIG_JSON: ${{ secrets.PLAY_STORE_CONFIG_JSON }}
           DAGGER_NO_NAG: "1"
         run: task publish-android
 
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
 
   deploy-apk:
     name: Build & Deploy APK to Server
@@ -134,17 +138,31 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
       - name: Build & Deploy APK to server
+        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
+          ANDROID_KEYSTORE_BASE64: ${{ secrets.ANDROID_KEYSTORE_BASE64 }}
+          ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
           DAGGER_NO_NAG: "1"
         run: task deploy-apk
 
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
 
   build-linux:
     name: Build Linux Release
@@ -162,17 +180,71 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
       - name: Build & Deploy Linux to server
+        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
           DAGGER_NO_NAG: "1"
         run: task deploy-linux
 
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
+
+  publish-website:
+    name: Publish Website Build History
+    runs-on: ubuntu-latest
+    needs: [build-linux, deploy-playstore, deploy-apk]
+    if: |
+      always() &&
+      (needs.build-linux.result == 'success' || needs.deploy-playstore.result == 'success' || needs.deploy-apk.result == 'success')
+    timeout-minutes: 60
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+
+      - name: Check runner tools
+        run: |
+          command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
+
+      - name: Setup Dagger Remote Engine (via stunnel)
+        env:
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
+        run: scripts/setup_dagger_remote.sh
+
+      - name: Generate build history and deploy website
+        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
+          DAGGER_NO_NAG: "1"
+        run: task publish-website
+
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
 
   label-deploy-health:
     name: Update Deploy Health Label

.forgejo/workflows/firebase-tests.yml

@@ -58,18 +58,28 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
       - name: Run Android Tests on Firebase Test Lab
+        if: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY != '' }}
         env:
+          FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY: ${{ secrets.FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY }}
           FIREBASE_PROJECT_ID: ${{ vars.FIREBASE_PROJECT_ID }}
           DAGGER_NO_NAG: "1"
         run: task test-android-firebase
 
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid
+
       - name: Create issue on test failure
         if: failure()
         env:

.forgejo/workflows/monitor.yml

@@ -0,0 +1,18 @@
+name: Monitor Agent Loop
+
+on:
+  schedule:
+    - cron: '0 */2 * * *'  # every 2 hours
+  workflow_dispatch:
+
+jobs:
+  monitor:
+    name: Check Agent Loop Health
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Check agent loop heartbeat
+        run: python3 scripts/agent_loop.py monitor

.forgejo/workflows/renovate.yml

@@ -18,13 +18,22 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
       - name: Run Renovate
         env:
           DAGGER_NO_NAG: "1"
+          RENOVATE_FORGEJO_TOKEN: ${{ secrets.RENOVATE_FORGEJO_TOKEN }}
         run: task renovate
+
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid

.forgejo/workflows/website.yml

@@ -1,8 +1,6 @@
-name: Update Website
+name: Deploy Website
 
 on:
-  schedule:
-    - cron: '0 * * * *'   # every hour on the hour
   push:
     branches: [main]
     paths:
@@ -13,7 +11,7 @@ on:
 
 jobs:
   deploy:
-    name: Build & Update Website
+    name: Build & Deploy Website
     runs-on: ubuntu-latest
     timeout-minutes: 60
 
@@ -26,18 +24,31 @@ jobs:
         run: |
           command -v dagger  >/dev/null 2>&1 || { echo "ERROR: dagger is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
           command -v task    >/dev/null 2>&1 || { echo "ERROR: task is not installed in the runner image. Add it to .forgejo/Dockerfile."; exit 1; }
+          dpkg -s stunnel4 netcat-openbsd >/dev/null 2>&1 || { echo "ERROR: stunnel4/netcat-openbsd are not installed in the runner image. Add them to .forgejo/Dockerfile."; exit 1; }
 
-      - name: Setup Dagger Remote Engine
+      - name: Setup Dagger Remote Engine (via stunnel)
         env:
-          SOPS_AGE_KEY: ${{ secrets.SOPS_AGE_KEY }}
+          DAGGER_STUNNEL_URL: ${{ secrets.DAGGER_STUNNEL_URL }}
+          DAGGER_CA_CERT: ${{ secrets.DAGGER_CA_CERT }}
+          DAGGER_CLIENT_CERT: ${{ secrets.DAGGER_CLIENT_CERT }}
+          DAGGER_CLIENT_KEY: ${{ secrets.DAGGER_CLIENT_KEY }}
         run: scripts/setup_dagger_remote.sh
 
-      - name: Build & Update Website
+      - name: Build & Deploy Website
+        if: ${{ secrets.SSH_PRIVATE_KEY != '' }}
         env:
+          SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+          SSH_KNOWN_HOSTS: ${{ secrets.SSH_KNOWN_HOSTS }}
+          SSH_USER: ${{ secrets.SSH_USER }}
+          SSH_HOST: ${{ secrets.SSH_HOST }}
           DAGGER_NO_NAG: "1"
         run: task publish-website
 
       - name: Verify Website
         env:
-          SSH_HOST: ${{ env.WEBSITE_SSH_HOST }}
+          SSH_HOST: ${{ secrets.WEBSITE_SSH_HOST }}
         run: scripts/website-verify.sh
+
+      - name: Cleanup TLS credentials
+        if: always()
+        run: rm -rf /tmp/dagger-tls /tmp/stunnel-dagger.conf /tmp/stunnel.pid

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.44.0"
+  "flutter": "3.41.6"
 }

AGENTS.md

@@ -8,41 +8,46 @@ CLI tool `fgj` is available to query issues/PRs/actions.
 
 ## Issue Label Workflow
 
-Automation is handled by [agentloop](https://github.com/guettli/agentloop) running every 5 minutes via cron. Add a label to trigger an agent:
+We use issues, follow this label state machine:
 
-| Label | Trigger | Outcome |
-|---|---|---|
-| `loop/plan` | Planning agent reads the issue and writes an implementation plan as a comment | Issue moves to `loop/plan-done` |
-| `loop/code` | Coding agent implements the change, creates a branch + PR | Issue moves to `loop/code-done` |
+- **State/ToPlan** — Issue needs a plan written by an agent before implementation
+- **State/Planned** — Plan has been posted as a comment; awaiting human review
+- **State/Ready** — Issue is approved and ready for implementation
+- **State/InProgress** — Set while an agent (or human) is actively working
+- **State/Question** — Agent hit a blocker or needs clarification
 
-**State machine:**
+Full lifecycle:
 
 ```
-loop/plan  →  loop/plan-in-progress  →  loop/plan-done
-                                      ↘  NeedSupervisor  (on failure)
-
-loop/code  →  loop/code-in-progress  →  loop/code-done
-                                      ↘  NeedSupervisor  (on failure)
+State/ToPlan → State/Planned   (automated: agent_loop.py runs a planning agent)
+State/Planned → State/Ready    (manual: human reviews the plan and approves)
+State/Ready → State/InProgress (automated: agent_loop.py before starting implementation)
+State/InProgress → closed      (automated: after PR is merged and CI passes)
+any state → State/Question     (automated or manual: when blocked)
 ```
 
-**Rules:**
-
-- Only issues authored by allowed users are picked up (guettli, guettlibot, guettlibot2, forgejo-actions).
-- An issue with `NeedSupervisor` needs human attention — investigate, fix, then re-label.
-- The coding agent opens a PR but does NOT close the issue. A human reviews the PR and closes the issue after merging.
-- Planning agents only post a comment — they do NOT write code or open PRs.
-- `loop/*` labels are managed by agentloop — do not set them manually while an agent is active.
-
-**Typical lifecycle for a new feature:**
+List open issues ready to pick up:
 
+```bash
+fgj issue list --json --state open | jq '[.[] | select(.labels[].name == "State/Ready")] | .[] | {number, title, html_url}'
 ```
-1. Create issue
-2. Add label loop/plan   → agent writes plan as comment
-3. Review plan, request changes or approve
-4. Add label loop/code   → agent implements + opens PR
-5. Review PR, merge
-6. Close issue
-```
+
+Rules:
+
+- Never start implementation on an issue without `State/Ready`
+- Planning agents only post a plan comment — they do NOT write code or open PRs
+- After `State/Planned`, a human must review the plan and manually add `State/Ready`
+- When working via the agent loop: label transitions are set automatically
+  by `agent_loop.py` — do **not** set them yourself.
+- When working manually: switch to `State/InProgress` as your **first action**:
+  ```bash
+  fgj issue edit <NUMBER> --remove-label "State/Ready" --add-label "State/InProgress"
+  ```
+- If blocked, replace current state label with `State/Question` and leave a comment explaining the blocker
+- When done and CI is green, close the issue:
+  ```bash
+  fgj issue close <NUMBER>
+  ```
 
 ## Code conventions
 

DEVELOPMENT.md

@@ -188,5 +188,3 @@ Using SSH to `localhost` is preferred over complex X11/Wayland permission hacks.
 ## Daily Workflow
 
 Refer to the [README.md](./README.md#daily-workflow) for common development tasks and commands.
-
-<!-- agentloop code test passed -->

README.md

@@ -216,8 +216,3 @@ test/
 - **Settings** — list and remove accounts
 - **Search** — IMAP server-side search (subject + body); results shown inline, no navigation change
 - **Offline-first** — all reads come from local Drift/SQLite DB; network only for sync and send
-# CI Trigger
-# CI Trigger 2
-# Dummy commit to verify CI fixes
-# Dummy commit 3
-# CI Trigger 1780415300

Taskfile.yml

@@ -294,11 +294,11 @@ tasks:
           for attempt in 1 2 3; do
             run_dagger "$@" && return 0
             RC=$?
-            if [ "$attempt" -lt 3 ] && { grep -qE "connection reset|context canceled|context deadline exceeded|connection refused|invalid return status code" "$DAGGER_OUT" || [ "$RC" -eq 2 ]; }; then
+            if [ "$attempt" -lt 3 ] && grep -qE "connection reset|context canceled|connection refused|invalid return status code" "$DAGGER_OUT"; then
               echo "$(_ts) dagger: network error on attempt $attempt/3, retrying..." >&2
             elif [ "$attempt" -lt 3 ] && grep -q "No space left on device" "$DAGGER_OUT"; then
               echo "$(_ts) dagger: disk space error on attempt $attempt/3, pruning Dagger cache..." >&2
-              timeout 120 dagger query '{ engine { localCache { prune(targetSpace: "20gb") } } }' 2>/dev/null || true
+              dagger query '{ engine { localCache { prune(targetSpace: "20gb") } } }' 2>/dev/null || true
               echo "$(_ts) dagger: waiting 90s for freed space to settle..." >&2
               sleep 90
             else
@@ -319,16 +319,7 @@ tasks:
           rm -f "$PORTFILE" "$DAGGER_OUT" "$RC_FILE"
         }
         trap cleanup EXIT
-        until [ -s "$PORTFILE" ]; do
-          sleep 0.05
-          if ! kill -0 "$RECV_PID" 2>/dev/null; then
-            echo "$(_ts) otel-receiver.py died before writing port file; falling back to plain run" >&2
-            retry_dagger dagger call --progress=plain -q -m ci --source=. check
-            RC=$?
-            rm -f "$PORTFILE" "$DAGGER_OUT" "$RC_FILE"
-            exit $RC
-          fi
-        done
+        until [ -s "$PORTFILE" ]; do sleep 0.05; done
         PORT=$(cat "$PORTFILE")
         retry_dagger env \
           OTEL_EXPORTER_OTLP_ENDPOINT="http://127.0.0.1:$PORT" \

android/app/build.gradle.kts

@@ -16,10 +16,8 @@ android {
         isCoreLibraryDesugaringEnabled = true
     }
 
-    kotlin {
-        compilerOptions {
-            jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
-        }
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     signingConfigs {
@@ -69,7 +67,7 @@ flutter {
 
 dependencies {
     // Required for flutter_local_notifications and other plugins that need Java 8+ APIs on API < 26.
-    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
     // integration_test is a dev dependency; the Flutter plugin loader adds it as
     // debugImplementation only, but GeneratedPluginRegistrant.java (in src/main)
     // references its class in all variants. Make it available for release compilation

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip

android/settings.gradle.kts

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.13.2" apply false
-    id("org.jetbrains.kotlin.android") version "2.3.21" apply false
+    id("com.android.application") version "8.11.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 
 include(":app")

ci/go.mod

@@ -44,10 +44,10 @@ require (
 	google.golang.org/protobuf v1.36.11 // indirect
 )
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploggrpc v0.16.0
 
-replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.19.0
+replace go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp => go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.16.0
 
-replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.19.0
+replace go.opentelemetry.io/otel/log => go.opentelemetry.io/otel/log v0.16.0
 
-replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.19.0
+replace go.opentelemetry.io/otel/sdk/log => go.opentelemetry.io/otel/sdk/log v0.16.0

ci/main.go

@@ -181,7 +181,7 @@ func New(
 // Used as the base for pubGetLayer so flutter pub get is execution-cached between runs.
 func (m *Ci) toolchain() *dagger.Container {
 	return dag.Container().
-		From("ghcr.io/cirruslabs/flutter:3.44.0").
+		From("ghcr.io/cirruslabs/flutter:3.41.6").
 		WithExec([]string{"apt-get", "-qq", "update"}).
 		WithExec([]string{"apt-get", "install", "-y", "-qq", "clang", "cmake", "ninja-build", "pkg-config", "libgtk-3-dev", "liblzma-dev", "libsecret-1-dev", "libgcrypt20-dev", "libjsoncpp-dev", "sqlite3", "iproute2", "netcat-openbsd", "xvfb", "libosmesa6", "libegl1", "lld"}).
 		WithExec([]string{"useradd", "-m", "-s", "/bin/bash", "ci"}).

done.md

@@ -4,18 +4,6 @@ This file contains tasks which got implemented.
 
 Tasks get moved from next.md to done.md
 
-## Tasks (2026-05-29)
-
-- **Merge PR #307 — user preferences and configurable navigation (Issue #315)**: Confirmed that
-  all features from PR #307 (issue #299) were already merged into main via separate PRs:
-  - Configurable menu bar position (bottom/top) for mailbox view — merged via #298/#303
-  - Configurable back button position for single mail view — merged via #299/#307 features in #300
-  - Configurable "after mail action" (next message / return to mailbox) — merged via #300/#308
-  - Archive button with `resolveMailboxByRole` helper — merged via #287/#291, #286/#290
-  - User preferences DB schema (v34–v36: `user_preferences` table) — in main
-  - PR #307 and issue #299 closed.
-  - Issue #315 closed.
-
 ## Tasks (2026-05-26)
 
 - **Renovate Bot (Issue #257)**: Renovate Bot runs daily via Forgejo Actions to keep

integration_test/app_e2e_test.dart

@@ -317,7 +317,7 @@ void main() {
 
       // ── Check Sent folder ──────────────────────────────────────────────────
       // Use the drawer to switch folders (no back button on Linux desktop).
-      await tester.tap(find.byTooltip('Open folders'));
+      await tester.tap(find.byTooltip('Open navigation menu'));
       await tester.pumpAndSettle();
       await tester.tap(find.text('Sent'));
       await tester.pumpAndSettle();
@@ -331,7 +331,7 @@ void main() {
       expect(find.text(subject), findsOneWidget);
 
       // ── Check Inbox ────────────────────────────────────────────────────────
-      await tester.tap(find.byTooltip('Open folders'));
+      await tester.tap(find.byTooltip('Open navigation menu'));
       await tester.pumpAndSettle();
       await tester.tap(find.text('INBOX'));
       await tester.pumpAndSettle();

lib/core/db_schema_version.dart

@@ -1 +1 @@
-const int dbSchemaVersion = 36;
+const int dbSchemaVersion = 33;

lib/core/models/user_preferences.dart

@@ -1,14 +0,0 @@
-enum MenuPosition { bottom, top }
-
-enum AfterMailViewAction { nextMessage, showMailbox }
-
-class UserPreferences {
-  const UserPreferences({
-    this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
-  });
-  final MenuPosition menuPosition;
-  final MenuPosition mailViewButtonPosition;
-  final AfterMailViewAction afterMailViewAction;
-}

lib/core/repositories/user_preferences_repository.dart

@@ -1,8 +0,0 @@
-import 'package:sharedinbox/core/models/user_preferences.dart';
-
-abstract class UserPreferencesRepository {
-  Stream<UserPreferences> observePreferences();
-  Future<void> updateMenuPosition(MenuPosition position);
-  Future<void> updateMailViewButtonPosition(MenuPosition position);
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action);
-}

lib/core/services/share_encryption_service.dart

@@ -92,9 +92,8 @@ class ShareEncryptionService {
   ) {
     if (!s.startsWith(_pubKeyPrefix)) return null;
     try {
-      final data = Uint8List.fromList(
-        base64.decode(s.substring(_pubKeyPrefix.length)),
-      );
+      final data =
+          Uint8List.fromList(base64.decode(s.substring(_pubKeyPrefix.length)));
       if (data.length != _keyIdLen + _pubKeyLen) return null;
       return (
         keyId: data.sublist(0, _keyIdLen),

lib/core/sieve/sieve_interpreter.dart

@@ -108,9 +108,8 @@ class SieveInterpreter {
   }
 
   bool _globMatch(String value, String pattern) {
-    final regexStr = RegExp.escape(
-      pattern,
-    ).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
+    final regexStr =
+        RegExp.escape(pattern).replaceAll(r'\*', '.*').replaceAll(r'\?', '.');
     return RegExp('^$regexStr\$').hasMatch(value);
   }
 

lib/core/sieve/sieve_parser.dart

@@ -466,7 +466,9 @@ class _Scanner {
 
   String readTaggedArg() {
     if (!isAtEnd && _src[_pos] == ':') return readWord();
-    throw SieveParseException('Expected tagged argument at position $_pos');
+    throw SieveParseException(
+      'Expected tagged argument at position $_pos',
+    );
   }
 
   String? peekSizeUnit() {
@@ -478,7 +480,9 @@ class _Scanner {
 
   String readDigits() {
     if (isAtEnd || !_isDigit(_src[_pos])) {
-      throw SieveParseException('Expected number at position $_pos');
+      throw SieveParseException(
+        'Expected number at position $_pos',
+      );
     }
     final start = _pos;
     while (!isAtEnd && _isDigit(_src[_pos])) {
@@ -489,7 +493,9 @@ class _Scanner {
 
   String readQuotedString() {
     if (_src[_pos] != '"') {
-      throw SieveParseException('Expected " at position $_pos');
+      throw SieveParseException(
+        'Expected " at position $_pos',
+      );
     }
     _pos++; // skip opening quote
     final buf = StringBuffer();

lib/core/utils/cid_utils.dart

@@ -35,7 +35,10 @@ String injectInlineImages(String html, imap.MimeMessage msg) {
         .replaceAll('src="cid:$bareCid"', 'src="$dataUri"')
         .replaceAll("src='cid:$bareCid'", "src='$dataUri'")
         .replaceAll('src="cid:${bareCid.toLowerCase()}"', 'src="$dataUri"')
-        .replaceAll("src='cid:${bareCid.toLowerCase()}'", "src='$dataUri'");
+        .replaceAll(
+          "src='cid:${bareCid.toLowerCase()}'",
+          "src='$dataUri'",
+        );
   }
   return result;
 }

lib/data/db/database.dart

@@ -307,23 +307,6 @@ class LocalSieveApplied extends Table {
   Set<Column> get primaryKey => {accountId, messageId};
 }
 
-/// App-wide user preferences, stored as a singleton row (id always 1).
-@DataClassName('UserPreferencesRow')
-class UserPreferences extends Table {
-  IntColumn get id => integer()();
-  // 'bottom' (default) | 'top'
-  TextColumn get menuPosition => text().withDefault(const Constant('bottom'))();
-  // Added in schema v35: 'bottom' (default) | 'top'
-  TextColumn get mailViewButtonPosition =>
-      text().withDefault(const Constant('bottom'))();
-  // Added in schema v36: 'nextMessage' (default) | 'showMailbox'
-  TextColumn get afterMailViewAction =>
-      text().withDefault(const Constant('nextMessage'))();
-
-  @override
-  Set<Column> get primaryKey => {id};
-}
-
 // ── Database ──────────────────────────────────────────────────────────────────
 
 @DriftDatabase(
@@ -344,7 +327,6 @@ class UserPreferences extends Table {
     LocalSieveScripts,
     LocalSieveApplied,
     ShareKeys,
-    UserPreferences,
   ],
 )
 class AppDatabase extends _$AppDatabase {
@@ -596,21 +578,6 @@ class AppDatabase extends _$AppDatabase {
             await m.addColumn(syncLogs, syncLogs.errorStackTrace);
             await m.addColumn(syncLogs, syncLogs.isPermanent);
           }
-          if (from < 34) {
-            await m.createTable(userPreferences);
-          }
-          if (from >= 34 && from < 35) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.mailViewButtonPosition,
-            );
-          }
-          if (from >= 34 && from < 36) {
-            await m.addColumn(
-              userPreferences,
-              userPreferences.afterMailViewAction,
-            );
-          }
         },
       );
 }

lib/data/db/local_sieve_repository.dart

@@ -9,9 +9,8 @@ class LocalSieveRepository {
   final AppDatabase _db;
 
   Future<List<SieveScript>> listScripts(String accountId) async {
-    final rows = await (_db.select(
-      _db.localSieveScripts,
-    )..where((t) => t.accountId.equals(accountId)))
+    final rows = await (_db.select(_db.localSieveScripts)
+          ..where((t) => t.accountId.equals(accountId)))
         .get();
     return rows
         .map(
@@ -27,9 +26,10 @@ class LocalSieveRepository {
 
   Future<String> getScriptContent(String accountId, String blobId) async {
     final rowId = int.parse(blobId);
-    final row = await (_db.select(
-      _db.localSieveScripts,
-    )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+    final row = await (_db.select(_db.localSieveScripts)
+          ..where(
+            (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
+          ))
         .getSingleOrNull();
     if (row == null) throw Exception('Local script not found: $blobId');
     return row.content;
@@ -44,7 +44,9 @@ class LocalSieveRepository {
     if (id != null) {
       final rowId = int.parse(id);
       await (_db.update(_db.localSieveScripts)
-            ..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+            ..where(
+              (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
+            ))
           .write(
         LocalSieveScriptsCompanion(
           name: Value(name),
@@ -76,9 +78,10 @@ class LocalSieveRepository {
 
   Future<void> deleteScript(String accountId, String scriptId) async {
     final rowId = int.parse(scriptId);
-    await (_db.delete(
-      _db.localSieveScripts,
-    )..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+    await (_db.delete(_db.localSieveScripts)
+          ..where(
+            (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
+          ))
         .go();
   }
 
@@ -89,7 +92,9 @@ class LocalSieveRepository {
           .write(const LocalSieveScriptsCompanion(isActive: Value(false)));
       final rowId = int.parse(scriptId);
       await (_db.update(_db.localSieveScripts)
-            ..where((t) => t.id.equals(rowId) & t.accountId.equals(accountId)))
+            ..where(
+              (t) => t.id.equals(rowId) & t.accountId.equals(accountId),
+            ))
           .write(const LocalSieveScriptsCompanion(isActive: Value(true)));
     });
   }

lib/data/repositories/draft_repository_impl.dart

@@ -9,8 +9,11 @@ import 'package:sharedinbox/data/db/database.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 
 class DraftRepositoryImpl implements DraftRepository {
-  DraftRepositoryImpl(this._db, this._accounts, {ImapConnectFn? imapConnect})
-      : _imapConnect = imapConnect;
+  DraftRepositoryImpl(
+    this._db,
+    this._accounts, {
+    ImapConnectFn? imapConnect,
+  }) : _imapConnect = imapConnect;
 
   final AppDatabase _db;
   final AccountRepository _accounts;
@@ -121,7 +124,10 @@ class DraftRepositoryImpl implements DraftRepository {
     }
   }
 
-  Future<void> _syncWithServer(imap.ImapClient client, String accountId) async {
+  Future<void> _syncWithServer(
+    imap.ImapClient client,
+    String accountId,
+  ) async {
     // Create/select the Drafts folder.
     try {
       await client.createMailbox('Drafts');
@@ -156,9 +162,8 @@ class DraftRepositoryImpl implements DraftRepository {
           ? uidList.first.toString()
           : null;
       if (uid != null) {
-        await (_db.update(_db.drafts)..where((t) => t.id.equals(row.id))).write(
-          DraftsCompanion(imapServerId: Value(uid)),
-        );
+        await (_db.update(_db.drafts)..where((t) => t.id.equals(row.id)))
+            .write(DraftsCompanion(imapServerId: Value(uid)));
       }
     }
 

lib/data/repositories/email_repository_impl.dart

@@ -156,7 +156,6 @@ class EmailRepositoryImpl implements EmailRepository {
       return;
     }
 
-    if (threadEmails.isEmpty) return;
     final latest = threadEmails.last;
 
     // Collect unique participants across the whole thread.
@@ -238,12 +237,7 @@ class EmailRepositoryImpl implements EmailRepository {
     try {
       await client.selectMailboxByPath(emailRow.mailboxPath);
       final fetch = await client.uidFetchMessage(emailRow.uid, '(BODY.PEEK[])');
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
+      final msg = fetch.messages.first;
       final textBody = msg.decodeTextPlainPart();
       final rawHtml = msg.decodeTextHtmlPart();
       final htmlBody =
@@ -331,7 +325,13 @@ class EmailRepositoryImpl implements EmailRepository {
           ],
           'fetchHTMLBodyValues': true,
           'fetchTextBodyValues': true,
-          'bodyProperties': ['partId', 'type', 'name', 'size', 'subParts'],
+          'bodyProperties': [
+            'partId',
+            'type',
+            'name',
+            'size',
+            'subParts',
+          ],
         },
         '0',
       ],
@@ -1949,9 +1949,8 @@ class EmailRepositoryImpl implements EmailRepository {
         .getSingleOrNull();
     final inboxPath = inboxMailbox?.path ?? 'INBOX';
 
-    final alreadyApplied = await (_db.select(
-      _db.localSieveApplied,
-    )..where((t) => t.accountId.equals(accountId)))
+    final alreadyApplied = await (_db.select(_db.localSieveApplied)
+          ..where((t) => t.accountId.equals(accountId)))
         .get();
     final appliedIds = alreadyApplied.map((r) => r.messageId).toSet();
 
@@ -2051,9 +2050,7 @@ class EmailRepositoryImpl implements EmailRepository {
             ..limit(1))
           .getSingleOrNull();
       if (destMailbox == null) {
-        log(
-          'Sieve: JMAP mailbox "$folder" not found for account ${account.id}',
-        );
+        log('Sieve: JMAP mailbox "$folder" not found for account ${account.id}');
         return;
       }
       destPath = destMailbox.path;
@@ -2811,13 +2808,11 @@ class EmailRepositoryImpl implements EmailRepository {
       // Content-Transfer-Encoding) and getPart() can decode the part correctly.
       // A partial BODY.PEEK[n] fetch omits those headers, causing
       // decodeContentBinary() to return raw base64 instead of decoded bytes.
-      final fetch = await client.uidFetchMessage(emailRow.uid, 'BODY.PEEK[]');
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
+      final fetch = await client.uidFetchMessage(
+        emailRow.uid,
+        'BODY.PEEK[]',
+      );
+      final msg = fetch.messages.first;
       final part = msg.getPart(attachment.fetchPartId) ?? msg;
       final bytes = part.decodeContentBinary();
       if (bytes == null) {
@@ -2879,14 +2874,11 @@ class EmailRepositoryImpl implements EmailRepository {
     );
     try {
       await client.selectMailboxByPath(emailRow.mailboxPath);
-      final fetch = await client.uidFetchMessage(emailRow.uid, 'BODY.PEEK[]');
-      final msg = fetch.messages.firstOrNull;
-      if (msg == null) {
-        throw StateError(
-          'IMAP server returned no message for UID ${emailRow.uid}.',
-        );
-      }
-      return msg.renderMessage();
+      final fetch = await client.uidFetchMessage(
+        emailRow.uid,
+        'BODY.PEEK[]',
+      );
+      return fetch.messages.first.renderMessage();
     } finally {
       await client.logout();
     }
@@ -3260,17 +3252,14 @@ class EmailRepositoryImpl implements EmailRepository {
     await _db.customStatement('PRAGMA foreign_keys = OFF');
     try {
       await _db.transaction(() async {
-        await (_db.delete(
-          _db.emails,
-        )..where((t) => t.accountId.equals(accountId)))
+        await (_db.delete(_db.emails)
+              ..where((t) => t.accountId.equals(accountId)))
             .go();
-        await (_db.delete(
-          _db.pendingChanges,
-        )..where((t) => t.accountId.equals(accountId)))
+        await (_db.delete(_db.pendingChanges)
+              ..where((t) => t.accountId.equals(accountId)))
             .go();
-        await (_db.delete(
-          _db.syncStates,
-        )..where((t) => t.accountId.equals(accountId)))
+        await (_db.delete(_db.syncStates)
+              ..where((t) => t.accountId.equals(accountId)))
             .go();
       });
     } finally {

lib/data/repositories/mailbox_repository_impl.dart

@@ -82,9 +82,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
 
       // Pre-load existing DB roles so we can preserve manually-set roles for
       // folders the server doesn't tag with a special-use attribute.
-      final existingRows = await (_db.select(
-        _db.mailboxes,
-      )..where((t) => t.accountId.equals(account.id)))
+      final existingRows = await (_db.select(_db.mailboxes)
+            ..where((t) => t.accountId.equals(account.id)))
           .get();
       final existingRoles = {for (final r in existingRows) r.id: r.role};
 
@@ -321,9 +320,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
 
   @override
   Future<void> clearForResync(String accountId) async {
-    await (_db.delete(
-      _db.mailboxes,
-    )..where((t) => t.accountId.equals(accountId)))
+    await (_db.delete(_db.mailboxes)
+          ..where((t) => t.accountId.equals(accountId)))
         .go();
   }
 
@@ -369,9 +367,7 @@ class MailboxRepositoryImpl implements MailboxRepository {
             role: Value(role),
           ),
         );
-    final row = await (_db.select(
-      _db.mailboxes,
-    )..where((t) => t.id.equals(id)))
+    final row = await (_db.select(_db.mailboxes)..where((t) => t.id.equals(id)))
         .getSingle();
     return _toModel(row);
   }
@@ -423,9 +419,8 @@ class MailboxRepositoryImpl implements MailboxRepository {
             role: Value(role),
           ),
         );
-    final row = await (_db.select(
-      _db.mailboxes,
-    )..where((t) => t.id.equals(dbId)))
+    final row = await (_db.select(_db.mailboxes)
+          ..where((t) => t.id.equals(dbId)))
         .getSingle();
     return _toModel(row);
   }

lib/data/repositories/search_history_repository_impl.dart

@@ -24,9 +24,8 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
 
     await _db.transaction(() async {
       // Remove existing entry for same query (deduplication).
-      await (_db.delete(
-        _db.searchHistoryEntries,
-      )..where((t) => t.query.equals(trimmed)))
+      await (_db.delete(_db.searchHistoryEntries)
+            ..where((t) => t.query.equals(trimmed)))
           .go();
 
       await _db.into(_db.searchHistoryEntries).insert(
@@ -44,9 +43,8 @@ class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
           .get();
 
       if (keepIds.isNotEmpty) {
-        await (_db.delete(
-          _db.searchHistoryEntries,
-        )..where((t) => t.id.isNotIn(keepIds)))
+        await (_db.delete(_db.searchHistoryEntries)
+              ..where((t) => t.id.isNotIn(keepIds)))
             .go();
       }
     });

lib/data/repositories/share_key_repository_impl.dart

@@ -40,9 +40,8 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
     await _pruneExpired();
 
     final keyIdHex = _hex(keyId);
-    final row = await (_db.select(
-      _db.shareKeys,
-    )..where((t) => t.id.equals(keyIdHex)))
+    final row = await (_db.select(_db.shareKeys)
+          ..where((t) => t.id.equals(keyIdHex)))
         .getSingleOrNull();
 
     if (row == null) return null;
@@ -56,9 +55,10 @@ class ShareKeyRepositoryImpl implements ShareKeyRepository {
   }
 
   Future<void> _pruneExpired() async {
-    await (_db.delete(
-      _db.shareKeys,
-    )..where((t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc())))
+    await (_db.delete(_db.shareKeys)
+          ..where(
+            (t) => t.expiresAt.isSmallerThanValue(DateTime.now().toUtc()),
+          ))
         .go();
   }
 

lib/data/repositories/user_preferences_repository_impl.dart

@@ -1,70 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart' as pref;
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
-import 'package:sharedinbox/data/db/database.dart';
-
-class UserPreferencesRepositoryImpl implements UserPreferencesRepository {
-  UserPreferencesRepositoryImpl(this._db);
-
-  final AppDatabase _db;
-  static const _rowId = 1;
-
-  @override
-  Stream<pref.UserPreferences> observePreferences() {
-    return (_db.select(
-      _db.userPreferences,
-    )..where((t) => t.id.equals(_rowId)))
-        .watchSingleOrNull()
-        .map(_rowToModel);
-  }
-
-  @override
-  Future<void> updateMenuPosition(pref.MenuPosition position) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            menuPosition: Value(position.name),
-          ),
-        );
-  }
-
-  @override
-  Future<void> updateMailViewButtonPosition(pref.MenuPosition position) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            mailViewButtonPosition: Value(position.name),
-          ),
-        );
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(
-    pref.AfterMailViewAction action,
-  ) async {
-    await _db.into(_db.userPreferences).insertOnConflictUpdate(
-          UserPreferencesCompanion(
-            id: const Value(_rowId),
-            afterMailViewAction: Value(action.name),
-          ),
-        );
-  }
-
-  static pref.UserPreferences _rowToModel(UserPreferencesRow? row) {
-    if (row == null) return const pref.UserPreferences();
-    return pref.UserPreferences(
-      menuPosition: pref.MenuPosition.values.firstWhere(
-        (e) => e.name == row.menuPosition,
-        orElse: () => pref.MenuPosition.bottom,
-      ),
-      mailViewButtonPosition: pref.MenuPosition.values.firstWhere(
-        (e) => e.name == row.mailViewButtonPosition,
-        orElse: () => pref.MenuPosition.bottom,
-      ),
-      afterMailViewAction: pref.AfterMailViewAction.values.firstWhere(
-        (e) => e.name == row.afterMailViewAction,
-        orElse: () => pref.AfterMailViewAction.nextMessage,
-      ),
-    );
-  }
-}

lib/di.dart

@@ -5,7 +5,6 @@ import 'package:http/http.dart' as http;
 import 'package:sharedinbox/core/models/account.dart' as model;
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
@@ -14,7 +13,6 @@ import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/share_key_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/repositories/undo_repository.dart';
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
@@ -23,8 +21,7 @@ import 'package:sharedinbox/core/services/undo_service.dart';
 import 'package:sharedinbox/core/storage/secure_storage.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 import 'package:sharedinbox/core/sync/reliability_runner.dart';
-import 'package:sharedinbox/data/db/database.dart'
-    hide Email, EmailBody, UserPreferences;
+import 'package:sharedinbox/data/db/database.dart' hide Email, EmailBody;
 import 'package:sharedinbox/data/db/local_sieve_repository.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 import 'package:sharedinbox/data/jmap/sieve_repository.dart';
@@ -36,7 +33,6 @@ import 'package:sharedinbox/data/repositories/search_history_repository_impl.dar
 import 'package:sharedinbox/data/repositories/share_key_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/sync_log_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/undo_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/user_preferences_repository_impl.dart';
 import 'package:sharedinbox/data/storage/flutter_secure_storage_impl.dart';
 
 /// Swappable IMAP connection factory — override in tests to use plaintext.
@@ -101,9 +97,8 @@ final undoRepositoryProvider = Provider<UndoRepository>((ref) {
   return UndoRepositoryImpl(ref.watch(dbProvider));
 });
 
-final searchHistoryRepositoryProvider = Provider<SearchHistoryRepository>((
-  ref,
-) {
+final searchHistoryRepositoryProvider =
+    Provider<SearchHistoryRepository>((ref) {
   return SearchHistoryRepositoryImpl(ref.watch(dbProvider));
 });
 
@@ -136,10 +131,8 @@ final syncHealthProvider =
       .watchSingleOrNull();
 });
 
-final isSyncingProvider = StreamProvider.autoDispose.family<bool, String>((
-  ref,
-  accountId,
-) {
+final isSyncingProvider =
+    StreamProvider.autoDispose.family<bool, String>((ref, accountId) {
   return ref.watch(syncManagerProvider).watchSyncing(accountId);
 });
 
@@ -188,9 +181,8 @@ final manageSieveProbeServiceProvider = Provider<ManageSieveProbeService>((
   return ManageSieveProbeService(ref.watch(accountRepositoryProvider));
 });
 
-final undoServiceProvider = NotifierProvider<UndoService, List<UndoAction>>(
-  UndoService.new,
-);
+final undoServiceProvider =
+    NotifierProvider<UndoService, List<UndoAction>>(UndoService.new);
 
 /// Loads email header + body and marks the email as seen.
 /// Owned by [EmailDetailScreen]; decouples data loading from the widget tree.
@@ -235,15 +227,3 @@ final accountConnectionStatusProvider =
       .read(connectionTestServiceProvider)
       .testConnection(account, password);
 });
-
-final userPreferencesRepositoryProvider = Provider<UserPreferencesRepository>((
-  ref,
-) {
-  return UserPreferencesRepositoryImpl(ref.watch(dbProvider));
-});
-
-final userPreferencesProvider = StreamProvider.autoDispose<UserPreferences>((
-  ref,
-) {
-  return ref.watch(userPreferencesRepositoryProvider).observePreferences();
-});

lib/ui/router.dart

@@ -20,7 +20,6 @@ import 'package:sharedinbox/ui/screens/sieve_scripts_screen.dart';
 import 'package:sharedinbox/ui/screens/sync_log_screen.dart';
 import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
 import 'package:sharedinbox/ui/screens/undo_log_screen.dart';
-import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 import 'package:sharedinbox/ui/widgets/undo_shell.dart';
 
 final router = GoRouter(
@@ -57,10 +56,6 @@ final router = GoRouter(
               path: 'about',
               builder: (ctx, state) => const AboutScreen(),
             ),
-            GoRoute(
-              path: 'preferences',
-              builder: (ctx, state) => const UserPreferencesScreen(),
-            ),
             GoRoute(
               path: ':accountId/edit',
               builder: (ctx, state) => EditAccountScreen(

lib/ui/screens/about_screen.dart

@@ -72,10 +72,8 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
 
   Future<void> _launchUrl(BuildContext context, Uri url) async {
     try {
-      final launched = await launchUrl(
-        url,
-        mode: LaunchMode.externalApplication,
-      );
+      final launched =
+          await launchUrl(url, mode: LaunchMode.externalApplication);
       if (!launched && context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(
@@ -123,10 +121,8 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
       'https://codeberg.org/guettli/sharedinbox/issues/new?body=$body',
     );
     try {
-      final launched = await launchUrl(
-        url,
-        mode: LaunchMode.externalApplication,
-      );
+      final launched =
+          await launchUrl(url, mode: LaunchMode.externalApplication);
       if (!launched && context.mounted) {
         ScaffoldMessenger.of(context).showSnackBar(
           const SnackBar(
@@ -180,7 +176,9 @@ class _AboutScreenState extends ConsumerState<AboutScreen> {
                       selectable: true,
                       onTapLink: (text, href, title) {
                         if (href != null) {
-                          unawaited(_launchUrl(context, Uri.parse(href)));
+                          unawaited(
+                            _launchUrl(context, Uri.parse(href)),
+                          );
                         }
                       },
                     );

lib/ui/screens/account_list_screen.dart

@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -67,14 +66,6 @@ class AccountListScreen extends ConsumerWidget {
                 unawaited(context.push('/accounts/about'));
               },
             ),
-            ListTile(
-              leading: const Icon(Icons.settings),
-              title: const Text('Preferences'),
-              onTap: () {
-                Navigator.pop(context); // Close drawer
-                unawaited(context.push('/accounts/preferences'));
-              },
-            ),
           ],
         ),
       ),
@@ -120,80 +111,20 @@ class _AccountTile extends ConsumerWidget {
     final health = ref.watch(syncHealthProvider(account.id));
     final typeLabel = account.type == AccountType.jmap ? 'JMAP' : 'IMAP';
 
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        ListTile(
-          leading: const Icon(Icons.account_circle),
-          title: Text(account.displayName),
-          subtitle: Text('${account.email}\n$typeLabel'),
-          isThreeLine: true,
-          trailing: Row(
-            mainAxisSize: MainAxisSize.min,
-            children: [
-              status.when(
-                loading: () => const SizedBox(
-                  width: 20,
-                  height: 20,
-                  child: CircularProgressIndicator(strokeWidth: 2),
-                ),
-                data: (_) =>
-                    const Icon(Icons.check_circle, color: Colors.green),
-                error: (e, _) => Tooltip(
-                  message: e.toString(),
-                  child: const Icon(Icons.error_outline, color: Colors.red),
-                ),
-              ),
-              PopupMenuButton<_AccountAction>(
-                onSelected: (action) => _onAction(context, action),
-                itemBuilder: (_) => [
-                  const PopupMenuItem(
-                    value: _AccountAction.syncLog,
-                    child: Text('Sync log'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.verifySync,
-                    child: Text('Verify sync health'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.forceSync,
-                    child: Text('Force full sync'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.edit,
-                    child: Text('Edit'),
-                  ),
-                  if (_sieveSupported(account))
-                    const PopupMenuItem(
-                      value: _AccountAction.emailFiltersRemote,
-                      child: Text('Server email filters'),
-                    ),
-                  const PopupMenuItem(
-                    value: _AccountAction.emailFiltersLocal,
-                    child: Text('Local email filters'),
-                  ),
-                  const PopupMenuItem(
-                    value: _AccountAction.send,
-                    child: Text('Send accounts'),
-                  ),
-                  const PopupMenuDivider(),
-                  const PopupMenuItem(
-                    value: _AccountAction.delete,
-                    child: Text('Delete'),
-                  ),
-                ],
-              ),
-            ],
-          ),
-          onTap: () => context.push('/accounts/${account.id}/mailboxes'),
-        ),
-        Padding(
-          padding: const EdgeInsets.fromLTRB(72, 0, 16, 8),
-          child: health.when(
+    return ListTile(
+      leading: const Icon(Icons.account_circle),
+      title: Text(account.displayName),
+      subtitle: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text('${account.email}\n$typeLabel'),
+          const SizedBox(height: 4),
+          health.when(
             data: (h) {
               if (h == null) return const Text('Sync health: Not verified yet');
               final date = h.lastVerifiedAt.toLocal().toString().split('.')[0];
               return Row(
+                mainAxisSize: MainAxisSize.min,
                 children: [
                   const Text('Sync health: '),
                   Icon(
@@ -202,13 +133,7 @@ class _AccountTile extends ConsumerWidget {
                     color: h.isHealthy ? Colors.green : Colors.orange,
                   ),
                   const SizedBox(width: 4),
-                  Expanded(
-                    child: Text(
-                      h.isHealthy
-                          ? 'Healthy'
-                          : _formatDiscrepancies(h.discrepancySummary),
-                    ),
-                  ),
+                  Text(h.isHealthy ? 'Healthy' : 'Discrepancies found'),
                   Text(' ($date)', style: const TextStyle(fontSize: 10)),
                 ],
               );
@@ -216,8 +141,66 @@ class _AccountTile extends ConsumerWidget {
             loading: () => const Text('Sync health: checking...'),
             error: (e, _) => Text('Sync health error: $e'),
           ),
-        ),
-      ],
+        ],
+      ),
+      isThreeLine: true,
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          status.when(
+            loading: () => const SizedBox(
+              width: 20,
+              height: 20,
+              child: CircularProgressIndicator(strokeWidth: 2),
+            ),
+            data: (_) => const Icon(Icons.check_circle, color: Colors.green),
+            error: (e, _) => Tooltip(
+              message: e.toString(),
+              child: const Icon(Icons.error_outline, color: Colors.red),
+            ),
+          ),
+          PopupMenuButton<_AccountAction>(
+            onSelected: (action) => _onAction(context, action),
+            itemBuilder: (_) => [
+              const PopupMenuItem(
+                value: _AccountAction.syncLog,
+                child: Text('Sync log'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.verifySync,
+                child: Text('Verify sync health'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.forceSync,
+                child: Text('Force full sync'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.edit,
+                child: Text('Edit'),
+              ),
+              if (_sieveSupported(account))
+                const PopupMenuItem(
+                  value: _AccountAction.emailFiltersRemote,
+                  child: Text('Server email filters'),
+                ),
+              const PopupMenuItem(
+                value: _AccountAction.emailFiltersLocal,
+                child: Text('Local email filters'),
+              ),
+              const PopupMenuItem(
+                value: _AccountAction.send,
+                child: Text('Send accounts'),
+              ),
+              const PopupMenuDivider(),
+              const PopupMenuItem(
+                value: _AccountAction.delete,
+                child: Text('Delete'),
+              ),
+            ],
+          ),
+        ],
+      ),
+      onTap: () => context.push('/accounts/${account.id}/mailboxes'),
     );
   }
 
@@ -310,30 +293,6 @@ class _AccountTile extends ConsumerWidget {
   }
 }
 
-String _formatDiscrepancies(String? summary) {
-  if (summary == null) return 'Discrepancies found';
-  try {
-    final decoded = jsonDecode(summary) as Map<String, dynamic>;
-    var missingLocally = 0;
-    var missingOnServer = 0;
-    var flagMismatches = 0;
-    for (final v in decoded.values) {
-      final m = v as Map<String, dynamic>;
-      missingLocally += (m['missingLocally'] as int? ?? 0);
-      missingOnServer += (m['missingOnServer'] as int? ?? 0);
-      flagMismatches += (m['flagMismatches'] as int? ?? 0);
-    }
-    final parts = <String>[];
-    if (missingLocally > 0) parts.add('missing locally: $missingLocally');
-    if (missingOnServer > 0) parts.add('missing on server: $missingOnServer');
-    if (flagMismatches > 0) parts.add('flag mismatches: $flagMismatches');
-    if (parts.isEmpty) return 'Discrepancies found';
-    return 'Discrepancies found (${parts.join(', ')})';
-  } catch (_) {
-    return 'Discrepancies found';
-  }
-}
-
 class _OnboardingView extends StatelessWidget {
   const _OnboardingView();
 

lib/ui/screens/account_receive_screen.dart

@@ -219,7 +219,11 @@ class _AccountReceiveScreenState extends ConsumerState<AccountReceiveScreen> {
             ),
           ),
         _Step.done => const Center(
-            child: Icon(Icons.check_circle, size: 64, color: Colors.green),
+            child: Icon(
+              Icons.check_circle,
+              size: 64,
+              color: Colors.green,
+            ),
           ),
         _Step.error => Center(
             child: Padding(

lib/ui/screens/account_send_screen.dart

@@ -158,7 +158,10 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
     for (final account in selected) {
       final password = await repo.getPassword(account.id);
       payloads.add(
-        AccountPayload(accountJson: account.toJson(), password: password),
+        AccountPayload(
+          accountJson: account.toJson(),
+          password: password,
+        ),
       );
     }
 
@@ -358,7 +361,9 @@ class _AccountSendScreenState extends ConsumerState<AccountSendScreen> {
               unawaited(Clipboard.setData(ClipboardData(text: _encryptedQr!)));
               ScaffoldMessenger.of(context).showSnackBar(
                 const SnackBar(
-                  content: Text('Encrypted code copied to clipboard'),
+                  content: Text(
+                    'Encrypted code copied to clipboard',
+                  ),
                 ),
               );
             },

lib/ui/screens/changelog_screen.dart

@@ -12,9 +12,8 @@ class ChangeLogScreen extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(title: const Text('ChangeLog')),
       body: FutureBuilder<String>(
-        future: DefaultAssetBundle.of(
-          context,
-        ).loadString('assets/changelog.txt'),
+        future:
+            DefaultAssetBundle.of(context).loadString('assets/changelog.txt'),
         builder: (context, snapshot) {
           if (snapshot.connectionState == ConnectionState.waiting) {
             return const Center(child: CircularProgressIndicator());

lib/ui/screens/compose_screen.dart

@@ -194,7 +194,9 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
       await OpenFilex.open(path);
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(
         SnackBar(
           duration: const Duration(seconds: 5),
           content: Text('Failed to open file: $e'),
@@ -211,7 +213,9 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
 
   Future<void> _send() async {
     if (_accountId == null) {
-      ScaffoldMessenger.of(context).showSnackBar(
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(
         const SnackBar(
           duration: Duration(seconds: 5),
           content: Text('Select an account first'),
@@ -251,7 +255,9 @@ class _ComposeScreenState extends ConsumerState<ComposeScreen> {
       if (mounted) context.pop();
     } catch (e) {
       if (!mounted) return;
-      ScaffoldMessenger.of(context).showSnackBar(
+      ScaffoldMessenger.of(
+        context,
+      ).showSnackBar(
         SnackBar(
           duration: const Duration(seconds: 5),
           content: Text('Send failed: $e'),

lib/ui/screens/crash_screen.dart

@@ -81,9 +81,9 @@ class CrashScreen extends StatelessWidget {
                   builder: (context, snapshot) => Text(
                     'v${snapshot.data ?? '…'}  •  $_buildMode  •  '
                     '${Platform.operatingSystem} ${Platform.operatingSystemVersion}',
-                    style: Theme.of(
-                      context,
-                    ).textTheme.bodySmall?.copyWith(color: Colors.grey[600]),
+                    style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                          color: Colors.grey[600],
+                        ),
                     textAlign: TextAlign.center,
                   ),
                 ),

lib/ui/screens/email_action_helpers.dart

@@ -54,9 +54,8 @@ Future<Mailbox?> resolveMailboxByRole(
                 style: TextStyle(fontWeight: FontWeight.bold),
               ),
             ),
-            for (final m in mailboxes.where(
-              (m) => m.path != currentMailboxPath,
-            ))
+            for (final m
+                in mailboxes.where((m) => m.path != currentMailboxPath))
               ListTile(
                 leading: const Icon(Icons.folder_outlined),
                 title: Text(m.name),

lib/ui/screens/email_detail_screen.dart

@@ -13,7 +13,6 @@ import 'package:share_plus/share_plus.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/utils/format_utils.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
@@ -72,7 +71,18 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             onPressed: header == null
                 ? null
                 : () {
-                    unawaited(_replyWithRecipientDialog(context, header, body));
+                    unawaited(
+                      _replyWithRecipientDialog(context, header, body),
+                    );
+                  },
+          ),
+          IconButton(
+            icon: const Icon(Icons.forward),
+            tooltip: 'Forward',
+            onPressed: header == null
+                ? null
+                : () {
+                    unawaited(_forward(context, header, body));
                   },
           ),
           IconButton(
@@ -88,7 +98,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             icon: const Icon(Icons.delete),
             tooltip: 'Delete',
             onPressed: () async {
-              final nextEmailId = await _getNextEmailIdIfNeeded(header);
               final destPath = await repo.deleteEmail(widget.emailId);
 
               if (header != null) {
@@ -107,9 +116,28 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 );
               }
 
-              if (context.mounted) _navigateTo(context, header, nextEmailId);
+              if (context.mounted) context.pop();
             },
           ),
+          IconButton(
+            icon: const Icon(Icons.report_outlined),
+            tooltip: 'Mark as spam',
+            onPressed: header == null
+                ? null
+                : () {
+                    unawaited(_markAsSpam(context, header));
+                  },
+          ),
+          IconButton(
+            icon: const Icon(Icons.drive_file_move_outline),
+            tooltip: 'Move to folder',
+            onPressed: header == null ? null : () => _moveTo(context, header),
+          ),
+          IconButton(
+            icon: const Icon(Icons.access_time),
+            tooltip: 'Snooze',
+            onPressed: header == null ? null : () => _snooze(context, header),
+          ),
           IconButton(
             icon: Icon(
               _isFlagged ? Icons.star : Icons.star_border,
@@ -124,15 +152,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
           PopupMenuButton<String>(
             itemBuilder: (ctx) => [
-              const PopupMenuItem(value: 'forward', child: Text('Forward')),
-              const PopupMenuItem(value: 'move', child: Text('Move to folder')),
-              const PopupMenuItem(value: 'snooze', child: Text('Snooze')),
-              const PopupMenuItem(value: 'spam', child: Text('Mark as spam')),
               const PopupMenuItem(
                 value: 'mark_unread',
                 child: Text('Mark as unread'),
               ),
-              const PopupMenuDivider(),
               const PopupMenuItem(
                 value: 'headers',
                 child: Text('Show Mail Headers'),
@@ -141,21 +164,15 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 value: 'structure',
                 child: Text('Show Mail Structure'),
               ),
-              const PopupMenuItem(value: 'rfc', child: Text('Show Raw Email')),
+              const PopupMenuItem(
+                value: 'rfc',
+                child: Text('Show Raw Email'),
+              ),
             ],
             onSelected: (value) async {
-              if (value == 'forward' && header != null) {
-                unawaited(_forward(context, header, body));
-              } else if (value == 'move' && header != null) {
-                unawaited(_moveTo(context, header));
-              } else if (value == 'snooze' && header != null) {
-                unawaited(_snooze(context, header));
-              } else if (value == 'spam' && header != null) {
-                unawaited(_markAsSpam(context, header));
-              } else if (value == 'mark_unread') {
-                final nextEmailId = await _getNextEmailIdIfNeeded(header);
+              if (value == 'mark_unread') {
                 await repo.setFlag(widget.emailId, seen: false);
-                if (context.mounted) _navigateTo(context, header, nextEmailId);
+                if (context.mounted) context.pop();
               } else if (value == 'headers' && body != null) {
                 _showHeaders(context, body);
               } else if (value == 'structure' && body != null) {
@@ -235,40 +252,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String?> _getNextEmailIdIfNeeded(Email? header) async {
-    if (header == null) return null;
-    final prefs = ref.read(userPreferencesProvider).value;
-    final action =
-        prefs?.afterMailViewAction ?? AfterMailViewAction.nextMessage;
-    if (action != AfterMailViewAction.nextMessage) return null;
-
-    final threads = await ref
-        .read(emailRepositoryProvider)
-        .observeThreads(header.accountId, header.mailboxPath)
-        .first;
-
-    final currentIndex = threads.indexWhere(
-      (t) => t.emailIds.contains(widget.emailId),
-    );
-    if (currentIndex >= 0 && currentIndex + 1 < threads.length) {
-      return threads[currentIndex + 1].latestEmailId;
-    }
-    return null;
-  }
-
-  void _navigateTo(BuildContext context, Email? header, String? nextEmailId) {
-    if (!context.mounted) return;
-    if (nextEmailId != null && header != null) {
-      context.go(
-        '/accounts/${header.accountId}'
-        '/mailboxes/${Uri.encodeComponent(header.mailboxPath)}'
-        '/emails/${Uri.encodeComponent(nextEmailId)}',
-      );
-    } else {
-      context.pop();
-    }
-  }
-
   Future<void> _downloadAndOpen(EmailAttachment att) async {
     setState(() => _downloading.add(att.filename));
     try {
@@ -420,9 +403,6 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 
   Future<void> _archive(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -452,13 +432,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _markAsSpam(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final mailbox = await resolveMailboxByRole(
       context,
       ref.read(mailboxRepositoryProvider),
@@ -488,7 +465,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _forward(
@@ -504,14 +481,15 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     unawaited(
       context.push(
         '/compose',
-        extra: {'prefillSubject': subject, 'prefillBody': quoted},
+        extra: {
+          'prefillSubject': subject,
+          'prefillBody': quoted,
+        },
       ),
     );
   }
 
   Future<void> _moveTo(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-
     final mailboxRepo = ref.read(mailboxRepositoryProvider);
     final mailboxes =
         await mailboxRepo.observeMailboxes(header.accountId).first;
@@ -560,13 +538,10 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
     );
 
-    if (context.mounted) _navigateTo(context, header, nextEmailId);
+    if (context.mounted) context.pop();
   }
 
   Future<void> _snooze(BuildContext context, Email header) async {
-    final nextEmailId = await _getNextEmailIdIfNeeded(header);
-    if (!context.mounted) return;
-
     final until = await showModalBottomSheet<DateTime>(
       context: context,
       builder: (ctx) => const SnoozePicker(),
@@ -594,7 +569,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           ),
         ),
       );
-      _navigateTo(context, header, nextEmailId);
+      context.pop();
     }
   }
 
@@ -606,9 +581,9 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           .fetchRawRfc822(widget.emailId);
     } catch (e) {
       if (!context.mounted) return;
-      ScaffoldMessenger.of(
-        context,
-      ).showSnackBar(SnackBar(content: Text('Failed to fetch raw email: $e')));
+      ScaffoldMessenger.of(context).showSnackBar(
+        SnackBar(content: Text('Failed to fetch raw email: $e')),
+      );
       return;
     }
 
@@ -773,7 +748,9 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
       ScaffoldMessenger.of(context).showSnackBar(
         const SnackBar(
           duration: Duration(seconds: 5),
-          content: Text('Structure not available. Try re-syncing the email.'),
+          content: Text(
+            'Structure not available. Try re-syncing the email.',
+          ),
         ),
       );
       return;
@@ -882,8 +859,14 @@ class _ReplyAllDialogState extends State<_ReplyAllDialog> {
                     SegmentedButton<_Placement>(
                       showSelectedIcon: false,
                       segments: const [
-                        ButtonSegment(value: _Placement.to, label: Text('To')),
-                        ButtonSegment(value: _Placement.cc, label: Text('Cc')),
+                        ButtonSegment(
+                          value: _Placement.to,
+                          label: Text('To'),
+                        ),
+                        ButtonSegment(
+                          value: _Placement.cc,
+                          label: Text('Cc'),
+                        ),
                         ButtonSegment(
                           value: _Placement.skip,
                           label: Text('Skip'),
@@ -955,13 +938,10 @@ class _UnsubscribeChip extends StatelessWidget {
   Widget build(BuildContext context) {
     final uri = _parseUnsubscribeUri(header);
     if (uri == null) return const SizedBox.shrink();
-    return Tooltip(
-      message: uri.toString(),
-      child: ActionChip(
-        avatar: const Icon(Icons.unsubscribe_outlined, size: 16),
-        label: const Text('Unsubscribe'),
-        onPressed: () => launchUrl(uri, mode: LaunchMode.externalApplication),
-      ),
+    return ActionChip(
+      avatar: const Icon(Icons.unsubscribe_outlined, size: 16),
+      label: const Text('Unsubscribe'),
+      onPressed: () => launchUrl(uri, mode: LaunchMode.externalApplication),
     );
   }
 }

lib/ui/screens/email_list_screen.dart

@@ -8,7 +8,6 @@ import 'package:intl/intl.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/screens/email_action_helpers.dart';
@@ -149,21 +148,16 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   Widget build(BuildContext context) {
     final repo = ref.watch(emailRepositoryProvider);
     final accountAsync = ref.watch(accountByIdProvider(widget.accountId));
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final menuAtBottom = prefs.menuPosition == MenuPosition.bottom;
 
     return Scaffold(
-      appBar: _buildAppBar(repo, accountAsync, menuAtBottom: menuAtBottom),
+      appBar: _buildAppBar(repo, accountAsync),
       drawer: _selecting
           ? null
           : FolderDrawer(
               accountId: widget.accountId,
               currentMailboxPath: widget.mailboxPath,
             ),
-      bottomNavigationBar: _selecting
-          ? _selectionBottomBar()
-          : (menuAtBottom ? _folderNavBottomBar() : null),
+      bottomNavigationBar: _selecting ? _selectionBottomBar() : null,
       body: Column(
         children: [
           _buildSyncErrorBanner(),
@@ -179,14 +173,12 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
 
   PreferredSizeWidget _buildAppBar(
     EmailRepository emailRepo,
-    AsyncValue<Account?> accountAsync, {
-    required bool menuAtBottom,
-  }) {
+    AsyncValue<Account?> accountAsync,
+  ) {
     final selectionCount =
         _searching ? _selectedSearchIds.length : _selectedThreadIds.length;
 
     return AppBar(
-      automaticallyImplyLeading: !menuAtBottom,
       leading: _selecting
           ? IconButton(
               icon: const Icon(Icons.close),
@@ -309,22 +301,6 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     );
   }
 
-  Widget _folderNavBottomBar() {
-    return BottomAppBar(
-      child: Row(
-        children: [
-          Builder(
-            builder: (context) => IconButton(
-              icon: const Icon(Icons.menu),
-              tooltip: 'Open folders',
-              onPressed: () => Scaffold.of(context).openDrawer(),
-            ),
-          ),
-        ],
-      ),
-    );
-  }
-
   Widget _selectionBottomBar() {
     return BottomAppBar(
       child: Row(
@@ -381,7 +357,11 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     }
     return MaterialBanner(
       padding: const EdgeInsets.fromLTRB(16, 8, 8, 8),
-      content: Text(error, maxLines: 2, overflow: TextOverflow.ellipsis),
+      content: Text(
+        error,
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
+      ),
       leading: Icon(
         Icons.sync_problem,
         color: Theme.of(context).colorScheme.error,
@@ -395,8 +375,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
           child: const Text('Retry'),
         ),
         TextButton(
-          onPressed: () =>
-              context.push('/accounts/${widget.accountId}/sync-log'),
+          onPressed: () => context.push(
+            '/accounts/${widget.accountId}/sync-log',
+          ),
           child: const Text('View log'),
         ),
         TextButton(

lib/ui/screens/mailbox_list_screen.dart

@@ -4,7 +4,6 @@ import 'package:go_router/go_router.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/mailbox.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
@@ -18,12 +17,8 @@ class MailboxListScreen extends ConsumerWidget {
     final mailboxRepo = ref.watch(mailboxRepositoryProvider);
     final emailRepo = ref.watch(emailRepositoryProvider);
     final accountAsync = ref.watch(accountByIdProvider(accountId));
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final menuAtBottom = prefs.menuPosition == MenuPosition.bottom;
     return Scaffold(
       appBar: AppBar(
-        automaticallyImplyLeading: !menuAtBottom,
         title: const Text('Folders'),
         actions: [
           IconButton(
@@ -47,19 +42,6 @@ class MailboxListScreen extends ConsumerWidget {
         ],
       ),
       drawer: FolderDrawer(accountId: accountId),
-      bottomNavigationBar: menuAtBottom
-          ? BottomAppBar(
-              child: Row(
-                children: [
-                  IconButton(
-                    icon: const Icon(Icons.menu),
-                    tooltip: 'Open folders',
-                    onPressed: () => Scaffold.of(context).openDrawer(),
-                  ),
-                ],
-              ),
-            )
-          : null,
       body: Column(
         children: [
           // ── Failed-mutation banner ───────────────────────────────────────

lib/ui/screens/search_screen.dart

@@ -10,9 +10,8 @@ import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/email_tile.dart';
 
-final _searchHistoryProvider = FutureProvider.autoDispose<List<String>>((
-  ref,
-) async {
+final _searchHistoryProvider =
+    FutureProvider.autoDispose<List<String>>((ref) async {
   return ref.watch(searchHistoryRepositoryProvider).getRecentSearches();
 });
 

lib/ui/screens/sieve_scripts_screen.dart

@@ -137,7 +137,9 @@ class _SieveScriptsScreenState extends ConsumerState<SieveScriptsScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
-        title: Text(widget.isLocal ? 'Local Filters' : 'Remote Filters'),
+        title: Text(
+          widget.isLocal ? 'Local Filters' : 'Remote Filters',
+        ),
       ),
       body: _buildBody(),
       floatingActionButton: FloatingActionButton(

lib/ui/screens/thread_detail_screen.dart

@@ -7,7 +7,6 @@ import 'package:intl/intl.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/undo_action.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/secure_email_webview.dart';
@@ -29,16 +28,9 @@ class ThreadDetailScreen extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final repo = ref.watch(emailRepositoryProvider);
-    final prefs =
-        ref.watch(userPreferencesProvider).value ?? const UserPreferences();
-    final buttonAtBottom = prefs.mailViewButtonPosition == MenuPosition.bottom;
 
     return Scaffold(
-      appBar: AppBar(
-        title: const Text('Thread'),
-        automaticallyImplyLeading: !buttonAtBottom,
-      ),
-      bottomNavigationBar: buttonAtBottom ? _buildBackButtonBar(context) : null,
+      appBar: AppBar(title: const Text('Thread')),
       body: StreamBuilder<List<Email>>(
         stream: repo.observeEmailsInThread(accountId, mailboxPath, threadId),
         builder: (context, snapshot) {
@@ -68,20 +60,6 @@ class ThreadDetailScreen extends ConsumerWidget {
       ),
     );
   }
-
-  Widget _buildBackButtonBar(BuildContext context) {
-    return BottomAppBar(
-      child: Row(
-        children: [
-          IconButton(
-            icon: const Icon(Icons.arrow_back),
-            tooltip: 'Back',
-            onPressed: () => context.pop(),
-          ),
-        ],
-      ),
-    );
-  }
 }
 
 class _EmailMessageCard extends ConsumerStatefulWidget {
@@ -163,17 +141,6 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
           FutureBuilder<EmailBody>(
             future: _bodyFuture,
             builder: (context, snapshot) {
-              if (snapshot.hasError) {
-                return Padding(
-                  padding: const EdgeInsets.all(16),
-                  child: Text(
-                    'Failed to load email: ${snapshot.error}',
-                    style: TextStyle(
-                      color: Theme.of(context).colorScheme.error,
-                    ),
-                  ),
-                );
-              }
               if (!snapshot.hasData) {
                 return const Center(
                   child: Padding(

lib/ui/screens/undo_log_screen.dart

@@ -84,7 +84,9 @@ class _UndoActionTile extends ConsumerWidget {
               .read(undoServiceProvider.notifier)
               .undo(actionId: action.id);
           if (context.mounted) {
-            ScaffoldMessenger.of(context).showSnackBar(
+            ScaffoldMessenger.of(
+              context,
+            ).showSnackBar(
               const SnackBar(
                 duration: Duration(seconds: 5),
                 content: Text('Action undone.'),

lib/ui/screens/user_preferences_screen.dart

@@ -1,139 +0,0 @@
-import 'dart:async';
-
-import 'package:flutter/material.dart';
-import 'package:flutter_riverpod/flutter_riverpod.dart';
-
-import 'package:sharedinbox/core/models/user_preferences.dart';
-import 'package:sharedinbox/di.dart';
-
-class UserPreferencesScreen extends ConsumerWidget {
-  const UserPreferencesScreen({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final prefsAsync = ref.watch(userPreferencesProvider);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Preferences')),
-      body: prefsAsync.when(
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (_, __) =>
-            const Center(child: Text('Error loading preferences')),
-        data: (prefs) => ListView(
-          children: [
-            ListTile(
-              title: Text(
-                'Menu bar position',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'Where the folder navigation menu is shown in the mailbox view.',
-              ),
-            ),
-            RadioGroup<MenuPosition>(
-              groupValue: prefs.menuPosition,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateMenuPosition(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<MenuPosition>(
-                    title: Text('Bottom (default)'),
-                    subtitle: Text(
-                      'Open folder navigation from a button at the bottom of the screen.',
-                    ),
-                    value: MenuPosition.bottom,
-                  ),
-                  RadioListTile<MenuPosition>(
-                    title: Text('Top'),
-                    subtitle: Text(
-                      'Open folder navigation from the hamburger icon in the top bar.',
-                    ),
-                    value: MenuPosition.top,
-                  ),
-                ],
-              ),
-            ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'Single mail view button position',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'Where the back button is shown in the single mail view.',
-              ),
-            ),
-            RadioGroup<MenuPosition>(
-              groupValue: prefs.mailViewButtonPosition,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateMailViewButtonPosition(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<MenuPosition>(
-                    title: Text('Bottom (default)'),
-                    subtitle: Text(
-                      'Show the back button at the bottom of the screen.',
-                    ),
-                    value: MenuPosition.bottom,
-                  ),
-                  RadioListTile<MenuPosition>(
-                    title: Text('Top'),
-                    subtitle: Text('Show the back button in the top bar.'),
-                    value: MenuPosition.top,
-                  ),
-                ],
-              ),
-            ),
-            const Divider(),
-            ListTile(
-              title: Text(
-                'After mail action',
-                style: Theme.of(context).textTheme.titleSmall,
-              ),
-              subtitle: const Text(
-                'What to show after deleting, archiving, or otherwise handling a message.',
-              ),
-            ),
-            RadioGroup<AfterMailViewAction>(
-              groupValue: prefs.afterMailViewAction,
-              onChanged: (value) {
-                if (value == null) return;
-                unawaited(
-                  ref
-                      .read(userPreferencesRepositoryProvider)
-                      .updateAfterMailViewAction(value),
-                );
-              },
-              child: const Column(
-                children: [
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Next message (default)'),
-                    subtitle: Text('Show the next message in the mailbox.'),
-                    value: AfterMailViewAction.nextMessage,
-                  ),
-                  RadioListTile<AfterMailViewAction>(
-                    title: Text('Return to mailbox'),
-                    subtitle: Text('Return to the message list.'),
-                    value: AfterMailViewAction.showMailbox,
-                  ),
-                ],
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/ui/utils/about_markdown.dart

@@ -26,9 +26,8 @@ String buildAboutMarkdown({
   final osName = _capitalize(Platform.operatingSystem);
   final isDark = MediaQuery.of(context).platformBrightness == Brightness.dark;
   final locale = Localizations.localeOf(context).toString();
-  final textScale = MediaQuery.of(
-    context,
-  ).textScaler.scale(1.0).toStringAsFixed(1);
+  final textScale =
+      MediaQuery.of(context).textScaler.scale(1.0).toStringAsFixed(1);
 
   final gitCommitLine = _gitHash.isNotEmpty
       ? '| Git Commit | [$_gitHash](https://codeberg.org/guettli/sharedinbox/commit/$_gitHash) |\n'

lib/ui/widgets/secure_email_webview.dart

@@ -31,13 +31,10 @@ String buildEmailHtml(String htmlBody, {bool loadRemoteImages = false}) {
 <meta name="color-scheme" content="light">
 <meta http-equiv="Content-Security-Policy" content="$csp">
 <style>
-body { margin: 0; padding: 0; font-family: sans-serif; word-break: break-word; overflow-x: hidden; color-scheme: light; background-color: #ffffff; color: #000000; }
+body { margin: 0; padding: 0; font-family: sans-serif; word-break: break-word; color-scheme: light; background-color: #ffffff; color: #000000; }
 img { max-width: 100%; height: auto; }
 a { color: #1976D2; }
-* { box-sizing: border-box; max-width: 100%; }
-table { width: 100%; border-collapse: collapse; }
-td, th { overflow-wrap: break-word; word-break: break-word; }
-pre { white-space: pre-wrap; word-break: break-word; overflow-x: auto; }
+* { box-sizing: border-box; }
 </style>
 </head>
 <body>
@@ -111,16 +108,12 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
       );
 
   Future<void> _measureHeight(String _) async {
-    try {
-      final result = await _controller!.runJavaScriptReturningResult(
-        'document.documentElement.scrollHeight',
-      );
-      final h = double.tryParse(result.toString());
-      if (h != null && h > 0 && mounted) {
-        setState(() => _height = h);
-      }
-    } catch (_) {
-      // WebView not ready yet; height stays at default
+    final result = await _controller!.runJavaScriptReturningResult(
+      'document.documentElement.scrollHeight',
+    );
+    final h = double.tryParse(result.toString());
+    if (h != null && h > 0 && mounted) {
+      setState(() => _height = h);
     }
   }
 
@@ -191,14 +184,12 @@ class _SecureEmailWebViewState extends State<SecureEmailWebView> {
     );
 
     if (confirmed == true && mounted) {
-      final launched = await launchUrl(
-        uri,
-        mode: LaunchMode.externalApplication,
-      );
+      final launched =
+          await launchUrl(uri, mode: LaunchMode.externalApplication);
       if (!launched && mounted) {
-        ScaffoldMessenger.of(
-          context,
-        ).showSnackBar(SnackBar(content: Text('Could not open: $url')));
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text('Could not open: $url')),
+        );
       }
     }
   }

pubspec.lock

@@ -659,10 +659,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349"
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.18.0"
+    version: "1.17.0"
   mime:
     dependency: "direct main"
     description:
@@ -1088,26 +1088,26 @@ packages:
     dependency: "direct dev"
     description:
       name: test
-      sha256: "8d9ceddbab833f180fbefed08afa76d7c03513dfdba87ffcec2718b02bbcbf20"
+      sha256: "280d6d890011ca966ad08df7e8a4ddfab0fb3aa49f96ed6de56e3521347a9ae7"
       url: "https://pub.dev"
     source: hosted
-    version: "1.31.0"
+    version: "1.30.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e"
+      sha256: "8161c84903fd860b26bfdefb7963b3f0b68fee7adea0f59ef805ecca346f0c7a"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.11"
+    version: "0.7.10"
   test_core:
     dependency: transitive
     description:
       name: test_core
-      sha256: "1991d4cfe85d5043241acac92962c3977c8d2f2add1ee73130c7b286417d1d34"
+      sha256: "0381bd1585d1a924763c308100f2138205252fb90c9d4eeaf28489ee65ccde51"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.17"
+    version: "0.6.16"
   timezone:
     dependency: transitive
     description:

pubspec.yaml

@@ -33,7 +33,7 @@ dependencies:
   flutter_secure_storage: ^10.0.0
 
   # Date formatting
-  intl: ^0.20.2
+  intl: any
 
   # File picking (compose attachments) and opening downloaded attachments
   file_picker: ^12.0.0-beta.4

renovate.json

@@ -5,7 +5,7 @@
   ],
   "labels": ["dependencies"],
   "github-actions": {
-    "enabled": false
+    "fileMatch": ["^\\.forgejo/workflows/[^/]+\\.ya?ml$"]
   },
   "packageRules": [
     {

scripts/check_coverage.dart

@@ -20,9 +20,7 @@ const _noCode = {
   'lib/core/repositories/sync_log_repository.dart',
   'lib/core/repositories/undo_repository.dart',
   'lib/core/repositories/search_history_repository.dart',
-  'lib/core/repositories/user_preferences_repository.dart',
   'lib/core/models/undo_action.dart',
-  'lib/core/models/user_preferences.dart',
   'lib/core/storage/secure_storage.dart',
 };
 
@@ -75,8 +73,6 @@ const _excluded = {
   'lib/data/repositories/sync_log_repository_impl.dart',
   'lib/data/repositories/undo_repository_impl.dart',
   'lib/data/repositories/search_history_repository_impl.dart',
-  'lib/data/repositories/user_preferences_repository_impl.dart',
-  'lib/ui/screens/user_preferences_screen.dart',
   'lib/core/services/update_service.dart',
 };
 

scripts/setup_dagger_remote.sh

@@ -1,76 +1,102 @@
 #!/usr/bin/env bash
+# Establishes a secure tunnel to a remote Dagger Engine via stunnel.
 set -euo pipefail
 
-if [ -z "${SOPS_AGE_KEY:-}" ]; then
-    echo "Error: SOPS_AGE_KEY must be set."
+if [ -z "${DAGGER_STUNNEL_URL:-}" ]; then
+    echo "Error: DAGGER_STUNNEL_URL must be set."
     exit 1
 fi
 
-echo "Decrypting secrets with SOPS..."
-export SOPS_AGE_KEY="$SOPS_AGE_KEY"
-SECRETS_JSON=$(mktemp)
-trap "rm -f $SECRETS_JSON" EXIT
+# Parse host and port (e.g., example.com:8774 or just example.com)
+host=$(echo "$DAGGER_STUNNEL_URL" | cut -d: -f1)
+port=$(echo "$DAGGER_STUNNEL_URL" | cut -d: -f2)
+if [ "$host" == "$port" ]; then
+    port="8774"
+fi
 
-sops --decrypt --output-type json secrets.enc.yaml > "$SECRETS_JSON"
-
-DAGGER_SSH_KEY=$(jq -r '.DAGGER_SSH_KEY' "$SECRETS_JSON")
-DAGGER_ENGINE_HOST=$(jq -r '.DAGGER_ENGINE_HOST' "$SECRETS_JSON")
-
-# Export all CI secrets to the GitHub Actions environment so subsequent steps
-# can use them without referencing Forgejo secrets directly.
-export_secret() {
-    local name="$1"
-    local value
-    value=$(jq -r --arg k "$name" '.[$k] // empty' "$SECRETS_JSON")
-    if [ -n "${GITHUB_ENV:-}" ]; then
-        # Use heredoc syntax for multiline-safe export
-        {
-            printf '%s<<__EOF__\n' "$name"
-            printf '%s\n' "$value"
-            printf '__EOF__\n'
-        } >> "$GITHUB_ENV"
+MAX_PROBE_ATTEMPTS=5
+PROBE_DELAY=30
+for attempt in $(seq 1 $MAX_PROBE_ATTEMPTS); do
+    echo "Probing $host:$port (attempt $attempt/$MAX_PROBE_ATTEMPTS)..."
+    if nc -zw 5 "$host" "$port" 2>/dev/null; then
+        echo "Found active server on $host:$port"
+        break
     fi
-    printf '[secrets] exported %s (%d chars)\n' "$name" "${#value}"
-}
+    if [ "$attempt" -eq "$MAX_PROBE_ATTEMPTS" ]; then
+        echo "Warning: No Dagger server responded on $host:$port after $MAX_PROBE_ATTEMPTS attempts"
+        echo "Remote engine unavailable — CI will use the local Dagger engine."
+        exit 0
+    fi
+    echo "Dagger server not responding, waiting ${PROBE_DELAY}s before retry..."
+    sleep $PROBE_DELAY
+done
 
-export_secret "SSH_PRIVATE_KEY"
-export_secret "SSH_KNOWN_HOSTS"
-export_secret "SSH_USER"
-export_secret "SSH_HOST"
-export_secret "WEBSITE_SSH_HOST"
-export_secret "PLAY_STORE_CONFIG_JSON"
-export_secret "ANDROID_KEYSTORE_BASE64"
-export_secret "ANDROID_KEYSTORE_PASSWORD"
-export_secret "FIREBASE_TEST_LAB_SERVICE_ACCOUNT_KEY"
-export_secret "RENOVATE_FORGEJO_TOKEN"
-
-# Setup SSH directory and keys
-mkdir -p ~/.ssh
-chmod 700 ~/.ssh
-echo "$DAGGER_SSH_KEY" > ~/.ssh/dagger_key
-chmod 600 ~/.ssh/dagger_key
-
-# Add remote host to known_hosts
-ssh-keyscan -H "$DAGGER_ENGINE_HOST" >> ~/.ssh/known_hosts 2>/dev/null
-
-# Create a background SSH tunnel to the Dagger engine.
-# We map local port 8080 to remote port 1774 (where our socat bridge is listening).
-echo "Establishing SSH tunnel to $DAGGER_ENGINE_HOST..."
-ssh -i ~/.ssh/dagger_key -o StrictHostKeyChecking=no -f -N -L 8080:localhost:1774 "dagger@$DAGGER_ENGINE_HOST"
-
-# Export _EXPERIMENTAL_DAGGER_RUNNER_HOST to use the tunnel.
-export _EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://localhost:8080"
-if [ -n "${GITHUB_ENV:-}" ]; then
-    echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://localhost:8080" >> "$GITHUB_ENV"
+# 2a. Try plain TCP connection first (works when server is a plain TCP proxy, no TLS)
+echo "Trying plain TCP Dagger connection at tcp://$host:$port..."
+if _DAGGER_RUNNER_HOST="tcp://$host:$port" \
+   _EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://$host:$port" \
+   timeout 8 dagger version >/dev/null 2>&1; then
+    echo "Plain TCP Dagger connection succeeded — no TLS stunnel needed."
+    if [ -n "${GITHUB_ENV:-}" ]; then
+        echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://$host:$port" >> "$GITHUB_ENV"
+        echo "_DAGGER_RUNNER_HOST=tcp://$host:$port" >> "$GITHUB_ENV"
+    else
+        export _EXPERIMENTAL_DAGGER_RUNNER_HOST="tcp://$host:$port"
+        export _DAGGER_RUNNER_HOST="tcp://$host:$port"
+        echo "Dagger configured at tcp://$host:$port (plain TCP)"
+    fi
+    exit 0
 fi
+echo "Plain TCP connection not available; trying TLS stunnel..."
 
-# Verify the connection
-echo "Verifying connection to Dagger engine via SSH tunnel..."
-# Use a simple command that doesn't require complex GraphQL operations.
-if ! timeout 45 dagger core --help >/dev/null 2>&1 ; then
-    echo "Error: Dagger engine unreachable via tunnel at localhost:8080"
-    # Debug
-    ps aux | grep ssh
+# 2b. Setup TLS credentials (passed as env vars from secrets)
+mkdir -p /tmp/dagger-tls
+echo "$DAGGER_CA_CERT" > /tmp/dagger-tls/ca.crt
+echo "$DAGGER_CLIENT_CERT" > /tmp/dagger-tls/client.crt
+echo "$DAGGER_CLIENT_KEY" > /tmp/dagger-tls/client.key
+chmod 600 /tmp/dagger-tls/client.key
+
+# 3. Configure and start stunnel
+STUNNEL_CONF="/tmp/stunnel-dagger.conf"
+cat << EOF > "$STUNNEL_CONF"
+client = yes
+foreground = yes
+pid = /tmp/stunnel.pid
+debug = warning
+; TCP keepalive on the remote side to prevent NAT/firewall from resetting the connection
+socket = r:SO_KEEPALIVE=1
+socket = r:TCP_KEEPIDLE=10
+socket = r:TCP_KEEPINTVL=5
+socket = r:TCP_KEEPCNT=3
+
+[dagger]
+accept = 127.0.0.1:1774
+connect = $host:$port
+CAfile = /tmp/dagger-tls/ca.crt
+cert = /tmp/dagger-tls/client.crt
+key = /tmp/dagger-tls/client.key
+verifyChain = yes
+EOF
+
+# Start stunnel in the background
+stunnel "$STUNNEL_CONF" &
+TUNNEL_PID=$!
+
+# Give it a moment to establish
+sleep 2
+
+if ! kill -0 "$TUNNEL_PID" 2>/dev/null; then
+    echo "Error: stunnel failed to start"
     exit 1
 fi
-echo "Dagger connection verified successfully."
+
+# 4. Export environment for subsequent CI steps
+if [ -n "${GITHUB_ENV:-}" ]; then
+    echo "_EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774" >> "$GITHUB_ENV"
+    echo "_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774" >> "$GITHUB_ENV"
+    echo "Tunnel established. Dagger is configured to use the remote engine."
+else
+    export _EXPERIMENTAL_DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774
+    export _DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774
+    echo "Tunnel established. Run: export _DAGGER_RUNNER_HOST=tcp://127.0.0.1:1774"
+fi

scripts/test_agent_loop.py

@@ -0,0 +1,938 @@
+#!/usr/bin/env python3
+"""Tests for agent_loop.py."""
+import contextlib
+import io
+import json
+import os
+import tempfile
+import unittest
+from datetime import datetime, timedelta, timezone
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import sys
+sys.path.insert(0, str(Path(__file__).parent))
+
+import agent_loop
+
+
+class TestUrlHelpers(unittest.TestCase):
+    def test_issue_url(self):
+        url = agent_loop._issue_url(128)
+        self.assertEqual(url, "https://codeberg.org/guettli/sharedinbox/issues/128")
+
+    def test_ci_run_url(self):
+        url = agent_loop._ci_run_url(4145144)
+        self.assertEqual(url, "https://codeberg.org/guettli/sharedinbox/actions/runs/4145144")
+
+
+class TestStateFile(unittest.TestCase):
+    def setUp(self):
+        self._tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".json")
+        self._tmp.close()
+        self._orig = agent_loop.STATE_FILE
+        agent_loop.STATE_FILE = Path(self._tmp.name)
+        Path(self._tmp.name).unlink()  # Start with no state file.
+
+    def tearDown(self):
+        agent_loop.STATE_FILE = self._orig
+        Path(self._tmp.name).unlink(missing_ok=True)
+
+    def test_write_state_stores_pid(self):
+        agent_loop._write_state(12345, 91, "issue")
+        data = json.loads(Path(self._tmp.name).read_text())
+        self.assertEqual(data["pid"], 12345)
+        self.assertNotIn("tmux_session", data)
+
+    def test_write_state_stores_issue_and_kind(self):
+        agent_loop._write_state(99, 7, "ci-fix")
+        data = json.loads(Path(self._tmp.name).read_text())
+        self.assertEqual(data["issue"], 7)
+        self.assertEqual(data["type"], "ci-fix")
+        self.assertIn("started_at", data)
+
+    def test_read_state_returns_none_when_missing(self):
+        self.assertIsNone(agent_loop._read_state())
+
+    def test_read_and_write_roundtrip(self):
+        agent_loop._write_state(42, 10, "issue")
+        state = agent_loop._read_state()
+        self.assertIsNotNone(state)
+        self.assertEqual(state["pid"], 42)
+        self.assertEqual(state["issue"], 10)
+
+    def test_clear_state_removes_file(self):
+        agent_loop._write_state(1, None, "ci-fix")
+        agent_loop._clear_state()
+        self.assertIsNone(agent_loop._read_state())
+
+    def test_write_state_stores_issue_title(self):
+        agent_loop._write_state(42, 10, "issue", "My Test Issue")
+        data = json.loads(Path(self._tmp.name).read_text())
+        self.assertEqual(data["issue_title"], "My Test Issue")
+
+    def test_write_state_omits_issue_title_when_none(self):
+        agent_loop._write_state(42, None, "ci-fix")
+        data = json.loads(Path(self._tmp.name).read_text())
+        self.assertNotIn("issue_title", data)
+
+
+class TestAgentAlive(unittest.TestCase):
+    def test_own_pid_is_alive(self):
+        self.assertTrue(agent_loop._agent_alive({"pid": os.getpid()}))
+
+    def test_nonexistent_pid_is_dead(self):
+        self.assertFalse(agent_loop._agent_alive({"pid": 999999999}))
+
+    def test_missing_pid_returns_false(self):
+        self.assertFalse(agent_loop._agent_alive({}))
+        self.assertFalse(agent_loop._agent_alive({"pid": None}))
+
+
+class TestIsClaudeProcess(unittest.TestCase):
+    def test_returns_true_for_claude_comm(self):
+        with patch.object(agent_loop.Path, "read_text", return_value="claude\n"):
+            self.assertTrue(agent_loop._is_claude_process(1234))
+
+    def test_returns_true_for_node_comm(self):
+        with patch.object(agent_loop.Path, "read_text", return_value="node\n"):
+            self.assertTrue(agent_loop._is_claude_process(1234))
+
+    def test_returns_false_for_other_process(self):
+        with patch.object(agent_loop.Path, "read_text", return_value="bash\n"):
+            self.assertFalse(agent_loop._is_claude_process(1234))
+
+    def test_returns_false_when_proc_missing(self):
+        with patch.object(agent_loop.Path, "read_text", side_effect=OSError):
+            self.assertFalse(agent_loop._is_claude_process(1234))
+
+
+class TestKillAgent(unittest.TestCase):
+    def test_kill_sends_sigkill(self):
+        with patch("agent_loop._is_claude_process", return_value=True):
+            with patch("agent_loop.os.kill") as mock_kill:
+                agent_loop._kill_agent({"pid": 1234})
+                mock_kill.assert_called_once_with(1234, 9)
+
+    def test_kill_ignores_missing_process(self):
+        with patch("agent_loop._is_claude_process", return_value=True):
+            with patch("agent_loop.os.kill", side_effect=ProcessLookupError):
+                agent_loop._kill_agent({"pid": 1234})  # Should not raise.
+
+    def test_kill_noop_when_no_pid(self):
+        with patch("agent_loop.os.kill") as mock_kill:
+            agent_loop._kill_agent({})
+            mock_kill.assert_not_called()
+
+    def test_kill_skips_recycled_pid(self):
+        with patch("agent_loop._is_claude_process", return_value=False):
+            with patch("agent_loop.os.kill") as mock_kill:
+                agent_loop._kill_agent({"pid": 1234})
+                mock_kill.assert_not_called()
+
+
+class TestStartAgent(unittest.TestCase):
+    def _make_mock_proc(self, pid=42):
+        proc = MagicMock()
+        proc.pid = pid
+        proc.stdin = io.BytesIO()
+        return proc
+
+    def test_start_agent_returns_pid(self):
+        mock_proc = self._make_mock_proc(pid=42)
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with patch("agent_loop.subprocess.Popen", return_value=mock_proc):
+                with patch.object(agent_loop.Path, "home", return_value=Path(tmpdir)):
+                    result = agent_loop._start_agent("do something", "issue-99")
+        self.assertEqual(result, 42)
+
+    def test_start_agent_uses_popen_not_tmux(self):
+        mock_proc = self._make_mock_proc(pid=7)
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with patch("agent_loop.subprocess.Popen", return_value=mock_proc) as mock_popen:
+                with patch("agent_loop.subprocess.run") as mock_run:
+                    with patch.object(agent_loop.Path, "home", return_value=Path(tmpdir)):
+                        agent_loop._start_agent("prompt", "ci-fix")
+            mock_popen.assert_called_once()
+            mock_run.assert_not_called()
+
+    def test_start_agent_passes_session_name_to_claude(self):
+        mock_proc = self._make_mock_proc(pid=7)
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with patch("agent_loop.subprocess.Popen", return_value=mock_proc) as mock_popen:
+                with patch.object(agent_loop.Path, "home", return_value=Path(tmpdir)):
+                    agent_loop._start_agent("prompt", "issue-55")
+            cmd = mock_popen.call_args[0][0]
+            self.assertIn("issue-55", cmd)
+            self.assertIn("claude", cmd[0])
+
+    def test_start_agent_uses_start_new_session(self):
+        mock_proc = self._make_mock_proc(pid=7)
+        with tempfile.TemporaryDirectory() as tmpdir:
+            with patch("agent_loop.subprocess.Popen", return_value=mock_proc) as mock_popen:
+                with patch.object(agent_loop.Path, "home", return_value=Path(tmpdir)):
+                    agent_loop._start_agent("prompt", "issue-55")
+            kwargs = mock_popen.call_args[1]
+            self.assertTrue(kwargs.get("start_new_session"))
+
+
+class TestMain(unittest.TestCase):
+    """Tests for the main() flow."""
+
+    def _make_mock_proc(self, pid=42):
+        proc = MagicMock()
+        proc.pid = pid
+        proc.stdin = io.BytesIO()
+        return proc
+
+    def _make_issue(self, number=10, title="Do something"):
+        return {"number": number, "title": title, "body": "", "labels": []}
+
+    def test_sets_in_progress_before_starting_agent(self):
+        """_set_labels(InProgress) must be called before _start_agent."""
+        call_order = []
+        mock_proc = self._make_mock_proc(pid=55)
+
+        def fake_set_labels(issue, add, remove):
+            call_order.append(("set_labels", add, remove))
+
+        def fake_start_agent(prompt, session_name):
+            call_order.append(("start_agent", session_name))
+            return 55
+
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[self._make_issue(10)]), \
+             patch("agent_loop._set_labels", side_effect=fake_set_labels), \
+             patch("agent_loop._start_agent", side_effect=fake_start_agent), \
+             patch("agent_loop._write_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        labels_idx = next(
+            i for i, c in enumerate(call_order) if c[0] == "set_labels"
+        )
+        agent_idx = next(
+            i for i, c in enumerate(call_order) if c[0] == "start_agent"
+        )
+        self.assertLess(labels_idx, agent_idx,
+                        "_set_labels must be called before _start_agent")
+
+    def test_sets_in_progress_label_and_removes_ready(self):
+        """The InProgress label is added and the Ready label is removed."""
+        captured = {}
+
+        def fake_set_labels(issue, add, remove):
+            captured["add"] = add
+            captured["remove"] = remove
+
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[self._make_issue(7)]), \
+             patch("agent_loop._set_labels", side_effect=fake_set_labels), \
+             patch("agent_loop._start_agent", return_value=99), \
+             patch("agent_loop._write_state"):
+            agent_loop._run_loop()
+
+        self.assertIn(agent_loop.LABEL_IN_PROGRESS, captured.get("add", []))
+        self.assertIn(agent_loop.LABEL_READY, captured.get("remove", []))
+
+    def test_no_ready_issues_does_nothing(self):
+        """main() exits cleanly with 0 when there are no ready issues."""
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[]), \
+             patch("agent_loop._set_labels") as mock_labels, \
+             patch("agent_loop._start_agent") as mock_start:
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_labels.assert_not_called()
+        mock_start.assert_not_called()
+
+    def test_prompt_does_not_tell_agent_to_close_issue(self):
+        """Agents must not close issues; the loop handles closing after CI passes."""
+        captured_prompt = {}
+
+        def fake_start_agent(prompt, session_name):
+            captured_prompt["prompt"] = prompt
+            return 77
+
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[self._make_issue(42)]), \
+             patch("agent_loop._set_labels"), \
+             patch("agent_loop._start_agent", side_effect=fake_start_agent), \
+             patch("agent_loop._write_state"):
+            agent_loop._run_loop()
+
+        prompt = captured_prompt.get("prompt", "")
+        # "do NOT close the issue" (blocker instruction) is fine; what must be
+        # absent is any affirmative instruction to close on completion.
+        self.assertNotIn("close the issue and stop", prompt.lower())
+
+
+class TestPendingCi(unittest.TestCase):
+    """Tests for the pending-CI state: issue closed only after CI passes."""
+
+    def _dead_state(self, issue: int, kind: str = "issue") -> dict:
+        return {
+            "pid": 999999999,  # non-existent PID
+            "issue": issue,
+            "started_at": "2026-01-01T00:00:00+00:00",
+            "type": kind,
+        }
+
+    def _open_pr(self, branch: str = "issue-10-fix") -> dict:
+        return {"number": 5, "head": {"ref": branch}, "created_at": "2026-01-01T00:00:00+00:00"}
+
+    def _find_pr_open(self, branch, state="open"):
+        if state == "open":
+            return self._open_pr(branch)
+        return None
+
+    def test_closes_issue_when_ci_passes_after_agent_finishes(self):
+        """After issue agent finishes, loop merges the PR and closes the issue once CI is green."""
+        # First call: PR found open. Second call (post-merge verification): PR closed.
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=[self._open_pr(), None]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._merge_pr") as mock_merge, \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_merge.assert_called_once_with(5)
+        mock_close.assert_called_once_with(10)
+
+    def test_ci_passed_output_includes_ci_run_url(self):
+        """'CI passed' line includes the CI run URL when a run is available."""
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=[self._open_pr(), None]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 4145144, "status": "success"}), \
+             patch("agent_loop._merge_pr"), \
+             patch("agent_loop._close_issue"), \
+             patch("agent_loop._clear_state"), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertIn("https://codeberg.org/guettli/sharedinbox/actions/runs/4145144", output)
+        self.assertIn("https://codeberg.org/guettli/sharedinbox/issues/10", output)
+
+    def test_already_merged_pr_closes_issue_without_ci_url(self):
+        """When the PR was already merged, the issue is closed and no CI run URL appears."""
+        def find_pr(branch, state="open"):
+            if state == "closed":
+                return {"number": 5, "merged": True}
+            return None
+
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=find_pr), \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"), \
+             contextlib.redirect_stdout(buf):
+            result = agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertEqual(result, 0)
+        mock_close.assert_called_once_with(10)
+        self.assertIn("already merged", output)
+        self.assertNotIn("/actions/runs/", output)
+
+    def test_no_pr_found_sets_question_label(self):
+        """When no open or merged PR exists for the pending branch, set State/Question."""
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", return_value=None), \
+             patch("agent_loop._set_labels") as mock_labels, \
+             patch("agent_loop._comment_issue") as mock_comment, \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_close.assert_not_called()
+        mock_labels.assert_called_once_with(
+            10,
+            add=[agent_loop.LABEL_QUESTION],
+            remove=[agent_loop.LABEL_IN_PROGRESS],
+        )
+        mock_comment.assert_called_once()
+        self.assertIn("issue-10-fix", mock_comment.call_args[0][1])
+
+    def test_does_not_close_issue_when_ci_fails(self):
+        """After issue agent finishes, loop must NOT close the issue if CI failed on PR branch."""
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=self._find_pr_open), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "failure"}), \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._start_agent", return_value=55), \
+             patch("agent_loop._write_state"), \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_close.assert_not_called()
+
+    def test_saves_pending_ci_state_while_ci_running(self):
+        """When CI is still running on PR branch after agent finishes, pending issue is preserved."""
+        written = {}
+
+        def fake_write_state(pid, issue, kind, issue_title=None, session_name=None, ci_run_id=None):
+            written["pid"] = pid
+            written["issue"] = issue
+            written["kind"] = kind
+
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=self._find_pr_open), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "running"}), \
+             patch("agent_loop._write_state", side_effect=fake_write_state), \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        self.assertEqual(written.get("issue"), 10)
+        self.assertEqual(written.get("kind"), "pending-ci")
+        self.assertIsNone(written.get("pid"))
+
+    def test_ci_fix_preserves_pending_issue_in_state(self):
+        """When CI fails on PR branch after agent finishes, ci-fix state includes the pending issue."""
+        written = {}
+
+        def fake_write_state(pid, issue, kind, issue_title=None, session_name=None, ci_run_id=None):
+            written["pid"] = pid
+            written["issue"] = issue
+            written["kind"] = kind
+
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=self._find_pr_open), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "failure"}), \
+             patch("agent_loop._start_agent", return_value=55), \
+             patch("agent_loop._write_state", side_effect=fake_write_state), \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        self.assertEqual(written.get("issue"), 10)
+        self.assertEqual(written.get("kind"), "ci-fix")
+
+    def test_closes_issue_after_ci_fix_and_ci_passes(self):
+        """After ci-fix agent finishes and CI passes on PR branch, the pending issue is closed."""
+        with patch("agent_loop._read_state", return_value=self._dead_state(10, "ci-fix")), \
+             patch("agent_loop._find_pr_for_branch", side_effect=[self._open_pr(), None]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._merge_pr") as mock_merge, \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_merge.assert_called_once_with(5)
+        mock_close.assert_called_once_with(10)
+
+    def test_no_pending_issue_ci_fix_without_issue(self):
+        """ci-fix for a manual push (no pending issue) does not try to close anything."""
+        with patch("agent_loop._read_state", return_value={
+            "pid": 999999999, "issue": None, "started_at": "2026-01-01T00:00:00+00:00",
+            "type": "ci-fix",
+        }), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._ready_issues", return_value=[]), \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_close.assert_not_called()
+
+
+class TestOutputFormat(unittest.TestCase):
+    """Verify output format: no [agent_loop] prefix, URLs in output."""
+
+    def test_output_starts_with_header(self):
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[]), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        first_line = buf.getvalue().splitlines()[0]
+        self.assertTrue(first_line.startswith("---------------------- Starting "),
+                        f"Unexpected first line: {first_line!r}")
+
+    def test_no_agent_loop_prefix_in_output(self):
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[]), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        self.assertNotIn("[agent_loop]", buf.getvalue())
+
+    def test_ci_run_output_contains_url(self):
+        run = {"id": 4145144, "status": "running"}
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=run), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        self.assertIn("https://codeberg.org/guettli/sharedinbox/actions/runs/4145144",
+                      buf.getvalue())
+
+    def test_issue_output_contains_url_and_title(self):
+        issue = {"number": 128, "title": "Fix something", "body": "", "labels": []}
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[issue]), \
+             patch("agent_loop._set_labels"), \
+             patch("agent_loop._start_agent", return_value=99), \
+             patch("agent_loop._write_state"), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertIn("https://codeberg.org/guettli/sharedinbox/issues/128", output)
+        self.assertIn("Fix something", output)
+
+
+class TestLatestMainCiRun(unittest.TestCase):
+    """_latest_main_ci_run() must return only ci.yml push-to-main runs."""
+
+    def _ci_run(self, run_id, status="success"):
+        return {"event": "push", "prettyref": "main", "workflow_id": "ci.yml",
+                "status": status, "id": run_id}
+
+    def _deploy_run(self, run_id, status="success"):
+        return {"event": "push", "prettyref": "main", "workflow_id": "deploy.yml",
+                "status": status, "id": run_id}
+
+    def test_skips_deploy_run_returns_ci_run(self):
+        # Forgejo reports deploy.yml schedule runs as event=push/prettyref=main;
+        # must be excluded by workflow_id filter.
+        runs = [self._deploy_run(1), self._ci_run(2)]
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}):
+            result = agent_loop._latest_main_ci_run()
+        self.assertIsNotNone(result)
+        self.assertEqual(result["id"], 2)
+
+    def test_returns_none_when_only_deploy_runs_exist(self):
+        runs = [self._deploy_run(1)]
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}):
+            result = agent_loop._latest_main_ci_run()
+        self.assertIsNone(result)
+
+    def test_returns_none_when_only_schedule_runs_exist(self):
+        runs = [{"event": "schedule", "prettyref": "main", "workflow_id": "deploy.yml",
+                 "status": "success", "id": 1}]
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}):
+            result = agent_loop._latest_main_ci_run()
+        self.assertIsNone(result)
+
+    def test_returns_ci_push_to_main_run(self):
+        runs = [self._ci_run(42, status="running")]
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}):
+            result = agent_loop._latest_main_ci_run()
+        self.assertIsNotNone(result)
+        self.assertEqual(result["id"], 42)
+
+
+class TestLatestCiRunForBranch(unittest.TestCase):
+    """Tests for _latest_ci_run_for_branch — Forgejo API field mapping."""
+
+    def _make_pr_run(self, branch: str, status: str = "success") -> dict:
+        payload = json.dumps({"pull_request": {"head": {"ref": branch}}})
+        return {"event": "pull_request", "event_payload": payload, "status": status, "id": 1}
+
+    def _make_push_run(self, prettyref: str, status: str = "success") -> dict:
+        return {"event": "push", "prettyref": prettyref, "status": status, "id": 2}
+
+    def _mock_tea_runs(self, runs):
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}) as m:
+            yield m
+
+    def test_pr_event_matches_via_event_payload(self):
+        run = self._make_pr_run("issue-166-fix")
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": [run]}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNotNone(result)
+        self.assertEqual(result["id"], 1)
+
+    def test_pr_event_does_not_match_wrong_branch(self):
+        run = self._make_pr_run("issue-99-fix")
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": [run]}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNone(result)
+
+    def test_push_event_matches_via_prettyref(self):
+        run = self._make_push_run("issue-166-fix")
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": [run]}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNotNone(result)
+        self.assertEqual(result["id"], 2)
+
+    def test_push_event_prettyref_pr_number_does_not_match_branch(self):
+        # Forgejo sets prettyref="#169" for PR runs — must not match branch name.
+        run = {"event": "push", "prettyref": "#169", "status": "success", "id": 3}
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": [run]}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNone(result)
+
+    def test_head_branch_field_absent_still_works(self):
+        # Regression: the old code used run.get("head_branch") which is absent in Forgejo.
+        run = self._make_pr_run("issue-166-fix")
+        self.assertNotIn("head_branch", run)
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": [run]}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNotNone(result)
+
+    def test_returns_none_when_no_runs(self):
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": []}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertIsNone(result)
+
+    def test_returns_first_matching_run(self):
+        runs = [
+            self._make_pr_run("issue-166-fix", status="success"),
+            self._make_pr_run("issue-166-fix", status="failure"),
+        ]
+        runs[0]["id"] = 10
+        runs[1]["id"] = 11
+        with patch("agent_loop._tea_get", return_value={"workflow_runs": runs}):
+            result = agent_loop._latest_ci_run_for_branch("issue-166-fix")
+        self.assertEqual(result["id"], 10)
+
+
+class TestFindSessionUuid(unittest.TestCase):
+    """Tests for _find_session_uuid()."""
+
+    def _write_jsonl(self, directory: Path, filename: str, entries: list) -> Path:
+        path = directory / filename
+        with path.open("w") as fh:
+            for entry in entries:
+                fh.write(json.dumps(entry) + "\n")
+        return path
+
+    def test_returns_uuid_for_matching_session_name(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            projects_dir = Path(tmpdir)
+            self._write_jsonl(projects_dir, "abc123.jsonl", [
+                {"type": "agent-name", "agentName": "issue-91", "sessionId": "uuid-abc-123"},
+            ])
+            orig = agent_loop.CLAUDE_PROJECTS_DIR
+            agent_loop.CLAUDE_PROJECTS_DIR = projects_dir
+            try:
+                result = agent_loop._find_session_uuid("issue-91")
+            finally:
+                agent_loop.CLAUDE_PROJECTS_DIR = orig
+        self.assertEqual(result, "uuid-abc-123")
+
+    def test_returns_none_when_name_does_not_match(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            projects_dir = Path(tmpdir)
+            self._write_jsonl(projects_dir, "abc123.jsonl", [
+                {"type": "agent-name", "agentName": "issue-99", "sessionId": "uuid-abc-123"},
+            ])
+            orig = agent_loop.CLAUDE_PROJECTS_DIR
+            agent_loop.CLAUDE_PROJECTS_DIR = projects_dir
+            try:
+                result = agent_loop._find_session_uuid("issue-91")
+            finally:
+                agent_loop.CLAUDE_PROJECTS_DIR = orig
+        self.assertIsNone(result)
+
+    def test_returns_none_when_directory_missing(self):
+        orig = agent_loop.CLAUDE_PROJECTS_DIR
+        agent_loop.CLAUDE_PROJECTS_DIR = Path("/nonexistent/path/that/does/not/exist")
+        try:
+            result = agent_loop._find_session_uuid("issue-91")
+        finally:
+            agent_loop.CLAUDE_PROJECTS_DIR = orig
+        self.assertIsNone(result)
+
+    def test_returns_none_when_no_agent_name_entry(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            projects_dir = Path(tmpdir)
+            self._write_jsonl(projects_dir, "abc123.jsonl", [
+                {"type": "message", "content": "hello"},
+            ])
+            orig = agent_loop.CLAUDE_PROJECTS_DIR
+            agent_loop.CLAUDE_PROJECTS_DIR = projects_dir
+            try:
+                result = agent_loop._find_session_uuid("issue-91")
+            finally:
+                agent_loop.CLAUDE_PROJECTS_DIR = orig
+        self.assertIsNone(result)
+
+    def test_scans_multiple_files_to_find_match(self):
+        with tempfile.TemporaryDirectory() as tmpdir:
+            projects_dir = Path(tmpdir)
+            self._write_jsonl(projects_dir, "aaa.jsonl", [
+                {"type": "agent-name", "agentName": "issue-10", "sessionId": "uuid-10"},
+            ])
+            self._write_jsonl(projects_dir, "bbb.jsonl", [
+                {"type": "agent-name", "agentName": "issue-91", "sessionId": "uuid-91"},
+            ])
+            orig = agent_loop.CLAUDE_PROJECTS_DIR
+            agent_loop.CLAUDE_PROJECTS_DIR = projects_dir
+            try:
+                result = agent_loop._find_session_uuid("issue-91")
+            finally:
+                agent_loop.CLAUDE_PROJECTS_DIR = orig
+        self.assertEqual(result, "uuid-91")
+
+
+class TestRunLoopResumeCommand(unittest.TestCase):
+    """Tests that _run_loop() shows a UUID-based resume command when agent is running."""
+
+    def _alive_state(self, session_name="issue-91"):
+        return {
+            "pid": os.getpid(),  # own PID is always alive
+            "issue": 91,
+            "started_at": "2026-05-23T12:00:00+00:00",
+            "type": "issue",
+            "session_name": session_name,
+        }
+
+    def test_resume_shows_uuid_when_found(self):
+        buf = io.StringIO()
+        fake_uuid = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee"
+        with patch("agent_loop._read_state", return_value=self._alive_state()), \
+             patch("agent_loop._agent_alive", return_value=True), \
+             patch("agent_loop._agent_age_seconds", return_value=600), \
+             patch("agent_loop._find_session_uuid", return_value=fake_uuid), \
+             patch("agent_loop._git_summary", return_value=""), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertIn(f"claude --resume {fake_uuid}", output)
+
+    def test_resume_shows_list_hint_when_uuid_not_found(self):
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=self._alive_state()), \
+             patch("agent_loop._agent_alive", return_value=True), \
+             patch("agent_loop._agent_age_seconds", return_value=600), \
+             patch("agent_loop._find_session_uuid", return_value=None), \
+             patch("agent_loop._git_summary", return_value=""), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertIn("scripts/agent_loop.py list", output)
+        # Must NOT show the session name as a valid resume argument.
+        self.assertNotIn("claude --resume issue-91", output)
+
+    def test_resume_not_shown_when_no_session_name(self):
+        state = self._alive_state()
+        del state["session_name"]
+        buf = io.StringIO()
+        with patch("agent_loop._read_state", return_value=state), \
+             patch("agent_loop._agent_alive", return_value=True), \
+             patch("agent_loop._agent_age_seconds", return_value=600), \
+             patch("agent_loop._find_session_uuid", return_value=None), \
+             patch("agent_loop._git_summary", return_value=""), \
+             contextlib.redirect_stdout(buf):
+            agent_loop._run_loop()
+        output = buf.getvalue()
+        self.assertNotIn("Resume:", output)
+
+
+
+class TestCatchupSkipsQuestionIssues(unittest.TestCase):
+    """Catch-up must not retry merging a PR whose issue is already State/Question."""
+
+    def _make_pr(self, pr_number=50, branch="issue-10-fix"):
+        return {"number": pr_number, "head": {"ref": branch}}
+
+    def test_skips_merge_when_issue_has_question_label(self):
+        pr = self._make_pr()
+        ci_run = {"id": 999, "status": "success"}
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[pr]), \
+             patch("agent_loop._latest_ci_run_for_pr", return_value=ci_run), \
+             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_QUESTION]), \
+             patch("agent_loop._merge_pr") as mock_merge, \
+             patch("agent_loop._comment_issue") as mock_comment, \
+             patch("agent_loop._set_labels") as mock_labels, \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[]):
+            result = agent_loop._run_loop()
+        self.assertEqual(result, 0)
+        mock_merge.assert_not_called()
+        mock_comment.assert_not_called()
+        mock_labels.assert_not_called()
+
+    def test_proceeds_with_merge_when_issue_lacks_question_label(self):
+        pr = self._make_pr()
+        ci_run = {"id": 999, "status": "success"}
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[pr]), \
+             patch("agent_loop._latest_ci_run_for_pr", return_value=ci_run), \
+             patch("agent_loop._get_issue_labels", return_value=[agent_loop.LABEL_IN_PROGRESS]), \
+             patch("agent_loop._merge_pr") as mock_merge, \
+             patch("agent_loop._find_pr_for_branch", return_value=None), \
+             patch("agent_loop._close_issue"):
+            result = agent_loop._run_loop()
+        self.assertEqual(result, 0)
+        mock_merge.assert_called_once_with(50)
+
+
+class TestMergeFailsOpen(unittest.TestCase):
+    """Tests for auto-resolution when a PR is still open after the merge command."""
+
+    def _dead_state(self, issue: int, kind: str = "issue") -> dict:
+        return {
+            "pid": 999999999,
+            "issue": issue,
+            "started_at": "2026-01-01T00:00:00+00:00",
+            "type": kind,
+        }
+
+    def _open_pr(self, branch: str = "issue-10-fix") -> dict:
+        return {"number": 5, "head": {"ref": branch}, "created_at": "2026-01-01T00:00:00+00:00"}
+
+    def test_merge_fails_open_with_conflicts_spawns_rebase_agent(self):
+        """mergeable=false → rebase agent spawned, state written as pending-ci."""
+        written_state = {}
+
+        def fake_write_state(pid, issue, kind, issue_title=None, session_name=None, ci_run_id=None):
+            written_state["pid"] = pid
+            written_state["issue"] = issue
+            written_state["kind"] = kind
+            written_state["session_name"] = session_name
+
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch", side_effect=[self._open_pr(), self._open_pr()]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._merge_pr"), \
+             patch("agent_loop._tea_get", return_value={"mergeable": False}), \
+             patch("agent_loop._start_agent", return_value=77) as mock_start, \
+             patch("agent_loop._write_state", side_effect=fake_write_state), \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_start.assert_called_once()
+        prompt = mock_start.call_args[0][0]
+        self.assertIn("Rebase branch", prompt)
+        self.assertIn("issue-10-fix", prompt)
+        self.assertEqual(written_state.get("kind"), "pending-ci")
+        self.assertEqual(written_state.get("issue"), 10)
+
+    def test_merge_fails_open_no_conflicts_retries_and_succeeds(self):
+        """mergeable=true, second attempt succeeds → issue closed."""
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch",
+                   side_effect=[self._open_pr(), self._open_pr(), None]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._merge_pr"), \
+             patch("agent_loop._tea_get", return_value={"mergeable": True}), \
+             patch("agent_loop.time.sleep"), \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_close.assert_called_once_with(10)
+
+    def test_merge_fails_open_no_conflicts_all_retries_exhausted(self):
+        """All retries exhausted with PR still open → falls through to State/Question."""
+        with patch("agent_loop._read_state", return_value=self._dead_state(10)), \
+             patch("agent_loop._find_pr_for_branch",
+                   side_effect=[self._open_pr(), self._open_pr(),
+                                 self._open_pr(), self._open_pr()]), \
+             patch("agent_loop._latest_ci_run_for_branch", return_value={"id": 1, "status": "success"}), \
+             patch("agent_loop._merge_pr"), \
+             patch("agent_loop._tea_get", return_value={"mergeable": True}), \
+             patch("agent_loop.time.sleep"), \
+             patch("agent_loop._set_labels") as mock_labels, \
+             patch("agent_loop._comment_issue") as mock_comment, \
+             patch("agent_loop._close_issue") as mock_close, \
+             patch("agent_loop._clear_state"):
+            result = agent_loop._run_loop()
+
+        self.assertEqual(result, 0)
+        mock_close.assert_not_called()
+        mock_labels.assert_called_once_with(
+            10,
+            add=[agent_loop.LABEL_QUESTION],
+            remove=[agent_loop.LABEL_IN_PROGRESS],
+        )
+        mock_comment.assert_called_once()
+
+
+class TestHeartbeat(unittest.TestCase):
+    """Tests for _update_heartbeat() and cmd_monitor()."""
+
+    def setUp(self):
+        self._tmp = tempfile.NamedTemporaryFile(delete=False, suffix=".heartbeat")
+        self._tmp.close()
+        self._orig = agent_loop.HEARTBEAT_FILE
+        agent_loop.HEARTBEAT_FILE = Path(self._tmp.name)
+        Path(self._tmp.name).unlink()  # Start with no heartbeat file.
+
+    def tearDown(self):
+        agent_loop.HEARTBEAT_FILE = self._orig
+        Path(self._tmp.name).unlink(missing_ok=True)
+
+    def test_update_heartbeat_writes_timestamp(self):
+        agent_loop._update_heartbeat()
+        content = Path(self._tmp.name).read_text().strip()
+        dt = datetime.fromisoformat(content)
+        age = (datetime.now(timezone.utc) - dt).total_seconds()
+        self.assertLess(age, 5)
+
+    def test_update_heartbeat_creates_file(self):
+        self.assertFalse(Path(self._tmp.name).exists())
+        agent_loop._update_heartbeat()
+        self.assertTrue(Path(self._tmp.name).exists())
+
+    def test_monitor_healthy_when_recent(self):
+        agent_loop._update_heartbeat()
+        result = agent_loop.cmd_monitor()
+        self.assertEqual(result, 0)
+
+    def test_monitor_warns_when_heartbeat_missing(self):
+        buf = io.StringIO()
+        with contextlib.redirect_stdout(buf):
+            result = agent_loop.cmd_monitor()
+        self.assertEqual(result, 1)
+        self.assertIn("WARNING", buf.getvalue())
+
+    def test_monitor_warns_when_stale(self):
+        stale = (datetime.now(timezone.utc) - timedelta(hours=3)).isoformat()
+        Path(self._tmp.name).write_text(stale)
+        buf = io.StringIO()
+        with contextlib.redirect_stdout(buf):
+            result = agent_loop.cmd_monitor()
+        self.assertEqual(result, 1)
+        self.assertIn("WARNING", buf.getvalue())
+
+    def test_monitor_warns_when_corrupted(self):
+        Path(self._tmp.name).write_text("not-a-timestamp")
+        buf = io.StringIO()
+        with contextlib.redirect_stdout(buf):
+            result = agent_loop.cmd_monitor()
+        self.assertEqual(result, 1)
+        self.assertIn("WARNING", buf.getvalue())
+
+    def test_run_loop_updates_heartbeat(self):
+        self.assertFalse(Path(self._tmp.name).exists())
+        with patch("agent_loop._read_state", return_value=None), \
+             patch("agent_loop._open_issue_prs", return_value=[]), \
+             patch("agent_loop._latest_main_ci_run", return_value=None), \
+             patch("agent_loop._ready_issues", return_value=[]):
+            agent_loop._run_loop()
+        self.assertTrue(Path(self._tmp.name).exists())
+
+
+if __name__ == "__main__":
+    unittest.main()

test/backend/account_sync_manager_test.dart

@@ -20,67 +20,63 @@ Future<imap.ImapClient> _fakeImapConnect(
     throw const SocketException('fake — no real IMAP server in tests');
 
 void main() {
-  test(
-    'AccountSyncManager schedules IMAP sync for multiple accounts',
-    () async {
-      final accounts = _FakeAccounts('pw');
-      final mailboxes = _FakeMailboxes();
-      final emails = _FakeEmails();
-      final logs = _FakeLogs();
+  test('AccountSyncManager schedules IMAP sync for multiple accounts',
+      () async {
+    final accounts = _FakeAccounts('pw');
+    final mailboxes = _FakeMailboxes();
+    final emails = _FakeEmails();
+    final logs = _FakeLogs();
 
-      final manager = AccountSyncManager(
-        accounts,
-        mailboxes,
-        emails,
-        syncLog: logs,
-        imapConnect: _fakeImapConnect,
-      );
+    final manager = AccountSyncManager(
+      accounts,
+      mailboxes,
+      emails,
+      syncLog: logs,
+      imapConnect: _fakeImapConnect,
+    );
 
-      final a1 = _account('1');
-      final a2 = _account('2');
+    final a1 = _account('1');
+    final a2 = _account('2');
 
-      manager.start();
-      accounts.push([a1, a2]);
+    manager.start();
+    accounts.push([a1, a2]);
 
-      // Allow some time for listeners to fire.
-      await Future<void>.delayed(const Duration(milliseconds: 100));
+    // Allow some time for listeners to fire.
+    await Future<void>.delayed(const Duration(milliseconds: 100));
 
-      expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
-      expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
+    expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
+    expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
 
-      manager.dispose();
-    },
-  );
+    manager.dispose();
+  });
 
-  test(
-    'AccountSyncManager schedules JMAP sync for multiple accounts',
-    () async {
-      final accounts = _FakeAccounts('pw');
-      final mailboxes = _FakeMailboxes();
-      final emails = _FakeEmails();
-      final logs = _FakeLogs();
+  test('AccountSyncManager schedules JMAP sync for multiple accounts',
+      () async {
+    final accounts = _FakeAccounts('pw');
+    final mailboxes = _FakeMailboxes();
+    final emails = _FakeEmails();
+    final logs = _FakeLogs();
 
-      final manager = AccountSyncManager(
-        accounts,
-        mailboxes,
-        emails,
-        syncLog: logs,
-      );
+    final manager = AccountSyncManager(
+      accounts,
+      mailboxes,
+      emails,
+      syncLog: logs,
+    );
 
-      final a1 = _jmapAccount('1');
-      final a2 = _jmapAccount('2');
+    final a1 = _jmapAccount('1');
+    final a2 = _jmapAccount('2');
 
-      manager.start();
-      accounts.push([a1, a2]);
+    manager.start();
+    accounts.push([a1, a2]);
 
-      await Future<void>.delayed(const Duration(milliseconds: 100));
+    await Future<void>.delayed(const Duration(milliseconds: 100));
 
-      expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
-      expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
+    expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
+    expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
 
-      manager.dispose();
-    },
-  );
+    manager.dispose();
+  });
 }
 
 Account _account(String id) => Account(
@@ -175,7 +171,11 @@ class _FakeEmails implements EmailRepository {
   final syncCounts = <String, int>{};
 
   @override
-  Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
+  Stream<List<Email>> observeEmails(
+    String a,
+    String m, {
+    int limit = 50,
+  }) =>
       Stream.value([]);
 
   @override

test/backend/email_repository_imap_test.dart

@@ -566,61 +566,59 @@ void main() {
     expect(pending.first.changeType, 'delete');
   });
 
-  test(
-    'downloadAttachment fetches binary attachment bytes from IMAP',
-    () async {
-      final attachmentBytes = Uint8List.fromList(
-        List.generate(32, (i) => i + 1),
+  test('downloadAttachment fetches binary attachment bytes from IMAP',
+      () async {
+    final attachmentBytes = Uint8List.fromList(
+      List.generate(32, (i) => i + 1),
+    );
+    const attachmentName = 'hello.bin';
+    const attachmentMime = 'application/octet-stream';
+
+    // Build a multipart email with a binary attachment and append it.
+    final client = await _imapConnect(
+      host: imapHost,
+      port: imapPort,
+      user: userEmail,
+      pass: userPass,
+    );
+    try {
+      final builder = MessageBuilder()
+        ..from = [MailAddress('Alice', userEmail)]
+        ..to = [MailAddress('Alice', userEmail)]
+        ..subject = 'attach-${DateTime.now().millisecondsSinceEpoch}'
+        ..text = 'See attachment.';
+      builder.addBinary(
+        attachmentBytes,
+        MediaType.fromText(attachmentMime),
+        filename: attachmentName,
       );
-      const attachmentName = 'hello.bin';
-      const attachmentMime = 'application/octet-stream';
-
-      // Build a multipart email with a binary attachment and append it.
-      final client = await _imapConnect(
-        host: imapHost,
-        port: imapPort,
-        user: userEmail,
-        pass: userPass,
+      await client.appendMessage(
+        builder.buildMimeMessage(),
+        targetMailboxPath: 'INBOX',
       );
-      try {
-        final builder = MessageBuilder()
-          ..from = [MailAddress('Alice', userEmail)]
-          ..to = [MailAddress('Alice', userEmail)]
-          ..subject = 'attach-${DateTime.now().millisecondsSinceEpoch}'
-          ..text = 'See attachment.';
-        builder.addBinary(
-          attachmentBytes,
-          MediaType.fromText(attachmentMime),
-          filename: attachmentName,
-        );
-        await client.appendMessage(
-          builder.buildMimeMessage(),
-          targetMailboxPath: 'INBOX',
-        );
-      } finally {
-        await client.logout();
-      }
+    } finally {
+      await client.logout();
+    }
 
-      final r = makeRepo();
-      await r.accounts.addAccount(account, userPass);
-      await r.emails.syncEmails('test', 'INBOX');
+    final r = makeRepo();
+    await r.accounts.addAccount(account, userPass);
+    await r.emails.syncEmails('test', 'INBOX');
 
-      final emails = await r.emails.observeEmails('test', 'INBOX').first;
-      expect(emails, hasLength(1));
-      expect(emails.first.hasAttachment, isTrue);
+    final emails = await r.emails.observeEmails('test', 'INBOX').first;
+    expect(emails, hasLength(1));
+    expect(emails.first.hasAttachment, isTrue);
 
-      final body = await r.emails.getEmailBody(emails.first.id);
-      expect(body.attachments, hasLength(1));
-      expect(body.attachments.first.filename, attachmentName);
-      expect(body.attachments.first.contentType, attachmentMime);
-      expect(body.attachments.first.fetchPartId, isNotEmpty);
+    final body = await r.emails.getEmailBody(emails.first.id);
+    expect(body.attachments, hasLength(1));
+    expect(body.attachments.first.filename, attachmentName);
+    expect(body.attachments.first.contentType, attachmentMime);
+    expect(body.attachments.first.fetchPartId, isNotEmpty);
 
-      final path = await r.emails.downloadAttachment(
-        emails.first.id,
-        body.attachments.first,
-      );
-      final downloaded = await File(path).readAsBytes();
-      expect(downloaded, equals(attachmentBytes));
-    },
-  );
+    final path = await r.emails.downloadAttachment(
+      emails.first.id,
+      body.attachments.first,
+    );
+    final downloaded = await File(path).readAsBytes();
+    expect(downloaded, equals(attachmentBytes));
+  });
 }

test/unit/account_repository_contract_test.dart

@@ -73,15 +73,13 @@ abstract class AccountRepositoryContract {
       expect(await repo.getPassword(_a.id), 'new');
     });
 
-    test(
-      'removeAccount makes account disappear from observeAccounts',
-      () async {
-        final repo = makeRepo();
-        await repo.addAccount(_a, 'pw');
-        await repo.removeAccount(_a.id);
-        expect(await repo.observeAccounts().first, isEmpty);
-      },
-    );
+    test('removeAccount makes account disappear from observeAccounts',
+        () async {
+      final repo = makeRepo();
+      await repo.addAccount(_a, 'pw');
+      await repo.removeAccount(_a.id);
+      expect(await repo.observeAccounts().first, isEmpty);
+    });
 
     test('getAccount returns null after removeAccount', () async {
       final repo = makeRepo();

test/unit/account_sync_manager_test.dart

@@ -37,41 +37,44 @@ void main() {
   // MissingPluginException (channel unavailable on the device), the IMAP sync
   // loop must stop permanently instead of retrying indefinitely with backoff.
   test(
-    'MissingPluginException from secure storage stops IMAP sync loop permanently',
-    () async {
-      final syncLog = FakeSyncLogRepository();
+      'MissingPluginException from secure storage stops IMAP sync loop permanently',
+      () async {
+    final syncLog = FakeSyncLogRepository();
 
-      final m = AccountSyncManager(
-        _AccountRepositoryWithMissingPlugin(),
-        FakeMailboxRepositoryWithInbox(),
-        FakeEmailRepository(),
-        syncLog: syncLog,
-      );
+    final m = AccountSyncManager(
+      _AccountRepositoryWithMissingPlugin(),
+      FakeMailboxRepositoryWithInbox(),
+      FakeEmailRepository(),
+      syncLog: syncLog,
+    );
 
-      m.start();
+    m.start();
 
-      // Allow the first sync cycle to run and fail.
-      await Future<void>.delayed(const Duration(milliseconds: 100));
+    // Allow the first sync cycle to run and fail.
+    await Future<void>.delayed(const Duration(milliseconds: 100));
 
-      expect(syncLog.logs, hasLength(1));
-      expect(syncLog.logs.first.success, isFalse);
+    expect(syncLog.logs, hasLength(1));
+    expect(syncLog.logs.first.success, isFalse);
 
-      // Kicking the loop should have no effect once it has stopped permanently.
-      m.syncNow('1');
-      await Future<void>.delayed(const Duration(milliseconds: 100));
+    // Kicking the loop should have no effect once it has stopped permanently.
+    m.syncNow('1');
+    await Future<void>.delayed(const Duration(milliseconds: 100));
 
-      // Before the fix: kick triggers a retry → 2 log entries.
-      // After the fix: loop is permanently stopped → still exactly 1 entry.
-      expect(syncLog.logs, hasLength(1));
+    // Before the fix: kick triggers a retry → 2 log entries.
+    // After the fix: loop is permanently stopped → still exactly 1 entry.
+    expect(syncLog.logs, hasLength(1));
 
-      m.dispose();
-    },
-  );
+    m.dispose();
+  });
 }
 
 class FakeEmailRepository implements EmailRepository {
   @override
-  Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
+  Stream<List<Email>> observeEmails(
+    String a,
+    String m, {
+    int limit = 50,
+  }) =>
       Stream.value([]);
   @override
   Stream<List<EmailThread>> observeThreads(

test/unit/background_sync_test.dart

@@ -9,13 +9,12 @@ void main() {
   // startup, throwing PlatformException(channel-error, ...).
   // registerBackgroundSync() must absorb the failure and let the app continue.
   test(
-    'registerBackgroundSync completes without throwing when plugin is unavailable',
-    () async {
-      // In the unit-test environment the native WorkManager plugin is not
-      // registered, so Workmanager().initialize() throws a PlatformException or
-      // MissingPluginException.  The fix catches it.  This test fails before the
-      // fix (exception propagates) and passes after it (exception is swallowed).
-      await expectLater(registerBackgroundSync(), completes);
-    },
-  );
+      'registerBackgroundSync completes without throwing when plugin is unavailable',
+      () async {
+    // In the unit-test environment the native WorkManager plugin is not
+    // registered, so Workmanager().initialize() throws a PlatformException or
+    // MissingPluginException.  The fix catches it.  This test fails before the
+    // fix (exception propagates) and passes after it (exception is swallowed).
+    await expectLater(registerBackgroundSync(), completes);
+  });
 }

test/unit/cid_utils_test.dart

@@ -86,9 +86,8 @@ void main() {
       final result = injectInlineImages(html, msg);
 
       // Extract base64 payload from the data URI.
-      final match = RegExp(
-        r'data:image/png;base64,([A-Za-z0-9+/=]+)',
-      ).firstMatch(result);
+      final match =
+          RegExp(r'data:image/png;base64,([A-Za-z0-9+/=]+)').firstMatch(result);
       expect(match, isNotNull);
       final decoded = base64.decode(match!.group(1)!);
       expect(decoded.length, greaterThan(0));

test/unit/email_repository_contract_test.dart

@@ -44,7 +44,10 @@ abstract class EmailRepositoryContract {
   void run() {
     test('observeEmails starts empty', () async {
       final repo = await makeRepo();
-      expect(await repo.observeEmails(_account.id, 'INBOX').first, isEmpty);
+      expect(
+        await repo.observeEmails(_account.id, 'INBOX').first,
+        isEmpty,
+      );
     });
 
     test('observeEmails emits inserted email', () async {
@@ -58,7 +61,10 @@ abstract class EmailRepositoryContract {
     test('observeEmails only returns emails for the given mailbox', () async {
       final repo = await makeRepo();
       await insertEmail(repo, id: 'er-acc:1', mailboxPath: 'INBOX');
-      expect(await repo.observeEmails(_account.id, 'Sent').first, isEmpty);
+      expect(
+        await repo.observeEmails(_account.id, 'Sent').first,
+        isEmpty,
+      );
     });
 
     test('observeEmails orders by receivedAt descending', () async {
@@ -110,7 +116,11 @@ abstract class EmailRepositoryContract {
 
     test('setFlag flagged updates isFlagged', () async {
       final repo = await makeRepo();
-      await insertEmail(repo, id: 'er-acc:11', mailboxPath: 'INBOX');
+      await insertEmail(
+        repo,
+        id: 'er-acc:11',
+        mailboxPath: 'INBOX',
+      );
       await repo.setFlag('er-acc:11', flagged: true);
       final email = await repo.getEmail('er-acc:11');
       expect(email!.isFlagged, isTrue);
@@ -147,7 +157,10 @@ abstract class EmailRepositoryContract {
 
     test('observeThreads starts empty', () async {
       final repo = await makeRepo();
-      expect(await repo.observeThreads(_account.id, 'INBOX').first, isEmpty);
+      expect(
+        await repo.observeThreads(_account.id, 'INBOX').first,
+        isEmpty,
+      );
     });
   }
 }

test/unit/email_repository_impl_test.dart

@@ -453,49 +453,47 @@ void main() {
       expect(results.first.subject, 'foobar baz');
     });
 
-    test(
-      'searchAddresses returns results sorted by most recently used',
-      () async {
-        final r = _makeRepos();
-        await r.accounts.addAccount(_account, 'pw');
+    test('searchAddresses returns results sorted by most recently used',
+        () async {
+      final r = _makeRepos();
+      await r.accounts.addAccount(_account, 'pw');
 
-        final older = DateTime(2024);
-        final newer = DateTime(2024, 6);
+      final older = DateTime(2024);
+      final newer = DateTime(2024, 6);
 
-        // Two emails — older one has alice@, newer one has bob@.
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:old',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 1,
-                receivedAt: older,
-                toAddresses: const Value(
-                  '[{"name":"Alice","email":"alice@example.com"}]',
-                ),
+      // Two emails — older one has alice@, newer one has bob@.
+      await r.db.into(r.db.emails).insert(
+            EmailsCompanion.insert(
+              id: 'acc-1:old',
+              accountId: 'acc-1',
+              mailboxPath: 'INBOX',
+              uid: 1,
+              receivedAt: older,
+              toAddresses: const Value(
+                '[{"name":"Alice","email":"alice@example.com"}]',
               ),
-            );
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:new',
-                accountId: 'acc-1',
-                mailboxPath: 'Sent',
-                uid: 2,
-                receivedAt: newer,
-                toAddresses: const Value(
-                  '[{"name":"Bob","email":"bob@example.com"}]',
-                ),
+            ),
+          );
+      await r.db.into(r.db.emails).insert(
+            EmailsCompanion.insert(
+              id: 'acc-1:new',
+              accountId: 'acc-1',
+              mailboxPath: 'Sent',
+              uid: 2,
+              receivedAt: newer,
+              toAddresses: const Value(
+                '[{"name":"Bob","email":"bob@example.com"}]',
               ),
-            );
+            ),
+          );
 
-        // Query matching both; newer (bob) should come first.
-        final results = await r.emails.searchAddresses(null, 'example');
-        expect(results.map((a) => a.email).toList(), [
-          'bob@example.com',
-          'alice@example.com',
-        ]);
-      },
-    );
+      // Query matching both; newer (bob) should come first.
+      final results = await r.emails.searchAddresses(null, 'example');
+      expect(
+        results.map((a) => a.email).toList(),
+        ['bob@example.com', 'alice@example.com'],
+      );
+    });
 
     // ── IMAP method tests ────────────────────────────────────────────────────
 
@@ -699,47 +697,47 @@ void main() {
       expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
     });
 
-    test(
-      'snooze flush selects src mailbox and moves email to Snoozed',
-      () async {
-        final spy = SnoozeSpyImapClient();
-        final r = _makeRepos(imapConnect: (_, __, ___) async => spy);
-        await r.accounts.addAccount(_account, 'pw');
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:5',
-                accountId: 'acc-1',
-                mailboxPath: 'Snoozed',
-                uid: 5,
-                receivedAt: DateTime(2024),
-              ),
-            );
-        await r.db.into(r.db.pendingChanges).insert(
-              PendingChangesCompanion.insert(
-                accountId: 'acc-1',
-                resourceType: 'Email',
-                resourceId: 'acc-1:5',
-                changeType: 'snooze',
-                payload: jsonEncode({
-                  'uid': 5,
-                  'src': 'INBOX',
-                  'dest': 'Snoozed',
-                  'until': '2026-05-10T15:00:00.000',
-                }),
-                createdAt: DateTime.now(),
-              ),
-            );
+    test('snooze flush selects src mailbox and moves email to Snoozed',
+        () async {
+      final spy = SnoozeSpyImapClient();
+      final r = _makeRepos(
+        imapConnect: (_, __, ___) async => spy,
+      );
+      await r.accounts.addAccount(_account, 'pw');
+      await r.db.into(r.db.emails).insert(
+            EmailsCompanion.insert(
+              id: 'acc-1:5',
+              accountId: 'acc-1',
+              mailboxPath: 'Snoozed',
+              uid: 5,
+              receivedAt: DateTime(2024),
+            ),
+          );
+      await r.db.into(r.db.pendingChanges).insert(
+            PendingChangesCompanion.insert(
+              accountId: 'acc-1',
+              resourceType: 'Email',
+              resourceId: 'acc-1:5',
+              changeType: 'snooze',
+              payload: jsonEncode({
+                'uid': 5,
+                'src': 'INBOX',
+                'dest': 'Snoozed',
+                'until': '2026-05-10T15:00:00.000',
+              }),
+              createdAt: DateTime.now(),
+            ),
+          );
 
-        await r.emails.flushPendingChanges('acc-1', 'pw');
+      await r.emails.flushPendingChanges('acc-1', 'pw');
 
-        // Change successfully applied — removed from queue.
-        expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
-        // Source mailbox extracted from 'src', not 'mailboxPath'.
-        expect(spy.selectedMailbox, 'INBOX');
-        expect(spy.createdMailbox, 'Snoozed');
-        expect(spy.movedToMailbox, 'Snoozed');
-      },
-    );
+      // Change successfully applied — removed from queue.
+      expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
+      // Source mailbox extracted from 'src', not 'mailboxPath'.
+      expect(spy.selectedMailbox, 'INBOX');
+      expect(spy.createdMailbox, 'Snoozed');
+      expect(spy.movedToMailbox, 'Snoozed');
+    });
   });
 
   group('Snooze', () {
@@ -1642,123 +1640,119 @@ void main() {
       expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
     });
 
-    test(
-      'snooze creates Snoozed folder via Mailbox/set when dest is Snoozed',
-      () async {
-        final List<Map<String, dynamic>> capturedBodies = [];
-        final client = MockClient((req) async {
-          if (req.url.path.contains('well-known')) {
-            return http.Response(
-              jsonEncode({
-                'apiUrl': 'https://jmap.example.com/api/',
-                'accounts': {
-                  'acct1': {'name': 'alice@example.com', 'isPersonal': true},
-                },
-                'primaryAccounts': {
-                  'urn:ietf:params:jmap:core': 'acct1',
-                  'urn:ietf:params:jmap:mail': 'acct1',
-                },
-                'capabilities': {},
-                'username': 'alice@example.com',
-                'state': 'sess1',
-              }),
-              200,
-            );
-          }
-          final body = jsonDecode(req.body) as Map<String, dynamic>;
-          capturedBodies.add(body);
-          final calls = body['methodCalls'] as List;
-          final methodName = (calls.first as List)[0] as String;
-          if (methodName == 'Mailbox/set') {
-            return http.Response(
-              jsonEncode({
-                'sessionState': 's1',
-                'methodResponses': [
-                  [
-                    'Mailbox/set',
-                    {
-                      'accountId': 'acct1',
-                      'created': {
-                        'new-snoozed': {'id': 'mbx-snoozed'},
-                      },
-                    },
-                    '0',
-                  ],
-                ],
-              }),
-              200,
-            );
-          }
+    test('snooze creates Snoozed folder via Mailbox/set when dest is Snoozed',
+        () async {
+      final List<Map<String, dynamic>> capturedBodies = [];
+      final client = MockClient((req) async {
+        if (req.url.path.contains('well-known')) {
+          return http.Response(
+            jsonEncode({
+              'apiUrl': 'https://jmap.example.com/api/',
+              'accounts': {
+                'acct1': {'name': 'alice@example.com', 'isPersonal': true},
+              },
+              'primaryAccounts': {
+                'urn:ietf:params:jmap:core': 'acct1',
+                'urn:ietf:params:jmap:mail': 'acct1',
+              },
+              'capabilities': {},
+              'username': 'alice@example.com',
+              'state': 'sess1',
+            }),
+            200,
+          );
+        }
+        final body = jsonDecode(req.body) as Map<String, dynamic>;
+        capturedBodies.add(body);
+        final calls = body['methodCalls'] as List;
+        final methodName = (calls.first as List)[0] as String;
+        if (methodName == 'Mailbox/set') {
           return http.Response(
             jsonEncode({
               'sessionState': 's1',
               'methodResponses': [
                 [
-                  'Email/set',
-                  {'accountId': 'acct1', 'updated': {}},
+                  'Mailbox/set',
+                  {
+                    'accountId': 'acct1',
+                    'created': {
+                      'new-snoozed': {'id': 'mbx-snoozed'},
+                    },
+                  },
                   '0',
                 ],
               ],
             }),
             200,
           );
-        });
-
-        final r = _makeRepos(httpClient: client);
-        await seedChange(
-          r.db,
-          r.accounts,
-          changeType: 'snooze',
-          payload: jsonEncode({
-            'uid': 0,
-            'src': 'mbx-inbox',
-            'dest': 'Snoozed',
-            'until': '2026-05-10T15:00:00.000',
+        }
+        return http.Response(
+          jsonEncode({
+            'sessionState': 's1',
+            'methodResponses': [
+              [
+                'Email/set',
+                {'accountId': 'acct1', 'updated': {}},
+                '0',
+              ],
+            ],
           }),
+          200,
         );
+      });
 
-        await r.emails.flushPendingChanges('jmap-1', 'pw');
+      final r = _makeRepos(httpClient: client);
+      await seedChange(
+        r.db,
+        r.accounts,
+        changeType: 'snooze',
+        payload: jsonEncode({
+          'uid': 0,
+          'src': 'mbx-inbox',
+          'dest': 'Snoozed',
+          'until': '2026-05-10T15:00:00.000',
+        }),
+      );
 
-        // Change successfully applied — removed from queue.
-        expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
+      await r.emails.flushPendingChanges('jmap-1', 'pw');
 
-        // First API call should be Mailbox/set to create the Snoozed folder.
-        expect(capturedBodies, hasLength(2));
-        final firstCall =
-            ((capturedBodies.first['methodCalls'] as List).first as List)[0];
-        expect(firstCall, 'Mailbox/set');
+      // Change successfully applied — removed from queue.
+      expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
 
-        // Second call should be Email/set using the newly created mailbox ID.
-        final secondCallArgs = ((capturedBodies[1]['methodCalls'] as List).first
-            as List)[1] as Map<String, dynamic>;
-        final update = (secondCallArgs['update'] as Map<String, dynamic>)['e1']
-            as Map<String, dynamic>;
-        expect(update['mailboxIds/mbx-snoozed'], true);
-      },
-    );
+      // First API call should be Mailbox/set to create the Snoozed folder.
+      expect(capturedBodies, hasLength(2));
+      final firstCall =
+          ((capturedBodies.first['methodCalls'] as List).first as List)[0];
+      expect(firstCall, 'Mailbox/set');
 
-    test(
-      'snooze uses existing mailbox ID when dest is already a JMAP ID',
-      () async {
-        final r = _makeRepos(httpClient: mockFlush(200));
-        await seedChange(
-          r.db,
-          r.accounts,
-          changeType: 'snooze',
-          payload: jsonEncode({
-            'uid': 0,
-            'src': 'mbx-inbox',
-            'dest': 'mbx-snoozed',
-            'until': '2026-05-10T15:00:00.000',
-          }),
-        );
+      // Second call should be Email/set using the newly created mailbox ID.
+      final secondCallArgs = ((capturedBodies[1]['methodCalls'] as List).first
+          as List)[1] as Map<String, dynamic>;
+      final update = (secondCallArgs['update'] as Map<String, dynamic>)['e1']
+          as Map<String, dynamic>;
+      expect(update['mailboxIds/mbx-snoozed'], true);
+    });
 
-        await r.emails.flushPendingChanges('jmap-1', 'pw');
+    test('snooze uses existing mailbox ID when dest is already a JMAP ID',
+        () async {
+      final r = _makeRepos(httpClient: mockFlush(200));
+      await seedChange(
+        r.db,
+        r.accounts,
+        changeType: 'snooze',
+        payload: jsonEncode({
+          'uid': 0,
+          'src': 'mbx-inbox',
+          'dest': 'mbx-snoozed',
+          'until': '2026-05-10T15:00:00.000',
+        }),
+      );
 
-        // Change applied without needing Mailbox/set (dest was already a valid ID).
-        expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
-      },
-    );
+      await r.emails.flushPendingChanges('jmap-1', 'pw');
+
+      // Change applied without needing Mailbox/set (dest was already a valid ID).
+      expect(await r.db.select(r.db.pendingChanges).get(), isEmpty);
+    });
   });
 
   group('JMAP syncEmails body caching', () {
@@ -2288,42 +2282,41 @@ void main() {
 
   group('concurrent moves', () {
     test(
-      'two simultaneous moves enqueue two changes and leave email in last destination',
-      () async {
-        final r = _makeRepos();
-        await r.accounts.addAccount(_account, 'pw');
-        await r.db.into(r.db.emails).insert(
-              EmailsCompanion.insert(
-                id: 'acc-1:5',
-                accountId: 'acc-1',
-                mailboxPath: 'INBOX',
-                uid: 5,
-                receivedAt: DateTime(2024),
-              ),
-            );
+        'two simultaneous moves enqueue two changes and leave email in last destination',
+        () async {
+      final r = _makeRepos();
+      await r.accounts.addAccount(_account, 'pw');
+      await r.db.into(r.db.emails).insert(
+            EmailsCompanion.insert(
+              id: 'acc-1:5',
+              accountId: 'acc-1',
+              mailboxPath: 'INBOX',
+              uid: 5,
+              receivedAt: DateTime(2024),
+            ),
+          );
 
-        // Fire both moves without awaiting to exercise concurrent enqueue logic.
-        final f1 = r.emails.moveEmail('acc-1:5', 'Archive');
-        final f2 = r.emails.moveEmail('acc-1:5', 'Trash');
-        await Future.wait([f1, f2]);
+      // Fire both moves without awaiting to exercise concurrent enqueue logic.
+      final f1 = r.emails.moveEmail('acc-1:5', 'Archive');
+      final f2 = r.emails.moveEmail('acc-1:5', 'Trash');
+      await Future.wait([f1, f2]);
 
-        final changes = await r.db.select(r.db.pendingChanges).get();
-        expect(changes, hasLength(2));
-        expect(changes.map((c) => c.changeType), everyElement('move'));
+      final changes = await r.db.select(r.db.pendingChanges).get();
+      expect(changes, hasLength(2));
+      expect(changes.map((c) => c.changeType), everyElement('move'));
 
-        final destinations =
-            changes.map((c) => (jsonDecode(c.payload) as Map)['dest']).toSet();
-        expect(destinations, containsAll(['Archive', 'Trash']));
+      final destinations =
+          changes.map((c) => (jsonDecode(c.payload) as Map)['dest']).toSet();
+      expect(destinations, containsAll(['Archive', 'Trash']));
 
-        final email = await r.emails.getEmail('acc-1:5');
-        expect(
-          email!.mailboxPath,
-          anyOf('Archive', 'Trash'),
-          reason:
-              'email must be optimistically moved to one of the two destinations',
-        );
-      },
-    );
+      final email = await r.emails.getEmail('acc-1:5');
+      expect(
+        email!.mailboxPath,
+        anyOf('Archive', 'Trash'),
+        reason:
+            'email must be optimistically moved to one of the two destinations',
+      );
+    });
   });
 
   group('IMAP SMTP auth failure', () {

test/unit/mailbox_repository_contract_test.dart

@@ -61,7 +61,10 @@ abstract class MailboxRepositoryContract {
 
     test('findMailboxByRole returns null when no match', () async {
       final repo = await makeRepo();
-      expect(await repo.findMailboxByRole(_account.id, 'archive'), isNull);
+      expect(
+        await repo.findMailboxByRole(_account.id, 'archive'),
+        isNull,
+      );
     });
 
     test('findMailboxByRole returns the matching mailbox', () async {

test/unit/mailbox_repository_impl_test.dart

@@ -486,11 +486,8 @@ void main() {
         );
         await r.accounts.addAccount(_jmapAccount, 'pw');
 
-        final result = await r.mailboxes.createMailboxWithRole(
-          'jmap-1',
-          'Archive',
-          'archive',
-        );
+        final result = await r.mailboxes
+            .createMailboxWithRole('jmap-1', 'Archive', 'archive');
 
         expect(result.name, 'Archive');
         expect(result.role, 'archive');
@@ -501,80 +498,81 @@ void main() {
         expect(found!.name, 'Archive');
       });
 
-      test('JMAP: throws when server returns no created ID', () async {
-        final r = _makeRepos(
-          httpClient: _mockJmap(
-            apiResponses: [
-              {
-                'sessionState': 'sess1',
-                'methodResponses': [
-                  [
-                    'Mailbox/set',
-                    {
-                      'accountId': 'acct1',
-                      'created': null,
-                      'notCreated': {
-                        'new-mailbox': {'type': 'serverFail'},
+      test(
+        'JMAP: throws when server returns no created ID',
+        () async {
+          final r = _makeRepos(
+            httpClient: _mockJmap(
+              apiResponses: [
+                {
+                  'sessionState': 'sess1',
+                  'methodResponses': [
+                    [
+                      'Mailbox/set',
+                      {
+                        'accountId': 'acct1',
+                        'created': null,
+                        'notCreated': {
+                          'new-mailbox': {'type': 'serverFail'},
+                        },
                       },
-                    },
-                    '0',
+                      '0',
+                    ],
                   ],
-                ],
-              },
-            ],
-          ),
-        );
-        await r.accounts.addAccount(_jmapAccount, 'pw');
+                },
+              ],
+            ),
+          );
+          await r.accounts.addAccount(_jmapAccount, 'pw');
 
-        await expectLater(
-          r.mailboxes.createMailboxWithRole('jmap-1', 'Archive', 'archive'),
-          throwsA(isA<Exception>()),
-        );
-      });
+          await expectLater(
+            r.mailboxes.createMailboxWithRole('jmap-1', 'Archive', 'archive'),
+            throwsA(isA<Exception>()),
+          );
+        },
+      );
     });
 
     group('syncMailboxes IMAP preserves manually-set role', () {
-      test(
-        'existing role is kept when server returns no special-use flag',
-        () async {
-          final spy = SnoozeSpyImapClient();
-          // Make listMailboxes return a plain folder without \Archive.
-          final db = openTestDatabase();
-          final accounts = AccountRepositoryImpl(db, MapSecureStorage());
+      test('existing role is kept when server returns no special-use flag',
+          () async {
+        final spy = SnoozeSpyImapClient();
+        // Make listMailboxes return a plain folder without \Archive.
+        final db = openTestDatabase();
+        final accounts = AccountRepositoryImpl(db, MapSecureStorage());
 
-          // Override listMailboxes to return one plain folder.
-          final fakeClient = _PlainArchiveImapClient();
-          final mailboxes = MailboxRepositoryImpl(
-            db,
-            accounts,
-            imapConnect: (_, __, ___) async => fakeClient,
-          );
-          await accounts.addAccount(_account, 'pw');
+        // Override listMailboxes to return one plain folder.
+        final fakeClient = _PlainArchiveImapClient();
+        final mailboxes = MailboxRepositoryImpl(
+          db,
+          accounts,
+          imapConnect: (_, __, ___) async => fakeClient,
+        );
+        await accounts.addAccount(_account, 'pw');
 
-          // Pre-seed the DB with role='archive' (as if user created the folder).
-          await db.into(db.mailboxes).insert(
-                MailboxesCompanion.insert(
-                  id: 'acc-1:Archive',
-                  accountId: 'acc-1',
-                  path: 'Archive',
-                  name: 'Archive',
-                  role: const Value('archive'),
-                ),
-              );
+        // Pre-seed the DB with role='archive' (as if user created the folder).
+        await db.into(db.mailboxes).insert(
+              MailboxesCompanion.insert(
+                id: 'acc-1:Archive',
+                accountId: 'acc-1',
+                path: 'Archive',
+                name: 'Archive',
+                role: const Value('archive'),
+              ),
+            );
 
-          await mailboxes.syncMailboxes('acc-1');
+        await mailboxes.syncMailboxes('acc-1');
 
-          final found = await mailboxes.findMailboxByRole('acc-1', 'archive');
-          expect(
-            found,
-            isNotNull,
-            reason: 'Manually-set role should be preserved after sync',
-          );
-          expect(found!.path, 'Archive');
-          // Suppress unused warning on spy.
-          expect(spy, isNotNull);
-        },
-      );
+        final found = await mailboxes.findMailboxByRole('acc-1', 'archive');
+        expect(
+          found,
+          isNotNull,
+          reason: 'Manually-set role should be preserved after sync',
+        );
+        expect(found!.path, 'Archive');
+        // Suppress unused warning on spy.
+        expect(spy, isNotNull);
+      });
     });
   });
 }

test/unit/migration_test.dart

@@ -14,7 +14,7 @@ void main() {
   group('Migration', () {
     test('schemaVersion matches expected value', () async {
       final db = AppDatabase(NativeDatabase.memory());
-      expect(db.schemaVersion, 36);
+      expect(db.schemaVersion, 33);
       await db.close();
     });
 
@@ -178,17 +178,17 @@ void main() {
 
       // v28: mime_tree_json column on email_bodies.
       await db
-          .customSelect('SELECT mime_tree_json FROM email_bodies LIMIT 0')
+          .customSelect(
+            'SELECT mime_tree_json FROM email_bodies LIMIT 0',
+          )
           .get();
 
       // v29: local_sieve_scripts table.
       await db.customSelect('SELECT count(*) FROM local_sieve_scripts').get();
 
       // v30: duration_ms column on sync_log_mailboxes.
-      final syncLogMailboxColumns = await _tableColumns(
-        db,
-        'sync_log_mailboxes',
-      );
+      final syncLogMailboxColumns =
+          await _tableColumns(db, 'sync_log_mailboxes');
       expect(syncLogMailboxColumns, contains('duration_ms'));
 
       // v32: local_sieve_applied table.
@@ -199,29 +199,19 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v34: user_preferences table.
-      await db.customSelect('SELECT count(*) FROM user_preferences').get();
-
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
     test(
-      'upgrade from v22 to latest adds list_unsubscribe_header and imap_server_id',
-      () async {
-        final dbFile = File('test_migration_v22.db');
-        if (dbFile.existsSync()) dbFile.deleteSync();
+        'upgrade from v22 to latest adds list_unsubscribe_header and imap_server_id',
+        () async {
+      final dbFile = File('test_migration_v22.db');
+      if (dbFile.existsSync()) dbFile.deleteSync();
 
-        // Build a v22 database schema directly with raw SQL.
-        final rawDb = sqlite.sqlite3.open(dbFile.path);
-        rawDb.execute('''
+      // Build a v22 database schema directly with raw SQL.
+      final rawDb = sqlite.sqlite3.open(dbFile.path);
+      rawDb.execute('''
         CREATE TABLE accounts (
           id TEXT NOT NULL PRIMARY KEY,
           display_name TEXT NOT NULL,
@@ -242,7 +232,7 @@ void main() {
           verbose INTEGER NOT NULL DEFAULT 0 CHECK ("verbose" IN (0, 1))
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE drafts (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
           account_id TEXT NULL,
@@ -254,7 +244,7 @@ void main() {
           updated_at INTEGER NOT NULL
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE mailboxes (
           id TEXT NOT NULL PRIMARY KEY,
           account_id TEXT NOT NULL,
@@ -265,7 +255,7 @@ void main() {
           role TEXT NULL
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE emails (
           id TEXT NOT NULL PRIMARY KEY,
           account_id TEXT NOT NULL,
@@ -289,7 +279,7 @@ void main() {
           snoozed_from_mailbox_path TEXT NULL
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE threads (
           account_id TEXT NOT NULL,
           mailbox_path TEXT NOT NULL,
@@ -306,7 +296,7 @@ void main() {
           PRIMARY KEY (account_id, mailbox_path, id)
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE email_bodies (
           email_id TEXT NOT NULL PRIMARY KEY REFERENCES emails(id) ON DELETE CASCADE,
           text_body TEXT NULL,
@@ -316,7 +306,7 @@ void main() {
           headers_json TEXT NULL
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE sync_logs (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
           account_id TEXT NOT NULL,
@@ -333,7 +323,7 @@ void main() {
           protocol_log TEXT NULL
         );
       ''');
-        rawDb.execute('''
+      rawDb.execute('''
         CREATE TABLE sync_log_mailboxes (
           id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
           sync_log_id INTEGER NOT NULL REFERENCES sync_logs (id) ON DELETE CASCADE,
@@ -343,81 +333,69 @@ void main() {
           bytes_transferred INTEGER NOT NULL DEFAULT 0
         );
       ''');
-        rawDb.execute('PRAGMA user_version = 22;');
-        rawDb.close();
+      rawDb.execute('PRAGMA user_version = 22;');
+      rawDb.close();
 
-        final db = AppDatabase(NativeDatabase(dbFile));
-        // Trigger migration.
-        await db.select(db.accounts).get();
+      final db = AppDatabase(NativeDatabase(dbFile));
+      // Trigger migration.
+      await db.select(db.accounts).get();
 
-        final emailColumns = await _tableColumns(db, 'emails');
-        expect(emailColumns, contains('list_unsubscribe_header'));
+      final emailColumns = await _tableColumns(db, 'emails');
+      expect(emailColumns, contains('list_unsubscribe_header'));
 
-        final draftColumns = await _tableColumns(db, 'drafts');
-        expect(draftColumns, contains('imap_server_id'));
+      final draftColumns = await _tableColumns(db, 'drafts');
+      expect(draftColumns, contains('imap_server_id'));
 
-        // v25: new indexes on mailboxes and threads.
-        final allIndexes = await db
-            .customSelect("SELECT name FROM sqlite_master WHERE type='index'")
-            .get();
-        final indexNames =
-            allIndexes.map((r) => r.read<String>('name')).toSet();
-        expect(indexNames, contains('mailboxes_account_id'));
-        expect(indexNames, contains('threads_latest_date'));
+      // v25: new indexes on mailboxes and threads.
+      final allIndexes = await db
+          .customSelect("SELECT name FROM sqlite_master WHERE type='index'")
+          .get();
+      final indexNames = allIndexes.map((r) => r.read<String>('name')).toSet();
+      expect(indexNames, contains('mailboxes_account_id'));
+      expect(indexNames, contains('threads_latest_date'));
 
-        // v26: FTS5 virtual table and triggers.
-        final allTriggers = await db
-            .customSelect("SELECT name FROM sqlite_master WHERE type='trigger'")
-            .get();
-        final triggerNames =
-            allTriggers.map((r) => r.read<String>('name')).toSet();
-        expect(
-          triggerNames,
-          containsAll(['email_fts_ai', 'email_fts_au', 'email_fts_ad']),
-        );
-        await db.customSelect('SELECT count(*) FROM email_fts').get();
+      // v26: FTS5 virtual table and triggers.
+      final allTriggers = await db
+          .customSelect("SELECT name FROM sqlite_master WHERE type='trigger'")
+          .get();
+      final triggerNames =
+          allTriggers.map((r) => r.read<String>('name')).toSet();
+      expect(
+        triggerNames,
+        containsAll(['email_fts_ai', 'email_fts_au', 'email_fts_ad']),
+      );
+      await db.customSelect('SELECT count(*) FROM email_fts').get();
 
-        // v27: search_history_entries table.
-        await db
-            .customSelect('SELECT count(*) FROM search_history_entries')
-            .get();
+      // v27: search_history_entries table.
+      await db
+          .customSelect('SELECT count(*) FROM search_history_entries')
+          .get();
 
-        // v28: mime_tree_json column on email_bodies.
-        await db
-            .customSelect('SELECT mime_tree_json FROM email_bodies LIMIT 0')
-            .get();
+      // v28: mime_tree_json column on email_bodies.
+      await db
+          .customSelect(
+            'SELECT mime_tree_json FROM email_bodies LIMIT 0',
+          )
+          .get();
 
-        // v29: local_sieve_scripts table.
-        await db.customSelect('SELECT count(*) FROM local_sieve_scripts').get();
+      // v29: local_sieve_scripts table.
+      await db.customSelect('SELECT count(*) FROM local_sieve_scripts').get();
 
-        // v30: duration_ms column on sync_log_mailboxes.
-        final syncLogMailboxColumns = await _tableColumns(
-          db,
-          'sync_log_mailboxes',
-        );
-        expect(syncLogMailboxColumns, contains('duration_ms'));
+      // v30: duration_ms column on sync_log_mailboxes.
+      final syncLogMailboxColumns =
+          await _tableColumns(db, 'sync_log_mailboxes');
+      expect(syncLogMailboxColumns, contains('duration_ms'));
 
-        // v33: error_stack_trace and is_permanent columns on sync_logs.
-        final syncLogColumns = await _tableColumns(db, 'sync_logs');
-        expect(syncLogColumns, contains('error_stack_trace'));
-        expect(syncLogColumns, contains('is_permanent'));
+      // v33: error_stack_trace and is_permanent columns on sync_logs.
+      final syncLogColumns = await _tableColumns(db, 'sync_logs');
+      expect(syncLogColumns, contains('error_stack_trace'));
+      expect(syncLogColumns, contains('is_permanent'));
 
-        // v34: user_preferences table.
-        await db.customSelect('SELECT count(*) FROM user_preferences').get();
+      await db.close();
+      if (dbFile.existsSync()) dbFile.deleteSync();
+    });
 
-        // v35: mail_view_button_position column on user_preferences.
-        final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-        expect(userPrefsColumns, contains('mail_view_button_position'));
-
-        // v36: after_mail_view_action column on user_preferences.
-        expect(userPrefsColumns, contains('after_mail_view_action'));
-
-        await db.close();
-        if (dbFile.existsSync()) dbFile.deleteSync();
-      },
-    );
-
-    test('fresh install creates all tables at schemaVersion 36', () async {
+    test('fresh install creates all tables at schemaVersion 33', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -444,7 +422,6 @@ void main() {
           'local_sieve_scripts', // v29
           'share_keys', // v31
           'local_sieve_applied', // v32
-          'user_preferences', // v34
         ]),
       );
 
@@ -455,10 +432,8 @@ void main() {
       expect(draftColumns, contains('imap_server_id'));
 
       // v30: duration_ms column on sync_log_mailboxes.
-      final syncLogMailboxColumns = await _tableColumns(
-        db,
-        'sync_log_mailboxes',
-      );
+      final syncLogMailboxColumns =
+          await _tableColumns(db, 'sync_log_mailboxes');
       expect(syncLogMailboxColumns, contains('duration_ms'));
 
       // v33: error_stack_trace and is_permanent columns on sync_logs.
@@ -466,13 +441,6 @@ void main() {
       expect(syncLogColumns, contains('error_stack_trace'));
       expect(syncLogColumns, contains('is_permanent'));
 
-      // v35: mail_view_button_position column on user_preferences.
-      final userPrefsColumns = await _tableColumns(db, 'user_preferences');
-      expect(userPrefsColumns, contains('mail_view_button_position'));
-
-      // v36: after_mail_view_action column on user_preferences.
-      expect(userPrefsColumns, contains('after_mail_view_action'));
-
       await db.close();
     });
   });

test/unit/notification_service_test.dart

@@ -9,15 +9,14 @@ void main() {
   // absent at startup, throwing MissingPluginException (or a similar error).
   // initNotifications() must absorb the failure and let the app continue.
   test(
-    'initNotifications completes without throwing when plugin is unavailable',
-    () async {
-      // In the unit-test environment the native plugin is not registered, so
-      // _plugin.initialize() throws. The fix catches it and keeps _initialized
-      // false.  This test fails before the fix (exception propagates) and passes
-      // after it (exception is swallowed).
-      await expectLater(initNotifications(), completes);
-    },
-  );
+      'initNotifications completes without throwing when plugin is unavailable',
+      () async {
+    // In the unit-test environment the native plugin is not registered, so
+    // _plugin.initialize() throws. The fix catches it and keeps _initialized
+    // false.  This test fails before the fix (exception propagates) and passes
+    // after it (exception is swallowed).
+    await expectLater(initNotifications(), completes);
+  });
 
   test('showNewMailNotification completes without throwing', () async {
     // Platform.isAndroid is false in tests, so this returns early without

test/unit/reliability_runner_test.dart

@@ -26,9 +26,11 @@ class _FakeAccounts implements AccountRepository {
   @override
   Stream<List<Account>> observeAccounts() => Stream.value(accounts);
   @override
-  Future<Account?> getAccount(String id) async => accounts
-      .cast<Account?>()
-      .firstWhere((a) => a?.id == id, orElse: () => null);
+  Future<Account?> getAccount(String id) async =>
+      accounts.cast<Account?>().firstWhere(
+            (a) => a?.id == id,
+            orElse: () => null,
+          );
   @override
   Future<void> addAccount(Account account, String password) async {}
   @override
@@ -92,7 +94,11 @@ class _CountingEmails implements EmailRepository {
   @override
   Future<int> flushPendingChanges(String accountId, String password) async => 0;
   @override
-  Stream<List<Email>> observeEmails(String a, String m, {int limit = 50}) =>
+  Stream<List<Email>> observeEmails(
+    String a,
+    String m, {
+    int limit = 50,
+  }) =>
       Stream.value([]);
   @override
   Stream<List<EmailThread>> observeThreads(

test/unit/share_encryption_service_test.dart

@@ -47,7 +47,9 @@ void main() {
     test('parsePublicKeyQr returns null for invalid input', () {
       expect(ShareEncryptionService.parsePublicKeyQr('not-valid'), isNull);
       expect(
-        ShareEncryptionService.parsePublicKeyQr('sharedinbox.de:pubkey:v1:!!!'),
+        ShareEncryptionService.parsePublicKeyQr(
+          'sharedinbox.de:pubkey:v1:!!!',
+        ),
         isNull,
       );
       expect(

test/unit/sieve_interpreter_test.dart

@@ -73,7 +73,11 @@ void main() {
         SieveRule(
           joinType: 'single',
           conditions: [
-            HeaderCondition(['from', 'reply-to'], ':is', ['boss@work.com']),
+            HeaderCondition(
+              ['from', 'reply-to'],
+              ':is',
+              ['boss@work.com'],
+            ),
           ],
           actions: [
             FlagAction([r'\Important']),
@@ -117,10 +121,8 @@ void main() {
         ),
       ];
 
-      final ctx = interp.execute(
-        rules,
-        _email(subject: 'Weekly Newsletter Issue'),
-      );
+      final ctx =
+          interp.execute(rules, _email(subject: 'Weekly Newsletter Issue'));
       expect(ctx.targetFolders, contains('Bulk'));
     });
   });

test/unit/sieve_parser_test.dart

@@ -261,9 +261,8 @@ if exists "X-Spam-Flag" {
 
   group('SieveParser — rule model', () {
     test('simple if produces one rule with branchGroupId', () {
-      final rules = parser.parse(
-        'if header :contains "Subject" "x" { discard; }',
-      );
+      final rules =
+          parser.parse('if header :contains "Subject" "x" { discard; }');
       expect(rules, hasLength(1));
       expect(rules.first.branchGroupId, isNotNull);
       expect(rules.first.conditions, hasLength(1));

test/unit/sync_log_repository_impl_test.dart

@@ -127,35 +127,33 @@ void main() {
     expect(rows.first.errorMessage, 'Connection refused');
   });
 
-  test(
-    'stores and retrieves stackTrace and isPermanent on error entries',
-    () async {
-      final repo = SyncLogRepositoryImpl(db);
-      final start = DateTime(2024, 3, 1, 9);
-      final end = DateTime(2024, 3, 1, 9, 0, 1);
-      const fakeTrace = '#0 main (file:///app/lib/main.dart:10:5)';
+  test('stores and retrieves stackTrace and isPermanent on error entries',
+      () async {
+    final repo = SyncLogRepositoryImpl(db);
+    final start = DateTime(2024, 3, 1, 9);
+    final end = DateTime(2024, 3, 1, 9, 0, 1);
+    const fakeTrace = '#0 main (file:///app/lib/main.dart:10:5)';
 
-      await repo.log(
-        accountId: 'acc1',
-        success: false,
-        errorMessage: 'MissingPluginException',
-        stackTrace: fakeTrace,
-        isPermanent: true,
-        protocol: 'imap',
-        emailsFetched: 0,
-        emailsSkipped: 0,
-        mailboxesSynced: 0,
-        pendingFlushed: 0,
-        bytesTransferred: 0,
-        startedAt: start,
-        finishedAt: end,
-      );
+    await repo.log(
+      accountId: 'acc1',
+      success: false,
+      errorMessage: 'MissingPluginException',
+      stackTrace: fakeTrace,
+      isPermanent: true,
+      protocol: 'imap',
+      emailsFetched: 0,
+      emailsSkipped: 0,
+      mailboxesSynced: 0,
+      pendingFlushed: 0,
+      bytesTransferred: 0,
+      startedAt: start,
+      finishedAt: end,
+    );
 
-      final entries = await repo.observeSyncLogs('acc1').first;
-      final entry = entries.firstWhere((e) => e.startedAt == start);
-      expect(entry.stackTrace, fakeTrace);
-      expect(entry.isPermanent, true);
-      expect(entry.errorMessage, 'MissingPluginException');
-    },
-  );
+    final entries = await repo.observeSyncLogs('acc1').first;
+    final entry = entries.firstWhere((e) => e.startedAt == start);
+    expect(entry.stackTrace, fakeTrace);
+    expect(entry.isPermanent, true);
+    expect(entry.errorMessage, 'MissingPluginException');
+  });
 }

test/unit/undo_logic_test.dart

@@ -260,9 +260,8 @@ void main() {
       expect(original!.messageId, isNull); // set a messageId so lookup works
 
       // Seed a messageId so undo can find the email after UID change.
-      await (db.update(db.emails)..where((t) => t.id.equals(oldEmailId))).write(
-        const EmailsCompanion(messageId: Value('msg-101@test')),
-      );
+      await (db.update(db.emails)..where((t) => t.id.equals(oldEmailId)))
+          .write(const EmailsCompanion(messageId: Value('msg-101@test')));
 
       final originalWithMsgId = await repo.getEmail(oldEmailId);
 
@@ -304,9 +303,8 @@ void main() {
       await container.read(undoServiceProvider.notifier).undo();
 
       // 4. Verify the current email row is now in INBOX.
-      final inInbox = await (db.select(
-        db.emails,
-      )..where((t) => t.mailboxPath.equals('INBOX')))
+      final inInbox = await (db.select(db.emails)
+            ..where((t) => t.mailboxPath.equals('INBOX')))
           .get();
       expect(
         inInbox,

test/unit/undo_service_test.dart

@@ -122,74 +122,70 @@ void main() {
     verify(mockEmailRepo.moveEmail('e1', 'INBOX')).called(1);
   });
 
-  test(
-    'undo pushes inverse action into log when destinationMailboxPath is set',
-    () async {
-      final action = UndoAction(
-        id: 'del1',
-        accountId: 'acc1',
-        type: UndoType.delete,
-        emailIds: ['e1'],
-        sourceMailboxPath: 'INBOX',
-        destinationMailboxPath: 'Trash',
-      );
+  test('undo pushes inverse action into log when destinationMailboxPath is set',
+      () async {
+    final action = UndoAction(
+      id: 'del1',
+      accountId: 'acc1',
+      type: UndoType.delete,
+      emailIds: ['e1'],
+      sourceMailboxPath: 'INBOX',
+      destinationMailboxPath: 'Trash',
+    );
 
-      when(mockEmailRepo.moveEmail(any, any)).thenAnswer((_) async {});
-      when(
-        mockEmailRepo.cancelPendingChange(any, any),
-      ).thenAnswer((_) async => false);
+    when(mockEmailRepo.moveEmail(any, any)).thenAnswer((_) async {});
+    when(
+      mockEmailRepo.cancelPendingChange(any, any),
+    ).thenAnswer((_) async => false);
 
-      final notifier = container.read(undoServiceProvider.notifier);
-      await notifier.init();
-      await notifier.pushAction(action);
-      await notifier.undo(actionId: 'del1');
+    final notifier = container.read(undoServiceProvider.notifier);
+    await notifier.init();
+    await notifier.pushAction(action);
+    await notifier.undo(actionId: 'del1');
 
-      // Original entry stays; inverse is added.
-      final log = container.read(undoServiceProvider);
-      expect(log.length, 2);
-      expect(log[0].id, 'del1');
-      final inv = log[1];
-      expect(inv.id, 'del1-inv');
-      expect(inv.type, UndoType.move);
-      expect(inv.emailIds, ['e1']);
-      expect(inv.sourceMailboxPath, 'Trash');
-      expect(inv.destinationMailboxPath, 'INBOX');
-      verify(
-        mockUndoRepo.saveAction(
-          argThat(predicate<UndoAction>((a) => a.id == 'del1-inv')),
-        ),
-      ).called(1);
-    },
-  );
+    // Original entry stays; inverse is added.
+    final log = container.read(undoServiceProvider);
+    expect(log.length, 2);
+    expect(log[0].id, 'del1');
+    final inv = log[1];
+    expect(inv.id, 'del1-inv');
+    expect(inv.type, UndoType.move);
+    expect(inv.emailIds, ['e1']);
+    expect(inv.sourceMailboxPath, 'Trash');
+    expect(inv.destinationMailboxPath, 'INBOX');
+    verify(
+      mockUndoRepo.saveAction(
+        argThat(predicate<UndoAction>((a) => a.id == 'del1-inv')),
+      ),
+    ).called(1);
+  });
 
-  test(
-    'undo without destinationMailboxPath does not push inverse action',
-    () async {
-      final action = UndoAction(
-        id: 'mv1',
-        accountId: 'acc1',
-        type: UndoType.move,
-        emailIds: ['e1'],
-        sourceMailboxPath: 'INBOX',
-        // no destinationMailboxPath
-      );
+  test('undo without destinationMailboxPath does not push inverse action',
+      () async {
+    final action = UndoAction(
+      id: 'mv1',
+      accountId: 'acc1',
+      type: UndoType.move,
+      emailIds: ['e1'],
+      sourceMailboxPath: 'INBOX',
+      // no destinationMailboxPath
+    );
 
-      when(mockEmailRepo.moveEmail(any, any)).thenAnswer((_) async {});
-      when(
-        mockEmailRepo.cancelPendingChange(any, any),
-      ).thenAnswer((_) async => false);
+    when(mockEmailRepo.moveEmail(any, any)).thenAnswer((_) async {});
+    when(
+      mockEmailRepo.cancelPendingChange(any, any),
+    ).thenAnswer((_) async => false);
 
-      final notifier = container.read(undoServiceProvider.notifier);
-      await notifier.init();
-      await notifier.pushAction(action);
-      await notifier.undo(actionId: 'mv1');
+    final notifier = container.read(undoServiceProvider.notifier);
+    await notifier.init();
+    await notifier.pushAction(action);
+    await notifier.undo(actionId: 'mv1');
 
-      // Original entry stays; no inverse since no destinationMailboxPath.
-      final log = container.read(undoServiceProvider);
-      expect(log.length, 1);
-      expect(log.first.id, 'mv1');
-    },
-  );
+    // Original entry stays; no inverse since no destinationMailboxPath.
+    final log = container.read(undoServiceProvider);
+    expect(log.length, 1);
+    expect(log.first.id, 'mv1');
+  });
 
   test('undo with actionId removes and undos specific action', () async {
     // action1 has no destination → no inverse action
@@ -354,9 +350,13 @@ void main() {
     );
 
     // Simulate slow DB load
-    when(mockUndoRepo.getHistory(limit: anyNamed('limit'))).thenAnswer(
-      (_) =>
-          Future.delayed(const Duration(milliseconds: 10), () => [persisted]),
+    when(
+      mockUndoRepo.getHistory(limit: anyNamed('limit')),
+    ).thenAnswer(
+      (_) => Future.delayed(
+        const Duration(milliseconds: 10),
+        () => [persisted],
+      ),
     );
 
     final notifier = container.read(undoServiceProvider.notifier);

test/widget/about_screen_test.dart

@@ -46,9 +46,8 @@ class ThrowingUrlLauncher extends Mock
 Widget _buildScreen({List<Account> accounts = const []}) {
   return ProviderScope(
     overrides: [
-      accountRepositoryProvider.overrideWithValue(
-        FakeAccountRepository(accounts),
-      ),
+      accountRepositoryProvider
+          .overrideWithValue(FakeAccountRepository(accounts)),
     ],
     child: const MaterialApp(home: AboutScreen()),
   );
@@ -152,10 +151,8 @@ void main() {
       },
     );
     addTearDown(
-      () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
-        SystemChannels.platform,
-        null,
-      ),
+      () => tester.binding.defaultBinaryMessenger
+          .setMockMethodCallHandler(SystemChannels.platform, null),
     );
 
     await tester.pumpWidget(_buildScreen());
@@ -176,7 +173,10 @@ void main() {
     expect(clipboardText, contains('Locale'));
     expect(clipboardText, contains('Text Scale'));
     expect(clipboardText, contains('DB Schema Version'));
-    expect(clipboardText, contains('[sharedinbox.de](https://sharedinbox.de)'));
+    expect(
+      clipboardText,
+      contains('[sharedinbox.de](https://sharedinbox.de)'),
+    );
   });
 
   testWidgets('AboutScreen create-issue button opens Codeberg URL', (

test/widget/account_export_screen_test.dart

@@ -74,7 +74,10 @@ void main() {
           recipientKeyId: material.keyId,
           recipientPublicKeyBytes: material.publicKeyBytes,
           accounts: [
-            AccountPayload(accountJson: account.toJson(), password: 'secret'),
+            AccountPayload(
+              accountJson: account.toJson(),
+              password: 'secret',
+            ),
           ],
         );
 
@@ -96,7 +99,10 @@ void main() {
         await tester.tap(find.text('Import'));
         await tester.pumpAndSettle();
 
-        expect(find.text('Imported 1 account successfully.'), findsOneWidget);
+        expect(
+          find.text('Imported 1 account successfully.'),
+          findsOneWidget,
+        );
       },
     );
 

test/widget/account_list_screen_test.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:sharedinbox/data/db/database.dart' show SyncHealthRow;
 
 import 'helpers.dart';
 
@@ -207,73 +206,5 @@ void main() {
       expect(tester.takeException(), isNull);
       expect(find.text('sharedinbox.de'), findsOneWidget);
     });
-
-    testWidgets('shows Healthy when sync health is healthy', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            syncHealth: SyncHealthRow(
-              accountId: kTestAccount.id,
-              lastVerifiedAt: DateTime(2024, 6),
-              isHealthy: true,
-            ),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.textContaining('Healthy'), findsOneWidget);
-    });
-
-    testWidgets('shows discrepancy details when sync health has discrepancies',
-        (
-      tester,
-    ) async {
-      const summary =
-          '{"INBOX":{"missingLocally":3,"missingOnServer":0,"flagMismatches":1}}';
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            syncHealth: SyncHealthRow(
-              accountId: kTestAccount.id,
-              lastVerifiedAt: DateTime(2024, 6),
-              isHealthy: false,
-              discrepancySummary: summary,
-            ),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.textContaining('missing locally: 3'), findsOneWidget);
-      expect(find.textContaining('flag mismatches: 1'), findsOneWidget);
-    });
-
-    testWidgets('sync health row is positioned below the account name row', (
-      tester,
-    ) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts',
-          overrides: baseOverrides(
-            accounts: [kTestAccount],
-            syncHealth: SyncHealthRow(
-              accountId: kTestAccount.id,
-              lastVerifiedAt: DateTime(2024, 6),
-              isHealthy: true,
-            ),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      final namePos = tester.getTopLeft(find.text('Alice')).dy;
-      final healthPos = tester.getTopLeft(find.textContaining('Healthy')).dy;
-      expect(healthPos, greaterThan(namePos));
-    });
   });
 }

test/widget/crash_screen_test.dart

@@ -96,10 +96,8 @@ void main() {
         },
       );
       addTearDown(
-        () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
-          SystemChannels.platform,
-          null,
-        ),
+        () => tester.binding.defaultBinaryMessenger
+            .setMockMethodCallHandler(SystemChannels.platform, null),
       );
 
       const exception = 'TestException: clipboard test';
@@ -128,77 +126,79 @@ void main() {
     },
   );
 
-  testWidgets('CrashScreen shows git hash as clickable link above stacktrace', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(800, 1200);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
+  testWidgets(
+    'CrashScreen shows git hash as clickable link above stacktrace',
+    (tester) async {
+      tester.view.physicalSize = const Size(800, 1200);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(() => tester.view.resetPhysicalSize());
 
-    final mock = MockUrlLauncher();
-    UrlLauncherPlatform.instance = mock;
+      final mock = MockUrlLauncher();
+      UrlLauncherPlatform.instance = mock;
 
-    const exception = 'TestException: git hash test';
-    final stackTrace = StackTrace.current;
-    const testHash = 'abc1234';
+      const exception = 'TestException: git hash test';
+      final stackTrace = StackTrace.current;
+      const testHash = 'abc1234';
 
-    await tester.pumpWidget(
-      CrashScreen(
-        exception: exception,
-        stackTrace: stackTrace,
-        gitHash: testHash,
-      ),
-    );
-    await tester.pumpAndSettle();
+      await tester.pumpWidget(
+        CrashScreen(
+          exception: exception,
+          stackTrace: stackTrace,
+          gitHash: testHash,
+        ),
+      );
+      await tester.pumpAndSettle();
 
-    // Git hash link should be present
-    final gitLinkFinder = find.textContaining('Git Commit: abc1234');
-    expect(gitLinkFinder, findsOneWidget);
+      // Git hash link should be present
+      final gitLinkFinder = find.textContaining('Git Commit: abc1234');
+      expect(gitLinkFinder, findsOneWidget);
 
-    // Link must appear above the stack trace
-    final stackTraceFinder = find.text('Stack Trace:');
-    expect(
-      tester.getTopLeft(gitLinkFinder).dy,
-      lessThan(tester.getTopLeft(stackTraceFinder).dy),
-    );
+      // Link must appear above the stack trace
+      final stackTraceFinder = find.text('Stack Trace:');
+      expect(
+        tester.getTopLeft(gitLinkFinder).dy,
+        lessThan(tester.getTopLeft(stackTraceFinder).dy),
+      );
 
-    // Tapping the link should open the Codeberg commit URL
-    await tester.tap(gitLinkFinder);
-    await tester.pumpAndSettle();
+      // Tapping the link should open the Codeberg commit URL
+      await tester.tap(gitLinkFinder);
+      await tester.pumpAndSettle();
 
-    expect(
-      mock.launchedUrl,
-      equals('https://codeberg.org/guettli/sharedinbox/commit/abc1234'),
-    );
-  });
+      expect(
+        mock.launchedUrl,
+        equals('https://codeberg.org/guettli/sharedinbox/commit/abc1234'),
+      );
+    },
+  );
 
-  testWidgets('CrashScreen shows version, build mode, and platform in the UI', (
-    tester,
-  ) async {
-    tester.view.physicalSize = const Size(800, 1200);
-    tester.view.devicePixelRatio = 1.0;
-    addTearDown(() => tester.view.resetPhysicalSize());
+  testWidgets(
+    'CrashScreen shows version, build mode, and platform in the UI',
+    (tester) async {
+      tester.view.physicalSize = const Size(800, 1200);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(() => tester.view.resetPhysicalSize());
 
-    const exception = 'TestException: info row test';
-    final stackTrace = StackTrace.current;
+      const exception = 'TestException: info row test';
+      final stackTrace = StackTrace.current;
 
-    await tester.pumpWidget(
-      MaterialApp(
-        home: CrashScreen(exception: exception, stackTrace: stackTrace),
-      ),
-    );
-    await tester.pumpAndSettle();
+      await tester.pumpWidget(
+        MaterialApp(
+          home: CrashScreen(exception: exception, stackTrace: stackTrace),
+        ),
+      );
+      await tester.pumpAndSettle();
 
-    // Info row shows app version (from mock), build mode, and platform OS.
-    expect(find.textContaining('1.0.0+42'), findsWidgets);
-    // In test builds kDebugMode is true.
-    expect(find.textContaining('debug'), findsOneWidget);
-    // Platform OS is always present (linux in CI, android/ios on device).
-    expect(
-      find.textContaining(RegExp(r'linux|android|ios|windows|macos')),
-      findsWidgets,
-    );
-  });
+      // Info row shows app version (from mock), build mode, and platform OS.
+      expect(find.textContaining('1.0.0+42'), findsWidgets);
+      // In test builds kDebugMode is true.
+      expect(find.textContaining('debug'), findsOneWidget);
+      // Platform OS is always present (linux in CI, android/ios on device).
+      expect(
+        find.textContaining(RegExp(r'linux|android|ios|windows|macos')),
+        findsWidgets,
+      );
+    },
+  );
 
   testWidgets(
     'CrashScreen shows app version as clickable link when git hash is set',
@@ -264,10 +264,8 @@ void main() {
         },
       );
       addTearDown(
-        () => tester.binding.defaultBinaryMessenger.setMockMethodCallHandler(
-          SystemChannels.platform,
-          null,
-        ),
+        () => tester.binding.defaultBinaryMessenger
+            .setMockMethodCallHandler(SystemChannels.platform, null),
       );
 
       const exception = 'TestException: version link clipboard test';

test/widget/edit_account_screen_test.dart

@@ -106,62 +106,62 @@ void main() {
     });
 
     testWidgets(
-      'try connection button is disabled when no password stored or entered',
-      (tester) async {
-        tester.view.physicalSize = const Size(800, 1400);
-        tester.view.devicePixelRatio = 1.0;
-        addTearDown(tester.view.resetPhysicalSize);
-        addTearDown(tester.view.resetDevicePixelRatio);
+        'try connection button is disabled when no password stored or entered',
+        (
+      tester,
+    ) async {
+      tester.view.physicalSize = const Size(800, 1400);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
 
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/edit',
-            overrides: baseOverrides(
-              accounts: [kTestAccount],
-              hasStoredPassword: false,
-            ),
+      await tester.pumpWidget(
+        buildApp(
+          initialLocation: '/accounts/acc-1/edit',
+          overrides: baseOverrides(
+            accounts: [kTestAccount],
+            hasStoredPassword: false,
           ),
-        );
-        await tester.pumpAndSettle();
+        ),
+      );
+      await tester.pumpAndSettle();
 
-        final button = tester.widget<OutlinedButton>(
-          find.byKey(const Key('editTryConnectionButton')),
-        );
-        expect(button.onPressed, isNull);
-      },
-    );
+      final button = tester.widget<OutlinedButton>(
+        find.byKey(const Key('editTryConnectionButton')),
+      );
+      expect(button.onPressed, isNull);
+    });
 
     testWidgets(
-      'try connection button is enabled after typing password with no stored password',
-      (tester) async {
-        tester.view.physicalSize = const Size(800, 1400);
-        tester.view.devicePixelRatio = 1.0;
-        addTearDown(tester.view.resetPhysicalSize);
-        addTearDown(tester.view.resetDevicePixelRatio);
+        'try connection button is enabled after typing password with no stored password',
+        (tester) async {
+      tester.view.physicalSize = const Size(800, 1400);
+      tester.view.devicePixelRatio = 1.0;
+      addTearDown(tester.view.resetPhysicalSize);
+      addTearDown(tester.view.resetDevicePixelRatio);
 
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation: '/accounts/acc-1/edit',
-            overrides: baseOverrides(
-              accounts: [kTestAccount],
-              hasStoredPassword: false,
-            ),
+      await tester.pumpWidget(
+        buildApp(
+          initialLocation: '/accounts/acc-1/edit',
+          overrides: baseOverrides(
+            accounts: [kTestAccount],
+            hasStoredPassword: false,
           ),
-        );
-        await tester.pumpAndSettle();
+        ),
+      );
+      await tester.pumpAndSettle();
 
-        await tester.enterText(
-          find.byKey(const Key('editPasswordField')),
-          'mypassword',
-        );
-        await tester.pump();
+      await tester.enterText(
+        find.byKey(const Key('editPasswordField')),
+        'mypassword',
+      );
+      await tester.pump();
 
-        final button = tester.widget<OutlinedButton>(
-          find.byKey(const Key('editTryConnectionButton')),
-        );
-        expect(button.onPressed, isNotNull);
-      },
-    );
+      final button = tester.widget<OutlinedButton>(
+        find.byKey(const Key('editTryConnectionButton')),
+      );
+      expect(button.onPressed, isNotNull);
+    });
 
     testWidgets('save button is disabled when no password stored or entered', (
       tester,
@@ -182,9 +182,8 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      final button = tester.widget<FilledButton>(
-        find.widgetWithText(FilledButton, 'Save'),
-      );
+      final button = tester
+          .widget<FilledButton>(find.widgetWithText(FilledButton, 'Save'));
       expect(button.onPressed, isNull);
     });
 

test/widget/email_detail_screen_test.dart

@@ -52,7 +52,10 @@ List<Override> _overrides({required EmailBody body, Email? email}) => [
       ),
       mailboxRepositoryProvider.overrideWithValue(FakeMailboxRepository()),
       emailRepositoryProvider.overrideWithValue(
-        FakeEmailRepository(emailDetail: email ?? testEmail(), emailBody: body),
+        FakeEmailRepository(
+          emailDetail: email ?? testEmail(),
+          emailBody: body,
+        ),
       ),
     ];
 
@@ -188,45 +191,45 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(
-        find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply all'),
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Reply all',
+        ),
         findsNothing,
       );
     });
 
-    testWidgets(
-      'Reply on single-recipient email navigates directly to compose',
-      (tester) async {
-        // testEmail has from=[bob], to=[alice]. After removing alice (own),
-        // only bob remains → no dialog, navigate straight to compose.
-        final email = testEmail();
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation:
-                '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-            overrides: [
-              ..._overrides(
-                body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-                email: email,
-              ),
-              draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
-            ],
-          ),
-        );
-        await tester.pumpAndSettle();
+    testWidgets('Reply on single-recipient email navigates directly to compose',
+        (tester) async {
+      // testEmail has from=[bob], to=[alice]. After removing alice (own),
+      // only bob remains → no dialog, navigate straight to compose.
+      final email = testEmail();
+      await tester.pumpWidget(
+        buildApp(
+          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
+          overrides: [
+            ..._overrides(
+              body: const EmailBody(emailId: 'acc-1:42', attachments: []),
+              email: email,
+            ),
+            draftRepositoryProvider.overrideWithValue(FakeDraftRepository()),
+          ],
+        ),
+      );
+      await tester.pumpAndSettle();
 
-        await tester.tap(
-          find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply'),
-        );
-        await tester.pumpAndSettle();
+      await tester.tap(
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Reply',
+        ),
+      );
+      await tester.pumpAndSettle();
 
-        // No dialog shown — straight navigation to compose.
-        expect(find.text('Reply All'), findsNothing);
-      },
-    );
+      // No dialog shown — straight navigation to compose.
+      expect(find.text('Reply All'), findsNothing);
+    });
 
-    testWidgets('Reply on multi-recipient email shows Reply All dialog', (
-      tester,
-    ) async {
+    testWidgets('Reply on multi-recipient email shows Reply All dialog',
+        (tester) async {
       // Email with an extra Cc recipient so the dialog is triggered.
       final email = Email(
         id: 'acc-1:42',
@@ -255,7 +258,9 @@ void main() {
       await tester.pumpAndSettle();
 
       await tester.tap(
-        find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Reply'),
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Reply',
+        ),
       );
       await tester.pumpAndSettle();
 
@@ -266,9 +271,7 @@ void main() {
       expect(find.textContaining('carol@example.com'), findsAtLeastNWidgets(1));
     });
 
-    testWidgets('Mark as spam is in popup menu, not a standalone button', (
-      tester,
-    ) async {
+    testWidgets('Mark as spam button is present in app bar', (tester) async {
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
@@ -279,24 +282,16 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // No standalone icon button for mark as spam.
       expect(
         find.byWidgetPredicate(
           (w) => w is Tooltip && w.message == 'Mark as spam',
         ),
-        findsNothing,
+        findsOneWidget,
       );
-
-      // It appears in the popup menu.
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Mark as spam'), findsOneWidget);
     });
 
-    testWidgets('Mark as spam shows dialog when no junk folder', (
-      tester,
-    ) async {
+    testWidgets('Mark as spam shows dialog when no junk folder',
+        (tester) async {
       // FakeMailboxRepository has no mailboxes by default → findMailboxByRole
       // returns null → dialog shown.
       await tester.pumpWidget(
@@ -309,11 +304,11 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      // Open the popup menu first, then tap Mark as spam.
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
-
-      await tester.tap(find.text('Mark as spam'));
+      await tester.tap(
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Mark as spam',
+        ),
+      );
       await tester.pumpAndSettle();
 
       expect(find.text('No spam folder found'), findsOneWidget);
@@ -331,7 +326,9 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(
-        find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Archive'),
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Archive',
+        ),
         findsOneWidget,
       );
     });
@@ -350,16 +347,17 @@ void main() {
       await tester.pumpAndSettle();
 
       await tester.tap(
-        find.byWidgetPredicate((w) => w is Tooltip && w.message == 'Archive'),
+        find.byWidgetPredicate(
+          (w) => w is Tooltip && w.message == 'Archive',
+        ),
       );
       await tester.pumpAndSettle();
 
       expect(find.text('No archive folder found'), findsOneWidget);
     });
 
-    testWidgets('Mark as unread is in popup menu, not a standalone button', (
-      tester,
-    ) async {
+    testWidgets('Mark as unread is in popup menu, not a standalone button',
+        (tester) async {
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
@@ -395,16 +393,13 @@ void main() {
             accountRepositoryProvider.overrideWithValue(
               FakeAccountRepository([kTestAccount]),
             ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
+            mailboxRepositoryProvider
+                .overrideWithValue(FakeMailboxRepository()),
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(
                 emailDetail: testEmail(),
-                emailBody: const EmailBody(
-                  emailId: 'acc-1:42',
-                  attachments: [],
-                ),
+                emailBody:
+                    const EmailBody(emailId: 'acc-1:42', attachments: []),
                 rawRfc822: rawContent,
               ),
             ),
@@ -433,16 +428,13 @@ void main() {
             accountRepositoryProvider.overrideWithValue(
               FakeAccountRepository([kTestAccount]),
             ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
+            mailboxRepositoryProvider
+                .overrideWithValue(FakeMailboxRepository()),
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(
                 emailDetail: testEmail(),
-                emailBody: const EmailBody(
-                  emailId: 'acc-1:42',
-                  attachments: [],
-                ),
+                emailBody:
+                    const EmailBody(emailId: 'acc-1:42', attachments: []),
                 rawRfc822: 'Subject: test\r\n\r\nBody',
               ),
             ),
@@ -483,38 +475,6 @@ void main() {
       expect(find.text('Share'), findsOneWidget);
     });
 
-    testWidgets('long-press on unsubscribe chip shows URL tooltip', (
-      tester,
-    ) async {
-      final email = testEmail(
-        listUnsubscribeHeader: '<https://example.com/unsubscribe>',
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-            email: email,
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('Unsubscribe'), findsOneWidget);
-
-      expect(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'https://example.com/unsubscribe',
-        ),
-        findsOneWidget,
-      );
-
-      await tester.longPress(find.text('Unsubscribe'));
-      await tester.pumpAndSettle();
-
-      expect(find.text('https://example.com/unsubscribe'), findsOneWidget);
-    });
-
     testWidgets('Show Mail Structure opens dialog with MIME parts', (
       tester,
     ) async {
@@ -557,31 +517,36 @@ void main() {
       expect(find.textContaining('application/pdf'), findsOneWidget);
     });
 
-    testWidgets('Show Mail Structure shows snackbar when mimeTree is absent', (
-      tester,
-    ) async {
-      const body = EmailBody(
-        emailId: 'acc-1:42',
-        textBody: 'Hello',
-        attachments: [],
-        // mimeTree is null — not yet cached or not available.
-      );
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(body: body),
-        ),
-      );
-      await tester.pumpAndSettle();
+    testWidgets(
+      'Show Mail Structure shows snackbar when mimeTree is absent',
+      (tester) async {
+        const body = EmailBody(
+          emailId: 'acc-1:42',
+          textBody: 'Hello',
+          attachments: [],
+          // mimeTree is null — not yet cached or not available.
+        );
+        await tester.pumpWidget(
+          buildApp(
+            initialLocation:
+                '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
+            overrides: _overrides(body: body),
+          ),
+        );
+        await tester.pumpAndSettle();
 
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
+        await tester.tap(find.byType(PopupMenuButton<String>));
+        await tester.pumpAndSettle();
 
-      await tester.tap(find.text('Show Mail Structure'));
-      await tester.pumpAndSettle();
+        await tester.tap(find.text('Show Mail Structure'));
+        await tester.pumpAndSettle();
 
-      expect(find.textContaining('Structure not available'), findsOneWidget);
-    });
+        expect(
+          find.textContaining('Structure not available'),
+          findsOneWidget,
+        );
+      },
+    );
   });
 }
 

test/widget/email_list_screen_golden_test.dart

@@ -51,7 +51,9 @@ List<Override> _overrides({
       searchHistoryRepositoryProvider.overrideWithValue(
         FakeSearchHistoryRepository(),
       ),
-      syncLastErrorProvider.overrideWith((ref, _) => Stream.value(syncError)),
+      syncLastErrorProvider.overrideWith(
+        (ref, _) => Stream.value(syncError),
+      ),
     ];
 
 void main() {
@@ -120,7 +122,9 @@ void main() {
         buildApp(
           initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails',
           overrides: _overrides(
-            searchResults: [_email(id: 'acc-1:5', subject: 'Project proposal')],
+            searchResults: [
+              _email(id: 'acc-1:5', subject: 'Project proposal'),
+            ],
           ),
         ),
       );

test/widget/email_list_screen_test.dart

@@ -316,7 +316,7 @@ void main() {
       await tester.pumpAndSettle();
 
       expect(find.text('INBOX'), findsOneWidget);
-      expect(find.byIcon(Icons.close), findsNothing);
+      expect(find.byType(BottomAppBar), findsNothing);
     });
 
     testWidgets('tapping clear icon in search bar clears results', (
@@ -430,62 +430,63 @@ void main() {
       expect(find.text('Result email'), findsWidgets);
     });
 
-    testWidgets('deleting all search results pops back to previous screen', (
-      tester,
-    ) async {
-      final email = testEmail(subject: 'Needle');
+    testWidgets(
+      'deleting all search results pops back to previous screen',
+      (tester) async {
+        final email = testEmail(subject: 'Needle');
 
-      // Start at the mailbox list so the email list is pushed on top of it,
-      // making context.canPop() == true inside EmailListScreen.
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes',
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository([kTestMailbox]),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(searchResults: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
+        // Start at the mailbox list so the email list is pushed on top of it,
+        // making context.canPop() == true inside EmailListScreen.
+        await tester.pumpWidget(
+          buildApp(
+            initialLocation: '/accounts/acc-1/mailboxes',
+            overrides: [
+              accountRepositoryProvider.overrideWithValue(
+                FakeAccountRepository([kTestAccount]),
+              ),
+              mailboxRepositoryProvider.overrideWithValue(
+                FakeMailboxRepository([kTestMailbox]),
+              ),
+              emailRepositoryProvider.overrideWithValue(
+                FakeEmailRepository(searchResults: [email]),
+              ),
+            ],
+          ),
+        );
+        await tester.pumpAndSettle();
 
-      expect(find.byType(MailboxListScreen), findsOneWidget);
+        expect(find.byType(MailboxListScreen), findsOneWidget);
 
-      // Navigate into INBOX (pushes EmailListScreen onto the stack).
-      await tester.tap(find.text('INBOX'));
-      await tester.pumpAndSettle();
+        // Navigate into INBOX (pushes EmailListScreen onto the stack).
+        await tester.tap(find.text('INBOX'));
+        await tester.pumpAndSettle();
 
-      expect(find.byType(EmailListScreen), findsOneWidget);
+        expect(find.byType(EmailListScreen), findsOneWidget);
 
-      // Search for the email.
-      await tester.enterText(find.byType(TextField), 'Needle');
-      await tester.testTextInput.receiveAction(TextInputAction.search);
-      await tester.pumpAndSettle();
+        // Search for the email.
+        await tester.enterText(find.byType(TextField), 'Needle');
+        await tester.testTextInput.receiveAction(TextInputAction.search);
+        await tester.pumpAndSettle();
 
-      // 'Needle' also appears in the SearchBar input, so match at least one.
-      expect(find.text('Needle'), findsAtLeastNWidgets(1));
+        // 'Needle' also appears in the SearchBar input, so match at least one.
+        expect(find.text('Needle'), findsAtLeastNWidgets(1));
 
-      // Long-press the sender name (unique to the email tile) to enter
-      // selection mode.
-      await tester.longPress(find.text('Bob'));
-      await tester.pumpAndSettle();
+        // Long-press the sender name (unique to the email tile) to enter
+        // selection mode.
+        await tester.longPress(find.text('Bob'));
+        await tester.pumpAndSettle();
 
-      await tester.tap(find.byIcon(Icons.select_all));
-      await tester.pumpAndSettle();
+        await tester.tap(find.byIcon(Icons.select_all));
+        await tester.pumpAndSettle();
 
-      await tester.tap(find.byIcon(Icons.delete));
-      await tester.pumpAndSettle();
+        await tester.tap(find.byIcon(Icons.delete));
+        await tester.pumpAndSettle();
 
-      // Should have popped back to the mailbox list.
-      expect(find.byType(EmailListScreen), findsNothing);
-      expect(find.byType(MailboxListScreen), findsOneWidget);
-    });
+        // Should have popped back to the mailbox list.
+        expect(find.byType(EmailListScreen), findsNothing);
+        expect(find.byType(MailboxListScreen), findsOneWidget);
+      },
+    );
 
     testWidgets(
       'deleting some search results updates the list without popping',

test/widget/helpers.dart

@@ -14,7 +14,6 @@ import 'package:sharedinbox/core/models/discovery_result.dart';
 import 'package:sharedinbox/core/models/draft.dart';
 import 'package:sharedinbox/core/models/email.dart';
 import 'package:sharedinbox/core/models/mailbox.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
@@ -22,12 +21,10 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
 import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/share_key_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
-import 'package:sharedinbox/core/repositories/user_preferences_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
 import 'package:sharedinbox/core/services/share_encryption_service.dart';
-import 'package:sharedinbox/data/db/database.dart' show SyncHealthRow;
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/screens/account_list_screen.dart';
 import 'package:sharedinbox/ui/screens/account_receive_screen.dart';
@@ -41,7 +38,6 @@ import 'package:sharedinbox/ui/screens/email_list_screen.dart';
 import 'package:sharedinbox/ui/screens/mailbox_list_screen.dart';
 import 'package:sharedinbox/ui/screens/search_screen.dart';
 import 'package:sharedinbox/ui/screens/thread_detail_screen.dart';
-import 'package:sharedinbox/ui/screens/user_preferences_screen.dart';
 
 // ---------------------------------------------------------------------------
 // Fake repositories
@@ -414,7 +410,6 @@ class _NoOpManageSieveProbeService implements ManageSieveProbeService {
 Widget buildApp({
   required String initialLocation,
   required List<Override> overrides,
-  UserPreferencesRepository? userPreferences,
 }) {
   final testRouter = GoRouter(
     initialLocation: initialLocation,
@@ -435,10 +430,6 @@ Widget buildApp({
             path: 'send',
             builder: (ctx, state) => const AccountSendScreen(),
           ),
-          GoRoute(
-            path: 'preferences',
-            builder: (ctx, state) => const UserPreferencesScreen(),
-          ),
           GoRoute(
             path: ':accountId/edit',
             builder: (ctx, state) => EditAccountScreen(
@@ -514,18 +505,16 @@ Widget buildApp({
   return ProviderScope(
     // Defaults come first so tests can override them via [overrides].
     //
-    // syncLogRepositoryProvider is backed by a Drift StreamQuery. When the
-    // provider is disposed, Drift schedules a Timer.run() for cache
-    // debouncing. Flutter's test framework then fails the test with "A Timer
-    // is still pending". Replacing it with a synchronous stream avoids this.
-    // syncHealthProvider has the same issue and is overridden in baseOverrides.
+    // syncHealthProvider and syncLogRepositoryProvider are backed by Drift
+    // StreamQueries. When a StreamProvider that wraps a Drift query is disposed,
+    // Drift schedules a Timer.run() for cache debouncing. Flutter's test
+    // framework then fails the test with "A Timer is still pending". Replacing
+    // these with simple synchronous streams avoids the pending-timer assertion.
     overrides: [
+      syncHealthProvider.overrideWith((ref, _) => Stream.value(null)),
       syncLogRepositoryProvider.overrideWithValue(
         const NoOpSyncLogRepository(),
       ),
-      userPreferencesRepositoryProvider.overrideWithValue(
-        userPreferences ?? FakeUserPreferencesRepository(),
-      ),
       ...overrides,
       manageSieveProbeServiceProvider.overrideWith(
         (ref) => _NoOpManageSieveProbeService(),
@@ -552,7 +541,6 @@ List<Override> baseOverrides({
   Exception? connectionError,
   ShareKeyRepository? shareKeyRepository,
   bool hasStoredPassword = true,
-  SyncHealthRow? syncHealth,
 }) =>
     [
       accountRepositoryProvider.overrideWithValue(
@@ -571,9 +559,6 @@ List<Override> baseOverrides({
       shareKeyRepositoryProvider.overrideWithValue(
         shareKeyRepository ?? FakeShareKeyRepository(),
       ),
-      // syncHealthProvider is backed by a Drift StreamQuery; override with a
-      // plain stream to avoid "A Timer is still pending" in tests.
-      syncHealthProvider.overrideWith((ref, _) => Stream.value(syncHealth)),
     ];
 
 // ---------------------------------------------------------------------------
@@ -603,7 +588,6 @@ Email testEmail({
   bool isSeen = false,
   bool isFlagged = false,
   bool hasAttachment = false,
-  String? listUnsubscribeHeader,
 }) =>
     Email(
       id: id,
@@ -619,45 +603,8 @@ Email testEmail({
       isSeen: isSeen,
       isFlagged: isFlagged,
       hasAttachment: hasAttachment,
-      listUnsubscribeHeader: listUnsubscribeHeader,
     );
 
-class FakeUserPreferencesRepository implements UserPreferencesRepository {
-  FakeUserPreferencesRepository({
-    this.menuPosition = MenuPosition.bottom,
-    this.mailViewButtonPosition = MenuPosition.bottom,
-    this.afterMailViewAction = AfterMailViewAction.nextMessage,
-  });
-
-  MenuPosition menuPosition;
-  MenuPosition mailViewButtonPosition;
-  AfterMailViewAction afterMailViewAction;
-
-  @override
-  Stream<UserPreferences> observePreferences() => Stream.value(
-        UserPreferences(
-          menuPosition: menuPosition,
-          mailViewButtonPosition: mailViewButtonPosition,
-          afterMailViewAction: afterMailViewAction,
-        ),
-      );
-
-  @override
-  Future<void> updateMenuPosition(MenuPosition position) async {
-    menuPosition = position;
-  }
-
-  @override
-  Future<void> updateMailViewButtonPosition(MenuPosition position) async {
-    mailViewButtonPosition = position;
-  }
-
-  @override
-  Future<void> updateAfterMailViewAction(AfterMailViewAction action) async {
-    afterMailViewAction = action;
-  }
-}
-
 class FakeSearchHistoryRepository implements SearchHistoryRepository {
   final List<String> _history = [];
 

test/widget/search_screen_test.dart

@@ -89,7 +89,9 @@ void main() {
       expect(find.text('No results'), findsOneWidget);
     });
 
-    testWidgets('shows email results under "Messages" section', (tester) async {
+    testWidgets('shows email results under "Messages" section', (
+      tester,
+    ) async {
       final email = testEmail(subject: 'Invoice Q3');
       await tester.pumpWidget(
         buildApp(
@@ -120,7 +122,9 @@ void main() {
       expect(find.text('Invoice Q3'), findsOneWidget);
     });
 
-    testWidgets('shows folder results under "Folders" section', (tester) async {
+    testWidgets('shows folder results under "Folders" section', (
+      tester,
+    ) async {
       const archiveMailbox = Mailbox(
         id: 'acc-1:Archive',
         accountId: 'acc-1',

test/widget/secure_email_webview_test.dart

@@ -20,12 +20,10 @@ Widget _wrap(Widget child) => MaterialApp(
 
 void main() {
   group('buildEmailHtml', () {
-    test(
-      'forces light color-scheme to prevent black-on-black in dark mode',
-      () {
-        _expectLightMode(buildEmailHtml('<p>Hello</p>'));
-      },
-    );
+    test('forces light color-scheme to prevent black-on-black in dark mode',
+        () {
+      _expectLightMode(buildEmailHtml('<p>Hello</p>'));
+    });
 
     test('includes email body content', () {
       final html = buildEmailHtml('<p>Test body</p>');
@@ -43,21 +41,6 @@ void main() {
       expect(html, contains('https: http: data: blob:'));
       _expectLightMode(html);
     });
-
-    test('prevents horizontal overflow so wide HTML emails are not cut off',
-        () {
-      final html = buildEmailHtml(
-        '<table width="600"><tr><td>x</td></tr></table>',
-      );
-      // Body clips overflow so fixed-width email tables don't escape the viewport.
-      expect(html, contains('overflow-x: hidden'));
-      // Tables are forced to full viewport width so fixed pixel widths don't overflow.
-      expect(html, contains('table { width: 100%'));
-      // All elements are capped at viewport width via max-width.
-      expect(html, contains('max-width: 100%'));
-      // Pre-formatted text wraps instead of stretching the page.
-      expect(html, contains('white-space: pre-wrap'));
-    });
   });
 
   // On Linux (the test host) the widget falls back to plain text extracted via
@@ -65,7 +48,11 @@ void main() {
   group('SecureEmailWebView (Linux plain-text fallback)', () {
     testWidgets('renders extracted text from HTML', (tester) async {
       await tester.pumpWidget(
-        _wrap(const SecureEmailWebView(htmlBody: '<p>Hello <b>world</b></p>')),
+        _wrap(
+          const SecureEmailWebView(
+            htmlBody: '<p>Hello <b>world</b></p>',
+          ),
+        ),
       );
       expect(find.textContaining('Hello'), findsOneWidget);
       expect(find.textContaining('world'), findsOneWidget);
@@ -91,11 +78,12 @@ void main() {
       expect(find.byType(SelectableText), findsOneWidget);
     });
 
-    testWidgets('toggling loadRemoteImages rebuilds without error', (
-      tester,
-    ) async {
+    testWidgets('toggling loadRemoteImages rebuilds without error',
+        (tester) async {
       await tester.pumpWidget(
-        _wrap(const SecureEmailWebView(htmlBody: '<p>Body</p>')),
+        _wrap(
+          const SecureEmailWebView(htmlBody: '<p>Body</p>'),
+        ),
       );
       await tester.pumpWidget(
         _wrap(
@@ -109,7 +97,9 @@ void main() {
     });
 
     testWidgets('handles empty HTML body', (tester) async {
-      await tester.pumpWidget(_wrap(const SecureEmailWebView(htmlBody: '')));
+      await tester.pumpWidget(
+        _wrap(const SecureEmailWebView(htmlBody: '')),
+      );
       expect(find.byType(SelectableText), findsOneWidget);
     });
   });

test/widget/sieve_scripts_screen_test.dart

@@ -27,9 +27,13 @@ void main() {
     await tester.pumpWidget(
       ProviderScope(
         overrides: [
-          sieveRepositoryProvider.overrideWith((ref) => _FakeSieveRepository()),
+          sieveRepositoryProvider.overrideWith(
+            (ref) => _FakeSieveRepository(),
+          ),
         ],
-        child: const MaterialApp(home: SieveScriptsScreen(accountId: 'acc-1')),
+        child: const MaterialApp(
+          home: SieveScriptsScreen(accountId: 'acc-1'),
+        ),
       ),
     );
     await tester.pumpAndSettle();

test/widget/thread_detail_screen_test.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import 'package:sharedinbox/core/models/email.dart';
-import 'package:sharedinbox/core/models/user_preferences.dart';
 import 'package:sharedinbox/di.dart';
 
 import 'helpers.dart';
@@ -143,60 +142,6 @@ void main() {
       expect(find.byIcon(Icons.expand_more), findsOneWidget);
     });
 
-    testWidgets('shows bottom app bar with back button by default', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsOneWidget);
-      expect(find.byIcon(Icons.arrow_back), findsOneWidget);
-    });
-
-    testWidgets('hides bottom app bar when button position is top', (
-      tester,
-    ) async {
-      final email = _threadEmail();
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/threads/thread-1',
-          userPreferences: FakeUserPreferencesRepository(
-            mailViewButtonPosition: MenuPosition.top,
-          ),
-          overrides: [
-            accountRepositoryProvider.overrideWithValue(
-              FakeAccountRepository([kTestAccount]),
-            ),
-            mailboxRepositoryProvider.overrideWithValue(
-              FakeMailboxRepository(),
-            ),
-            emailRepositoryProvider.overrideWithValue(
-              FakeEmailRepository(emails: [email]),
-            ),
-          ],
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.byType(BottomAppBar), findsNothing);
-    });
-
     testWidgets('flagged email shows star icon', (tester) async {
       final email = _threadEmail(isFlagged: true);
       await tester.pumpWidget(

test/widget/undo_shell_test.dart

@@ -38,9 +38,8 @@ void main() {
         sourceMailboxPath: 'INBOX',
         timestamp: DateTime.now().subtract(const Duration(hours: 1)),
       );
-      when(
-        mockUndoRepo.getHistory(limit: anyNamed('limit')),
-      ).thenAnswer((_) async => [staleAction]);
+      when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
+          .thenAnswer((_) async => [staleAction]);
 
       await tester.pumpWidget(buildShell(mockUndoRepo));
       await tester.pumpAndSettle();
@@ -49,12 +48,10 @@ void main() {
     },
   );
 
-  testWidgets('shows snackbar for fresh action pushed in current session', (
-    tester,
-  ) async {
-    when(
-      mockUndoRepo.getHistory(limit: anyNamed('limit')),
-    ).thenAnswer((_) async => []);
+  testWidgets('shows snackbar for fresh action pushed in current session',
+      (tester) async {
+    when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
+        .thenAnswer((_) async => []);
 
     await tester.pumpWidget(buildShell(mockUndoRepo));
     await tester.pumpAndSettle();
@@ -67,20 +64,18 @@ void main() {
       emailIds: ['e1'],
       sourceMailboxPath: 'INBOX',
     );
-    await ProviderScope.containerOf(
-      context,
-    ).read(undoServiceProvider.notifier).pushAction(freshAction);
+    await ProviderScope.containerOf(context)
+        .read(undoServiceProvider.notifier)
+        .pushAction(freshAction);
     await tester.pumpAndSettle();
 
     expect(find.text('1 email(s) moved'), findsOneWidget);
   });
 
-  testWidgets('shows correct text for delete action (moved to Trash)', (
-    tester,
-  ) async {
-    when(
-      mockUndoRepo.getHistory(limit: anyNamed('limit')),
-    ).thenAnswer((_) async => []);
+  testWidgets('shows correct text for delete action (moved to Trash)',
+      (tester) async {
+    when(mockUndoRepo.getHistory(limit: anyNamed('limit')))
+        .thenAnswer((_) async => []);
 
     await tester.pumpWidget(buildShell(mockUndoRepo));
     await tester.pumpAndSettle();
@@ -93,9 +88,9 @@ void main() {
       emailIds: ['e1', 'e2'],
       sourceMailboxPath: 'INBOX',
     );
-    await ProviderScope.containerOf(
-      context,
-    ).read(undoServiceProvider.notifier).pushAction(deleteAction);
+    await ProviderScope.containerOf(context)
+        .read(undoServiceProvider.notifier)
+        .pushAction(deleteAction);
     await tester.pumpAndSettle();
 
     expect(find.text('2 email(s) moved to Trash'), findsOneWidget);