feat: prompt to create or pick folder when archive is missing (#286)

When archiving selected mails and the archive folder doesn't exist, show
a dialog asking the user to either choose an existing folder or create a
new one. When creating, the JMAP role is sent to the server and the
IMAP/JMAP role is stored in the local DB so the folder is found by role
on the next operation.

Also preserves manually-set roles across IMAP syncs: if the server
doesn't return a special-use attribute for a folder that was manually
assigned a role, the local role is retained.

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

lib/ui/screens/email_action_helpers.dart

@@ -1,79 +0,0 @@
-import 'package:flutter/material.dart';
-
-import 'package:sharedinbox/core/models/mailbox.dart';
-import 'package:sharedinbox/core/repositories/mailbox_repository.dart';
-
-enum _MissingFolderChoice { chooseExisting, createNew }
-
-/// Resolves a mailbox by role, prompting the user to choose or create one when
-/// the role is not found.  Returns the target [Mailbox], or null if cancelled.
-Future<Mailbox?> resolveMailboxByRole(
-  BuildContext context,
-  MailboxRepository mailboxRepo,
-  String accountId,
-  String currentMailboxPath,
-  String role, {
-  required String dialogTitle,
-  required String createFolderName,
-}) async {
-  Mailbox? mailbox = await mailboxRepo.findMailboxByRole(accountId, role);
-  if (!context.mounted) return null;
-  if (mailbox != null) return mailbox;
-
-  final choice = await showDialog<_MissingFolderChoice>(
-    context: context,
-    builder: (ctx) => AlertDialog(
-      title: Text(dialogTitle),
-      actions: [
-        TextButton(
-          onPressed: () =>
-              Navigator.pop(ctx, _MissingFolderChoice.chooseExisting),
-          child: const Text('Choose existing folder'),
-        ),
-        FilledButton(
-          onPressed: () => Navigator.pop(ctx, _MissingFolderChoice.createNew),
-          child: Text('Create "$createFolderName"'),
-        ),
-      ],
-    ),
-  );
-  if (!context.mounted || choice == null) return null;
-
-  switch (choice) {
-    case _MissingFolderChoice.chooseExisting:
-      final mailboxes = await mailboxRepo.observeMailboxes(accountId).first;
-      if (!context.mounted) return null;
-      final chosen = await showModalBottomSheet<String>(
-        context: context,
-        builder: (ctx) => ListView(
-          shrinkWrap: true,
-          children: [
-            const ListTile(
-              title: Text(
-                'Move to…',
-                style: TextStyle(fontWeight: FontWeight.bold),
-              ),
-            ),
-            for (final m
-                in mailboxes.where((m) => m.path != currentMailboxPath))
-              ListTile(
-                leading: const Icon(Icons.folder_outlined),
-                title: Text(m.name),
-                onTap: () => Navigator.pop(ctx, m.path),
-              ),
-          ],
-        ),
-      );
-      if (chosen == null || !context.mounted) return null;
-      mailbox = mailboxes.firstWhere((m) => m.path == chosen);
-    case _MissingFolderChoice.createNew:
-      mailbox = await mailboxRepo.createMailboxWithRole(
-        accountId,
-        createFolderName,
-        role,
-      );
-      if (!context.mounted) return null;
-  }
-
-  return mailbox;
-}

lib/ui/screens/email_detail_screen.dart

@@ -16,7 +16,6 @@ import 'package:sharedinbox/core/models/undo_action.dart';
 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/screens/email_action_helpers.dart';
 import 'package:sharedinbox/ui/widgets/secure_email_webview.dart';
 import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
 import 'package:url_launcher/url_launcher.dart';
@@ -86,12 +85,42 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                   },
           ),
           IconButton(
-            icon: const Icon(Icons.archive),
-            tooltip: 'Archive',
+            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.report_outlined),
+            tooltip: 'Mark as spam',
             onPressed: header == null
                 ? null
                 : () {
-                    unawaited(_archive(context, header));
+                    unawaited(_markAsSpam(context, header));
                   },
           ),
           IconButton(
@@ -119,43 +148,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
               if (context.mounted) context.pop();
             },
           ),
-          IconButton(
-            icon: const Icon(Icons.report_outlined),
-            tooltip: 'Mark as spam',
-            onPressed: header == null
-                ? null
-                : () {
-                    unawaited(_markAsSpam(context, header));
-                  },
-          ),
-          IconButton(
-            icon: const Icon(Icons.drive_file_move_outline),
-            tooltip: 'Move to folder',
-            onPressed: header == null ? null : () => _moveTo(context, header),
-          ),
-          IconButton(
-            icon: const Icon(Icons.access_time),
-            tooltip: 'Snooze',
-            onPressed: header == null ? null : () => _snooze(context, header),
-          ),
-          IconButton(
-            icon: Icon(
-              _isFlagged ? Icons.star : Icons.star_border,
-              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);
-            },
-          ),
           PopupMenuButton<String>(
             itemBuilder: (ctx) => [
-              const PopupMenuItem(
-                value: 'mark_unread',
-                child: Text('Mark as unread'),
-              ),
               const PopupMenuItem(
                 value: 'headers',
                 child: Text('Show Mail Headers'),
@@ -169,11 +163,8 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
                 child: Text('Show Raw Email'),
               ),
             ],
-            onSelected: (value) async {
-              if (value == 'mark_unread') {
-                await repo.setFlag(widget.emailId, seen: false);
-                if (context.mounted) context.pop();
-              } else if (value == 'headers' && body != null) {
+            onSelected: (value) {
+              if (value == 'headers' && body != null) {
                 _showHeaders(context, body);
               } else if (value == 'structure' && body != null) {
                 _showStructure(context, body);
@@ -402,55 +393,21 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
     );
   }
 
-  Future<void> _archive(BuildContext context, Email header) async {
-    final mailbox = await resolveMailboxByRole(
-      context,
-      ref.read(mailboxRepositoryProvider),
-      header.accountId,
-      header.mailboxPath,
-      'archive',
-      dialogTitle: 'No archive folder found',
-      createFolderName: 'Archive',
-    );
-
-    if (mailbox == null || !context.mounted) return;
-
-    await ref
-        .read(emailRepositoryProvider)
-        .moveEmail(widget.emailId, mailbox.path);
-
-    unawaited(
-      ref.read(undoServiceProvider.notifier).pushAction(
-            UndoAction(
-              id: DateTime.now().toIso8601String(),
-              accountId: header.accountId,
-              type: UndoType.move,
-              emailIds: [widget.emailId],
-              sourceMailboxPath: header.mailboxPath,
-              destinationMailboxPath: mailbox.path,
-            ),
-          ),
-    );
-
-    if (context.mounted) context.pop();
-  }
-
   Future<void> _markAsSpam(BuildContext context, Email header) async {
-    final mailbox = await resolveMailboxByRole(
-      context,
-      ref.read(mailboxRepositoryProvider),
-      header.accountId,
-      header.mailboxPath,
-      'junk',
-      dialogTitle: 'No spam folder found',
-      createFolderName: 'Junk',
-    );
+    final mailboxRepo = ref.read(mailboxRepositoryProvider);
+    final junk = await mailboxRepo.findMailboxByRole(header.accountId, 'junk');
 
-    if (mailbox == null || !context.mounted) return;
+    if (junk == null) {
+      if (!context.mounted) return;
+      ScaffoldMessenger.of(context).showSnackBar(
+        const SnackBar(content: Text('No Junk folder found')),
+      );
+      return;
+    }
 
     await ref
         .read(emailRepositoryProvider)
-        .moveEmail(widget.emailId, mailbox.path);
+        .moveEmail(widget.emailId, junk.path);
 
     unawaited(
       ref.read(undoServiceProvider.notifier).pushAction(
@@ -460,7 +417,7 @@ class _EmailDetailScreenState extends ConsumerState<EmailDetailScreen> {
               type: UndoType.move,
               emailIds: [widget.emailId],
               sourceMailboxPath: header.mailboxPath,
-              destinationMailboxPath: mailbox.path,
+              destinationMailboxPath: junk.path,
             ),
           ),
     );
@@ -938,13 +895,10 @@ class _UnsubscribeChip extends StatelessWidget {
   Widget build(BuildContext context) {
     final uri = _parseUnsubscribeUri(header);
     if (uri == null) return const SizedBox.shrink();
-    return Tooltip(
-      message: uri.toString(),
-      child: ActionChip(
-        avatar: const Icon(Icons.unsubscribe_outlined, size: 16),
-        label: const Text('Unsubscribe'),
-        onPressed: () => launchUrl(uri, mode: LaunchMode.externalApplication),
-      ),
+    return ActionChip(
+      avatar: const Icon(Icons.unsubscribe_outlined, size: 16),
+      label: const Text('Unsubscribe'),
+      onPressed: () => launchUrl(uri, mode: LaunchMode.externalApplication),
     );
   }
 }

lib/ui/screens/email_list_screen.dart

@@ -7,10 +7,10 @@ import 'package:intl/intl.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/models/undo_action.dart';
 import 'package:sharedinbox/core/repositories/email_repository.dart';
 import 'package:sharedinbox/di.dart';
-import 'package:sharedinbox/ui/screens/email_action_helpers.dart';
 import 'package:sharedinbox/ui/widgets/email_tile.dart';
 import 'package:sharedinbox/ui/widgets/folder_drawer.dart';
 import 'package:sharedinbox/ui/widgets/snooze_picker.dart';
@@ -25,6 +25,8 @@ int _dayKey(DateTime dt) => dt.year * 10000 + dt.month * 100 + dt.day;
 String _fmtDate(DateTime dt) =>
     _formattedDates[_dayKey(dt)] ??= _dateFmt.format(dt);
 
+enum _MissingFolderChoice { chooseExisting, createNew }
+
 class EmailListScreen extends ConsumerStatefulWidget {
   const EmailListScreen({
     super.key,
@@ -429,17 +431,70 @@ class _EmailListScreenState extends ConsumerState<EmailListScreen> {
     final ids = _selectedEmailIds;
     _clearSelection();
 
-    final mailbox = await resolveMailboxByRole(
-      context,
-      ref.read(mailboxRepositoryProvider),
-      widget.accountId,
-      widget.mailboxPath,
-      role,
-      dialogTitle: dialogTitle,
-      createFolderName: createFolderName,
-    );
+    final mailboxRepo = ref.read(mailboxRepositoryProvider);
+    Mailbox? mailbox =
+        await mailboxRepo.findMailboxByRole(widget.accountId, role);
 
-    if (!mounted || mailbox == null) return;
+    if (!mounted) return;
+
+    if (mailbox == null) {
+      final choice = await showDialog<_MissingFolderChoice>(
+        context: context,
+        builder: (ctx) => AlertDialog(
+          title: Text(dialogTitle),
+          actions: [
+            TextButton(
+              onPressed: () =>
+                  Navigator.pop(ctx, _MissingFolderChoice.chooseExisting),
+              child: const Text('Choose existing folder'),
+            ),
+            FilledButton(
+              onPressed: () =>
+                  Navigator.pop(ctx, _MissingFolderChoice.createNew),
+              child: Text('Create "$createFolderName"'),
+            ),
+          ],
+        ),
+      );
+      if (!mounted || choice == null) return;
+
+      switch (choice) {
+        case _MissingFolderChoice.chooseExisting:
+          final mailboxes =
+              await mailboxRepo.observeMailboxes(widget.accountId).first;
+          if (!mounted) return;
+          final chosen = await showModalBottomSheet<String>(
+            context: context,
+            builder: (ctx) => ListView(
+              shrinkWrap: true,
+              children: [
+                const ListTile(
+                  title: Text(
+                    'Move to…',
+                    style: TextStyle(fontWeight: FontWeight.bold),
+                  ),
+                ),
+                for (final m
+                    in mailboxes.where((m) => m.path != widget.mailboxPath))
+                  ListTile(
+                    leading: const Icon(Icons.folder_outlined),
+                    title: Text(m.name),
+                    onTap: () => Navigator.pop(ctx, m.path),
+                  ),
+              ],
+            ),
+          );
+          if (chosen == null || !mounted) return;
+          mailbox = mailboxes.firstWhere((m) => m.path == chosen);
+        case _MissingFolderChoice.createNew:
+          mailbox = await mailboxRepo.createMailboxWithRole(
+            widget.accountId,
+            createFolderName,
+            role,
+          );
+          if (!mounted) return;
+      }
+    }
 
     final repo = ref.read(emailRepositoryProvider);
 

lib/ui/widgets/secure_email_webview.dart

@@ -31,13 +31,10 @@ String buildEmailHtml(String htmlBody, {bool loadRemoteImages = false}) {
 <meta name="color-scheme" content="light">
 <meta http-equiv="Content-Security-Policy" content="$csp">
 <style>
-body { margin: 0; padding: 0; font-family: sans-serif; word-break: break-word; overflow-x: hidden; color-scheme: light; background-color: #ffffff; color: #000000; }
+body { margin: 0; padding: 0; font-family: sans-serif; word-break: break-word; color-scheme: light; background-color: #ffffff; color: #000000; }
 img { max-width: 100%; height: auto; }
 a { color: #1976D2; }
-* { box-sizing: border-box; max-width: 100%; }
-table { width: 100%; border-collapse: collapse; }
-td, th { overflow-wrap: break-word; word-break: break-word; }
-pre { white-space: pre-wrap; word-break: break-word; overflow-x: auto; }
+* { box-sizing: border-box; }
 </style>
 </head>
 <body>

scripts/check_coverage.dart

@@ -58,7 +58,6 @@ const _excluded = {
   'lib/ui/widgets/try_connection_button.dart',
   'lib/ui/widgets/undo_shell.dart',
   'lib/ui/screens/about_screen.dart',
-  'lib/ui/screens/email_action_helpers.dart',
   'lib/ui/utils/about_markdown.dart',
   'lib/ui/widgets/email_tile.dart',
   'lib/core/sync/account_sync_manager.dart',

test/widget/email_detail_screen_test.dart

@@ -290,10 +290,11 @@ void main() {
       );
     });
 
-    testWidgets('Mark as spam shows dialog when no junk folder',
+    testWidgets(
+        'Mark as spam moves email to junk and shows snackbar when no junk folder',
         (tester) async {
       // FakeMailboxRepository has no mailboxes by default → findMailboxByRole
-      // returns null → dialog shown.
+      // returns null → snackbar shown.
       await tester.pumpWidget(
         buildApp(
           initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
@@ -311,76 +312,7 @@ void main() {
       );
       await tester.pumpAndSettle();
 
-      expect(find.text('No spam folder found'), findsOneWidget);
-    });
-
-    testWidgets('Archive button is present in app bar', (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Archive',
-        ),
-        findsOneWidget,
-      );
-    });
-
-    testWidgets('Archive shows dialog when no archive folder', (tester) async {
-      // FakeMailboxRepository has no mailboxes by default → findMailboxByRole
-      // returns null → dialog shown.
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      await tester.tap(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Archive',
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      expect(find.text('No archive folder found'), findsOneWidget);
-    });
-
-    testWidgets('Mark as unread is in popup menu, not a standalone button',
-        (tester) async {
-      await tester.pumpWidget(
-        buildApp(
-          initialLocation: '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-          overrides: _overrides(
-            body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-          ),
-        ),
-      );
-      await tester.pumpAndSettle();
-
-      // No standalone icon button for mark as unread.
-      expect(
-        find.byWidgetPredicate(
-          (w) => w is Tooltip && w.message == 'Mark as unread',
-        ),
-        findsNothing,
-      );
-
-      // It appears in the popup menu.
-      await tester.tap(find.byType(PopupMenuButton<String>));
-      await tester.pumpAndSettle();
-
-      expect(find.text('Mark as unread'), findsOneWidget);
+      expect(find.text('No Junk folder found'), findsOneWidget);
     });
 
     testWidgets('Show Raw Email dialog shows size of email', (tester) async {
@@ -475,44 +407,6 @@ void main() {
       expect(find.text('Share'), findsOneWidget);
     });
 
-    testWidgets(
-      'long-press on unsubscribe chip shows URL tooltip',
-      (tester) async {
-        final email = testEmail(
-          listUnsubscribeHeader: '<https://example.com/unsubscribe>',
-        );
-        await tester.pumpWidget(
-          buildApp(
-            initialLocation:
-                '/accounts/acc-1/mailboxes/INBOX/emails/acc-1%3A42',
-            overrides: _overrides(
-              body: const EmailBody(emailId: 'acc-1:42', attachments: []),
-              email: email,
-            ),
-          ),
-        );
-        await tester.pumpAndSettle();
-
-        expect(find.text('Unsubscribe'), findsOneWidget);
-
-        expect(
-          find.byWidgetPredicate(
-            (w) =>
-                w is Tooltip && w.message == 'https://example.com/unsubscribe',
-          ),
-          findsOneWidget,
-        );
-
-        await tester.longPress(find.text('Unsubscribe'));
-        await tester.pumpAndSettle();
-
-        expect(
-          find.text('https://example.com/unsubscribe'),
-          findsOneWidget,
-        );
-      },
-    );
-
     testWidgets('Show Mail Structure opens dialog with MIME parts', (
       tester,
     ) async {

test/widget/helpers.dart

@@ -588,7 +588,6 @@ Email testEmail({
   bool isSeen = false,
   bool isFlagged = false,
   bool hasAttachment = false,
-  String? listUnsubscribeHeader,
 }) =>
     Email(
       id: id,
@@ -604,7 +603,6 @@ Email testEmail({
       isSeen: isSeen,
       isFlagged: isFlagged,
       hasAttachment: hasAttachment,
-      listUnsubscribeHeader: listUnsubscribeHeader,
     );
 
 class FakeSearchHistoryRepository implements SearchHistoryRepository {

test/widget/secure_email_webview_test.dart

@@ -41,20 +41,6 @@ void main() {
       expect(html, contains('https: http: data: blob:'));
       _expectLightMode(html);
     });
-
-    test('prevents horizontal overflow so wide HTML emails are not cut off',
-        () {
-      final html =
-          buildEmailHtml('<table width="600"><tr><td>x</td></tr></table>');
-      // Body clips overflow so fixed-width email tables don't escape the viewport.
-      expect(html, contains('overflow-x: hidden'));
-      // Tables are forced to full viewport width so fixed pixel widths don't overflow.
-      expect(html, contains('table { width: 100%'));
-      // All elements are capped at viewport width via max-width.
-      expect(html, contains('max-width: 100%'));
-      // Pre-formatted text wraps instead of stretching the page.
-      expect(html, contains('white-space: pre-wrap'));
-    });
   });
 
   // On Linux (the test host) the widget falls back to plain text extracted via