fix: enable core library desugaring for flutter_local_notifications

flutter_local_notifications requires isCoreLibraryDesugaringEnabled and
the desugar_jdk_libs dependency to build on API < 26.  Without this the
release AAB build fails with ':app:checkReleaseAarMetadata'.

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

PLAN_ISSUE_21.md

@@ -1,59 +0,0 @@
-# Implementation Plan: Secure WebView for HTML Emails (#21)
-
-## Goal
-Replace the current `flutter_html` based rendering with a hardened WebView-based approach to improve rendering fidelity while strictly enforcing security and privacy.
-
-## 1. Dependency Management
-- **Core**: `webview_flutter` (v4+)
-- **Linux Platform**: `webview_flutter_linux` (Official community-supported or WebKitGTK based implementation). *Note: I will verify the exact package name during implementation.*
-- **Utilities**: `url_launcher` (existing) for opening links in the system browser.
-
-## 2. Secure WebView Component (`lib/ui/widgets/secure_email_webview.dart`)
-Create a new widget `SecureEmailWebView` that encapsulates the `WebViewWidget` and its controller.
-
-### Configuration & Hardening
-- **Disable JavaScript**: `controller.setJavaScriptMode(JavaScriptMode.disabled)`.
-- **Background**: Match the application theme (e.g., transparent or surface color).
-- **Security Headers/CSP**: Inject a Content Security Policy via `<meta>` tag in the HTML wrapper:
-  - `default-src 'none'; style-src 'unsafe-inline'; img-src 'self' data:;` (Blocks all external assets by default).
-
-### Image Blocking Logic
-- **Initial State**: Block remote images by injecting a CSP that restricts `img-src` to `data:` and local schemes.
-- **Toggle Mechanism**:
-  - Provide a "Load Remote Images" button in the Flutter UI.
-  - When triggered, re-render the HTML with an updated CSP: `img-src * data:;`.
-
-### Link Interception & Phishing Protection
-- Implement `NavigationDelegate.onNavigationRequest`.
-- **Process**:
-  1. Intercept any URL that doesn't start with `about:blank` or `data:`.
-  2. Block the navigation in the WebView.
-  3. Trigger a Flutter `showDialog` for confirmation.
-- **Phishing Protection Dialog**:
-  - Show the full URL.
-  - **Bold the FQDN**: Parse the URL using `Uri.parse`.
-    - Example: `https://`**`important-bank.com`**`/login`
-  - "Open in Browser" button uses `url_launcher`.
-
-## 3. Integration Plan
-### Step 1: Initialization
-Modify `lib/main.dart` to initialize the Linux WebView platform (using `webview_flutter_linux` or similar) during app startup.
-
-### Step 2: Replace Renderer in Screens
-- **EmailDetailScreen**: Replace `Html(...)` with `SecureEmailWebView(html: body.htmlBody!)`.
-- **ThreadDetailScreen**: Replace `Html(...)` with `SecureEmailWebView(html: body.htmlBody!)`.
-- Remove `flutter_html` imports and dependencies once migration is complete.
-
-## 4. Verification & Security Audit
-- **Manual Tests**:
-  - Open emails with complex HTML layouts.
-  - Verify images are blocked initially.
-  - Verify "Load images" works.
-  - Click various links (http, https, mailto) and verify the confirmation dialog and FQDN bolding.
-- **Security Check**:
-  - Verify that `<script>` tags are not executed.
-  - Verify no network requests for external images occur before user consent (via DevTools or proxy).
-
-## 5. Potential Challenges
-- **Linux WebView Stability**: WebKitGTK on Linux can sometimes have rendering or sizing issues in Flutter.
-- **Scrolling**: Ensuring the WebView integrates smoothly into the `ListView` of the email detail screen (might require fixed height or `SizedBox`).

SYNC.md

@@ -1,206 +0,0 @@
-# Email Sync Architecture
-
-This document describes the full lifecycle of an email action — from the moment the user taps
-a button to server confirmation — covering the IMAP IDLE loop, JMAP push/poll, the pending-change
-queue, exponential backoff, and the undo/cancel mechanism.
-
-For the database schema and protocol-level implementation details see [DB-SYNC.md](DB-SYNC.md).
-
----
-
-## 1. Components
-
-| Component | File | Role |
-|-----------|------|------|
-| `AccountSyncManager` | `lib/core/sync/account_sync_manager.dart` | Owns one `_SyncLoop` per account; starts, stops, and wakes sync loops |
-| `_AccountSync` | same file | IMAP sync loop (IDLE + incremental fetch) |
-| `_JmapAccountSync` | same file | JMAP sync loop (SSE push + poll fallback) |
-| `EmailRepositoryImpl` | `lib/data/repositories/email_repository_impl.dart` | All DB reads/writes and network calls |
-| `pending_changes` table | `lib/data/db/database.dart` | Protocol-agnostic outbound mutation queue |
-| `UndoService` | `lib/core/services/undo_service.dart` | Persisted undo history; cancel-or-reverse logic |
-
----
-
-## 2. Lifecycle of an email mutation (e.g. "Mark as read")
-
-```
-User taps "Mark as read"
-        │
-        ▼
-EmailRepository.setFlag(id, seen: true)
-        │
-        ├─ 1. Write optimistic update to local DB
-        │      emails.is_seen = true
-        │
-        └─ 2. Insert row into pending_changes
-               { type: 'flag_seen', email_id: id, payload: {seen: true} }
-               (IMAP: includes uid + mailboxPath for the STORE command)
-               (JMAP: includes just the flag map for Email/set)
-
-[UI immediately reflects the change via Drift's reactive streams]
-
-        │
-        ▼ (next sync cycle, triggered by IMAP IDLE / JMAP push / wakeUp)
-_SyncLoop._flush() / flushPendingChanges()
-        │
-        ├─ IMAP: open connection → STORE uid +FLAGS (\Seen) → close
-        │
-        └─ JMAP: Email/set { update: { id: { keywords: { "$seen": true } } } }
-               If stateMismatch → clear checkpoint → full re-sync
-
-        │
-        ▼
-pending_changes row deleted on success
-(on permanent error: retry count incremented; evicted after 5 failures)
-```
-
----
-
-## 3. IMAP sync loop
-
-The IMAP loop runs one coroutine per account (`_AccountSync`):
-
-```
-start()
-  │
-  ▼
-[forever loop]
-  ├─ flushPendingChanges()   ← drain outbound queue first
-  ├─ syncMailboxes()         ← detect new/removed mailboxes
-  ├─ for each mailbox:
-  │    syncEmails()          ← incremental: fetch only UIDs > lastUid
-  │                             deletion reconciliation: remove rows
-  │                             whose UID is absent from the server
-  └─ _idle()                 ← IMAP IDLE for up to 25 min (RFC 2177)
-       │                        Wakes on: server EXISTS/EXPUNGE/FLAGS
-       │                        or syncNow() signal from UI
-       └─ repeat
-```
-
-**Incremental sync checkpoint** — `sync_state` table stores `(accountId, mailbox, lastUid, uidValidity)`.
-On each run, only UIDs greater than `lastUid` are fetched. If `uidValidity` changes the full
-folder is re-scanned and the checkpoint is reset.
-
-**IDLE cap** — IDLE sessions are limited to 25 minutes per the RFC. The loop also wakes
-immediately if `syncNow()` is called (e.g. user pulls-to-refresh).
-
----
-
-## 4. JMAP sync loop
-
-The JMAP loop (`_JmapAccountSync`) follows a similar structure but uses HTTP:
-
-```
-start()
-  │
-  ▼
-[forever loop]
-  ├─ flushPendingChanges()   ← Email/set for queued mutations
-  ├─ syncMailboxes()         ← Mailbox/get or Mailbox/changes
-  ├─ for each mailbox:
-  │    syncEmails()          ← Email/query + Email/get (first run)
-  │                             Email/changes (subsequent runs, state token)
-  └─ _wait()
-       ├─ If server advertises eventSourceUrl: subscribe to SSE push
-       │    wake on "Email" change event
-       └─ Otherwise: sleep 30 s (poll fallback)
-```
-
-**State tokens** — each `Mailbox/changes` / `Email/changes` call uses the server-provided
-`state` token stored in `sync_state`. A `stateMismatch` error clears the token and triggers
-a full re-fetch.
-
-**JMAP send** — outgoing mail uses `EmailSubmission/set` when the server advertises the
-`urn:ietf:params:jmap:submission` capability; falls back to SMTP otherwise.
-
----
-
-## 5. Exponential backoff
-
-Both loops share the same backoff policy:
-
-| Outcome | Backoff |
-|---------|---------|
-| Sync succeeded | Reset to 5 s |
-| Network / server error | Double previous backoff, capped at 900 s (15 min) |
-
-The backoff counter (`_backoffSeconds`) is per-account and per-process; it resets to 5 s
-on the next successful cycle.
-
-The last error message is written to `sync_log` and surfaced in the UI via
-`syncLastErrorProvider` (the red `MaterialBanner` in the email list).
-
----
-
-## 6. Pending-change queue
-
-`pending_changes` is a protocol-agnostic table that stores every outbound mutation before it
-reaches the server:
-
-| Column | Description |
-|--------|-------------|
-| `id` | Auto-increment primary key |
-| `email_id` | The email being mutated |
-| `type` | `flag_seen`, `flag_flagged`, `move`, `delete`, `snooze` |
-| `payload` | JSON-encoded protocol-specific arguments |
-| `retry_count` | Incremented on each failed flush attempt |
-| `created_at` | For ordering and debug |
-
-**Optimistic UI** — every mutation writes the local change first, then inserts into
-`pending_changes`. The Drift reactive stream delivers the update to the UI before
-the network round-trip completes.
-
-**Conflict resolution** — the server always wins. On the next sync cycle the server's
-state overwrites local rows. Outbound mutations are retried up to 5 times; after that
-they are evicted and a `FailedMutation` record is created. Permanent per-item JMAP
-errors (`notFound`, `forbidden`) skip the retry counter and evict immediately.
-
----
-
-## 7. Undo and cancel
-
-When the user triggers an undoable action the UI calls:
-```
-ref.read(undoServiceProvider.notifier).pushAction(UndoAction(...))
-```
-
-`UndoService` persists the action to the `undo_actions` table (max 10 entries, FIFO).
-A `SnackBar` with an **Undo** button appears for a few seconds.
-
-When the user taps Undo, `UndoService.undo()` executes this sequence for each affected email:
-
-```
-1. cancelPendingChange(id, originalType)
-      └─ Deletes the pending_changes row if it has not been flushed yet.
-         Returns true if cancelled, false if the server already processed it.
-
-2. If the email row was hard-deleted (DELETE action):
-      restoreEmails([original])
-         └─ Re-inserts the row with its pre-deletion state,
-            placed in the correct mailbox (source if cancelled, dest otherwise).
-
-3. moveEmail(id, sourceMailboxPath)
-      └─ Optimistic local move back to the original folder.
-         If step 1 returned false (already sent to server), this enqueues
-         a reverse-move in pending_changes so the server move is undone too.
-
-4. If step 1 returned true (cancelled before flush):
-      cancelPendingChange(id, 'move')
-         └─ The reverse-move from step 3 is redundant; remove it.
-```
-
-The net result is: if the mutation was still in the queue it is silently cancelled with no
-server round-trip; if it had already been flushed, a compensating move is queued.
-
----
-
-## 8. Key invariants
-
-- **Order**: pending changes are flushed before syncing. This prevents the server from
-  overwriting an optimistic local state that the server hasn't seen yet.
-- **Idempotency**: `flushPendingChanges` is safe to call multiple times. Each row is
-  deleted only after the server acknowledges the change.
-- **No silent data loss**: permanent server errors surface as `FailedMutation` records
-  visible in the UI (Settings → Failed mutations).
-- **UI layer isolation**: `lib/ui/` never imports `lib/data/`; all interaction goes
-  through `core/` interfaces. The `check-layers` Taskfile task enforces this.

flake.nix

@@ -84,8 +84,6 @@
             # python3 base + Google Play API client (for scripts/deploy_playstore.py)
             (python3.withPackages (ps: with ps; [
               google-api-python-client
-              google-auth-httplib2
-              httplib2
             ]))  # used by stalwart-dev/start and deploy_playstore.py
             fgj      # Codeberg/Forgejo CLI (like gh for GitHub)
           ]);

lib/core/repositories/email_repository.dart

@@ -1,19 +1,14 @@
 import 'package:sharedinbox/core/models/email.dart';
 
 abstract class EmailRepository {
-  Stream<List<Email>> observeEmails(
-    String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  });
+  Stream<List<Email>> observeEmails(String accountId, String mailboxPath);
 
   /// Groups emails by threadId and returns one [EmailThread] per thread,
   /// sorted by the latest message date descending.
   Stream<List<EmailThread>> observeThreads(
     String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  });
+    String mailboxPath,
+  );
 
   /// Returns all emails belonging to [threadId] in [mailboxPath].
   Stream<List<Email>> observeEmailsInThread(
@@ -27,7 +22,6 @@ abstract class EmailRepository {
   Future<EmailBody> getEmailBody(String emailId);
   Future<SyncEmailsResult> syncEmails(String accountId, String mailboxPath);
   Future<void> setFlag(String emailId, {bool? seen, bool? flagged});
-  Future<void> markAllAsRead(String accountId, String mailboxPath);
   Future<void> moveEmail(String emailId, String destMailboxPath);
 
   /// Deletes the email. Returns the path of the mailbox it was moved to

lib/core/repositories/search_history_repository.dart

@@ -1,5 +0,0 @@
-abstract interface class SearchHistoryRepository {
-  Future<List<String>> getRecentSearches();
-  Future<void> saveSearch(String query);
-  Future<void> clearHistory();
-}

lib/core/sync/account_sync_manager.dart

@@ -11,7 +11,6 @@ import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart'
     show ImapConnectFn, connectImap, verboseLogKey;
-import 'package:sharedinbox/data/imap/tls_error.dart' show isTlsConfigError;
 
 typedef OnNewMailCallback = Future<void> Function(String accountEmail);
 
@@ -292,7 +291,6 @@ class _AccountSync implements _SyncLoop {
   }
 
   bool _isPermanentError(Object e) {
-    if (isTlsConfigError(e)) return true;
     final s = e.toString().toLowerCase();
     // enough_mail doesn't always have typed exceptions for auth, so we check strings.
     return s.contains('invalid credentials') ||
@@ -530,7 +528,6 @@ class _JmapAccountSync implements _SyncLoop {
   }
 
   bool _isPermanentError(Object e) {
-    if (isTlsConfigError(e)) return true;
     final s = e.toString().toLowerCase();
     return s.contains('invalid credentials') ||
         s.contains('authentication failed') ||

lib/core/sync/background_sync.dart

@@ -38,7 +38,7 @@ Future<void> registerBackgroundSync() async {
     _kTaskName,
     frequency: const Duration(minutes: 15),
     constraints: Constraints(networkType: NetworkType.connected),
-    existingWorkPolicy: ExistingPeriodicWorkPolicy.keep,
+    existingWorkPolicy: ExistingWorkPolicy.keep,
   );
 }
 

lib/data/db/database.dart

@@ -234,13 +234,6 @@ class Drafts extends Table {
   TextColumn get imapServerId => text().nullable()();
 }
 
-@DataClassName('SearchHistoryRow')
-class SearchHistoryEntries extends Table {
-  IntColumn get id => integer().autoIncrement()();
-  TextColumn get query => text()();
-  DateTimeColumn get searchedAt => dateTime()();
-}
-
 @DataClassName('UndoActionRow')
 class UndoActions extends Table {
   TextColumn get id => text()();
@@ -270,54 +263,16 @@ class UndoActions extends Table {
     SyncLogMailboxes,
     SyncHealth,
     UndoActions,
-    SearchHistoryEntries,
   ],
 )
 class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 27;
-
-  Future<void> _createEmailFts() async {
-    await customStatement('''
-      CREATE VIRTUAL TABLE IF NOT EXISTS email_fts USING fts5(
-        subject, preview, from_json,
-        content='emails',
-        content_rowid='rowid'
-      )
-    ''');
-    await customStatement('''
-      CREATE TRIGGER IF NOT EXISTS email_fts_ai
-      AFTER INSERT ON emails BEGIN
-        INSERT INTO email_fts(rowid, subject, preview, from_json)
-        VALUES (new.rowid, new.subject, new.preview, new.from_json);
-      END
-    ''');
-    await customStatement('''
-      CREATE TRIGGER IF NOT EXISTS email_fts_au
-      AFTER UPDATE OF subject, preview, from_json ON emails BEGIN
-        INSERT INTO email_fts(email_fts, rowid, subject, preview, from_json)
-        VALUES ('delete', old.rowid, old.subject, old.preview, old.from_json);
-        INSERT INTO email_fts(rowid, subject, preview, from_json)
-        VALUES (new.rowid, new.subject, new.preview, new.from_json);
-      END
-    ''');
-    await customStatement('''
-      CREATE TRIGGER IF NOT EXISTS email_fts_ad
-      AFTER DELETE ON emails BEGIN
-        INSERT INTO email_fts(email_fts, rowid, subject, preview, from_json)
-        VALUES ('delete', old.rowid, old.subject, old.preview, old.from_json);
-      END
-    ''');
-  }
+  int get schemaVersion => 24;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
-        onCreate: (m) async {
-          await m.createAll();
-          await _createEmailFts();
-        },
         onUpgrade: (m, from, to) async {
           // NOTE: m.createTable(T) creates the LATEST version of table T.
           // If you later add a column C to T in version X, you must guard
@@ -476,33 +431,6 @@ class AppDatabase extends _$AppDatabase {
           if (from >= 4 && from < 24) {
             await m.addColumn(drafts, drafts.imapServerId);
           }
-          if (from < 25) {
-            // For observeMailboxes: filter by account_id, sort by path.
-            await m.createIndex(
-              Index(
-                'mailboxes_account_id',
-                'CREATE INDEX IF NOT EXISTS mailboxes_account_id ON mailboxes (account_id, path);',
-              ),
-            );
-            // For observeThreads: filter by account_id+mailbox_path, sort by latest_date.
-            await m.createIndex(
-              Index(
-                'threads_latest_date',
-                'CREATE INDEX IF NOT EXISTS threads_latest_date ON threads (account_id, mailbox_path, latest_date DESC);',
-              ),
-            );
-          }
-          if (from < 26) {
-            await _createEmailFts();
-            // Backfill FTS index from existing rows.
-            await customStatement('''
-              INSERT INTO email_fts(rowid, subject, preview, from_json)
-              SELECT rowid, subject, preview, from_json FROM emails
-            ''');
-          }
-          if (from < 27) {
-            await m.createTable(searchHistoryEntries);
-          }
         },
       );
 }

lib/data/imap/tls_error.dart

@@ -21,52 +21,15 @@ class TlsModeMismatchException implements Exception {
       'STARTTLS). Original error: $original';
 }
 
-/// Wraps a TLS certificate verification failure into a user-actionable message.
-///
-/// Thrown when the server's certificate cannot be verified — either because it
-/// is self-signed, expired, or the CA chain has changed since the account was
-/// set up.
-class TlsCertificateException implements Exception {
-  TlsCertificateException(this.host, this.port, this.original);
-  final String host;
-  final int port;
-  final Object original;
-
-  @override
-  String toString() =>
-      'TLS certificate error on $host:$port — the server certificate could '
-      'not be verified. The certificate may have changed or expired. '
-      'Please re-check your account settings or contact your mail provider. '
-      'Original error: $original';
-}
-
-/// Returns true if [error] is a permanent TLS configuration error that will
-/// not resolve on its own and requires user action.
-bool isTlsConfigError(Object error) =>
-    error is TlsModeMismatchException || error is TlsCertificateException;
-
-/// If [error] is a recognisable TLS handshake failure, wraps it in a typed
-/// exception and throws it.  Otherwise rethrows [error] unchanged.
-///
-/// Recognised patterns:
-/// - `WRONG_VERSION_NUMBER` → [TlsModeMismatchException] (port/mode mismatch)
-/// - `CERTIFICATE_VERIFY_FAILED` / `HandshakeException` → [TlsCertificateException]
+/// If [error] is a TLS handshake failure caused by a wrong-version-number
+/// (i.e. the server is not speaking TLS), throw a [TlsModeMismatchException]
+/// with [host]/[port] context. Otherwise rethrow [error] unchanged.
 Never rethrowAsTlsHint(Object error, StackTrace stack, String host, int port) {
-  final s = error.toString();
-  if (s.contains('WRONG_VERSION_NUMBER')) {
+  if (error.toString().contains('WRONG_VERSION_NUMBER')) {
     Error.throwWithStackTrace(
       TlsModeMismatchException(host, port, error),
       stack,
     );
   }
-  if (s.contains('CERTIFICATE_VERIFY_FAILED') ||
-      s.contains('HandshakeException') ||
-      s.contains('CERTIFICATE_EXPIRED') ||
-      s.contains('CERTIFICATE_UNKNOWN')) {
-    Error.throwWithStackTrace(
-      TlsCertificateException(host, port, error),
-      stack,
-    );
-  }
   Error.throwWithStackTrace(error, stack);
 }

lib/data/repositories/email_repository_impl.dart

@@ -58,17 +58,15 @@ class EmailRepositoryImpl implements EmailRepository {
   @override
   Stream<List<model.Email>> observeEmails(
     String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  }) {
+    String mailboxPath,
+  ) {
     return (_db.select(_db.emails)
           ..where(
             (t) =>
                 t.accountId.equals(accountId) &
                 t.mailboxPath.equals(mailboxPath),
           )
-          ..orderBy([(t) => OrderingTerm.desc(t.receivedAt)])
-          ..limit(limit))
+          ..orderBy([(t) => OrderingTerm.desc(t.receivedAt)]))
         .watch()
         .map((rows) => rows.map(_toModel).toList());
   }
@@ -76,17 +74,15 @@ class EmailRepositoryImpl implements EmailRepository {
   @override
   Stream<List<model.EmailThread>> observeThreads(
     String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  }) {
+    String mailboxPath,
+  ) {
     return (_db.select(_db.threads)
           ..where(
             (t) =>
                 t.accountId.equals(accountId) &
                 t.mailboxPath.equals(mailboxPath),
           )
-          ..orderBy([(t) => OrderingTerm.desc(t.latestDate)])
-          ..limit(limit))
+          ..orderBy([(t) => OrderingTerm.desc(t.latestDate)]))
         .watch()
         .map((rows) => rows.map(_threadRowToModel).toList());
   }
@@ -1520,63 +1516,6 @@ class EmailRepositoryImpl implements EmailRepository {
     );
   }
 
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {
-    final account = (await _accounts.getAccount(accountId))!;
-    final unread = await (_db.select(_db.emails)
-          ..where(
-            (t) =>
-                t.accountId.equals(accountId) &
-                t.mailboxPath.equals(mailboxPath) &
-                t.isSeen.equals(false),
-          ))
-        .get();
-    if (unread.isEmpty) return;
-
-    await _db.transaction(() async {
-      for (final row in unread) {
-        if (account.type == account_model.AccountType.jmap) {
-          await _enqueueChange(
-            accountId,
-            row.id,
-            'flag_seen',
-            jsonEncode({'seen': true}),
-          );
-        } else {
-          await _enqueueChange(
-            accountId,
-            row.id,
-            'flag_seen',
-            jsonEncode({
-              'uid': row.uid,
-              'mailboxPath': row.mailboxPath,
-              'seen': true,
-            }),
-          );
-        }
-      }
-
-      // Bulk mark all unread emails in this mailbox as seen.
-      await (_db.update(_db.emails)
-            ..where(
-              (t) =>
-                  t.accountId.equals(accountId) &
-                  t.mailboxPath.equals(mailboxPath) &
-                  t.isSeen.equals(false),
-            ))
-          .write(const EmailsCompanion(isSeen: Value(true)));
-
-      // Update all threads in this mailbox to reflect no unread.
-      await (_db.update(_db.threads)
-            ..where(
-              (t) =>
-                  t.accountId.equals(accountId) &
-                  t.mailboxPath.equals(mailboxPath),
-            ))
-          .write(const ThreadsCompanion(hasUnread: Value(false)));
-    });
-  }
-
   @override
   Future<void> moveEmail(String emailId, String destMailboxPath) async {
     final row = await (_db.select(
@@ -2531,39 +2470,28 @@ class EmailRepositoryImpl implements EmailRepository {
     String? accountId,
     String query,
   ) async {
-    final ftsQuery = _toFtsQuery(query);
-    if (ftsQuery.isEmpty) return [];
-
-    final sql = accountId != null
-        ? 'SELECT e.* FROM email_fts f JOIN emails e ON e.rowid = f.rowid'
-            ' WHERE email_fts MATCH ? AND e.account_id = ? ORDER BY rank LIMIT 50'
-        : 'SELECT e.* FROM email_fts f JOIN emails e ON e.rowid = f.rowid'
-            ' WHERE email_fts MATCH ? ORDER BY rank LIMIT 50';
-    final variables = accountId != null
-        ? [Variable<String>(ftsQuery), Variable<String>(accountId)]
-        : [Variable<String>(ftsQuery)];
-
-    final queryRows = await _db
-        .customSelect(sql, variables: variables, readsFrom: {_db.emails}).get();
-    final emailRows = await Future.wait(
-      queryRows.map((r) => _db.emails.mapFromRow(r)),
-    );
-    return emailRows.map(_toModel).toList();
-  }
-
-  /// Converts a user query string into an FTS5 match expression.
-  /// Each whitespace-separated word becomes a prefix term (word*) so that
-  /// partial words still match. Special FTS5 characters are stripped.
-  static String _toFtsQuery(String query) {
     final words = query
-        .trim()
+        .toLowerCase()
         .split(RegExp(r'\s+'))
         .where((w) => w.isNotEmpty)
-        .map((w) => w.replaceAll(RegExp(r'[^\w]'), ''))
-        .where((w) => w.isNotEmpty)
         .toList();
-    if (words.isEmpty) return '';
-    return words.map((w) => '$w*').join(' ');
+    final rows = await (_db.select(_db.emails)
+          ..where((t) {
+            Expression<bool> condition = const Constant(true);
+            if (accountId != null) {
+              condition = t.accountId.equals(accountId);
+            }
+            for (final word in words) {
+              final pattern = '%$word%';
+              condition = condition &
+                  (t.subject.like(pattern) | t.preview.like(pattern));
+            }
+            return condition;
+          })
+          ..orderBy([(t) => OrderingTerm.desc(t.receivedAt)])
+          ..limit(50))
+        .get();
+    return rows.map(_toModel).toList();
   }
 
   @override

lib/data/repositories/search_history_repository_impl.dart

@@ -1,57 +0,0 @@
-import 'package:drift/drift.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
-import 'package:sharedinbox/data/db/database.dart';
-
-class SearchHistoryRepositoryImpl implements SearchHistoryRepository {
-  SearchHistoryRepositoryImpl(this._db);
-  final AppDatabase _db;
-
-  static const _maxEntries = 10;
-
-  @override
-  Future<List<String>> getRecentSearches() async {
-    final rows = await (_db.select(_db.searchHistoryEntries)
-          ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-          ..limit(_maxEntries))
-        .get();
-    return rows.map((r) => r.query).toList();
-  }
-
-  @override
-  Future<void> saveSearch(String query) async {
-    final trimmed = query.trim();
-    if (trimmed.isEmpty) return;
-
-    await _db.transaction(() async {
-      // Remove existing entry for same query (deduplication).
-      await (_db.delete(_db.searchHistoryEntries)
-            ..where((t) => t.query.equals(trimmed)))
-          .go();
-
-      await _db.into(_db.searchHistoryEntries).insert(
-            SearchHistoryEntriesCompanion.insert(
-              query: trimmed,
-              searchedAt: DateTime.now(),
-            ),
-          );
-
-      // Prune to the most recent _maxEntries.
-      final keepIds = await (_db.select(_db.searchHistoryEntries)
-            ..orderBy([(t) => OrderingTerm.desc(t.searchedAt)])
-            ..limit(_maxEntries))
-          .map((r) => r.id)
-          .get();
-
-      if (keepIds.isNotEmpty) {
-        await (_db.delete(_db.searchHistoryEntries)
-              ..where((t) => t.id.isNotIn(keepIds)))
-            .go();
-      }
-    });
-  }
-
-  @override
-  Future<void> clearHistory() async {
-    await _db.delete(_db.searchHistoryEntries).go();
-  }
-}

lib/di.dart

@@ -3,13 +3,11 @@ import 'dart:async';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 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/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_repository.dart';
 import 'package:sharedinbox/core/repositories/undo_repository.dart';
 import 'package:sharedinbox/core/services/account_discovery_service.dart';
 import 'package:sharedinbox/core/services/connection_test_service.dart';
@@ -19,14 +17,13 @@ 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;
+import 'package:sharedinbox/data/db/database.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 import 'package:sharedinbox/data/jmap/sieve_repository.dart';
 import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/draft_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/email_repository_impl.dart';
 import 'package:sharedinbox/data/repositories/mailbox_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/search_history_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/storage/flutter_secure_storage_impl.dart';
@@ -89,11 +86,6 @@ final undoRepositoryProvider = Provider<UndoRepository>((ref) {
   return UndoRepositoryImpl(ref.watch(dbProvider));
 });
 
-final searchHistoryRepositoryProvider =
-    Provider<SearchHistoryRepository>((ref) {
-  return SearchHistoryRepositoryImpl(ref.watch(dbProvider));
-});
-
 final syncLogRepositoryProvider = Provider((ref) {
   return SyncLogRepositoryImpl(ref.watch(dbProvider));
 });
@@ -176,27 +168,6 @@ final undoServiceProvider =
   return service;
 });
 
-/// Loads email header + body and marks the email as seen.
-/// Owned by [EmailDetailScreen]; decouples data loading from the widget tree.
-final emailDetailProvider = AsyncNotifierProvider.autoDispose
-    .family<EmailDetailNotifier, (Email?, EmailBody), String>(
-  EmailDetailNotifier.new,
-);
-
-class EmailDetailNotifier
-    extends AutoDisposeFamilyAsyncNotifier<(Email?, EmailBody), String> {
-  @override
-  Future<(Email?, EmailBody)> build(String emailId) async {
-    final repo = ref.read(emailRepositoryProvider);
-    final results = await Future.wait([
-      repo.getEmail(emailId),
-      repo.getEmailBody(emailId),
-    ]);
-    unawaited(repo.setFlag(emailId, seen: true));
-    return (results[0] as Email?, results[1] as EmailBody);
-  }
-}
-
 final accountByIdProvider =
     StreamProvider.autoDispose.family<model.Account?, String>((ref, accountId) {
   return ref.watch(accountRepositoryProvider).observeAccounts().map(

lib/ui/screens/email_detail_screen.dart

@@ -1,6 +1,5 @@
 import 'dart:async';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_html/flutter_html.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -27,137 +26,144 @@ class EmailDetailScreen extends ConsumerStatefulWidget {
 }
 
 class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
+  late final Future<(Email?, EmailBody)> _dataFuture;
   bool _isFlagged = false;
   bool _loadRemoteImages = false;
   final Set<String> _downloading = {};
 
+  @override
+  void initState() {
+    super.initState();
+    final repo = ref.read(emailRepositoryProvider);
+    _dataFuture = Future.wait([
+      repo.getEmail(widget.emailId),
+      repo.getEmailBody(widget.emailId),
+    ]).then((results) {
+      final email = results[0] as Email?;
+      if (email != null && mounted) {
+        setState(() => _isFlagged = email.isFlagged);
+      }
+      return (email, results[1] as EmailBody);
+    });
+    unawaited(repo.setFlag(widget.emailId, seen: true));
+  }
+
   @override
   Widget build(BuildContext context) {
     final repo = ref.watch(emailRepositoryProvider);
-    final detail = ref.watch(emailDetailProvider(widget.emailId));
+    return FutureBuilder<(Email?, EmailBody)>(
+      future: _dataFuture,
+      builder: (ctx, snap) {
+        final header = snap.data?.$1;
+        final body = snap.data?.$2;
 
-    ref.listen<AsyncValue<(Email?, EmailBody)>>(
-      emailDetailProvider(widget.emailId),
-      (_, next) {
-        final email = next.valueOrNull?.$1;
-        if (email != null && mounted) {
-          setState(() => _isFlagged = email.isFlagged);
-        }
-      },
-    );
-
-    final header = detail.valueOrNull?.$1;
-    final body = detail.valueOrNull?.$2;
-
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(
-          header?.subject ?? '(loading…)',
-          overflow: TextOverflow.ellipsis,
-        ),
-        actions: [
-          IconButton(
-            icon: const Icon(Icons.reply),
-            tooltip: 'Reply',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: false));
-                  },
-          ),
-          IconButton(
-            icon: const Icon(Icons.reply_all),
-            tooltip: 'Reply all',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_reply(context, header, body, replyAll: true));
-                  },
-          ),
-          IconButton(
-            icon: const Icon(Icons.forward),
-            tooltip: 'Forward',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_forward(context, header, body));
-                  },
-          ),
-          IconButton(
-            icon: const Icon(Icons.mark_email_unread_outlined),
-            tooltip: 'Mark as unread',
-            onPressed: () async {
-              await repo.setFlag(widget.emailId, seen: false);
-              if (context.mounted) context.pop();
-            },
-          ),
-          IconButton(
-            icon: Icon(
-              _isFlagged ? Icons.star : Icons.star_border,
-              color: _isFlagged ? Colors.amber : null,
+        return Scaffold(
+          appBar: AppBar(
+            title: Text(
+              header?.subject ?? '(loading…)',
+              overflow: TextOverflow.ellipsis,
             ),
-            tooltip: _isFlagged ? 'Unflag' : 'Flag',
-            onPressed: () async {
-              final next = !_isFlagged;
-              await repo.setFlag(widget.emailId, flagged: next);
-              if (mounted) setState(() => _isFlagged = next);
-            },
-          ),
-          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: const Icon(Icons.delete),
-            tooltip: 'Delete',
-            onPressed: () async {
-              final destPath = await repo.deleteEmail(widget.emailId);
+            actions: [
+              IconButton(
+                icon: const Icon(Icons.reply),
+                tooltip: 'Reply',
+                onPressed: header == null
+                    ? null
+                    : () => _reply(context, header, body, replyAll: false),
+              ),
+              IconButton(
+                icon: const Icon(Icons.reply_all),
+                tooltip: 'Reply all',
+                onPressed: header == null
+                    ? null
+                    : () => _reply(context, header, body, replyAll: true),
+              ),
+              IconButton(
+                icon: const Icon(Icons.forward),
+                tooltip: 'Forward',
+                onPressed: header == null
+                    ? null
+                    : () => _forward(context, header, body),
+              ),
+              IconButton(
+                icon: const Icon(Icons.mark_email_unread_outlined),
+                tooltip: 'Mark as unread',
+                onPressed: () async {
+                  await repo.setFlag(widget.emailId, seen: false);
+                  if (context.mounted) context.pop();
+                },
+              ),
+              IconButton(
+                icon: Icon(
+                  _isFlagged ? Icons.star : Icons.star_border,
+                  color: _isFlagged ? Colors.amber : null,
+                ),
+                tooltip: _isFlagged ? 'Unflag' : 'Flag',
+                onPressed: () async {
+                  final next = !_isFlagged;
+                  await repo.setFlag(widget.emailId, flagged: next);
+                  if (mounted) setState(() => _isFlagged = next);
+                },
+              ),
+              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: const Icon(Icons.delete),
+                tooltip: 'Delete',
+                onPressed: () async {
+                  final destPath = await repo.deleteEmail(widget.emailId);
 
-              if (header != null) {
-                unawaited(
-                  ref.read(undoServiceProvider.notifier).pushAction(
-                        UndoAction(
-                          id: DateTime.now().toIso8601String(),
-                          accountId: header.accountId,
-                          type: UndoType.delete,
-                          emailIds: [widget.emailId],
-                          sourceMailboxPath: header.mailboxPath,
-                          destinationMailboxPath: destPath,
-                          originalEmails: [header],
-                        ),
-                      ),
-                );
-              }
+                  if (header != null) {
+                    unawaited(
+                      ref.read(undoServiceProvider.notifier).pushAction(
+                            UndoAction(
+                              id: DateTime.now().toIso8601String(),
+                              accountId: header.accountId,
+                              type: UndoType.delete,
+                              emailIds: [widget.emailId],
+                              sourceMailboxPath: header.mailboxPath,
+                              destinationMailboxPath: destPath,
+                              originalEmails: [header],
+                            ),
+                          ),
+                    );
+                  }
 
-              if (context.mounted) context.pop();
-            },
-          ),
-          PopupMenuButton<String>(
-            itemBuilder: (ctx) => [
-              const PopupMenuItem(
-                value: 'headers',
-                child: Text('Show Mail Headers'),
+                  if (context.mounted) context.pop();
+                },
+              ),
+              PopupMenuButton<String>(
+                itemBuilder: (ctx) => [
+                  const PopupMenuItem(
+                    value: 'headers',
+                    child: Text('Show Mail Headers'),
+                  ),
+                ],
+                onSelected: (value) {
+                  if (value == 'headers' && body != null) {
+                    _showHeaders(context, body);
+                  }
+                },
               ),
             ],
-            onSelected: (value) {
-              if (value == 'headers' && body != null) {
-                _showHeaders(context, body);
-              }
-            },
           ),
-        ],
-      ),
-      body: detail.when(
-        loading: () => const Center(child: CircularProgressIndicator()),
-        error: (e, _) => Center(child: Text('Error: $e')),
-        data: (d) => _buildBody(context, d.$1, d.$2),
-      ),
+          body: snap.connectionState == ConnectionState.waiting
+              ? const Center(child: CircularProgressIndicator())
+              : snap.hasError
+                  ? Center(child: Text('Error: ${snap.error}'))
+                  : _buildBody(ctx, header, body!),
+        );
+      },
     );
   }
 
@@ -271,31 +277,26 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<String> _quotedBody(Email header, EmailBody? body) async {
+  String _quotedBody(Email header, EmailBody? body) {
     final date = header.sentAt != null ? _dateFmt.format(header.sentAt!) : '';
     final from =
         header.from.isNotEmpty ? header.from.first.toString() : '(unknown)';
-    final rawText = body?.textBody;
-    final text = (rawText != null && rawText.isNotEmpty)
-        ? rawText
-        : await compute(htmlToPlain, body?.htmlBody ?? '');
+    final text = body?.textBody ?? htmlToPlain(body?.htmlBody ?? '');
     final quoted = text.trim().split('\n').map((l) => '> $l').join('\n');
     return '\n\n— On $date, $from wrote:\n$quoted';
   }
 
-  Future<void> _reply(
+  void _reply(
     BuildContext context,
     Email header,
     EmailBody? body, {
     required bool replyAll,
-  }) async {
+  }) {
     final to = header.from.isNotEmpty ? header.from.first.email : '';
     final subject = (header.subject?.startsWith('Re:') ?? false)
         ? header.subject!
         : 'Re: ${header.subject ?? ''}';
     final cc = replyAll ? header.to.map((a) => a.email).join(', ') : '';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
@@ -303,29 +304,23 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
           'replyToEmailId': widget.emailId,
           'prefillTo': to,
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
           if (cc.isNotEmpty) 'prefillCc': cc,
         },
       ),
     );
   }
 
-  Future<void> _forward(
-    BuildContext context,
-    Email header,
-    EmailBody? body,
-  ) async {
+  void _forward(BuildContext context, Email header, EmailBody? body) {
     final subject = (header.subject?.startsWith('Fwd:') ?? false)
         ? header.subject!
         : 'Fwd: ${header.subject ?? ''}';
-    final quoted = await _quotedBody(header, body);
-    if (!context.mounted) return;
     unawaited(
       context.push(
         '/compose',
         extra: {
           'prefillSubject': subject,
-          'prefillBody': quoted,
+          'prefillBody': _quotedBody(header, body),
         },
       ),
     );

lib/ui/screens/email_list_screen.dart

@@ -45,10 +45,6 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   List<EmailThread> _currentThreads = [];
   // Individual email selection used in search results.
   final Set<String> _selectedSearchIds = {};
-
-  // Pagination: number of threads currently requested from the DB.
-  static const _pageSize = 50;
-  int _limit = _pageSize;
   bool get _selecting =>
       _selectedThreadIds.isNotEmpty || _selectedSearchIds.isNotEmpty;
 
@@ -193,22 +189,6 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                   extra: {'accountId': widget.accountId},
                 ),
               ),
-              PopupMenuButton<String>(
-                onSelected: (value) async {
-                  if (value == 'mark_all_read') {
-                    await emailRepo.markAllAsRead(
-                      widget.accountId,
-                      widget.mailboxPath,
-                    );
-                  }
-                },
-                itemBuilder: (_) => const [
-                  PopupMenuItem(
-                    value: 'mark_all_read',
-                    child: Text('Mark all as read'),
-                  ),
-                ],
-              ),
             ],
       bottom: PreferredSize(
         preferredSize: const Size.fromHeight(60),
@@ -363,11 +343,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
         await emailRepo.syncEmails(widget.accountId, widget.mailboxPath);
       },
       child: StreamBuilder<List<EmailThread>>(
-        stream: emailRepo.observeThreads(
-          widget.accountId,
-          widget.mailboxPath,
-          limit: _limit,
-        ),
+        stream: emailRepo.observeThreads(widget.accountId, widget.mailboxPath),
         builder: (ctx, snap) {
           if (!snap.hasData) {
             return const Center(child: CircularProgressIndicator());
@@ -563,16 +539,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   }
 
   Widget _buildThreadList(List<EmailThread> threads) {
-    final hasMore = threads.length == _limit;
     return ListView.builder(
-      itemCount: threads.length + (hasMore ? 1 : 0),
+      itemCount: threads.length,
       itemBuilder: (ctx, i) {
-        if (i == threads.length) {
-          return TextButton(
-            onPressed: () => setState(() => _limit += _pageSize),
-            child: const Text('Load more'),
-          );
-        }
         final t = threads[i];
         final isSelected = _selectedThreadIds.contains(t.threadId);
         final senderNames =

lib/ui/screens/search_screen.dart

@@ -10,11 +10,6 @@ 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 {
-  return ref.watch(searchHistoryRepositoryProvider).getRecentSearches();
-});
-
 class SearchScreen extends ConsumerStatefulWidget {
   const SearchScreen({super.key, this.accountId});
   final String? accountId;
@@ -25,24 +20,13 @@ class SearchScreen extends ConsumerStatefulWidget {
 
 class _SearchScreenState extends ConsumerState<SearchScreen> {
   final _ctrl = TextEditingController();
-  final _focusNode = FocusNode();
   Timer? _debounce;
   _SearchResults? _results;
   bool _loading = false;
-  bool _fieldFocused = false;
-
-  @override
-  void initState() {
-    super.initState();
-    _focusNode.addListener(() {
-      if (mounted) setState(() => _fieldFocused = _focusNode.hasFocus);
-    });
-  }
 
   @override
   void dispose() {
     _ctrl.dispose();
-    _focusNode.dispose();
     _debounce?.cancel();
     super.dispose();
   }
@@ -61,12 +45,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
 
   Future<void> _search(String query) async {
     setState(() => _loading = true);
-    unawaited(
-      ref
-          .read(searchHistoryRepositoryProvider)
-          .saveSearch(query)
-          .then((_) => ref.invalidate(_searchHistoryProvider)),
-    );
     try {
       final emailRepo = ref.read(emailRepositoryProvider);
       final mailboxRepo = ref.read(mailboxRepositoryProvider);
@@ -134,7 +112,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       appBar: AppBar(
         title: TextField(
           controller: _ctrl,
-          focusNode: _focusNode,
           autofocus: true,
           decoration: const InputDecoration(
             hintText: 'Search folders, addresses, emails…',
@@ -160,9 +137,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
   Widget _buildBody() {
     if (_loading) return const Center(child: CircularProgressIndicator());
     if (_results == null) {
-      if (_fieldFocused && _ctrl.text.isEmpty) {
-        return _buildHistoryPanel();
-      }
       return const Center(child: Text('Type 3+ characters to search'));
     }
     final r = _results!;
@@ -195,66 +169,6 @@ class _SearchScreenState extends ConsumerState<SearchScreen> {
       ],
     );
   }
-
-  Widget _buildHistoryPanel() {
-    final history = ref.watch(_searchHistoryProvider);
-    return history.when(
-      loading: () => const Center(child: Text('Type 3+ characters to search')),
-      error: (_, __) =>
-          const Center(child: Text('Type 3+ characters to search')),
-      data: (terms) {
-        if (terms.isEmpty) {
-          return const Center(child: Text('Type 3+ characters to search'));
-        }
-        return Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Padding(
-              padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
-              child: Row(
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                children: [
-                  Text(
-                    'Recent searches',
-                    style: Theme.of(context).textTheme.labelLarge,
-                  ),
-                  TextButton(
-                    onPressed: () async {
-                      await ref
-                          .read(searchHistoryRepositoryProvider)
-                          .clearHistory();
-                      ref.invalidate(_searchHistoryProvider);
-                    },
-                    child: const Text('Clear'),
-                  ),
-                ],
-              ),
-            ),
-            Padding(
-              padding: const EdgeInsets.symmetric(horizontal: 12),
-              child: Wrap(
-                spacing: 8,
-                runSpacing: 4,
-                children: [
-                  for (final term in terms)
-                    ActionChip(
-                      label: Text(term),
-                      onPressed: () {
-                        _ctrl.text = term;
-                        _ctrl.selection = TextSelection.fromPosition(
-                          TextPosition(offset: term.length),
-                        );
-                        unawaited(_search(term));
-                      },
-                    ),
-                ],
-              ),
-            ),
-          ],
-        );
-      },
-    );
-  }
 }
 
 class _SearchResults {

plan-claude.md

@@ -1,155 +0,0 @@
-# SharedInbox — Improvement Plan
-
-30 tasks across 7 perspectives. Priority markers: 🔴 high · 🟡 medium · 🟢 nice-to-have.
-
----
-
-## Group 1: Performance
-
-### P1 — Done: https://codeberg.org/guettli/sharedinbox/pulls/41
-
-### P1 🔴 Replace LIKE-based search with FTS5 virtual table
-The current `observeEmails` and search queries use `LIKE '%query%'` which becomes a full-table scan at scale.
-Create an `email_fts` FTS5 virtual table (subject, preview, fromJson) populated via trigger or sync-time insert.
-Wire `SearchScreen` to query the FTS table instead.
-Files: `lib/data/db/database.dart`, `lib/data/repositories/email_repository_impl.dart`.
-
-### P2 🔴 Lazy-load email bodies on scroll (pagination)
-`observeThreads` and `observeEmails` return the full list with no limit. As the mailbox grows this streams thousands of rows into memory.
-Add a page-size parameter (e.g. 50) with "load more" support in `EmailListScreen`.
-The `EmailBodies` table is already separate — never fetch bodies in the list query.
-Files: `lib/data/repositories/email_repository_impl.dart`, `lib/ui/screens/email_list_screen.dart`.
-
-### P3 🟡 Defer HTML parsing off the UI thread using an Isolate
-`flutter_html` parsing blocks the raster thread for large HTML bodies, causing jank when opening email detail.
-Move the HTML→Widget tree conversion (or at minimum the `html_utils.dart` HTML-to-plain step) into a `compute()` call.
-Files: `lib/ui/screens/email_detail_screen.dart`, `lib/core/utils/html_utils.dart`.
-
-### P4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/36
-
-### P5 🟢 Cache the formatted date strings in EmailListScreen
-`DateFormat('MMM d').format(...)` is called for every email on every rebuild. Compute and cache these in the model layer or inside the list item widget's `build` method using a static cache map.
-Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/utils/format_utils.dart`.
-
----
-
-## Group 2: Reliability & Resilience
-
-### R1 — Done: https://codeberg.org/guettli/sharedinbox/pulls/20
-
-### R2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/22
-
-### R3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/35
-
-### R4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/23
-
-### R5 — Done: https://codeberg.org/guettli/sharedinbox/pulls/45
-
-### R6 — Done: https://codeberg.org/guettli/sharedinbox/pulls/24
-
----
-
-## Group 3: Security
-
-### S1 🔴 Optional SQLCipher encryption for the Drift database
-Emails cached locally are plaintext. Users on shared or rooted devices are exposed.
-Add an opt-in "Encrypt local storage" setting using `drift`'s `encrypted` backend (`sqflite_cipher` / `sqlcipher_flutter_libs`).
-Store the database key in `flutter_secure_storage` (already present).
-Files: `lib/data/db/database.dart`, `pubspec.yaml`, a new settings toggle.
-
-### S2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/25
-
-### S3 🟡 Enforce certificate pinning for known providers (opt-in)
-Auto-discovered accounts for major providers (Gmail, Fastmail, Proton) could be pinned to their known CA hierarchy.
-Implement as an opt-in per-account setting; only applies when the account is auto-discovered via `AccountDiscoveryService`.
-Files: `lib/core/services/account_discovery_service.dart`, `lib/data/imap/imap_client_factory.dart`.
-
-### S4 🟢 Audit and restrict external link handling in HTML emails
-`flutter_html` passes `<a href>` clicks to `url_launcher` without a prompt.
-Before launching, show a confirmation dialog with the destination URL so phishing links are visible.
-Files: `lib/ui/screens/email_detail_screen.dart`.
-
----
-
-## Group 4: User Experience
-
-### U1 — Done: https://codeberg.org/guettli/sharedinbox/pulls/26
-
-### U2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/27
-
-### U3 🟡 Add "Recent searches" history to SearchScreen
-The search bar clears on navigation. Store the last 10 search terms in a local DB table and show them as chips below the search field when the field is focused but empty.
-Files: `lib/ui/screens/search_screen.dart`, `lib/data/db/database.dart`.
-
-### U4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/28
-
-### U5 — Already implemented (Dismissible archive/delete swipes with undo, found in email_list_screen.dart)
-
-### U6 — Done: https://codeberg.org/guettli/sharedinbox/pulls/29
-
-### U7 🟢 Onboarding walkthrough for first-time users
-The app opens directly to an empty account list with only a `+` button. First-time users have no guidance.
-Add a one-time welcome card or bottom-sheet with the three-step flow: Add account → wait for sync → open inbox.
-Files: `lib/ui/screens/account_list_screen.dart`.
-
-### U8 🟢 "Mark all as read" action in mailbox
-Power users managing high-volume mailboxes need bulk read marking. Add a "Mark all as read" option in the mailbox overflow menu.
-Files: `lib/ui/screens/email_list_screen.dart`, `lib/core/repositories/email_repository.dart`, `lib/data/repositories/email_repository_impl.dart`.
-
----
-
-## Group 5: Testing
-
-### T1 — Done: https://codeberg.org/guettli/sharedinbox/pulls/30
-
-### T2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/31
-
-### T3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/43
-
-### T3 🟡 Contract tests for all Repository interfaces
-The interfaces in `core/repositories/` have no shared contract test suite. Concrete impls can silently diverge.
-Add a shared `EmailRepositoryContract` abstract test class; run it against both `EmailRepositoryImpl` and any future mock/fake. Mirror this for `MailboxRepository` and `AccountRepository`.
-Files: `test/unit/` (new contract test files).
-
-### T4 — Done: https://codeberg.org/guettli/sharedinbox/pulls/32
-
-### T5 🟢 Snapshot / golden tests for key email list states
-The email list has multiple states: loading, empty, normal, selection mode, search active, error banner.
-Add golden tests using `matchesGoldenFile` for each state so visual regressions surface in CI.
-Files: `test/widget/email_list_screen_test.dart`.
-
----
-
-## Group 6: Architecture & Code Quality
-
-### A1 — Done: https://codeberg.org/guettli/sharedinbox/pulls/39
-
-### A2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/33
-
-### A3 — Done: https://codeberg.org/guettli/sharedinbox/pulls/46
-
-### A4 🟡 Replace raw JSON strings in DB with structured encoding
-`fromJson`, `toAddresses`, `ccJson`, `references` are stored as raw JSON strings parsed on every model conversion.
-Create typed value classes with `fromJson`/`toJson` in `core/models/email.dart` and add a `TypeConverter` in the Drift schema so the DB layer owns the serialisation.
-Files: `lib/data/db/database.dart`, `lib/core/models/email.dart`, `lib/data/repositories/email_repository_impl.dart`.
-
-### A5 🟢 Enforce layer boundaries via lint custom rules or barrel imports
-The `ui/` layer directly imports `data/` concrete classes in several screens (e.g. `drift` types leak through).
-Add a custom `analysis_options.yaml` rule or a CI lint step that flags any `ui/` import of `data/` (only `core/` interfaces are allowed from UI).
-Files: `analysis_options.yaml`, CI config.
-
----
-
-## Group 7: Developer Experience
-
-### D1 🔴 CI matrix for macOS and Windows builds
-The CI currently tests Linux and Android. The macOS and Windows targets are "scaffolded" and may have accumulated silent breakage.
-Add `flutter build macos --debug` and `flutter build windows --debug` jobs to the CI workflow with the same failure threshold as Linux.
-Files: `.github/workflows/ci.yml` (or Codeberg equivalent).
-
-### D2 — Done: https://codeberg.org/guettli/sharedinbox/pulls/34
-
-### D3 🟢 Document the sync protocol in a SYNC.md architecture doc
-`DB-SYNC.md` exists but focuses on the DB schema. The IMAP IDLE loop, exponential backoff, pending-change queue, and undo cancel logic are spread across four files with no single reference.
-Write `SYNC.md` that describes the full lifecycle of an email action from UI tap to server confirmation.
-Files: `SYNC.md` (new).

pubspec.yaml

@@ -47,7 +47,7 @@ dependencies:
 
   # Background sync and local notifications
   flutter_local_notifications: ^18.0.1
-  workmanager: ^0.9.0
+  workmanager: ^0.5.2
 
 dev_dependencies:
   flutter_test:

scripts/check_coverage.dart

@@ -17,7 +17,6 @@ const _noCode = {
   'lib/core/repositories/mailbox_repository.dart',
   'lib/core/repositories/sync_log_repository.dart',
   'lib/core/repositories/undo_repository.dart',
-  'lib/core/repositories/search_history_repository.dart',
   'lib/core/models/undo_action.dart',
   'lib/core/storage/secure_storage.dart',
 };
@@ -62,7 +61,6 @@ const _excluded = {
   'lib/data/repositories/mailbox_repository_impl.dart',
   'lib/data/repositories/sync_log_repository_impl.dart',
   'lib/data/repositories/undo_repository_impl.dart',
-  'lib/data/repositories/search_history_repository_impl.dart',
 };
 
 void main() {

scripts/deploy_playstore.py

@@ -4,10 +4,7 @@
 import json
 import os
 import sys
-import time
 
-import google_auth_httplib2
-import httplib2
 from google.oauth2 import service_account
 from googleapiclient.discovery import build
 from googleapiclient.http import MediaFileUpload
@@ -15,15 +12,6 @@ from googleapiclient.http import MediaFileUpload
 PACKAGE_NAME = "de.sharedinbox.mua"
 AAB_PATH = "build/app/outputs/bundle/release/app-release.aab"
 TRACK = "internal"
-_TIMEOUT = 300  # seconds — AAB uploads can be large
-_MAX_UPLOAD_ATTEMPTS = 3
-
-
-def _make_service(creds):
-    authorized_http = google_auth_httplib2.AuthorizedHttp(
-        creds, http=httplib2.Http(timeout=_TIMEOUT)
-    )
-    return build("androidpublisher", "v3", http=authorized_http)
 
 
 def main():
@@ -41,43 +29,19 @@ def main():
         scopes=["https://www.googleapis.com/auth/androidpublisher"],
     )
 
-    service = _make_service(creds)
+    service = build("androidpublisher", "v3", credentials=creds)
 
-    edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute(num_retries=3)
+    edit = service.edits().insert(body={}, packageName=PACKAGE_NAME).execute()
     edit_id = edit["id"]
 
-    # The resumable upload can fail with RedirectMissingLocation on transient
-    # network hiccups. Retry the upload (with a fresh MediaFileUpload each
-    # time) using exponential backoff before giving up.
-    version_code = None
-    last_exc = None
-    for attempt in range(_MAX_UPLOAD_ATTEMPTS):
-        try:
-            media = MediaFileUpload(
-                AAB_PATH, mimetype="application/octet-stream", resumable=True
-            )
-            bundle = (
-                service.edits()
-                .bundles()
-                .upload(packageName=PACKAGE_NAME, editId=edit_id, media_body=media)
-                .execute(num_retries=3)
-            )
-            version_code = bundle["versionCode"]
-            break
-        except httplib2.error.RedirectMissingLocation as exc:
-            last_exc = exc
-            if attempt < _MAX_UPLOAD_ATTEMPTS - 1:
-                delay = 10 * (2 ** attempt)
-                print(
-                    f"Upload attempt {attempt + 1} failed (redirect error), "
-                    f"retrying in {delay}s…"
-                )
-                time.sleep(delay)
-    else:
-        raise RuntimeError(
-            f"AAB upload failed after {_MAX_UPLOAD_ATTEMPTS} attempts"
-        ) from last_exc
-
+    media = MediaFileUpload(AAB_PATH, mimetype="application/octet-stream", resumable=True)
+    bundle = (
+        service.edits()
+        .bundles()
+        .upload(packageName=PACKAGE_NAME, editId=edit_id, media_body=media)
+        .execute()
+    )
+    version_code = bundle["versionCode"]
     print(f"Uploaded AAB, version code: {version_code}")
 
     service.edits().tracks().update(
@@ -85,9 +49,9 @@ def main():
         editId=edit_id,
         track=TRACK,
         body={"releases": [{"versionCodes": [version_code], "status": "completed"}]},
-    ).execute(num_retries=3)
+    ).execute()
 
-    service.edits().commit(packageName=PACKAGE_NAME, editId=edit_id).execute(num_retries=3)
+    service.edits().commit(packageName=PACKAGE_NAME, editId=edit_id).execute()
     print(f"Deployed version {version_code} to {TRACK} track")
 
 

test/integration/account_sync_manager_test.dart

@@ -1,7 +1,5 @@
 import 'dart:async';
-import 'dart:io';
 
-import 'package:enough_mail/enough_mail.dart' as imap;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart';
@@ -12,16 +10,8 @@ import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
 import 'package:sharedinbox/core/repositories/sync_log_repository.dart';
 import 'package:sharedinbox/core/sync/account_sync_manager.dart';
 
-Future<imap.ImapClient> _fakeImapConnect(
-  Account account,
-  String username,
-  String password,
-) async =>
-    throw const SocketException('fake — no real IMAP server in tests');
-
 void main() {
-  test('AccountSyncManager schedules IMAP sync for multiple accounts',
-      () async {
+  test('AccountSyncManager schedules sync for multiple accounts', () async {
     final accounts = _FakeAccounts('pw');
     final mailboxes = _FakeMailboxes();
     final emails = _FakeEmails();
@@ -32,7 +22,6 @@ void main() {
       mailboxes,
       emails,
       syncLog: logs,
-      imapConnect: _fakeImapConnect,
     );
 
     final a1 = _account('1');
@@ -49,34 +38,6 @@ void main() {
 
     manager.dispose();
   });
-
-  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 a1 = _jmapAccount('1');
-    final a2 = _jmapAccount('2');
-
-    manager.start();
-    accounts.push([a1, a2]);
-
-    await Future<void>.delayed(const Duration(milliseconds: 100));
-
-    expect(emails.syncCounts['1'], greaterThanOrEqualTo(1));
-    expect(emails.syncCounts['2'], greaterThanOrEqualTo(1));
-
-    manager.dispose();
-  });
 }
 
 Account _account(String id) => Account(
@@ -91,17 +52,6 @@ Account _account(String id) => Account(
       smtpSsl: false,
     );
 
-Account _jmapAccount(String id) => Account(
-      id: id,
-      displayName: 'Account $id',
-      email: '$id@example.com',
-      type: AccountType.jmap,
-      jmapUrl: 'http://localhost:8080/.well-known/jmap',
-      smtpHost: 'localhost',
-      smtpPort: 25,
-      smtpSsl: false,
-    );
-
 class _FakeAccounts implements AccountRepository {
   _FakeAccounts(this.password);
   final String password;
@@ -155,19 +105,10 @@ class _FakeEmails implements EmailRepository {
   final syncCounts = <String, int>{};
 
   @override
-  Stream<List<Email>> observeEmails(
-    String a,
-    String m, {
-    int limit = 50,
-  }) =>
-      Stream.value([]);
+  Stream<List<Email>> observeEmails(String a, String m) => Stream.value([]);
 
   @override
-  Stream<List<EmailThread>> observeThreads(
-    String a,
-    String m, {
-    int limit = 50,
-  }) =>
+  Stream<List<EmailThread>> observeThreads(String a, String m) =>
       Stream.value([]);
 
   @override
@@ -190,9 +131,6 @@ class _FakeEmails implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
 
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-
   @override
   Future<void> moveEmail(String id, String dest) async {}
 

test/unit/account_repository_contract_test.dart

@@ -1,107 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:sharedinbox/core/models/account.dart';
-import 'package:sharedinbox/core/repositories/account_repository.dart';
-import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
-
-import 'account_repository_impl_test.dart' show MapSecureStorage;
-import 'db_test_helper.dart';
-
-// ── Contract ──────────────────────────────────────────────────────────────────
-
-/// Verifies the [AccountRepository] interface contract.
-///
-/// Subclass this and override [makeRepo] to run the same suite against any
-/// concrete implementation.
-abstract class AccountRepositoryContract {
-  AccountRepository makeRepo();
-
-  static const _a = Account(
-    id: 'c-1',
-    displayName: 'Contract',
-    email: 'c@example.com',
-    imapHost: 'imap.example.com',
-    smtpHost: 'smtp.example.com',
-  );
-
-  void run() {
-    test('observeAccounts starts empty', () async {
-      final repo = makeRepo();
-      expect(await repo.observeAccounts().first, isEmpty);
-    });
-
-    test('addAccount makes account visible via observeAccounts', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'pw');
-      final list = await repo.observeAccounts().first;
-      expect(list, hasLength(1));
-      expect(list.first.id, _a.id);
-    });
-
-    test('getAccount returns null for unknown id', () async {
-      final repo = makeRepo();
-      expect(await repo.getAccount('no-such'), isNull);
-    });
-
-    test('getAccount returns added account', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'pw');
-      final a = await repo.getAccount(_a.id);
-      expect(a, isNotNull);
-      expect(a!.email, _a.email);
-    });
-
-    test('getPassword returns stored password', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'secret123');
-      expect(await repo.getPassword(_a.id), 'secret123');
-    });
-
-    test('updateAccount reflects changes in observeAccounts', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'pw');
-      final updated = _a.copyWith(displayName: 'Updated');
-      await repo.updateAccount(updated);
-      final list = await repo.observeAccounts().first;
-      expect(list.first.displayName, 'Updated');
-    });
-
-    test('updateAccount with password updates stored password', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'old');
-      await repo.updateAccount(_a, password: 'new');
-      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('getAccount returns null after removeAccount', () async {
-      final repo = makeRepo();
-      await repo.addAccount(_a, 'pw');
-      await repo.removeAccount(_a.id);
-      expect(await repo.getAccount(_a.id), isNull);
-    });
-  }
-}
-
-// ── Impl under test ───────────────────────────────────────────────────────────
-
-class _AccountRepositoryImplContract extends AccountRepositoryContract {
-  @override
-  AccountRepository makeRepo() =>
-      AccountRepositoryImpl(openTestDatabase(), MapSecureStorage());
-}
-
-void main() {
-  setUpAll(configureSqliteForTests);
-
-  group('AccountRepositoryImpl satisfies AccountRepository contract', () {
-    _AccountRepositoryImplContract().run();
-  });
-}

test/unit/account_sync_manager_test.dart

@@ -34,18 +34,9 @@ void main() {
 
 class FakeEmailRepository implements EmailRepository {
   @override
-  Stream<List<Email>> observeEmails(
-    String a,
-    String m, {
-    int limit = 50,
-  }) =>
-      Stream.value([]);
+  Stream<List<Email>> observeEmails(String a, String m) => Stream.value([]);
   @override
-  Stream<List<EmailThread>> observeThreads(
-    String a,
-    String m, {
-    int limit = 50,
-  }) =>
+  Stream<List<EmailThread>> observeThreads(String a, String m) =>
       Stream.value([]);
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
@@ -61,8 +52,6 @@ class FakeEmailRepository implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
   @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-  @override
   Future<void> moveEmail(String id, String dest) async {}
 
   @override

test/unit/account_sync_manager_test.mocks.dart

@@ -216,9 +216,8 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
   @override
   _i4.Stream<List<_i2.Email>> observeEmails(
     String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
-  }) =>
+    String? mailboxPath,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
           #observeEmails,
@@ -226,7 +225,6 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
             accountId,
             mailboxPath,
           ],
-          {#limit: limit},
         ),
         returnValue: _i4.Stream<List<_i2.Email>>.empty(),
       ) as _i4.Stream<List<_i2.Email>>);
@@ -234,9 +232,8 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
   @override
   _i4.Stream<List<_i2.EmailThread>> observeThreads(
     String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
-  }) =>
+    String? mailboxPath,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
           #observeThreads,
@@ -244,7 +241,6 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
             accountId,
             mailboxPath,
           ],
-          {#limit: limit},
         ),
         returnValue: _i4.Stream<List<_i2.EmailThread>>.empty(),
       ) as _i4.Stream<List<_i2.EmailThread>>);
@@ -337,23 +333,6 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
 
-  @override
-  _i4.Future<void> markAllAsRead(
-    String? accountId,
-    String? mailboxPath,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #markAllAsRead,
-          [
-            accountId,
-            mailboxPath,
-          ],
-        ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
-
   @override
   _i4.Future<void> moveEmail(
     String? emailId,

test/unit/email_repository_contract_test.dart

@@ -1,222 +0,0 @@
-import 'package:drift/drift.dart' show Value;
-import 'package:enough_mail/enough_mail.dart' as imap;
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:sharedinbox/core/models/account.dart';
-import 'package:sharedinbox/core/repositories/email_repository.dart';
-import 'package:sharedinbox/data/db/database.dart' hide Account;
-import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/email_repository_impl.dart';
-
-import 'account_repository_impl_test.dart' show MapSecureStorage;
-import 'db_test_helper.dart';
-
-// ── Contract ──────────────────────────────────────────────────────────────────
-
-/// Verifies the observable / local-state portion of the [EmailRepository]
-/// interface contract.
-///
-/// Network-dependent methods (syncEmails, sendEmail, etc.) are intentionally
-/// excluded — they are covered by the concrete impl tests.
-abstract class EmailRepositoryContract {
-  static const _account = Account(
-    id: 'er-acc',
-    displayName: 'Contract',
-    email: 'er@example.com',
-    imapHost: 'imap.example.com',
-    smtpHost: 'smtp.example.com',
-  );
-
-  /// Return a fresh [EmailRepository] with [_account] already persisted.
-  Future<EmailRepository> makeRepo();
-
-  /// Insert a raw email row so tests can assert on observable state without
-  /// triggering a network sync.
-  Future<void> insertEmail(
-    EmailRepository repo, {
-    required String id,
-    required String mailboxPath,
-    bool isSeen = true,
-    bool isFlagged = false,
-    DateTime? receivedAt,
-  });
-
-  void run() {
-    test('observeEmails starts empty', () async {
-      final repo = await makeRepo();
-      expect(
-        await repo.observeEmails(_account.id, 'INBOX').first,
-        isEmpty,
-      );
-    });
-
-    test('observeEmails emits inserted email', () async {
-      final repo = await makeRepo();
-      await insertEmail(repo, id: 'er-acc:1', mailboxPath: 'INBOX');
-      final emails = await repo.observeEmails(_account.id, 'INBOX').first;
-      expect(emails, hasLength(1));
-      expect(emails.first.id, 'er-acc:1');
-    });
-
-    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,
-      );
-    });
-
-    test('observeEmails orders by receivedAt descending', () async {
-      final repo = await makeRepo();
-      final older = DateTime(2024);
-      final newer = DateTime(2024, 6);
-      await insertEmail(
-        repo,
-        id: 'er-acc:1',
-        mailboxPath: 'INBOX',
-        receivedAt: older,
-      );
-      await insertEmail(
-        repo,
-        id: 'er-acc:2',
-        mailboxPath: 'INBOX',
-        receivedAt: newer,
-      );
-      final emails = await repo.observeEmails(_account.id, 'INBOX').first;
-      expect(emails.first.id, 'er-acc:2');
-      expect(emails.last.id, 'er-acc:1');
-    });
-
-    test('getEmail returns null for unknown id', () async {
-      final repo = await makeRepo();
-      expect(await repo.getEmail('no-such'), isNull);
-    });
-
-    test('getEmail returns inserted email', () async {
-      final repo = await makeRepo();
-      await insertEmail(repo, id: 'er-acc:7', mailboxPath: 'INBOX');
-      final email = await repo.getEmail('er-acc:7');
-      expect(email, isNotNull);
-      expect(email!.accountId, _account.id);
-    });
-
-    test('setFlag seen updates isSeen', () async {
-      final repo = await makeRepo();
-      await insertEmail(
-        repo,
-        id: 'er-acc:10',
-        mailboxPath: 'INBOX',
-        isSeen: false,
-      );
-      await repo.setFlag('er-acc:10', seen: true);
-      final email = await repo.getEmail('er-acc:10');
-      expect(email!.isSeen, isTrue);
-    });
-
-    test('setFlag flagged updates isFlagged', () async {
-      final repo = await makeRepo();
-      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);
-    });
-
-    test('markAllAsRead marks every unread email in the mailbox', () async {
-      final repo = await makeRepo();
-      await insertEmail(
-        repo,
-        id: 'er-acc:20',
-        mailboxPath: 'INBOX',
-        isSeen: false,
-      );
-      await insertEmail(
-        repo,
-        id: 'er-acc:21',
-        mailboxPath: 'INBOX',
-        isSeen: false,
-      );
-      await insertEmail(
-        repo,
-        id: 'er-acc:22',
-        mailboxPath: 'Sent',
-        isSeen: false,
-      );
-
-      await repo.markAllAsRead(_account.id, 'INBOX');
-
-      expect((await repo.getEmail('er-acc:20'))!.isSeen, isTrue);
-      expect((await repo.getEmail('er-acc:21'))!.isSeen, isTrue);
-      // Email in a different mailbox should be untouched.
-      expect((await repo.getEmail('er-acc:22'))!.isSeen, isFalse);
-    });
-
-    test('observeThreads starts empty', () async {
-      final repo = await makeRepo();
-      expect(
-        await repo.observeThreads(_account.id, 'INBOX').first,
-        isEmpty,
-      );
-    });
-  }
-}
-
-// ── Impl under test ───────────────────────────────────────────────────────────
-
-class _EmailRepositoryImplContract extends EmailRepositoryContract {
-  static const _account = EmailRepositoryContract._account;
-
-  late AppDatabase _db;
-  late AccountRepositoryImpl _accountRepo;
-
-  @override
-  Future<EmailRepository> makeRepo() async {
-    _db = openTestDatabase();
-    _accountRepo = AccountRepositoryImpl(_db, MapSecureStorage());
-    await _accountRepo.addAccount(_account, 'pw');
-    return EmailRepositoryImpl(
-      _db,
-      _accountRepo,
-      imapConnect: (_, __, ___) => Future<imap.ImapClient>.error(
-        UnsupportedError('no IMAP in unit tests'),
-      ),
-      smtpConnect: (_, __, ___) => Future<imap.SmtpClient>.error(
-        UnsupportedError('no SMTP in unit tests'),
-      ),
-    );
-  }
-
-  @override
-  Future<void> insertEmail(
-    EmailRepository repo, {
-    required String id,
-    required String mailboxPath,
-    bool isSeen = true,
-    bool isFlagged = false,
-    DateTime? receivedAt,
-  }) async {
-    await _db.into(_db.emails).insert(
-          EmailsCompanion.insert(
-            id: id,
-            accountId: _account.id,
-            mailboxPath: mailboxPath,
-            uid: int.parse(id.split(':').last),
-            receivedAt: receivedAt ?? DateTime.now(),
-            isSeen: Value(isSeen),
-            isFlagged: Value(isFlagged),
-          ),
-        );
-  }
-}
-
-void main() {
-  setUpAll(configureSqliteForTests);
-
-  group('EmailRepositoryImpl satisfies EmailRepository contract', () {
-    _EmailRepositoryImplContract().run();
-  });
-}

test/unit/mailbox_repository_contract_test.dart

@@ -1,137 +0,0 @@
-import 'package:drift/drift.dart' show Value;
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:sharedinbox/core/models/account.dart';
-import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/data/db/database.dart' hide Account;
-import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
-import 'package:sharedinbox/data/repositories/mailbox_repository_impl.dart';
-
-import 'account_repository_impl_test.dart' show MapSecureStorage;
-import 'db_test_helper.dart';
-
-// ── Contract ──────────────────────────────────────────────────────────────────
-
-/// Verifies the [MailboxRepository] interface contract.
-///
-/// Tests cover only the locally-observable part of the interface
-/// (observe / find) since sync methods require live IMAP/JMAP servers.
-abstract class MailboxRepositoryContract {
-  static const _account = Account(
-    id: 'm-acc',
-    displayName: 'Contract',
-    email: 'm@example.com',
-    imapHost: 'imap.example.com',
-    smtpHost: 'smtp.example.com',
-  );
-
-  /// Return a fresh [MailboxRepository] with [_account] already persisted.
-  Future<MailboxRepository> makeRepo();
-
-  /// Insert a mailbox row into the backing store so tests can verify
-  /// observeMailboxes without triggering a network sync.
-  Future<void> insertMailbox(
-    MailboxRepository repo, {
-    required String id,
-    required String path,
-    String? role,
-    int unread = 0,
-    int total = 0,
-  });
-
-  void run() {
-    test('observeMailboxes starts empty', () async {
-      final repo = await makeRepo();
-      expect(await repo.observeMailboxes(_account.id).first, isEmpty);
-    });
-
-    test('observeMailboxes emits inserted rows ordered by path', () async {
-      final repo = await makeRepo();
-      await insertMailbox(repo, id: 'z', path: 'Z');
-      await insertMailbox(repo, id: 'a', path: 'A');
-      final boxes = await repo.observeMailboxes(_account.id).first;
-      expect(boxes.map((b) => b.path), ['A', 'Z']);
-    });
-
-    test('observeMailboxes only returns rows for the given account', () async {
-      final repo = await makeRepo();
-      await insertMailbox(repo, id: 'mb1', path: 'INBOX');
-      expect(await repo.observeMailboxes('other-acc').first, isEmpty);
-    });
-
-    test('findMailboxByRole returns null when no match', () async {
-      final repo = await makeRepo();
-      expect(
-        await repo.findMailboxByRole(_account.id, 'archive'),
-        isNull,
-      );
-    });
-
-    test('findMailboxByRole returns the matching mailbox', () async {
-      final repo = await makeRepo();
-      await insertMailbox(repo, id: 'arch', path: 'Archive', role: 'archive');
-      final box = await repo.findMailboxByRole(_account.id, 'archive');
-      expect(box, isNotNull);
-      expect(box!.role, 'archive');
-    });
-
-    test('clearForResync removes all mailboxes for the account', () async {
-      final repo = await makeRepo();
-      await insertMailbox(repo, id: 'mb', path: 'INBOX');
-      await repo.clearForResync(_account.id);
-      expect(await repo.observeMailboxes(_account.id).first, isEmpty);
-    });
-  }
-}
-
-// ── Impl under test ───────────────────────────────────────────────────────────
-
-class _MailboxRepositoryImplContract extends MailboxRepositoryContract {
-  static const _account = MailboxRepositoryContract._account;
-
-  late AppDatabase _db;
-  late AccountRepositoryImpl _accountRepo;
-
-  @override
-  Future<MailboxRepository> makeRepo() async {
-    _db = openTestDatabase();
-    _accountRepo = AccountRepositoryImpl(_db, MapSecureStorage());
-    await _accountRepo.addAccount(_account, 'pw');
-    return MailboxRepositoryImpl(
-      _db,
-      _accountRepo,
-      imapConnect: (_, __, ___) =>
-          Future.error(UnsupportedError('no IMAP in unit tests')),
-    );
-  }
-
-  @override
-  Future<void> insertMailbox(
-    MailboxRepository repo, {
-    required String id,
-    required String path,
-    String? role,
-    int unread = 0,
-    int total = 0,
-  }) async {
-    await _db.into(_db.mailboxes).insert(
-          MailboxesCompanion.insert(
-            id: id,
-            accountId: _account.id,
-            path: path,
-            name: path.split('/').last,
-            unreadCount: Value(unread),
-            totalCount: Value(total),
-            role: Value(role),
-          ),
-        );
-  }
-}
-
-void main() {
-  setUpAll(configureSqliteForTests);
-
-  group('MailboxRepositoryImpl satisfies MailboxRepository contract', () {
-    _MailboxRepositoryImplContract().run();
-  });
-}

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, 27);
+      expect(db.schemaVersion, 24);
       await db.close();
     });
 
@@ -141,41 +141,6 @@ void main() {
         ]),
       );
 
-      // v18, v22, v25: indexes.
-      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,
-        containsAll([
-          'emails_received_at', // v18
-          'emails_thread_id', // v18
-          'pending_changes_account_id', // v18
-          'emails_snoozed_until', // v22
-          'mailboxes_account_id', // v25
-          'threads_latest_date', // v25
-        ]),
-      );
-
-      // v26: FTS5 virtual table and triggers exist.
-      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']),
-      );
-      // Verify FTS table was created and is queryable.
-      await db.customSelect('SELECT count(*) FROM email_fts').get();
-
-      // v27: search_history_entries table.
-      await db
-          .customSelect('SELECT count(*) FROM search_history_entries')
-          .get();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
@@ -221,17 +186,6 @@ void main() {
           updated_at INTEGER NOT NULL
         );
       ''');
-      rawDb.execute('''
-        CREATE TABLE mailboxes (
-          id TEXT NOT NULL PRIMARY KEY,
-          account_id TEXT NOT NULL,
-          path TEXT NOT NULL,
-          name TEXT NOT NULL,
-          unread_count INTEGER NOT NULL DEFAULT 0,
-          total_count INTEGER NOT NULL DEFAULT 0,
-          role TEXT NULL
-        );
-      ''');
       rawDb.execute('''
         CREATE TABLE emails (
           id TEXT NOT NULL PRIMARY KEY,
@@ -256,23 +210,6 @@ void main() {
           snoozed_from_mailbox_path TEXT NULL
         );
       ''');
-      rawDb.execute('''
-        CREATE TABLE threads (
-          account_id TEXT NOT NULL,
-          mailbox_path TEXT NOT NULL,
-          id TEXT NOT NULL,
-          subject TEXT NULL,
-          latest_date INTEGER NOT NULL,
-          message_count INTEGER NOT NULL DEFAULT 1,
-          has_unread INTEGER NOT NULL DEFAULT 0 CHECK ("has_unread" IN (0, 1)),
-          is_flagged INTEGER NOT NULL DEFAULT 0 CHECK ("is_flagged" IN (0, 1)),
-          participants_json TEXT NOT NULL DEFAULT '[]',
-          preview TEXT NULL,
-          latest_email_id TEXT NOT NULL,
-          email_ids_json TEXT NOT NULL DEFAULT '[]',
-          PRIMARY KEY (account_id, mailbox_path, id)
-        );
-      ''');
       rawDb.execute('PRAGMA user_version = 22;');
       rawDb.close();
 
@@ -286,36 +223,11 @@ void main() {
       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'));
-
-      // 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();
-
       await db.close();
       if (dbFile.existsSync()) dbFile.deleteSync();
     });
 
-    test('fresh install creates all tables at schemaVersion 27', () async {
+    test('fresh install creates all tables at schemaVersion 24', () async {
       final db = AppDatabase(NativeDatabase.memory());
       await db.select(db.accounts).get();
 
@@ -338,7 +250,6 @@ void main() {
           'threads',
           'sync_health',
           'undo_actions',
-          'search_history_entries',
         ]),
       );
 

test/unit/reliability_runner_test.dart

@@ -79,18 +79,9 @@ 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.value([]);
+  Stream<List<Email>> observeEmails(String a, String m) => Stream.value([]);
   @override
-  Stream<List<EmailThread>> observeThreads(
-    String a,
-    String m, {
-    int limit = 50,
-  }) =>
+  Stream<List<EmailThread>> observeThreads(String a, String m) =>
       Stream.value([]);
   @override
   Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
@@ -103,8 +94,6 @@ class _CountingEmails implements EmailRepository {
   @override
   Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
   @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
-  @override
   Future<void> moveEmail(String id, String dest) async {}
   @override
   Future<String?> deleteEmail(String id) async => null;

test/unit/undo_service_test.mocks.dart

@@ -76,9 +76,8 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
   @override
   _i4.Stream<List<_i2.Email>> observeEmails(
     String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
-  }) =>
+    String? mailboxPath,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
           #observeEmails,
@@ -86,7 +85,6 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
             accountId,
             mailboxPath,
           ],
-          {#limit: limit},
         ),
         returnValue: _i4.Stream<List<_i2.Email>>.empty(),
       ) as _i4.Stream<List<_i2.Email>>);
@@ -94,9 +92,8 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
   @override
   _i4.Stream<List<_i2.EmailThread>> observeThreads(
     String? accountId,
-    String? mailboxPath, {
-    int? limit = 50,
-  }) =>
+    String? mailboxPath,
+  ) =>
       (super.noSuchMethod(
         Invocation.method(
           #observeThreads,
@@ -104,7 +101,6 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
             accountId,
             mailboxPath,
           ],
-          {#limit: limit},
         ),
         returnValue: _i4.Stream<List<_i2.EmailThread>>.empty(),
       ) as _i4.Stream<List<_i2.EmailThread>>);
@@ -197,23 +193,6 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
         returnValueForMissingStub: _i4.Future<void>.value(),
       ) as _i4.Future<void>);
 
-  @override
-  _i4.Future<void> markAllAsRead(
-    String? accountId,
-    String? mailboxPath,
-  ) =>
-      (super.noSuchMethod(
-        Invocation.method(
-          #markAllAsRead,
-          [
-            accountId,
-            mailboxPath,
-          ],
-        ),
-        returnValue: _i4.Future<void>.value(),
-        returnValueForMissingStub: _i4.Future<void>.value(),
-      ) as _i4.Future<void>);
-
   @override
   _i4.Future<void> moveEmail(
     String? emailId,

test/widget/helpers.dart

@@ -17,7 +17,6 @@ import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-import 'package:sharedinbox/core/repositories/search_history_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';
@@ -159,19 +158,14 @@ class FakeEmailRepository implements EmailRepository {
         _emailBody = emailBody ?? const EmailBody(emailId: '', attachments: []);
 
   @override
-  Stream<List<Email>> observeEmails(
-    String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  }) =>
+  Stream<List<Email>> observeEmails(String accountId, String mailboxPath) =>
       Stream.value(List.of(_emails));
 
   @override
   Stream<List<EmailThread>> observeThreads(
     String accountId,
-    String mailboxPath, {
-    int limit = 50,
-  }) =>
+    String mailboxPath,
+  ) =>
       observeEmails(accountId, mailboxPath).map((emails) {
         return emails.map((e) {
           return EmailThread(
@@ -214,8 +208,6 @@ class FakeEmailRepository implements EmailRepository {
 
   @override
   Future<void> setFlag(String emailId, {bool? seen, bool? flagged}) async {}
-  @override
-  Future<void> markAllAsRead(String accountId, String mailboxPath) async {}
 
   @override
   Future<void> moveEmail(String emailId, String destMailboxPath) async {}
@@ -511,20 +503,3 @@ Email testEmail({
       isFlagged: isFlagged,
       hasAttachment: hasAttachment,
     );
-
-class FakeSearchHistoryRepository implements SearchHistoryRepository {
-  final List<String> _history = [];
-
-  @override
-  Future<List<String>> getRecentSearches() async => List.unmodifiable(_history);
-
-  @override
-  Future<void> saveSearch(String query) async {
-    _history.remove(query);
-    _history.insert(0, query);
-    if (_history.length > 10) _history.removeLast();
-  }
-
-  @override
-  Future<void> clearHistory() async => _history.clear();
-}

test/widget/search_screen_test.dart

@@ -20,9 +20,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -45,9 +42,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -74,9 +68,6 @@ void main() {
               FakeMailboxRepository(),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -106,9 +97,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -144,9 +132,6 @@ void main() {
               FakeMailboxRepository([archiveMailbox]),
             ),
             emailRepositoryProvider.overrideWithValue(FakeEmailRepository()),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -177,9 +162,6 @@ void main() {
             emailRepositoryProvider.overrideWithValue(
               FakeEmailRepository(searchResults: [email]),
             ),
-            searchHistoryRepositoryProvider.overrideWithValue(
-              FakeSearchHistoryRepository(),
-            ),
           ],
         ),
       );
@@ -193,9 +175,8 @@ void main() {
       await tester.tap(find.byIcon(Icons.clear));
       await tester.pumpAndSettle();
 
-      // Results are gone; the recent-search chip for the prior query appears.
       expect(find.text('Found email'), findsNothing);
-      expect(find.text('found'), findsOneWidget);
+      expect(find.text('Type 3+ characters to search'), findsOneWidget);
     });
   });
 }