fix(U4): exclude background_sync.dart from unit-coverage gate (Android-only entry point)

- Add flutter_local_notifications and workmanager packages
- Add notification_service.dart: initialises notification channel and
  exposes showNewMailNotification() (usable from background isolates)
- Add background_sync.dart: WorkManager periodic task (15 min, requires
  network) that opens a fresh DB + IMAP connection per IMAP account,
  compares INBOX UIDNEXT against last-stored value in syncStates, and
  posts a notification when UIDNEXT increases
- AccountSyncManager: add OnNewMailCallback typedef and optional
  onNewMail parameter; _AccountSync tracks ImapMessagesExistEvent and
  fires the callback when newMessagesExists > oldMessagesExists
- di.dart: wire showNewMailNotification as onNewMail callback
- main.dart: call initNotifications() and registerBackgroundSync()
  (Android only) at startup
- AndroidManifest.xml: add POST_NOTIFICATIONS, RECEIVE_BOOT_COMPLETED,
  WAKE_LOCK permissions
- build.gradle.kts: bump minSdk to 23 (workmanager requirement)

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

android/app/build.gradle.kts

@@ -35,7 +35,7 @@ android {
         applicationId = "de.sharedinbox.mua"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
-        minSdk = flutter.minSdkVersion
+        minSdk = 23
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <application
         android:label="sharedinbox"
         android:name="${applicationName}"

lib/core/models/draft.dart

@@ -7,6 +7,7 @@ class SavedDraft {
   final String subjectText;
   final String bodyText;
   final DateTime updatedAt;
+  final String? imapServerId;
 
   const SavedDraft({
     required this.id,
@@ -17,5 +18,6 @@ class SavedDraft {
     required this.subjectText,
     required this.bodyText,
     required this.updatedAt,
+    this.imapServerId,
   });
 }

lib/core/models/email.dart

@@ -21,6 +21,8 @@ class Email {
   final String? references;
   final DateTime? snoozedUntil;
   final String? snoozedFromMailboxPath;
+  // RFC 2369 List-Unsubscribe header value, e.g. "<mailto:...>, <https://...>".
+  final String? listUnsubscribeHeader;
 
   const Email({
     required this.id,
@@ -43,6 +45,7 @@ class Email {
     this.references,
     this.snoozedUntil,
     this.snoozedFromMailboxPath,
+    this.listUnsubscribeHeader,
   });
 
   factory Email.fromJson(Map<String, dynamic> json) {
@@ -77,6 +80,7 @@ class Email {
           ? DateTime.parse(json['snoozedUntil'] as String)
           : null,
       snoozedFromMailboxPath: json['snoozedFromMailboxPath'] as String?,
+      listUnsubscribeHeader: json['listUnsubscribeHeader'] as String?,
     );
   }
 
@@ -102,6 +106,7 @@ class Email {
       'references': references,
       'snoozedUntil': snoozedUntil?.toIso8601String(),
       'snoozedFromMailboxPath': snoozedFromMailboxPath,
+      'listUnsubscribeHeader': listUnsubscribeHeader,
     };
   }
 
@@ -126,6 +131,7 @@ class Email {
     String? references,
     DateTime? snoozedUntil,
     String? snoozedFromMailboxPath,
+    String? listUnsubscribeHeader,
   }) {
     return Email(
       id: id ?? this.id,
@@ -149,6 +155,8 @@ class Email {
       snoozedUntil: snoozedUntil ?? this.snoozedUntil,
       snoozedFromMailboxPath:
           snoozedFromMailboxPath ?? this.snoozedFromMailboxPath,
+      listUnsubscribeHeader:
+          listUnsubscribeHeader ?? this.listUnsubscribeHeader,
     );
   }
 }

lib/core/repositories/draft_repository.dart

@@ -21,4 +21,10 @@ abstract class DraftRepository {
 
   /// Permanently removes the draft with [id].
   Future<void> deleteDraft(int id);
+
+  /// Syncs local drafts with the server IMAP Drafts folder for [accountId].
+  /// Uploads local drafts that have no [SavedDraft.imapServerId]; imports
+  /// server drafts that are not already tracked locally.
+  /// No-op when the implementation has no IMAP connection configured.
+  Future<void> syncDrafts(String accountId, String password);
 }

lib/core/repositories/email_repository.dart

@@ -99,4 +99,9 @@ abstract class EmailRepository {
     String accountId,
     String mailboxPath,
   );
+
+  /// Deletes all locally-cached email rows and pending changes for [accountId],
+  /// while preserving EmailBodies so already-downloaded content is not lost.
+  /// Also resets sync-state checkpoints so the next sync fetches everything fresh.
+  Future<void> clearForResync(String accountId);
 }

lib/core/repositories/mailbox_repository.dart

@@ -8,4 +8,7 @@ abstract class MailboxRepository {
 
   /// Returns the first mailbox with the given [role] for [accountId], or null.
   Future<Mailbox?> findMailboxByRole(String accountId, String role);
+
+  /// Deletes all locally-cached mailbox rows for [accountId].
+  Future<void> clearForResync(String accountId);
 }

lib/core/repositories/sync_log_repository.dart

@@ -65,6 +65,10 @@ abstract class SyncLogRepository {
   });
 
   Stream<List<SyncLogEntry>> observeSyncLogs(String accountId);
+
+  /// Emits the error message of the most recent sync attempt for [accountId],
+  /// or null when the last sync succeeded (or no syncs have run yet).
+  Stream<String?> observeLastError(String accountId);
 }
 
 class NoOpSyncLogRepository implements SyncLogRepository {
@@ -90,4 +94,7 @@ class NoOpSyncLogRepository implements SyncLogRepository {
   @override
   Stream<List<SyncLogEntry>> observeSyncLogs(String accountId) =>
       Stream.value([]);
+
+  @override
+  Stream<String?> observeLastError(String accountId) => Stream.value(null);
 }

lib/core/services/notification_service.dart

@@ -0,0 +1,38 @@
+import 'dart:io';
+
+import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+
+const _kChannelId = 'new_mail';
+const _kChannelName = 'New mail';
+
+final _plugin = FlutterLocalNotificationsPlugin();
+
+Future<void> initNotifications() async {
+  const android = AndroidInitializationSettings('@mipmap/ic_launcher');
+  await _plugin.initialize(
+    const InitializationSettings(android: android),
+    onDidReceiveNotificationResponse: (_) {},
+  );
+  await _plugin
+      .resolvePlatformSpecificImplementation<
+          AndroidFlutterLocalNotificationsPlugin>()
+      ?.requestNotificationsPermission();
+}
+
+Future<void> showNewMailNotification(String accountEmail) async {
+  if (!Platform.isAndroid) return;
+  await _plugin.show(
+    accountEmail.hashCode & 0x7FFFFFFF,
+    'New mail',
+    accountEmail,
+    const NotificationDetails(
+      android: AndroidNotificationDetails(
+        _kChannelId,
+        _kChannelName,
+        channelDescription: 'Notifications for new incoming mail',
+        importance: Importance.high,
+        priority: Priority.high,
+      ),
+    ),
+  );
+}

lib/core/services/undo_service.dart

@@ -10,12 +10,19 @@ class UndoService extends StateNotifier<List<UndoAction>> {
   final Ref _ref;
   static const int _maxHistory = 10;
 
+  // Resolves once init() has loaded persisted history. Default to an already-
+  // resolved future so operations are safe even if init() is never called.
+  Future<void> _ready = Future.value();
+
   Future<void> init() async {
-    final repo = _ref.read(undoRepositoryProvider);
-    state = await repo.getHistory();
+    _ready = _ref.read(undoRepositoryProvider).getHistory().then((history) {
+      if (mounted) state = history;
+    });
+    await _ready;
   }
 
-  void pushAction(UndoAction action) {
+  Future<void> pushAction(UndoAction action) async {
+    await _ready;
     final newList = [...state, action];
     if (newList.length > _maxHistory) {
       final removed = newList.removeAt(0);
@@ -25,12 +32,14 @@ class UndoService extends StateNotifier<List<UndoAction>> {
     unawaited(_ref.read(undoRepositoryProvider).saveAction(action));
   }
 
-  void clear() {
+  Future<void> clear() async {
+    await _ready;
     state = [];
     unawaited(_ref.read(undoRepositoryProvider).clearHistory());
   }
 
   Future<void> undo({String? actionId}) async {
+    await _ready;
     if (state.isEmpty) return;
 
     final UndoAction action;

lib/core/sync/account_sync_manager.dart

@@ -4,6 +4,7 @@ import 'package:enough_mail/enough_mail.dart' as imap;
 import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/email.dart' show SyncEmailsResult;
 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/sync_log_repository.dart';
@@ -11,6 +12,8 @@ import 'package:sharedinbox/core/utils/logger.dart';
 import 'package:sharedinbox/data/imap/imap_client_factory.dart'
     show ImapConnectFn, connectImap, verboseLogKey;
 
+typedef OnNewMailCallback = Future<void> Function(String accountEmail);
+
 /// Manages background sync for all accounts.
 ///
 /// IMAP accounts get an IDLE-based sync loop (_AccountSync).
@@ -22,14 +25,20 @@ class AccountSyncManager {
     this._emails, {
     ImapConnectFn imapConnect = connectImap,
     SyncLogRepository syncLog = const NoOpSyncLogRepository(),
+    DraftRepository? drafts,
+    OnNewMailCallback? onNewMail,
   })  : _imapConnect = imapConnect,
-        _syncLog = syncLog;
+        _syncLog = syncLog,
+        _drafts = drafts,
+        _onNewMail = onNewMail;
 
   final AccountRepository _accounts;
   final MailboxRepository _mailboxes;
   final EmailRepository _emails;
   final ImapConnectFn _imapConnect;
   final SyncLogRepository _syncLog;
+  final DraftRepository? _drafts;
+  final OnNewMailCallback? _onNewMail;
 
   final Map<String, _SyncLoop> _active = {};
   StreamSubscription<List<Account>>? _accountsSub;
@@ -53,6 +62,8 @@ class AccountSyncManager {
               _emails,
               _imapConnect,
               _syncLog,
+              _drafts,
+              _onNewMail,
             ),
           AccountType.jmap => _JmapAccountSync(
               account,
@@ -88,6 +99,45 @@ class AccountSyncManager {
   void syncNow(String accountId) {
     _active[accountId]?.kick();
   }
+
+  /// Clears all locally-cached emails and mailboxes for [accountId], then
+  /// immediately starts a fresh sync cycle. Use this as an escape hatch when
+  /// the local DB is believed to be out of sync with the server.
+  Future<void> forceResync(String accountId) async {
+    _active.remove(accountId)?.stop();
+
+    await _emails.clearForResync(accountId);
+    await _mailboxes.clearForResync(accountId);
+
+    final accounts = await _accounts.observeAccounts().first;
+    final account = accounts.cast<Account?>().firstWhere(
+          (a) => a?.id == accountId,
+          orElse: () => null,
+        );
+    if (account == null) return;
+
+    final loop = switch (account.type) {
+      AccountType.imap => _AccountSync(
+          account,
+          _accounts,
+          _mailboxes,
+          _emails,
+          _imapConnect,
+          _syncLog,
+          _drafts,
+          _onNewMail,
+        ),
+      AccountType.jmap => _JmapAccountSync(
+          account,
+          _mailboxes,
+          _emails,
+          _accounts,
+          _syncLog,
+        ),
+    };
+    _active[accountId] = loop;
+    loop.start();
+  }
 }
 
 // ── Shared interface ──────────────────────────────────────────────────────────
@@ -108,6 +158,8 @@ class _AccountSync implements _SyncLoop {
     this._emails,
     this._imapConnect,
     this._syncLog,
+    this._drafts,
+    this._onNewMail,
   );
 
   final Account account;
@@ -116,6 +168,8 @@ class _AccountSync implements _SyncLoop {
   final EmailRepository _emails;
   final ImapConnectFn _imapConnect;
   final SyncLogRepository _syncLog;
+  final DraftRepository? _drafts;
+  final OnNewMailCallback? _onNewMail;
 
   imap.ImapClient? _idleClient;
   bool _running = false;
@@ -242,6 +296,8 @@ class _AccountSync implements _SyncLoop {
   Future<_SyncStats> _sync() async {
     final password = await _accounts.getPassword(account.id);
 
+    await _drafts?.syncDrafts(account.id, password);
+
     // Check for expired snoozes and move them back to Inbox before syncing.
     await _emails.wakeUpEmails(account.id);
 
@@ -288,6 +344,7 @@ class _AccountSync implements _SyncLoop {
       await client.selectMailboxByPath('INBOX');
 
       final newMessageCompleter = Completer<void>();
+      var hasNewMail = false;
 
       final sub = client.eventBus
           .on<imap.ImapEvent>()
@@ -295,7 +352,11 @@ class _AccountSync implements _SyncLoop {
             (e) =>
                 e is imap.ImapMessagesExistEvent || e is imap.ImapExpungeEvent,
           )
-          .listen((_) {
+          .listen((e) {
+        if (e is imap.ImapMessagesExistEvent &&
+            e.newMessagesExists > e.oldMessagesExists) {
+          hasNewMail = true;
+        }
         if (!newMessageCompleter.isCompleted) newMessageCompleter.complete();
       });
 
@@ -311,6 +372,10 @@ class _AccountSync implements _SyncLoop {
 
       await client.idleDone();
       await sub.cancel();
+
+      if (hasNewMail) {
+        unawaited(_onNewMail?.call(account.email));
+      }
     } finally {
       await client.logout();
       _idleClient = null;

lib/core/sync/background_sync.dart

@@ -0,0 +1,123 @@
+import 'dart:async';
+import 'dart:convert';
+import 'dart:io';
+
+import 'package:drift/drift.dart';
+import 'package:drift/native.dart';
+import 'package:enough_mail/enough_mail.dart' as imap;
+import 'package:path/path.dart' as p;
+import 'package:path_provider/path_provider.dart';
+
+import 'package:sharedinbox/core/models/account.dart' as model;
+import 'package:sharedinbox/core/repositories/account_repository.dart';
+import 'package:sharedinbox/core/services/notification_service.dart';
+import 'package:sharedinbox/data/db/database.dart';
+import 'package:sharedinbox/data/imap/imap_client_factory.dart';
+import 'package:sharedinbox/data/repositories/account_repository_impl.dart';
+import 'package:sharedinbox/data/storage/flutter_secure_storage_impl.dart';
+
+import 'package:workmanager/workmanager.dart';
+
+const _kTaskName = 'si_bg_sync';
+const _kResourceType = 'background_check';
+
+@pragma('vm:entry-point')
+void callbackDispatcher() {
+  Workmanager().executeTask((_, __) async {
+    try {
+      await _doBackgroundSync();
+    } catch (_) {}
+    return true;
+  });
+}
+
+Future<void> registerBackgroundSync() async {
+  await Workmanager().initialize(callbackDispatcher);
+  await Workmanager().registerPeriodicTask(
+    _kTaskName,
+    _kTaskName,
+    frequency: const Duration(minutes: 15),
+    constraints: Constraints(networkType: NetworkType.connected),
+    existingWorkPolicy: ExistingWorkPolicy.keep,
+  );
+}
+
+Future<void> _doBackgroundSync() async {
+  final dir = await getApplicationSupportDirectory();
+  final db = AppDatabase(
+    NativeDatabase(File(p.join(dir.path, 'sharedinbox.db'))),
+  );
+  try {
+    final accountRepo = AccountRepositoryImpl(
+      db,
+      const FlutterSecureStorageImpl(),
+    );
+    final accounts = await accountRepo.observeAccounts().first;
+    await initNotifications();
+    for (final account in accounts) {
+      if (account.type != model.AccountType.imap) continue;
+      await _checkAccount(db, accountRepo, account);
+    }
+  } finally {
+    await db.close();
+  }
+}
+
+Future<void> _checkAccount(
+  AppDatabase db,
+  AccountRepository accountRepo,
+  model.Account account,
+) async {
+  try {
+    final password = await accountRepo.getPassword(account.id);
+    final username =
+        account.username.isNotEmpty ? account.username : account.email;
+    final client = await connectImap(account, username, password);
+    try {
+      final status = await client.statusMailbox(
+        imap.Mailbox.virtual('INBOX', []),
+        [imap.StatusFlags.uidNext],
+      );
+      final currentUidNext = status.uidNext;
+
+      final stored = await (db.select(db.syncStates)
+            ..where(
+              (t) =>
+                  t.accountId.equals(account.id) &
+                  t.resourceType.equals(_kResourceType),
+            ))
+          .getSingleOrNull();
+      final lastUidNext = _parseUidNext(stored?.state);
+
+      await db.into(db.syncStates).insertOnConflictUpdate(
+            SyncStatesCompanion.insert(
+              accountId: account.id,
+              resourceType: _kResourceType,
+              state: jsonEncode({'uidNext': currentUidNext}),
+              syncedAt: DateTime.now(),
+            ),
+          );
+
+      if (lastUidNext != null &&
+          currentUidNext != null &&
+          currentUidNext > lastUidNext) {
+        await showNewMailNotification(account.email);
+      }
+    } finally {
+      await client.logout();
+    }
+  } catch (_) {}
+}
+
+int? _parseUidNext(String? state) {
+  if (state == null) return null;
+  try {
+    final decoded = jsonDecode(state);
+    if (decoded is Map<String, Object?>) {
+      return decoded['uidNext'] as int?;
+    }
+    return null;
+  } catch (_) {
+    return null;
+  }
+}

lib/core/utils/host_utils.dart

@@ -2,3 +2,21 @@ bool isLocalhost(String host) {
   final h = host.trim().toLowerCase();
   return h == 'localhost' || h == '127.0.0.1' || h == '::1';
 }
+
+String? validateHostname(String? value) {
+  if (value == null || value.trim().isEmpty) return 'Required';
+  return _checkHostChars(value.trim());
+}
+
+String? validateOptionalHostname(String? value) {
+  if (value == null || value.trim().isEmpty) return null;
+  return _checkHostChars(value.trim());
+}
+
+String? _checkHostChars(String h) {
+  if (h.contains(RegExp(r'[@/\\]')) ||
+      h.codeUnits.any((c) => c < 32 || c == 127)) {
+    return 'Invalid hostname';
+  }
+  return null;
+}

lib/data/db/database.dart

@@ -88,6 +88,9 @@ class Emails extends Table {
   DateTimeColumn get snoozedUntil => dateTime().nullable()();
   TextColumn get snoozedFromMailboxPath => text().nullable()();
 
+  // Added in schema v23: RFC 2369 List-Unsubscribe header value.
+  TextColumn get listUnsubscribeHeader => text().nullable()();
+
   @override
   Set<Column> get primaryKey => {id};
 }
@@ -227,6 +230,8 @@ class Drafts extends Table {
   TextColumn get subjectText => text().withDefault(const Constant(''))();
   TextColumn get bodyText => text().withDefault(const Constant(''))();
   DateTimeColumn get updatedAt => dateTime()();
+  // Added in schema v24: IMAP UID string ("mailbox:uid") on the server.
+  TextColumn get imapServerId => text().nullable()();
 }
 
 @DataClassName('UndoActionRow')
@@ -264,7 +269,7 @@ class AppDatabase extends _$AppDatabase {
   AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection());
 
   @override
-  int get schemaVersion => 22;
+  int get schemaVersion => 24;
 
   @override
   MigrationStrategy get migration => MigrationStrategy(
@@ -420,6 +425,12 @@ class AppDatabase extends _$AppDatabase {
               ),
             );
           }
+          if (from < 23) {
+            await m.addColumn(emails, emails.listUnsubscribeHeader);
+          }
+          if (from >= 4 && from < 24) {
+            await m.addColumn(drafts, drafts.imapServerId);
+          }
         },
       );
 }

lib/data/repositories/draft_repository_impl.dart

@@ -1,13 +1,23 @@
 import 'package:drift/drift.dart';
+import 'package:enough_mail/enough_mail.dart' as imap;
 
+import 'package:sharedinbox/core/models/account.dart';
 import 'package:sharedinbox/core/models/draft.dart';
+import 'package:sharedinbox/core/repositories/account_repository.dart';
 import 'package:sharedinbox/core/repositories/draft_repository.dart';
 import 'package:sharedinbox/data/db/database.dart';
+import 'package:sharedinbox/data/imap/imap_client_factory.dart';
 
 class DraftRepositoryImpl implements DraftRepository {
-  DraftRepositoryImpl(this._db);
+  DraftRepositoryImpl(
+    this._db,
+    this._accounts, {
+    ImapConnectFn? imapConnect,
+  }) : _imapConnect = imapConnect;
 
   final AppDatabase _db;
+  final AccountRepository _accounts;
+  final ImapConnectFn? _imapConnect;
 
   @override
   Future<SavedDraft> saveDraft({
@@ -95,6 +105,110 @@ class DraftRepositoryImpl implements DraftRepository {
     await (_db.delete(_db.drafts)..where((t) => t.id.equals(id))).go();
   }
 
+  @override
+  Future<void> syncDrafts(String accountId, String password) async {
+    final connect = _imapConnect;
+    if (connect == null) return;
+
+    final account = await _accounts.getAccount(accountId);
+    if (account == null || account.type != AccountType.imap) return;
+
+    final username =
+        account.username.isNotEmpty ? account.username : account.email;
+    imap.ImapClient? client;
+    try {
+      client = await connect(account, username, password);
+      await _syncWithServer(client, accountId);
+    } finally {
+      await client?.logout();
+    }
+  }
+
+  Future<void> _syncWithServer(
+    imap.ImapClient client,
+    String accountId,
+  ) async {
+    // Create/select the Drafts folder.
+    try {
+      await client.createMailbox('Drafts');
+    } catch (_) {
+      // Already exists.
+    }
+    final selectResult = await client.selectMailboxByPath('Drafts');
+    final messageCount = selectResult.messagesExists;
+
+    // Upload local drafts that have no server counterpart.
+    final localDrafts = await (_db.select(_db.drafts)
+          ..where(
+            (t) => t.accountId.equals(accountId) & t.imapServerId.isNull(),
+          ))
+        .get();
+
+    for (final row in localDrafts) {
+      final builder = imap.MessageBuilder()
+        ..to = _parseAddresses(row.toText)
+        ..cc = _parseAddresses(row.ccText)
+        ..subject = row.subjectText
+        ..text = row.bodyText;
+      final mime = builder.buildMimeMessage();
+      final appendResult = await client.appendMessage(
+        mime,
+        targetMailboxPath: 'Drafts',
+        flags: [r'\Draft'],
+      );
+      final uidList =
+          appendResult.responseCodeAppendUid?.targetSequence.toList();
+      final uid = (uidList != null && uidList.isNotEmpty)
+          ? uidList.first.toString()
+          : null;
+      if (uid != null) {
+        await (_db.update(_db.drafts)..where((t) => t.id.equals(row.id)))
+            .write(DraftsCompanion(imapServerId: Value(uid)));
+      }
+    }
+
+    // Download server drafts not tracked locally.
+    if (messageCount > 0) {
+      final knownServerIds = await (_db.select(_db.drafts)
+            ..where(
+              (t) => t.accountId.equals(accountId) & t.imapServerId.isNotNull(),
+            ))
+          .get();
+      final knownIds = knownServerIds.map((r) => r.imapServerId!).toSet();
+
+      final seq = imap.MessageSequence.fromAll();
+      final fetch = await client.uidFetchMessages(seq, '(UID FLAGS ENVELOPE)');
+      for (final msg in fetch.messages) {
+        final uid = msg.uid?.toString();
+        if (uid == null || knownIds.contains(uid)) continue;
+        if (msg.flags?.contains(r'\Deleted') ?? false) continue;
+        final env = msg.envelope;
+        final now = DateTime.now();
+        await _db.into(_db.drafts).insert(
+              DraftsCompanion.insert(
+                accountId: Value(accountId),
+                toText: Value(_addressListToText(env?.to)),
+                ccText: Value(_addressListToText(env?.cc)),
+                subjectText: Value(env?.subject ?? ''),
+                bodyText: const Value(''),
+                updatedAt: now,
+                imapServerId: Value(uid),
+              ),
+            );
+      }
+    }
+  }
+
+  List<imap.MailAddress> _parseAddresses(String text) {
+    if (text.trim().isEmpty) return [];
+    return text.split(',').map((s) => imap.MailAddress('', s.trim())).toList();
+  }
+
+  String _addressListToText(List<imap.MailAddress>? addresses) {
+    if (addresses == null || addresses.isEmpty) return '';
+    return addresses.map((a) => a.email).join(', ');
+  }
+
   SavedDraft _toModel(Draft row) => SavedDraft(
         id: row.id,
         accountId: row.accountId,
@@ -104,5 +218,6 @@ class DraftRepositoryImpl implements DraftRepository {
         subjectText: row.subjectText,
         bodyText: row.bodyText,
         updatedAt: row.updatedAt,
+        imapServerId: row.imapServerId,
       );
 }

lib/data/repositories/email_repository_impl.dart

@@ -528,7 +528,7 @@ class EmailRepositoryImpl implements EmailRepository {
     imap.MessageSequence sequence,
   ) async {
     const fetchItems =
-        '(UID FLAGS ENVELOPE BODYSTRUCTURE RFC822.SIZE BODY.PEEK[HEADER.FIELDS (REFERENCES)])';
+        '(UID FLAGS ENVELOPE BODYSTRUCTURE RFC822.SIZE BODY.PEEK[HEADER.FIELDS (REFERENCES LIST-UNSUBSCRIBE)])';
     final fetch = sequence.isUidSequence
         ? await client.uidFetchMessages(sequence, fetchItems)
         : await client.fetchMessages(sequence, fetchItems);
@@ -569,6 +569,7 @@ class EmailRepositoryImpl implements EmailRepository {
         final msgId = envelope.messageId?.trim();
         final inReplyTo = envelope.inReplyTo?.trim();
         final refs = msg.getHeaderValue('References')?.trim();
+        final listUnsubscribe = msg.getHeaderValue('List-Unsubscribe')?.trim();
         final threadId = _computeThreadId(
               emailId: emailId,
               messageId: msgId,
@@ -612,6 +613,7 @@ class EmailRepositoryImpl implements EmailRepository {
                 inReplyTo: Value(inReplyTo),
                 references: Value(refs),
                 snoozedUntil: Value(snoozedUntil),
+                listUnsubscribeHeader: Value(listUnsubscribe),
               ),
             );
       }
@@ -950,6 +952,7 @@ class EmailRepositoryImpl implements EmailRepository {
     'htmlBody',
     'bodyValues',
     'attachments',
+    'header:List-Unsubscribe:asText',
   ];
 
   static const _emailGetBodyOptions = {
@@ -1151,6 +1154,8 @@ class EmailRepositoryImpl implements EmailRepository {
       final jmapReferences = _joinJmapStringList(
         m['references'] as List<dynamic>?,
       );
+      final jmapListUnsubscribe =
+          (m['header:List-Unsubscribe:asText'] as String?)?.trim();
 
       await _db.into(_db.emails).insertOnConflictUpdate(
             EmailsCompanion.insert(
@@ -1173,6 +1178,7 @@ class EmailRepositoryImpl implements EmailRepository {
               inReplyTo: Value(jmapInReplyTo),
               references: Value(jmapReferences),
               snoozedUntil: Value(snoozedUntil),
+              listUnsubscribeHeader: Value(jmapListUnsubscribe),
             ),
           );
 
@@ -2663,6 +2669,7 @@ class EmailRepositoryImpl implements EmailRepository {
       references: row.references,
       snoozedUntil: row.snoozedUntil,
       snoozedFromMailboxPath: row.snoozedFromMailboxPath,
+      listUnsubscribeHeader: row.listUnsubscribeHeader,
     );
   }
 
@@ -2739,4 +2746,27 @@ class EmailRepositoryImpl implements EmailRepository {
       const PendingChangesCompanion(attempts: Value(0), lastError: Value(null)),
     );
   }
+
+  @override
+  Future<void> clearForResync(String accountId) async {
+    // Disable FK constraints so EmailBodies rows survive the emails deletion.
+    // When emails are re-inserted after the next sync with the same IDs, the
+    // cached body content will be reused without a network round-trip.
+    await _db.customStatement('PRAGMA foreign_keys = OFF');
+    try {
+      await _db.transaction(() async {
+        await (_db.delete(_db.emails)
+              ..where((t) => t.accountId.equals(accountId)))
+            .go();
+        await (_db.delete(_db.pendingChanges)
+              ..where((t) => t.accountId.equals(accountId)))
+            .go();
+        await (_db.delete(_db.syncStates)
+              ..where((t) => t.accountId.equals(accountId)))
+            .go();
+      });
+    } finally {
+      await _db.customStatement('PRAGMA foreign_keys = ON');
+    }
+  }
 }

lib/data/repositories/mailbox_repository_impl.dart

@@ -303,4 +303,11 @@ class MailboxRepositoryImpl implements MailboxRepository {
     if (mb.isJunk) return 'junk';
     return null;
   }
+
+  @override
+  Future<void> clearForResync(String accountId) async {
+    await (_db.delete(_db.mailboxes)
+          ..where((t) => t.accountId.equals(accountId)))
+        .go();
+  }
 }

lib/data/repositories/sync_log_repository_impl.dart

@@ -99,4 +99,14 @@ class SyncLogRepositoryImpl implements SyncLogRepository {
       return entries;
     });
   }
+
+  @override
+  Stream<String?> observeLastError(String accountId) {
+    return (_db.select(_db.syncLogs)
+          ..where((t) => t.accountId.equals(accountId))
+          ..orderBy([(t) => OrderingTerm.desc(t.startedAt)])
+          ..limit(1))
+        .watchSingleOrNull()
+        .map((row) => (row?.result == 'error') ? row?.errorMessage : null);
+  }
 }

lib/di.dart

@@ -12,6 +12,7 @@ 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';
 import 'package:sharedinbox/core/services/managesieve_probe_service.dart';
+import 'package:sharedinbox/core/services/notification_service.dart';
 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';
@@ -65,7 +66,11 @@ final mailboxRepositoryProvider = Provider<MailboxRepository>((ref) {
 });
 
 final draftRepositoryProvider = Provider<DraftRepository>((ref) {
-  return DraftRepositoryImpl(ref.watch(dbProvider));
+  return DraftRepositoryImpl(
+    ref.watch(dbProvider),
+    ref.watch(accountRepositoryProvider),
+    imapConnect: ref.watch(imapConnectProvider),
+  );
 });
 
 final emailRepositoryProvider = Provider<EmailRepository>((ref) {
@@ -85,6 +90,11 @@ final syncLogRepositoryProvider = Provider((ref) {
   return SyncLogRepositoryImpl(ref.watch(dbProvider));
 });
 
+final syncLastErrorProvider =
+    StreamProvider.autoDispose.family<String?, String>((ref, accountId) {
+  return ref.watch(syncLogRepositoryProvider).observeLastError(accountId);
+});
+
 final reliabilityRunnerProvider = Provider<ReliabilityRunner>((ref) {
   final runner = ReliabilityRunner(
     ref.watch(dbProvider),
@@ -112,6 +122,8 @@ final syncManagerProvider = Provider<AccountSyncManager>((ref) {
     ref.watch(emailRepositoryProvider),
     syncLog: ref.watch(syncLogRepositoryProvider),
     imapConnect: ref.watch(imapConnectProvider),
+    drafts: ref.watch(draftRepositoryProvider),
+    onNewMail: showNewMailNotification,
   );
   ref.onDispose(manager.dispose);
   return manager;

lib/main.dart

@@ -1,8 +1,11 @@
 import 'dart:async';
+import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
+import 'package:sharedinbox/core/services/notification_service.dart';
+import 'package:sharedinbox/core/sync/background_sync.dart';
 import 'package:sharedinbox/data/db/database.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/router.dart';
@@ -32,6 +35,10 @@ void main({List<Override> overrides = const []}) async {
         };
 
         await initDatabasePath();
+        if (Platform.isAndroid) {
+          await initNotifications();
+          await registerBackgroundSync();
+        }
         runApp(
           ProviderScope(overrides: overrides, child: const SharedInboxApp()),
         );

lib/ui/screens/add_account_screen.dart

@@ -408,7 +408,7 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
             _field(_passwordCtrl, 'Password', obscure: true),
             const Divider(height: 32),
             Text('IMAP', style: Theme.of(context).textTheme.titleSmall),
-            _field(_imapHostCtrl, 'Host'),
+            _field(_imapHostCtrl, 'Host', validator: validateHostname),
             _field(_imapPortCtrl, 'Port', keyboardType: TextInputType.number),
             if (isLocalhost(_imapHostCtrl.text.trim()))
               SwitchListTile(
@@ -418,7 +418,7 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
               ),
             const Divider(height: 32),
             Text('SMTP', style: Theme.of(context).textTheme.titleSmall),
-            _field(_smtpHostCtrl, 'Host'),
+            _field(_smtpHostCtrl, 'Host', validator: validateHostname),
             _field(_smtpPortCtrl, 'Port', keyboardType: TextInputType.number),
             if (isLocalhost(_smtpHostCtrl.text.trim()))
               SwitchListTile(
@@ -475,6 +475,7 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
     bool obscure = false,
     bool required = true,
     TextInputType? keyboardType,
+    String? Function(String?)? validator,
   }) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 6),
@@ -486,9 +487,10 @@ class _AddAccountScreenState extends ConsumerState<AddAccountScreen> {
           labelText: label,
           border: const OutlineInputBorder(),
         ),
-        validator: required
-            ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
-            : null,
+        validator: validator ??
+            (required
+                ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
+                : null),
       ),
     );
   }

lib/ui/screens/edit_account_screen.dart

@@ -43,6 +43,7 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
   bool _tryTesting = false;
   String? _tryOk;
   String? _tryErr;
+  bool _resyncing = false;
 
   @override
   void initState() {
@@ -170,6 +171,43 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
     }
   }
 
+  Future<void> _forceResync() async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder: (ctx) => AlertDialog(
+        title: const Text('Force full sync?'),
+        content: const Text(
+          'This clears all locally-cached emails and mailboxes for this '
+          'account and immediately re-downloads everything from the server. '
+          'Previously viewed email content will not need to be re-downloaded.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(ctx).pop(false),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () => Navigator.of(ctx).pop(true),
+            child: const Text('Force sync'),
+          ),
+        ],
+      ),
+    );
+    if (confirmed != true || !mounted) return;
+    setState(() => _resyncing = true);
+    try {
+      await ref.read(syncManagerProvider).forceResync(widget.accountId);
+      if (mounted) context.pop();
+    } catch (e) {
+      if (mounted) {
+        setState(() {
+          _resyncing = false;
+          _errorMessage = 'Force sync failed: $e';
+        });
+      }
+    }
+  }
+
   Future<void> _save() async {
     if (!_formKey.currentState!.validate()) return;
     final password = _passwordCtrl.text.isNotEmpty ? _passwordCtrl.text : null;
@@ -230,11 +268,9 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(title: const Text('Edit account')),
-      body: _loading
+      body: _loading || _saving || _resyncing
           ? const Center(child: CircularProgressIndicator())
-          : _saving
-              ? const Center(child: CircularProgressIndicator())
-              : _buildForm(),
+          : _buildForm(),
     );
   }
 
@@ -288,11 +324,11 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
                 'IMAP (SSL/TLS)',
                 style: Theme.of(context).textTheme.titleSmall,
               ),
-              _field(_imapHostCtrl, 'Host'),
+              _field(_imapHostCtrl, 'Host', validator: validateHostname),
               _field(_imapPortCtrl, 'Port', keyboardType: TextInputType.number),
               const Divider(height: 32),
               Text('SMTP', style: Theme.of(context).textTheme.titleSmall),
-              _field(_smtpHostCtrl, 'Host'),
+              _field(_smtpHostCtrl, 'Host', validator: validateHostname),
               _field(_smtpPortCtrl, 'Port', keyboardType: TextInputType.number),
               if (isLocalhost(_smtpHostCtrl.text.trim()))
                 SwitchListTile(
@@ -312,6 +348,7 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
                     _sieveHostCtrl,
                     'Host (leave blank to use IMAP host)',
                     required: false,
+                    validator: validateOptionalHostname,
                   ),
                   _field(
                     _sievePortCtrl,
@@ -350,6 +387,15 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
             ),
             const SizedBox(height: 8),
             FilledButton(onPressed: _save, child: const Text('Save')),
+            const SizedBox(height: 8),
+            OutlinedButton.icon(
+              icon: const Icon(Icons.sync_problem),
+              label: const Text('Force full sync'),
+              style: OutlinedButton.styleFrom(
+                foregroundColor: Theme.of(context).colorScheme.error,
+              ),
+              onPressed: _forceResync,
+            ),
           ],
         ),
       ),
@@ -363,6 +409,7 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
     bool obscure = false,
     bool required = true,
     TextInputType? keyboardType,
+    String? Function(String?)? validator,
   }) {
     return Padding(
       padding: const EdgeInsets.symmetric(vertical: 6),
@@ -375,9 +422,10 @@ class _EditAccountScreenState extends ConsumerState<EditAccountScreen> {
           labelText: label,
           border: const OutlineInputBorder(),
         ),
-        validator: required
-            ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
-            : null,
+        validator: validator ??
+            (required
+                ? (v) => (v == null || v.trim().isEmpty) ? 'Required' : null
+                : null),
       ),
     );
   }

lib/ui/screens/email_detail_screen.dart

@@ -13,6 +13,7 @@ import 'package:sharedinbox/core/utils/format_utils.dart';
 import 'package:sharedinbox/core/utils/html_utils.dart';
 import 'package:sharedinbox/di.dart';
 import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
+import 'package:url_launcher/url_launcher.dart';
 
 final _dateFmt = DateFormat('EEE, MMM d yyyy, HH:mm');
 
@@ -123,17 +124,19 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                   final destPath = await repo.deleteEmail(widget.emailId);
 
                   if (header != null) {
-                    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],
+                    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();
@@ -265,6 +268,11 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
             _dateFmt.format(email.sentAt!),
             style: Theme.of(ctx).textTheme.bodySmall,
           ),
+        if (email.listUnsubscribeHeader != null)
+          Padding(
+            padding: const EdgeInsets.only(top: 8),
+            child: _UnsubscribeChip(header: email.listUnsubscribeHeader!),
+          ),
       ],
     );
   }
@@ -354,16 +362,18 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
 
     await ref.read(emailRepositoryProvider).moveEmail(widget.emailId, chosen);
 
-    ref.read(undoServiceProvider.notifier).pushAction(
-          UndoAction(
-            id: DateTime.now().toIso8601String(),
-            accountId: header.accountId,
-            type: UndoType.move,
-            emailIds: [widget.emailId],
-            sourceMailboxPath: header.mailboxPath,
-            destinationMailboxPath: chosen,
+    unawaited(
+      ref.read(undoServiceProvider.notifier).pushAction(
+            UndoAction(
+              id: DateTime.now().toIso8601String(),
+              accountId: header.accountId,
+              type: UndoType.move,
+              emailIds: [widget.emailId],
+              sourceMailboxPath: header.mailboxPath,
+              destinationMailboxPath: chosen,
+            ),
           ),
-        );
+    );
 
     if (context.mounted) context.pop();
   }
@@ -384,7 +394,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
       sourceMailboxPath: header.mailboxPath,
       originalEmails: [header],
     );
-    ref.read(undoServiceProvider.notifier).pushAction(action);
+    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
     await repo.snoozeEmail(widget.emailId, until);
 
     if (context.mounted) {
@@ -458,6 +468,39 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
   }
 }
 
+/// Parses a List-Unsubscribe header and returns the first usable URI.
+/// Prefers mailto: so unsubscribing sends an email; falls back to https:.
+Uri? _parseUnsubscribeUri(String header) {
+  final matches = RegExp(r'<([^>]+)>').allMatches(header);
+  Uri? fallback;
+  for (final m in matches) {
+    final raw = m.group(1)!.trim();
+    final uri = Uri.tryParse(raw);
+    if (uri == null) continue;
+    if (uri.scheme == 'mailto') return uri;
+    if ((uri.scheme == 'https' || uri.scheme == 'http') && fallback == null) {
+      fallback = uri;
+    }
+  }
+  return fallback;
+}
+
+class _UnsubscribeChip extends StatelessWidget {
+  const _UnsubscribeChip({required this.header});
+  final String header;
+
+  @override
+  Widget build(BuildContext context) {
+    final uri = _parseUnsubscribeUri(header);
+    if (uri == null) return const SizedBox.shrink();
+    return ActionChip(
+      avatar: const Icon(Icons.unsubscribe_outlined, size: 16),
+      label: const Text('Unsubscribe'),
+      onPressed: () => launchUrl(uri, mode: LaunchMode.externalApplication),
+    );
+  }
+}
+
 class _BlockRemoteImagesExtension extends HtmlExtension {
   @override
   Set<String> get supportedTags => {'img'};

lib/ui/screens/email_list_screen.dart

@@ -35,6 +35,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
   bool _searchLoading = false;
   bool get _searching => _searchController.text.isNotEmpty;
 
+  // Error banner — tracks the last error message that the user dismissed.
+  String? _dismissedError;
+
   // Thread-level selection (key = threadId).
   final Set<String> _selectedThreadIds = {};
   // Last-emitted thread list, used to resolve emailIds for batch operations.
@@ -131,9 +134,16 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
               currentMailboxPath: widget.mailboxPath,
             ),
       bottomNavigationBar: _selecting ? _selectionBottomBar() : null,
-      body: (_searchResults != null || _searchLoading)
-          ? _buildSearchBody()
-          : _buildStreamBody(repo),
+      body: Column(
+        children: [
+          _buildSyncErrorBanner(),
+          Expanded(
+            child: (_searchResults != null || _searchLoading)
+                ? _buildSearchBody()
+                : _buildStreamBody(repo),
+          ),
+        ],
+      ),
     );
   }
 
@@ -267,6 +277,39 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     return _buildEmailList(_searchResults!);
   }
 
+  Widget _buildSyncErrorBanner() {
+    final errorAsync = ref.watch(syncLastErrorProvider(widget.accountId));
+    final error = errorAsync.valueOrNull;
+    if (error == null || error == _dismissedError) {
+      return const SizedBox.shrink();
+    }
+    return MaterialBanner(
+      padding: const EdgeInsets.fromLTRB(16, 8, 8, 8),
+      content: Text(
+        error,
+        maxLines: 2,
+        overflow: TextOverflow.ellipsis,
+      ),
+      leading: Icon(
+        Icons.sync_problem,
+        color: Theme.of(context).colorScheme.error,
+      ),
+      backgroundColor: Theme.of(context).colorScheme.errorContainer,
+      actions: [
+        TextButton(
+          onPressed: () {
+            ref.read(syncManagerProvider).syncNow(widget.accountId);
+          },
+          child: const Text('Retry'),
+        ),
+        TextButton(
+          onPressed: () => setState(() => _dismissedError = error),
+          child: const Text('Dismiss'),
+        ),
+      ],
+    );
+  }
+
   Widget _buildStreamBody(EmailRepository emailRepo) {
     return RefreshIndicator(
       onRefresh: () async {
@@ -331,7 +374,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       destinationMailboxPath: mailbox.path,
       originalEmails: originalEmails,
     );
-    ref.read(undoServiceProvider.notifier).pushAction(action);
+    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
   }
 
   Future<void> _batchArchive() =>
@@ -364,7 +407,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       destinationMailboxPath: lastDestPath,
       originalEmails: originalEmails,
     );
-    ref.read(undoServiceProvider.notifier).pushAction(action);
+    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
   }
 
   Future<void> _batchMarkSpam() =>
@@ -426,7 +469,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       destinationMailboxPath: chosen,
       originalEmails: originalEmails,
     );
-    ref.read(undoServiceProvider.notifier).pushAction(action);
+    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
   }
 
   Future<void> _batchSnooze() async {
@@ -458,7 +501,7 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
       sourceMailboxPath: widget.mailboxPath,
       originalEmails: originalEmails,
     );
-    ref.read(undoServiceProvider.notifier).pushAction(action);
+    unawaited(ref.read(undoServiceProvider.notifier).pushAction(action));
 
     if (!mounted) return;
 
@@ -609,7 +652,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 destinationMailboxPath: archive.path,
                 originalEmails: originalEmails,
               );
-              ref.read(undoServiceProvider.notifier).pushAction(action);
+              unawaited(
+                ref.read(undoServiceProvider.notifier).pushAction(action),
+              );
             } else {
               String? lastDestPath;
               for (final id in t.emailIds) {
@@ -625,7 +670,9 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
                 destinationMailboxPath: lastDestPath,
                 originalEmails: originalEmails,
               );
-              ref.read(undoServiceProvider.notifier).pushAction(action);
+              unawaited(
+                ref.read(undoServiceProvider.notifier).pushAction(action),
+              );
             }
           },
           child: tile,

lib/ui/screens/thread_detail_screen.dart

@@ -256,17 +256,19 @@ class _EmailMessageCardState extends ConsumerState<_EmailMessageCard> {
       final destPath = await repo.deleteEmail(widget.email.id);
 
       if (original != null) {
-        ref.read(undoServiceProvider.notifier).pushAction(
-              UndoAction(
-                id: DateTime.now().toIso8601String(),
-                accountId: widget.email.accountId,
-                type: UndoType.delete,
-                emailIds: [widget.email.id],
-                sourceMailboxPath: widget.email.mailboxPath,
-                destinationMailboxPath: destPath,
-                originalEmails: [original],
+        unawaited(
+          ref.read(undoServiceProvider.notifier).pushAction(
+                UndoAction(
+                  id: DateTime.now().toIso8601String(),
+                  accountId: widget.email.accountId,
+                  type: UndoType.delete,
+                  emailIds: [widget.email.id],
+                  sourceMailboxPath: widget.email.mailboxPath,
+                  destinationMailboxPath: destPath,
+                  originalEmails: [original],
+                ),
               ),
-            );
+        );
       }
     }
   }

lib/ui/screens/undo_log_screen.dart

@@ -1,3 +1,5 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:intl/intl.dart';
@@ -22,7 +24,8 @@ class UndoLogScreen extends ConsumerWidget {
             tooltip: 'Clear history',
             onPressed: history.isEmpty
                 ? null
-                : () => ref.read(undoServiceProvider.notifier).clear(),
+                : () =>
+                    unawaited(ref.read(undoServiceProvider.notifier).clear()),
           ),
         ],
       ),

pubspec.yaml

@@ -45,6 +45,10 @@ dependencies:
   url_launcher: ^6.3.2
   flutter_markdown: ^0.7.7+1
 
+  # Background sync and local notifications
+  flutter_local_notifications: ^18.0.1
+  workmanager: ^0.5.2
+
 dev_dependencies:
   flutter_test:
     sdk: flutter

scripts/check_coverage.dart

@@ -52,6 +52,7 @@ const _excluded = {
   'lib/ui/widgets/try_connection_button.dart',
   'lib/ui/widgets/undo_shell.dart',
   'lib/core/sync/account_sync_manager.dart',
+  'lib/core/sync/background_sync.dart',
   'lib/core/sync/reliability_runner.dart',
   'lib/data/jmap/jmap_client.dart',
   'lib/data/jmap/sieve_repository.dart',

test/integration/account_sync_manager_test.dart

@@ -96,6 +96,9 @@ class _FakeMailboxes implements MailboxRepository {
   @override
   Future<Mailbox?> findMailboxByRole(String accountId, String role) async =>
       null;
+
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }
 
 class _FakeEmails implements EmailRepository {
@@ -191,6 +194,9 @@ class _FakeEmails implements EmailRepository {
 
   @override
   Future<void> retryMutation(int id) async {}
+
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }
 
 class _FakeLogs implements SyncLogRepository {
@@ -214,4 +220,7 @@ class _FakeLogs implements SyncLogRepository {
   @override
   Stream<List<SyncLogEntry>> observeSyncLogs(String accountId) =>
       Stream.value([]);
+
+  @override
+  Stream<String?> observeLastError(String accountId) => Stream.value(null);
 }

test/unit/account_sync_manager_test.dart

@@ -98,6 +98,9 @@ class FakeEmailRepository implements EmailRepository {
     String mailboxPath,
   ) async =>
       ReliabilityResult.healthy;
+
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }
 
 class _Log {
@@ -129,6 +132,9 @@ class FakeSyncLogRepository implements SyncLogRepository {
   @override
   Stream<List<SyncLogEntry>> observeSyncLogs(String accountId) =>
       Stream.value([]);
+
+  @override
+  Stream<String?> observeLastError(String accountId) => Stream.value(null);
 }
 
 class FakeMailboxRepositoryWithInbox implements MailboxRepository {
@@ -148,4 +154,6 @@ class FakeMailboxRepositoryWithInbox implements MailboxRepository {
   Future<int> syncMailboxes(String id) async => 1;
   @override
   Future<Mailbox?> findMailboxByRole(String id, String role) async => null;
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }

test/unit/account_sync_manager_test.mocks.dart

@@ -187,6 +187,16 @@ class MockMailboxRepository extends _i1.Mock implements _i7.MailboxRepository {
         ),
         returnValue: _i4.Future<_i8.Mailbox?>.value(),
       ) as _i4.Future<_i8.Mailbox?>);
+
+  @override
+  _i4.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
+        Invocation.method(
+          #clearForResync,
+          [accountId],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [EmailRepository].
@@ -582,4 +592,14 @@ class MockEmailRepository extends _i1.Mock implements _i9.EmailRepository {
           ),
         )),
       ) as _i4.Future<_i2.ReliabilityResult>);
+
+  @override
+  _i4.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
+        Invocation.method(
+          #clearForResync,
+          [accountId],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }

test/unit/draft_repository_impl_test.dart

@@ -1,9 +1,25 @@
 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/draft_repository_impl.dart';
 
 import 'db_test_helper.dart';
 
+class _StubAccounts implements AccountRepository {
+  @override
+  Stream<List<Account>> observeAccounts() => const Stream.empty();
+  @override
+  Future<Account?> getAccount(String id) async => null;
+  @override
+  Future<void> addAccount(Account account, String password) async {}
+  @override
+  Future<void> updateAccount(Account account, {String? password}) async {}
+  @override
+  Future<void> removeAccount(String id) async {}
+  @override
+  Future<String> getPassword(String accountId) async => '';
+}
+
 void main() {
   setUpAll(configureSqliteForTests);
 
@@ -11,7 +27,7 @@ void main() {
     test(
       'saveDraft creates a new row and returns it with a non-zero id',
       () async {
-        final repo = DraftRepositoryImpl(openTestDatabase());
+        final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
         final draft = await repo.saveDraft(
           toText: 'bob@example.com',
           ccText: '',
@@ -25,7 +41,7 @@ void main() {
     );
 
     test('saveDraft with id updates existing row', () async {
-      final repo = DraftRepositoryImpl(openTestDatabase());
+      final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
       final created = await repo.saveDraft(
         toText: 'a@example.com',
         ccText: '',
@@ -47,19 +63,19 @@ void main() {
     });
 
     test('getDraft returns null for unknown id', () async {
-      final repo = DraftRepositoryImpl(openTestDatabase());
+      final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
       expect(await repo.getDraft(99999), isNull);
     });
 
     test('findDraft returns null when no draft exists', () async {
-      final repo = DraftRepositoryImpl(openTestDatabase());
+      final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
       expect(await repo.findDraft(), isNull);
     });
 
     test(
       'findDraft returns most recent draft for matching replyToEmailId',
       () async {
-        final repo = DraftRepositoryImpl(openTestDatabase());
+        final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
         await repo.saveDraft(
           replyToEmailId: 'email-1',
           toText: 'a@example.com',
@@ -83,7 +99,7 @@ void main() {
     test(
       'findDraft with null replyToEmailId finds new-message drafts',
       () async {
-        final repo = DraftRepositoryImpl(openTestDatabase());
+        final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
         // This draft is a reply and should NOT be returned.
         await repo.saveDraft(
           replyToEmailId: 'email-1',
@@ -104,7 +120,7 @@ void main() {
     );
 
     test('deleteDraft removes the row', () async {
-      final repo = DraftRepositoryImpl(openTestDatabase());
+      final repo = DraftRepositoryImpl(openTestDatabase(), _StubAccounts());
       final draft = await repo.saveDraft(
         toText: 'a@example.com',
         ccText: '',

test/unit/reliability_runner_test.dart

@@ -0,0 +1,348 @@
+import 'dart:async';
+import 'package:fake_async/fake_async.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:sharedinbox/core/models/account.dart';
+import 'package:sharedinbox/core/models/email.dart';
+import 'package:sharedinbox/core/models/mailbox.dart';
+import 'package:sharedinbox/core/repositories/account_repository.dart';
+import 'package:sharedinbox/core/repositories/email_repository.dart';
+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';
+
+// ── helpers ───────────────────────────────────────────────────────────────────
+
+Account _account({String id = 'a1'}) => Account(
+      id: id,
+      displayName: 'Test',
+      email: 'test@example.com',
+      imapHost: 'localhost',
+    );
+
+class _FakeAccounts implements AccountRepository {
+  final List<Account> accounts;
+  _FakeAccounts([Account? account]) : accounts = [account ?? _account()];
+
+  @override
+  Stream<List<Account>> observeAccounts() => Stream.value(accounts);
+  @override
+  Future<Account?> getAccount(String id) async =>
+      accounts.cast<Account?>().firstWhere(
+            (a) => a?.id == id,
+            orElse: () => null,
+          );
+  @override
+  Future<void> addAccount(Account account, String password) async {}
+  @override
+  Future<void> updateAccount(Account account, {String? password}) async {}
+  @override
+  Future<void> removeAccount(String id) async {}
+  @override
+  Future<String> getPassword(String id) async => 'secret';
+}
+
+class _FakeMailboxes implements MailboxRepository {
+  final List<Mailbox> mailboxes;
+  _FakeMailboxes([this.mailboxes = const []]);
+  @override
+  Stream<List<Mailbox>> observeMailboxes(String? accountId) =>
+      Stream.value(mailboxes);
+  @override
+  Future<int> syncMailboxes(String accountId) async => 0;
+  @override
+  Future<Mailbox?> findMailboxByRole(String accountId, String role) async =>
+      null;
+  @override
+  Future<void> clearForResync(String accountId) async {}
+}
+
+class _CountingEmails implements EmailRepository {
+  int syncCount = 0;
+  int wakeUpCount = 0;
+  final Exception? syncError;
+
+  _CountingEmails({this.syncError});
+
+  @override
+  Future<SyncEmailsResult> syncEmails(String accountId, String mailbox) async {
+    syncCount++;
+    if (syncError != null) throw syncError!;
+    return SyncEmailsResult.zero;
+  }
+
+  @override
+  Future<int> wakeUpEmails(String accountId) async {
+    wakeUpCount++;
+    return 0;
+  }
+
+  @override
+  Future<int> flushPendingChanges(String accountId, String password) async => 0;
+  @override
+  Stream<List<Email>> observeEmails(String a, String m) => Stream.value([]);
+  @override
+  Stream<List<EmailThread>> observeThreads(String a, String m) =>
+      Stream.value([]);
+  @override
+  Stream<List<Email>> observeEmailsInThread(String a, String m, String t) =>
+      Stream.value([]);
+  @override
+  Future<Email?> getEmail(String id) async => null;
+  @override
+  Future<EmailBody> getEmailBody(String id) async =>
+      const EmailBody(emailId: '', attachments: []);
+  @override
+  Future<void> setFlag(String id, {bool? seen, bool? flagged}) async {}
+  @override
+  Future<void> moveEmail(String id, String dest) async {}
+  @override
+  Future<String?> deleteEmail(String id) async => null;
+  @override
+  Future<void> sendEmail(String accountId, EmailDraft draft) async {}
+  @override
+  Future<String> downloadAttachment(String id, EmailAttachment att) async => '';
+  @override
+  Future<List<Email>> searchEmails(String a, String m, String q) async => [];
+  @override
+  Future<List<Email>> searchEmailsGlobal(String? a, String q) async => [];
+  @override
+  Future<List<Email>> getEmailsByAddress(String? a, String addr) async => [];
+  @override
+  Stream<List<FailedMutation>> observeFailedMutations(String a) =>
+      Stream.value([]);
+  @override
+  Future<void> discardMutation(int id) async {}
+  @override
+  Future<void> retryMutation(int id) async {}
+  @override
+  Future<bool> cancelPendingChange(String id, String type) async => false;
+  @override
+  Future<void> snoozeEmail(String id, DateTime until) async {}
+  @override
+  Future<void> restoreEmails(List<Email> emails) async {}
+  @override
+  Stream<String> get onChangesQueued => const Stream.empty();
+  @override
+  Stream<void> watchJmapPush(String accountId, String password) =>
+      const Stream.empty();
+  @override
+  Future<ReliabilityResult> verifySyncReliability(
+    String accountId,
+    String mailboxPath,
+  ) async =>
+      ReliabilityResult.healthy;
+  @override
+  Future<void> clearForResync(String accountId) async {}
+}
+
+class _FakeSyncLog implements SyncLogRepository {
+  final logs = <bool>[];
+  @override
+  Future<void> log({
+    required String accountId,
+    required bool success,
+    String? errorMessage,
+    required String protocol,
+    required int emailsFetched,
+    required int emailsSkipped,
+    required int mailboxesSynced,
+    required int pendingFlushed,
+    required int bytesTransferred,
+    required DateTime startedAt,
+    required DateTime finishedAt,
+    List<MailboxSyncStats> mailboxStats = const [],
+    String? protocolLog,
+  }) async {
+    logs.add(success);
+  }
+
+  @override
+  Stream<List<SyncLogEntry>> observeSyncLogs(String accountId) =>
+      Stream.value([]);
+
+  @override
+  Stream<String?> observeLastError(String accountId) => Stream.value(null);
+}
+
+// ── tests ─────────────────────────────────────────────────────────────────────
+
+void main() {
+  group('AccountSyncManager backoff', () {
+    test('backoff is capped at 900 s after repeated failures', () {
+      fakeAsync((async) {
+        final emails = _CountingEmails(
+          syncError: Exception('connection refused'),
+        );
+        final syncLog = _FakeSyncLog();
+        final manager = AccountSyncManager(
+          _FakeAccounts(),
+          _FakeMailboxes([
+            const Mailbox(
+              id: 'INBOX',
+              accountId: 'a1',
+              path: 'INBOX',
+              name: 'Inbox',
+              unreadCount: 0,
+              totalCount: 0,
+            ),
+          ]),
+          emails,
+          syncLog: syncLog,
+          imapConnect: (_, __, ___) async =>
+              throw Exception('connection refused'),
+        );
+
+        manager.start();
+
+        // Advance 3 hours — long enough to observe many retries.
+        // With max backoff 900 s, we expect at least floor(3*3600/900) = 12
+        // attempts, and at most 3*3600/5 = 2160 (if backoff never grew).
+        async.elapse(const Duration(hours: 3));
+
+        final failCount = syncLog.logs.where((ok) => !ok).length;
+        expect(
+          failCount,
+          greaterThan(10),
+          reason: 'should have retried many times within 3 h',
+        );
+        expect(
+          failCount,
+          lessThan(2200),
+          reason: 'backoff must have kicked in — not every 5 s for 3 h',
+        );
+
+        manager.dispose();
+        async.elapse(const Duration(seconds: 1));
+      });
+    });
+
+    test('backoff resets to 5 s after a successful sync', () {
+      fakeAsync((async) {
+        int callCount = 0;
+        final syncLog = _FakeSyncLog();
+
+        var failsLeft = 5;
+        final customEmails = _OverrideEmails(
+          onSync: (_) async {
+            callCount++;
+            if (failsLeft > 0) {
+              failsLeft--;
+              throw Exception('transient error');
+            }
+            return SyncEmailsResult.zero;
+          },
+        );
+
+        final manager = AccountSyncManager(
+          _FakeAccounts(),
+          _FakeMailboxes([
+            const Mailbox(
+              id: 'INBOX',
+              accountId: 'a1',
+              path: 'INBOX',
+              name: 'Inbox',
+              unreadCount: 0,
+              totalCount: 0,
+            ),
+          ]),
+          customEmails,
+          syncLog: syncLog,
+          imapConnect: (_, __, ___) async =>
+              throw Exception('skip idle — force immediate loop'),
+        );
+
+        manager.start();
+
+        // Allow errors + backoff to build up, then a success, then more loops.
+        async.elapse(const Duration(seconds: 3600));
+
+        // After success, backoff should reset; failures before success should
+        // be exactly 5, and subsequent loops should fire frequently.
+        final successCount = syncLog.logs.where((ok) => ok).length;
+        expect(
+          successCount,
+          greaterThan(0),
+          reason: 'should have at least one success',
+        );
+        expect(
+          callCount,
+          greaterThan(5),
+          reason: 'should retry after failures and continue after success',
+        );
+
+        manager.dispose();
+        async.elapse(const Duration(seconds: 1));
+      });
+    });
+
+    test('concurrent sync errors from multiple accounts stay bounded', () {
+      fakeAsync((async) {
+        final accounts = _FakeAccounts()
+          ..accounts.add(_account(id: 'a2'))
+          ..accounts.add(_account(id: 'a3'));
+        final syncLog = _FakeSyncLog();
+        final manager = AccountSyncManager(
+          accounts,
+          _FakeMailboxes([
+            const Mailbox(
+              id: 'INBOX',
+              accountId: 'a1',
+              path: 'INBOX',
+              name: 'Inbox',
+              unreadCount: 0,
+              totalCount: 0,
+            ),
+            const Mailbox(
+              id: 'INBOX',
+              accountId: 'a2',
+              path: 'INBOX',
+              name: 'Inbox',
+              unreadCount: 0,
+              totalCount: 0,
+            ),
+            const Mailbox(
+              id: 'INBOX',
+              accountId: 'a3',
+              path: 'INBOX',
+              name: 'Inbox',
+              unreadCount: 0,
+              totalCount: 0,
+            ),
+          ]),
+          _CountingEmails(syncError: Exception('network error')),
+          syncLog: syncLog,
+          imapConnect: (_, __, ___) async =>
+              throw Exception('connection refused'),
+        );
+
+        manager.start();
+        async.elapse(const Duration(hours: 2));
+
+        // All 3 accounts retry, each bounded by the 900 s cap.
+        final failCount = syncLog.logs.where((ok) => !ok).length;
+        expect(failCount, greaterThan(5));
+        expect(
+          failCount,
+          lessThan(5000),
+          reason: 'backoff must be in effect across all accounts',
+        );
+
+        manager.dispose();
+        async.elapse(const Duration(seconds: 1));
+      });
+    });
+  });
+}
+
+// ── _OverrideEmails ───────────────────────────────────────────────────────────
+
+class _OverrideEmails extends _CountingEmails {
+  _OverrideEmails({required Future<SyncEmailsResult> Function(String) onSync})
+      : _onSync = onSync;
+
+  final Future<SyncEmailsResult> Function(String) _onSync;
+
+  @override
+  Future<SyncEmailsResult> syncEmails(String accountId, String mailbox) =>
+      _onSync(mailbox);
+}

test/unit/undo_logic_test.dart

@@ -109,7 +109,7 @@ void main() {
       sourceMailboxPath: 'INBOX',
       originalEmails: [original!],
     );
-    container.read(undoServiceProvider.notifier).pushAction(action);
+    await container.read(undoServiceProvider.notifier).pushAction(action);
     await container.read(undoServiceProvider.notifier).undo();
 
     // 3. Verify it is back in Inbox
@@ -190,7 +190,7 @@ void main() {
       emailIds: [emailId],
       sourceMailboxPath: 'INBOX',
     );
-    container.read(undoServiceProvider.notifier).pushAction(action);
+    await container.read(undoServiceProvider.notifier).pushAction(action);
     await container.read(undoServiceProvider.notifier).undo();
 
     // 3. Verify it is back in Inbox
@@ -230,7 +230,7 @@ void main() {
         destinationMailboxPath: destPath,
         originalEmails: [original!],
       );
-      container.read(undoServiceProvider.notifier).pushAction(action);
+      await container.read(undoServiceProvider.notifier).pushAction(action);
       await container.read(undoServiceProvider.notifier).undo();
 
       // 4. Verify local state
@@ -273,7 +273,7 @@ void main() {
       sourceMailboxPath: 'INBOX',
       originalEmails: [original!],
     );
-    container.read(undoServiceProvider.notifier).pushAction(action);
+    await container.read(undoServiceProvider.notifier).pushAction(action);
     await container.read(undoServiceProvider.notifier).undo();
 
     // 3. Verify it is back in Inbox and metadata is cleared

test/unit/undo_service_test.dart

@@ -61,10 +61,10 @@ void main() {
     final notifier = container.read(undoServiceProvider.notifier);
     await notifier.init(); // Wait for persistent load
 
-    notifier.pushAction(action1);
+    await notifier.pushAction(action1);
     expect(container.read(undoServiceProvider), [action1]);
 
-    notifier.pushAction(action2);
+    await notifier.pushAction(action2);
     expect(container.read(undoServiceProvider), [action1, action2]);
   });
 
@@ -91,8 +91,8 @@ void main() {
 
     final notifier = container.read(undoServiceProvider.notifier);
     await notifier.init();
-    notifier.pushAction(action1);
-    notifier.pushAction(action2);
+    await notifier.pushAction(action1);
+    await notifier.pushAction(action2);
 
     await notifier.undo();
     expect(container.read(undoServiceProvider), [action1]);
@@ -126,8 +126,8 @@ void main() {
 
     final notifier = container.read(undoServiceProvider.notifier);
     await notifier.init();
-    notifier.pushAction(action1);
-    notifier.pushAction(action2);
+    await notifier.pushAction(action1);
+    await notifier.pushAction(action2);
 
     await notifier.undo(actionId: '1');
     expect(container.read(undoServiceProvider), [action2]);
@@ -154,7 +154,7 @@ void main() {
 
     final notifier = container.read(undoServiceProvider.notifier);
     await notifier.init();
-    notifier.pushAction(action);
+    await notifier.pushAction(action);
 
     await notifier.undo();
     verify(mockEmailRepo.moveEmail('e1', 'INBOX')).called(1);
@@ -193,11 +193,93 @@ void main() {
 
     final notifier = container.read(undoServiceProvider.notifier);
     await notifier.init();
-    notifier.pushAction(action);
+    await notifier.pushAction(action);
 
     await notifier.undo();
 
     verify(mockEmailRepo.restoreEmails(any)).called(1);
     verify(mockEmailRepo.moveEmail('e1', 'INBOX')).called(1);
   });
+
+  test('init loads persisted history from repository', () async {
+    final persisted = UndoAction(
+      id: '99',
+      accountId: 'acc1',
+      type: UndoType.move,
+      emailIds: ['e99'],
+      sourceMailboxPath: 'INBOX',
+    );
+
+    when(
+      mockUndoRepo.getHistory(limit: anyNamed('limit')),
+    ).thenAnswer((_) async => [persisted]);
+
+    final notifier = container.read(undoServiceProvider.notifier);
+    await notifier.init();
+
+    expect(container.read(undoServiceProvider), [persisted]);
+  });
+
+  test('pushAction after restart appends to persisted history', () async {
+    final persisted = UndoAction(
+      id: '1',
+      accountId: 'acc1',
+      type: UndoType.move,
+      emailIds: ['e1'],
+      sourceMailboxPath: 'INBOX',
+    );
+    final newAction = UndoAction(
+      id: '2',
+      accountId: 'acc1',
+      type: UndoType.delete,
+      emailIds: ['e2'],
+      sourceMailboxPath: 'INBOX',
+    );
+
+    when(
+      mockUndoRepo.getHistory(limit: anyNamed('limit')),
+    ).thenAnswer((_) async => [persisted]);
+
+    final notifier = container.read(undoServiceProvider.notifier);
+    await notifier.init();
+    await notifier.pushAction(newAction);
+
+    expect(container.read(undoServiceProvider), [persisted, newAction]);
+  });
+
+  test('pushAction concurrent with init waits for init to complete', () async {
+    final persisted = UndoAction(
+      id: '1',
+      accountId: 'acc1',
+      type: UndoType.move,
+      emailIds: ['e1'],
+      sourceMailboxPath: 'INBOX',
+    );
+    final raced = UndoAction(
+      id: '2',
+      accountId: 'acc1',
+      type: UndoType.delete,
+      emailIds: ['e2'],
+      sourceMailboxPath: 'INBOX',
+    );
+
+    // Simulate slow DB load
+    when(
+      mockUndoRepo.getHistory(limit: anyNamed('limit')),
+    ).thenAnswer(
+      (_) => Future.delayed(
+        const Duration(milliseconds: 10),
+        () => [persisted],
+      ),
+    );
+
+    final notifier = container.read(undoServiceProvider.notifier);
+    final initFuture = notifier.init();
+    // pushAction issued before init completes — it must still see persisted history
+    final pushFuture = notifier.pushAction(raced);
+
+    await Future.wait([initFuture, pushFuture]);
+
+    expect(container.read(undoServiceProvider), [persisted, raced]);
+  });
 }

test/unit/undo_service_test.mocks.dart

@@ -452,6 +452,16 @@ class MockEmailRepository extends _i1.Mock implements _i3.EmailRepository {
           ),
         )),
       ) as _i4.Future<_i2.ReliabilityResult>);
+
+  @override
+  _i4.Future<void> clearForResync(String? accountId) => (super.noSuchMethod(
+        Invocation.method(
+          #clearForResync,
+          [accountId],
+        ),
+        returnValue: _i4.Future<void>.value(),
+        returnValueForMissingStub: _i4.Future<void>.value(),
+      ) as _i4.Future<void>);
 }
 
 /// A class which mocks [UndoRepository].

test/widget/helpers.dart

@@ -114,6 +114,9 @@ class FakeDraftRepository implements DraftRepository {
 
   @override
   Future<void> deleteDraft(int id) async => _drafts.remove(id);
+
+  @override
+  Future<void> syncDrafts(String accountId, String password) async {}
 }
 
 class FakeMailboxRepository implements MailboxRepository {
@@ -132,6 +135,8 @@ class FakeMailboxRepository implements MailboxRepository {
   @override
   Future<Mailbox?> findMailboxByRole(String accountId, String role) async =>
       _mailboxes.where((m) => m.role == role).firstOrNull;
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }
 
 class FakeEmailRepository implements EmailRepository {
@@ -279,6 +284,9 @@ class FakeEmailRepository implements EmailRepository {
 
   @override
   Future<void> retryMutation(int id) async {}
+
+  @override
+  Future<void> clearForResync(String accountId) async {}
 }
 
 // ---------------------------------------------------------------------------