diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 9592db5454b05bb4b7435443364635f65b5210a7..143e5414ce9a4de38c40df3299680f854a4efa40 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -11,7 +11,7 @@ submitting a new issue.
 
 * The issue tracker is solely for bug reports and feature/enhancement requests. If you have a question of any kind,
 please use the [support forum](https://forum.k9mail.app/c/support) instead.
-* Search the [existing issues](https://github.com/k9mail/k-9/issues?q=) first to make sure your issue hasn't been
+* Search the [existing issues](https://github.com/thundernest/k-9/issues?q=) first to make sure your issue hasn't been
 reported before.
 
 
@@ -22,8 +22,8 @@ We're using [Transifex](https://www.transifex.com/k-9/k9mail/) to manage transla
 
 ## Contributing code
 
-We love [pull requests](https://github.com/k9mail/k-9/pulls) from everyone!
+We love [pull requests](https://github.com/thundernest/k-9/pulls) from everyone!
 
 Any contributions, large or small, major features, bug fixes, unit/integration tests are welcomed and appreciated
 but will be thoroughly reviewed and discussed.
-Please make sure you read the [Code Style Guidelines](https://github.com/k9mail/k-9/wiki/CodeStyle).
+Please make sure you read the [Code Style Guidelines](https://github.com/thundernest/k-9/wiki/CodeStyle).
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 5b59297a1824b6d8652c9a580b5af005926a37cc..c44bf97bfc3571fb03d2190761624ce0122eb4db 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -72,6 +72,6 @@ body:
     attributes:
       label: Logs
       description: |
-        Please take some time to [retrieve logs](https://github.com/k9mail/k-9/wiki/LoggingErrors) and attach them here.
+        Please take some time to [retrieve logs](https://github.com/thundernest/k-9/wiki/LoggingErrors) and attach them here.
 
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.
diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
index e654e6d06628534aa51bb56f69f617e54e7fc8d0..194aa9c112be906e7a3057d15ca6cff8188af51e 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -1311,9 +1311,6 @@ public class MessagingController {
         fp.add(FetchProfile.Item.BODY);
         localFolder.fetch(Collections.singletonList(message), fp, null);
 
-        notificationController.removeNewMailNotification(account, message.makeMessageReference());
-        markMessageAsOpened(account, message);
-
         return message;
     }
 
@@ -1335,7 +1332,15 @@ public class MessagingController {
         return message;
     }
 
-    private void markMessageAsOpened(Account account, LocalMessage message) throws MessagingException {
+    public void markMessageAsOpened(Account account, LocalMessage message) {
+        put("markMessageAsOpened", null, () -> {
+            markMessageAsOpenedBlocking(account, message);
+        });
+    }
+
+    private void markMessageAsOpenedBlocking(Account account, LocalMessage message) {
+        notificationController.removeNewMailNotification(account,message.makeMessageReference());
+
         if (!message.isSet(Flag.SEEN)) {
             if (account.isMarkMessageAsReadOnView()) {
                 markMessageAsReadOnView(account, message);
@@ -1347,11 +1352,15 @@ public class MessagingController {
         }
     }
 
-    private void markMessageAsReadOnView(Account account, LocalMessage message) throws MessagingException {
-        List<Long> messageIds = Collections.singletonList(message.getDatabaseId());
-        setFlag(account, messageIds, Flag.SEEN, true);
+    private void markMessageAsReadOnView(Account account, LocalMessage message) {
+        try {
+            List<Long> messageIds = Collections.singletonList(message.getDatabaseId());
+            setFlag(account, messageIds, Flag.SEEN, true);
 
-        message.setFlagInternal(Flag.SEEN, true);
+            message.setFlagInternal(Flag.SEEN, true);
+        } catch (MessagingException e) {
+            Timber.e(e, "Error while marking message as read");
+        }
     }
 
     private void markMessageAsNotNew(Account account, LocalMessage message) {
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt
index d7e403b8c315bbd1d65326ab97bddfd161bbc6d0..84297e06b4ff357d61738995292c989774a6c9b7 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionCreator.kt
@@ -5,54 +5,35 @@ import com.fsck.k9.Account
 import com.fsck.k9.controller.MessageReference
 
 interface NotificationActionCreator {
-    fun createViewMessagePendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createViewMessagePendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createViewFolderPendingIntent(account: Account, folderId: Long, notificationId: Int): PendingIntent
+    fun createViewFolderPendingIntent(account: Account, folderId: Long): PendingIntent
 
-    fun createViewMessagesPendingIntent(
-        account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
-    ): PendingIntent
+    fun createViewMessagesPendingIntent(account: Account, messageReferences: List<MessageReference>): PendingIntent
 
-    fun createViewFolderListPendingIntent(account: Account, notificationId: Int): PendingIntent
+    fun createViewFolderListPendingIntent(account: Account): PendingIntent
 
-    fun createDismissAllMessagesPendingIntent(account: Account, notificationId: Int): PendingIntent
+    fun createDismissAllMessagesPendingIntent(account: Account): PendingIntent
 
-    fun createDismissMessagePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent
+    fun createDismissMessagePendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createReplyPendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createReplyPendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createMarkMessageAsReadPendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createMarkMessageAsReadPendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createMarkAllAsReadPendingIntent(
-        account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
-    ): PendingIntent
+    fun createMarkAllAsReadPendingIntent(account: Account, messageReferences: List<MessageReference>): PendingIntent
 
     fun getEditIncomingServerSettingsIntent(account: Account): PendingIntent
 
     fun getEditOutgoingServerSettingsIntent(account: Account): PendingIntent
 
-    fun createDeleteMessagePendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createDeleteMessagePendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createDeleteAllPendingIntent(
-        account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
-    ): PendingIntent
+    fun createDeleteAllPendingIntent(account: Account, messageReferences: List<MessageReference>): PendingIntent
 
-    fun createArchiveMessagePendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createArchiveMessagePendingIntent(messageReference: MessageReference): PendingIntent
 
-    fun createArchiveAllPendingIntent(
-        account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
-    ): PendingIntent
+    fun createArchiveAllPendingIntent(account: Account, messageReferences: List<MessageReference>): PendingIntent
 
-    fun createMarkMessageAsSpamPendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent
+    fun createMarkMessageAsSpamPendingIntent(messageReference: MessageReference): PendingIntent
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
index db99f40340ec52f42ee475fa4ad315094611ecda..de9f8c94bea4cbe209a290961d3dcd28acb9ea23 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
@@ -108,32 +108,43 @@ internal class NotificationDataStore {
         account: Account,
         selector: (List<MessageReference>) -> List<MessageReference>
     ): RemoveNotificationsResult? {
-        val notificationData = getNotificationData(account)
+        var notificationData = getNotificationData(account)
         if (notificationData.isEmpty()) return null
 
         val removeMessageReferences = selector.invoke(notificationData.messageReferences)
+        if (removeMessageReferences.isEmpty()) return null
 
         val operations = mutableListOf<NotificationStoreOperation>()
         val newNotificationHolders = mutableListOf<NotificationHolder>()
         val cancelNotificationIds = mutableListOf<Int>()
 
-        for (messageReference in removeMessageReferences) {
-            val notificationHolder = notificationData.activeNotifications.firstOrNull {
-                it.content.messageReference == messageReference
+        val activeMessageReferences = notificationData.activeNotifications.map { it.content.messageReference }.toSet()
+        val (removeActiveMessageReferences, removeInactiveMessageReferences) = removeMessageReferences
+            .partition { it in activeMessageReferences }
+
+        if (removeInactiveMessageReferences.isNotEmpty()) {
+            val inactiveMessageReferences = notificationData.inactiveNotifications
+                .map { it.content.messageReference }.toSet()
+
+            for (messageReference in removeInactiveMessageReferences) {
+                if (messageReference in inactiveMessageReferences) {
+                    operations.add(NotificationStoreOperation.Remove(messageReference))
+                }
             }
 
-            if (notificationHolder == null) {
-                val inactiveNotificationHolder = notificationData.inactiveNotifications.firstOrNull {
-                    it.content.messageReference == messageReference
-                } ?: continue
+            val removeMessageReferenceSet = removeInactiveMessageReferences.toSet()
+            notificationData = notificationData.copy(
+                inactiveNotifications = notificationData.inactiveNotifications
+                    .filter { it.content.messageReference !in removeMessageReferenceSet }
+            )
+        }
 
-                operations.add(NotificationStoreOperation.Remove(messageReference))
+        for (messageReference in removeActiveMessageReferences) {
+            val notificationHolder = notificationData.activeNotifications.first {
+                it.content.messageReference == messageReference
+            }
 
-                val newNotificationData = notificationData.copy(
-                    inactiveNotifications = notificationData.inactiveNotifications - inactiveNotificationHolder
-                )
-                notificationDataMap[account.uuid] = newNotificationData
-            } else if (notificationData.inactiveNotifications.isNotEmpty()) {
+            if (notificationData.inactiveNotifications.isNotEmpty()) {
                 val newNotificationHolder = notificationData.inactiveNotifications.first()
                     .toNotificationHolder(notificationHolder.notificationId)
 
@@ -148,29 +159,29 @@ internal class NotificationDataStore {
                     )
                 )
 
-                val newNotificationData = notificationData.copy(
+                notificationData = notificationData.copy(
                     activeNotifications = notificationData.activeNotifications - notificationHolder +
                         newNotificationHolder,
                     inactiveNotifications = notificationData.inactiveNotifications.drop(1)
                 )
-                notificationDataMap[account.uuid] = newNotificationData
             } else {
                 cancelNotificationIds.add(notificationHolder.notificationId)
 
                 operations.add(NotificationStoreOperation.Remove(messageReference))
 
-                val newNotificationData = notificationData.copy(
+                notificationData = notificationData.copy(
                     activeNotifications = notificationData.activeNotifications - notificationHolder
                 )
-                notificationDataMap[account.uuid] = newNotificationData
             }
         }
 
+        notificationDataMap[account.uuid] = notificationData
+
         return if (operations.isEmpty()) {
             null
         } else {
             RemoveNotificationsResult(
-                notificationData = getNotificationData(account),
+                notificationData = notificationData,
                 notificationStoreOperations = operations,
                 notificationHolders = newNotificationHolders,
                 cancelNotificationIds = cancelNotificationIds
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
index 3dd80b75ed82e145e405154609c0c259d1bbd792..2f82eabe1163c1d9b89439f9a8ccdfd03effbc9e 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
@@ -19,13 +19,9 @@ internal class SendFailedNotificationController(
 
         val pendingIntent = account.outboxFolderId.let { outboxFolderId ->
             if (outboxFolderId != null) {
-                actionBuilder.createViewFolderPendingIntent(
-                    account, outboxFolderId, notificationId
-                )
+                actionBuilder.createViewFolderPendingIntent(account, outboxFolderId)
             } else {
-                actionBuilder.createViewFolderListPendingIntent(
-                    account, notificationId
-                )
+                actionBuilder.createViewFolderListPendingIntent(account)
             }
         }
 
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
index 21553997b709d73b9f68b23cc93b8859b723ab4f..d6d5e3626a2e925fe07640fff2c4bef07d6a07f1 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
@@ -1,6 +1,5 @@
 package com.fsck.k9.notification
 
-import android.app.PendingIntent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.WearableExtender
 import com.fsck.k9.notification.NotificationChannelManager.ChannelType
@@ -24,7 +23,6 @@ internal class SingleMessageNotificationCreator(
 
         val notification = notificationHelper.createNotificationBuilder(account, ChannelType.MESSAGES)
             .setCategory(NotificationCompat.CATEGORY_EMAIL)
-            .setAutoCancel(true)
             .setGroup(baseNotificationData.groupKey)
             .setGroupSummary(isGroupSummary)
             .setSmallIcon(resourceProvider.iconNewMail)
@@ -35,8 +33,8 @@ internal class SingleMessageNotificationCreator(
             .setContentText(content.subject)
             .setSubText(baseNotificationData.accountName)
             .setBigText(content.preview)
-            .setContentIntent(createViewIntent(content, notificationId))
-            .setDeleteIntent(createDismissIntent(content, notificationId))
+            .setContentIntent(actionCreator.createViewMessagePendingIntent(content.messageReference))
+            .setDeleteIntent(actionCreator.createDismissMessagePendingIntent(content.messageReference))
             .setDeviceActions(singleNotificationData)
             .setWearActions(singleNotificationData)
             .setAppearance(singleNotificationData.isSilent, baseNotificationData.appearance)
@@ -57,14 +55,6 @@ internal class SingleMessageNotificationCreator(
         setStyle(NotificationCompat.BigTextStyle().bigText(text))
     }
 
-    private fun createViewIntent(content: NotificationContent, notificationId: Int): PendingIntent {
-        return actionCreator.createViewMessagePendingIntent(content.messageReference, notificationId)
-    }
-
-    private fun createDismissIntent(content: NotificationContent, notificationId: Int): PendingIntent {
-        return actionCreator.createDismissMessagePendingIntent(content.messageReference, notificationId)
-    }
-
     private fun NotificationBuilder.setDeviceActions(notificationData: SingleNotificationData) = apply {
         val actions = notificationData.actions
         for (action in actions) {
@@ -81,8 +71,7 @@ internal class SingleMessageNotificationCreator(
         val title = resourceProvider.actionReply()
         val content = notificationData.content
         val messageReference = content.messageReference
-        val replyToMessagePendingIntent =
-            actionCreator.createReplyPendingIntent(messageReference, notificationData.notificationId)
+        val replyToMessagePendingIntent = actionCreator.createReplyPendingIntent(messageReference)
 
         addAction(icon, title, replyToMessagePendingIntent)
     }
@@ -91,9 +80,8 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.iconMarkAsRead
         val title = resourceProvider.actionMarkAsRead()
         val content = notificationData.content
-        val notificationId = notificationData.notificationId
         val messageReference = content.messageReference
-        val action = actionCreator.createMarkMessageAsReadPendingIntent(messageReference, notificationId)
+        val action = actionCreator.createMarkMessageAsReadPendingIntent(messageReference)
 
         addAction(icon, title, action)
     }
@@ -102,9 +90,8 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.iconDelete
         val title = resourceProvider.actionDelete()
         val content = notificationData.content
-        val notificationId = notificationData.notificationId
         val messageReference = content.messageReference
-        val action = actionCreator.createDeleteMessagePendingIntent(messageReference, notificationId)
+        val action = actionCreator.createDeleteMessagePendingIntent(messageReference)
 
         addAction(icon, title, action)
     }
@@ -129,8 +116,7 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.wearIconReplyAll
         val title = resourceProvider.actionReply()
         val messageReference = notificationData.content.messageReference
-        val notificationId = notificationData.notificationId
-        val action = actionCreator.createReplyPendingIntent(messageReference, notificationId)
+        val action = actionCreator.createReplyPendingIntent(messageReference)
         val replyAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(replyAction)
@@ -140,8 +126,7 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.wearIconMarkAsRead
         val title = resourceProvider.actionMarkAsRead()
         val messageReference = notificationData.content.messageReference
-        val notificationId = notificationData.notificationId
-        val action = actionCreator.createMarkMessageAsReadPendingIntent(messageReference, notificationId)
+        val action = actionCreator.createMarkMessageAsReadPendingIntent(messageReference)
         val markAsReadAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(markAsReadAction)
@@ -151,8 +136,7 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.wearIconDelete
         val title = resourceProvider.actionDelete()
         val messageReference = notificationData.content.messageReference
-        val notificationId = notificationData.notificationId
-        val action = actionCreator.createDeleteMessagePendingIntent(messageReference, notificationId)
+        val action = actionCreator.createDeleteMessagePendingIntent(messageReference)
         val deleteAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(deleteAction)
@@ -162,8 +146,7 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.wearIconArchive
         val title = resourceProvider.actionArchive()
         val messageReference = notificationData.content.messageReference
-        val notificationId = notificationData.notificationId
-        val action = actionCreator.createArchiveMessagePendingIntent(messageReference, notificationId)
+        val action = actionCreator.createArchiveMessagePendingIntent(messageReference)
         val archiveAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(archiveAction)
@@ -173,8 +156,7 @@ internal class SingleMessageNotificationCreator(
         val icon = resourceProvider.wearIconMarkAsSpam
         val title = resourceProvider.actionMarkAsSpam()
         val messageReference = notificationData.content.messageReference
-        val notificationId = notificationData.notificationId
-        val action = actionCreator.createMarkMessageAsSpamPendingIntent(messageReference, notificationId)
+        val action = actionCreator.createMarkMessageAsSpamPendingIntent(messageReference)
         val spamAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(spamAction)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
index eb55bc9eda9bcc839bbdeebe98b4cdc34160faf7..c780415f115ee2069c9a4fd86a19895c733cc70b 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
@@ -5,7 +5,6 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.WearableExtender
 import com.fsck.k9.Account
 import com.fsck.k9.notification.NotificationChannelManager.ChannelType
-import com.fsck.k9.notification.NotificationIds.getNewMailSummaryNotificationId
 import timber.log.Timber
 import androidx.core.app.NotificationCompat.Builder as NotificationBuilder
 
@@ -53,7 +52,6 @@ internal class SummaryNotificationCreator(
 
         val notification = notificationHelper.createNotificationBuilder(account, ChannelType.MESSAGES)
             .setCategory(NotificationCompat.CATEGORY_EMAIL)
-            .setAutoCancel(true)
             .setGroup(baseNotificationData.groupKey)
             .setGroupSummary(true)
             .setSmallIcon(resourceProvider.iconNewMail)
@@ -65,7 +63,7 @@ internal class SummaryNotificationCreator(
             .setSubText(accountName)
             .setInboxStyle(title, summary, notificationData.content)
             .setContentIntent(createViewIntent(account, notificationData))
-            .setDeleteIntent(createDismissIntent(account, notificationData.notificationId))
+            .setDeleteIntent(actionCreator.createDismissAllMessagesPendingIntent(account))
             .setDeviceActions(account, notificationData)
             .setWearActions(account, notificationData)
             .setAppearance(notificationData.isSilent, baseNotificationData.appearance)
@@ -101,15 +99,7 @@ internal class SummaryNotificationCreator(
     }
 
     private fun createViewIntent(account: Account, notificationData: SummaryInboxNotificationData): PendingIntent {
-        return actionCreator.createViewMessagesPendingIntent(
-            account = account,
-            messageReferences = notificationData.messageReferences,
-            notificationId = notificationData.notificationId
-        )
-    }
-
-    private fun createDismissIntent(account: Account, notificationId: Int): PendingIntent {
-        return actionCreator.createDismissAllMessagesPendingIntent(account, notificationId)
+        return actionCreator.createViewMessagesPendingIntent(account, notificationData.messageReferences)
     }
 
     private fun NotificationBuilder.setDeviceActions(
@@ -131,9 +121,7 @@ internal class SummaryNotificationCreator(
         val icon = resourceProvider.iconMarkAsRead
         val title = resourceProvider.actionMarkAsRead()
         val messageReferences = notificationData.messageReferences
-        val notificationId = notificationData.notificationId
-        val markAllAsReadPendingIntent =
-            actionCreator.createMarkAllAsReadPendingIntent(account, messageReferences, notificationId)
+        val markAllAsReadPendingIntent = actionCreator.createMarkAllAsReadPendingIntent(account, messageReferences)
 
         addAction(icon, title, markAllAsReadPendingIntent)
     }
@@ -144,9 +132,8 @@ internal class SummaryNotificationCreator(
     ) {
         val icon = resourceProvider.iconDelete
         val title = resourceProvider.actionDelete()
-        val notificationId = getNewMailSummaryNotificationId(account)
         val messageReferences = notificationData.messageReferences
-        val action = actionCreator.createDeleteAllPendingIntent(account, messageReferences, notificationId)
+        val action = actionCreator.createDeleteAllPendingIntent(account, messageReferences)
 
         addAction(icon, title, action)
     }
@@ -175,8 +162,7 @@ internal class SummaryNotificationCreator(
         val icon = resourceProvider.wearIconMarkAsRead
         val title = resourceProvider.actionMarkAllAsRead()
         val messageReferences = notificationData.messageReferences
-        val notificationId = getNewMailSummaryNotificationId(account)
-        val action = actionCreator.createMarkAllAsReadPendingIntent(account, messageReferences, notificationId)
+        val action = actionCreator.createMarkAllAsReadPendingIntent(account, messageReferences)
         val markAsReadAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(markAsReadAction)
@@ -186,8 +172,7 @@ internal class SummaryNotificationCreator(
         val icon = resourceProvider.wearIconDelete
         val title = resourceProvider.actionDeleteAll()
         val messageReferences = notificationData.messageReferences
-        val notificationId = getNewMailSummaryNotificationId(account)
-        val action = actionCreator.createDeleteAllPendingIntent(account, messageReferences, notificationId)
+        val action = actionCreator.createDeleteAllPendingIntent(account, messageReferences)
         val deleteAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(deleteAction)
@@ -197,8 +182,7 @@ internal class SummaryNotificationCreator(
         val icon = resourceProvider.wearIconArchive
         val title = resourceProvider.actionArchiveAll()
         val messageReferences = notificationData.messageReferences
-        val notificationId = getNewMailSummaryNotificationId(account)
-        val action = actionCreator.createArchiveAllPendingIntent(account, messageReferences, notificationId)
+        val action = actionCreator.createArchiveAllPendingIntent(account, messageReferences)
         val archiveAction = NotificationCompat.Action.Builder(icon, title, action).build()
 
         addAction(archiveAction)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
index 3140fb813a829843f9bfe312336c952358b0b6f3..441d5698337633abfc980a5184bd24845b9c0624 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
@@ -18,9 +18,7 @@ internal class SyncNotificationController(
 
         val notificationId = NotificationIds.getFetchingMailNotificationId(account)
         val outboxFolderId = account.outboxFolderId ?: error("Outbox folder not configured")
-        val showMessageListPendingIntent = actionBuilder.createViewFolderPendingIntent(
-            account, outboxFolderId, notificationId
-        )
+        val showMessageListPendingIntent = actionBuilder.createViewFolderPendingIntent(account, outboxFolderId)
 
         val notificationBuilder = notificationHelper
             .createNotificationBuilder(account, NotificationChannelManager.ChannelType.MISCELLANEOUS)
@@ -53,9 +51,7 @@ internal class SyncNotificationController(
         val text = accountName + resourceProvider.checkingMailSeparator() + folderName
 
         val notificationId = NotificationIds.getFetchingMailNotificationId(account)
-        val showMessageListPendingIntent = actionBuilder.createViewFolderPendingIntent(
-            account, folderId, notificationId
-        )
+        val showMessageListPendingIntent = actionBuilder.createViewFolderPendingIntent(account, folderId)
 
         val notificationBuilder = notificationHelper
             .createNotificationBuilder(account, NotificationChannelManager.ChannelType.MISCELLANEOUS)
diff --git a/app/core/src/main/res/values/arrays_general_settings_values.xml b/app/core/src/main/res/values/arrays_general_settings_values.xml
index 560eb00e8edfac15ef728c39ebdaddb1844b1ec9..692227334947aea1968ae80438c8408b7b89479b 100644
--- a/app/core/src/main/res/values/arrays_general_settings_values.xml
+++ b/app/core/src/main/res/values/arrays_general_settings_values.xml
@@ -17,6 +17,7 @@
         <item>eo</item>
         <item>eu</item>
         <item>fr</item>
+        <item>fy</item>
         <item>gd</item>
         <item>gl</item>
         <item>hr</item>
@@ -75,6 +76,7 @@
         <item>ee</item>
         <item>fr</item>
         <item>fr_CA</item>
+        <item>fy</item>
         <item>ff</item>
         <item>ga</item>
         <item>gd</item>
@@ -99,7 +101,6 @@
         <item>pl</item>
         <item>pt_PT</item>
         <item>pt_BR</item>
-        <item>ru</item>
         <item>ro</item>
         <item>sq</item>
         <item>sk</item>
@@ -118,6 +119,7 @@
         <item>ky</item>
         <item>kk</item>
         <item>mk</item>
+        <item>ru</item>
         <item>sr</item>
         <item>uk</item>
         <item>hy</item>
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java
deleted file mode 100644
index d7c34f9fb7308985a15fe6559d430baaaebda237..0000000000000000000000000000000000000000
--- a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package com.fsck.k9.message.html;
-
-
-import org.junit.Test;
-
-import static junit.framework.Assert.assertEquals;
-
-
-public class HtmlConverterTest {
-    @Test
-    public void testTextQuoteToHtmlBlockquote() {
-        String message = "Panama!\r\n" +
-                "\r\n" +
-                "Bob Barker <bob@aol.com> wrote:\r\n" +
-                "> a canal\r\n" +
-                ">\r\n" +
-                "> Dorothy Jo Gideon <dorothy@aol.com> espoused:\r\n" +
-                "> >A man, a plan...\r\n" +
-                "> Too easy!\r\n" +
-                "\r\n" +
-                "Nice job :)\r\n" +
-                ">> Guess!";
-
-        String result = HtmlConverter.textToHtml(message);
-
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">"
-                + "Panama!<br>"
-                + "<br>"
-                + "Bob Barker &lt;bob@aol.com&gt; wrote:<br>"
-                +
-                "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">"
-                + " a canal<br>"
-                + "<br>"
-                + " Dorothy Jo Gideon &lt;dorothy@aol.com&gt; espoused:<br>"
-                +
-                "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">"
-                + "A man, a plan...<br>"
-                + "</blockquote>"
-                + "Too easy!<br>"
-                + "</blockquote>"
-                + "<br>"
-                + "Nice job :)<br>"
-                +
-                "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">"
-                +
-                "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">"
-                + "Guess!"
-                + "</blockquote>"
-                + "</blockquote>"
-                + "</pre>", result);
-    }
-
-    @Test
-    public void testTextQuoteToHtmlBlockquoteIndented() {
-        String message = "*facepalm*\r\n" +
-                "\r\n" +
-                "Bob Barker <bob@aol.com> wrote:\r\n" +
-                "> A wise man once said...\r\n" +
-                ">\r\n" +
-                ">     LOL F1RST!!!!!\r\n" +
-                ">\r\n" +
-                "> :)";
-
-        String result = HtmlConverter.textToHtml(message);
-
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">"
-                + "*facepalm*<br>"
-                + "<br>"
-                + "Bob Barker &lt;bob@aol.com&gt; wrote:<br>"
-                + "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">"
-                +   " A wise man once said...<br>"
-                +   "<br>"
-                +   "     LOL F1RST!!!!!<br>"
-                +   "<br>"
-                +   " :)"
-                + "</blockquote></pre>", result);
-
-    }
-
-    @Test
-    public void testQuoteDepthColor() {
-        String message = "zero\r\n" +
-                "> one\r\n" +
-                ">> two\r\n" +
-                ">>> three\r\n" +
-                ">>>> four\r\n" +
-                ">>>>> five\r\n" +
-                ">>>>>> six";
-
-        String result = HtmlConverter.textToHtml(message);
-
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">"
-                + "zero<br>"
-                + "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">"
-                +   "one<br>"
-                +   "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;\">"
-                +     "two<br>"
-                +     "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #8ae234; padding-left: 1ex;\">"
-                +       "three<br>"
-                +       "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #fcaf3e; padding-left: 1ex;\">"
-                +         "four<br>"
-                +         "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #e9b96e; padding-left: 1ex;\">"
-                +           "five<br>"
-                +           "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ccc; padding-left: 1ex;\">"
-                +             "six"
-                +           "</blockquote>"
-                +         "</blockquote>"
-                +       "</blockquote>"
-                +     "</blockquote>"
-                +   "</blockquote>"
-                + "</blockquote>"
-                + "</pre>", result);
-    }
-
-    @Test
-    public void testPreserveSpacesAtFirst() {
-        String message = "foo\r\n"
-                + " bar\r\n"
-                + "  baz\r\n";
-
-        String result = HtmlConverter.textToHtml(message);
-
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">"
-                + "foo<br>"
-                + " bar<br>"
-                + "  baz<br>"
-                + "</pre>", result);
-    }
-
-    @Test
-    public void testPreserveSpacesAtFirstForSpecialCharacters() {
-        String message =
-                " \r\n"
-                        + "  &\r\n"
-                        + "    \n"
-                        + "   <\r\n"
-                        + "  > \r\n";
-
-        String result = HtmlConverter.textToHtml(message);
-
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">"
-                + " <br>"
-                + "  &amp;<br>"
-                + "    <br>"
-                + "   &lt;<br>"
-                + "<blockquote class=\"gmail_quote\" style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;\">"
-                + "<br>"
-                + "</blockquote>"
-                + "</pre>", result);
-    }
-
-    @Test
-    public void issue2259Spec() {
-        String text = "text\n" +
-                "---------------------------\n" +
-                "some other text\n" +
-                "===========================\n" +
-                "more text\n" +
-                "-=-=-=-=-=-=-=-=-=-=-=-=-=-\n" +
-                "scissors below\n" +
-                "-- >8 --\n" +
-                "other direction\n" +
-                "-- 8< --\n" +
-                "end";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">text<hr>" +
-                "some other text<hr>" +
-                "more text<hr>" +
-                "scissors below<hr>" +
-                "other direction<hr>" +
-                "end</pre>",
-                result);
-    }
-
-    @Test
-    public void dashesContainingSpacesIgnoredAsHR() {
-        String text = "hello\n--- --- --- --- ---\nfoo bar";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello<br>--- --- --- --- ---<br>foo bar</pre>",
-                result);
-    }
-
-    @Test
-    public void mergeConsecutiveBreaksIntoOne() {
-        String text = "hello\n------------\n---------------\nfoo bar";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello<hr>foo bar</pre>", result);
-    }
-
-    @Test
-    public void dashedHorizontalRulePrefixedWithTextIgnoredAsHR() {
-        String text = "hello----\n\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello----<br><br></pre>", result);
-    }
-
-    @Test
-    public void doubleMinusIgnoredAsHR() {
-        String text = "--\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">--<br></pre>", result);
-    }
-
-    @Test
-    public void doubleEqualsIgnoredAsHR() {
-        String text = "==\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">==<br></pre>", result);
-    }
-
-    @Test
-    public void doubleUnderscoreIgnoredAsHR() {
-        String text = "__\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">__<br></pre>", result);
-    }
-
-    @Test
-    public void anyTripletIsHRuledOut() {
-        String text = "--=\n-=-\n===\n___\n\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\"><hr></pre>", result);
-    }
-
-    @Test
-    public void replaceSpaceSeparatedDashesWithHR() {
-        String text = "hello\n---------------------------\nfoo bar";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello<hr>foo bar</pre>", result);
-    }
-
-    @Test
-    public void replacementWithHRAtBeginning() {
-        String text = "---------------------------\nfoo bar";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\"><hr>foo bar</pre>", result);
-    }
-
-    @Test
-    public void replacementWithHRAtEnd() {
-        String text = "hello\n__________________________________";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello<hr></pre>", result);
-    }
-
-    @Test
-    public void replacementOfScissorsByHR() {
-        String text = "hello\n-- %< -------------- >8 --\nworld\n";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">hello<hr>world<br></pre>", result);
-    }
-
-    @Test
-    public void signatureEndingWithUrl() {
-        String text = "text\n-- \nsignature with url: https://domain.example/";
-        String result = HtmlConverter.textToHtml(text);
-        assertEquals("<pre dir=\"auto\" class=\"k9mail\">" +
-                "text<br>" +
-                "<div class='k9mail-signature'>" +
-                "-- <br>" +
-                "signature with url: <a href=\"https://domain.example/\">https://domain.example/</a>" +
-                "</div></pre>", result);
-    }
-
-    @Test
-    public void htmlToText_withLineBreaks() {
-        String input = "One<br>Two<br><br>Three";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("One\nTwo\n\nThree", result);
-    }
-
-    @Test
-    public void htmlToText_withBlockElements() {
-        String input = "<p>One</p><p>Two<br>Three</p><div>Four</div>";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("One\n\nTwo\nThree\n\nFour", result);
-    }
-
-    @Test
-    public void htmlToText_withLink() {
-        String input = "<a href='https://domain.example/'>Link text</a>";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("Link text <https://domain.example/>", result);
-    }
-
-    @Test
-    public void htmlToText_withLinkifiedUrl() {
-        String input = "Text <a href='https://domain.example/path/'>https://domain.example/path/</a> more text";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("Text https://domain.example/path/ more text", result);
-    }
-
-    @Test
-    public void htmlToText_withLinkifiedUrlContainingFormatting() {
-        String input = "<a href='https://domain.example/path/'>https://<b>domain.example</b>/path/</a>";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("https://domain.example/path/", result);
-    }
-
-    @Test
-    public void htmlToText_withLineBreaksInHtml() {
-        String input = "One\nTwo\r\nThree";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals("One Two Three", result);
-    }
-
-    @Test
-    public void htmlToText_withLongTextLine_shouldNotAddLineBreaksToOutput() {
-        String input = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam sit amet finibus felis, " +
-                "viverra ullamcorper justo. Suspendisse potenti. Etiam erat sem, interdum a condimentum quis, " +
-                "fringilla quis orci.";
-
-        String result = HtmlConverter.htmlToText(input);
-
-        assertEquals(input, result);
-    }
-}
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..178110da15971c3963a93e3ddd282e15c0b0e20c
--- /dev/null
+++ b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
@@ -0,0 +1,505 @@
+package com.fsck.k9.message.html
+
+import com.fsck.k9.mail.crlf
+import com.fsck.k9.mail.removeLineBreaks
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class HtmlConverterTest {
+    @Test
+    fun `textToHtml() should convert quoted text using blockquote tags`() {
+        val message =
+            """
+            Panama!
+            
+            Bob Barker <bob@aol.com> wrote:
+            > a canal
+            >
+            > Dorothy Jo Gideon <dorothy@aol.com> espoused:
+            > >A man, a plan...
+            > Too easy!
+            
+            Nice job :)
+            >> Guess!
+            """.trimIndent().crlf()
+
+        val result = HtmlConverter.textToHtml(message)
+
+        assertThat(result).isEqualTo(
+            """
+            |<pre dir="auto" class="k9mail">
+            |Panama!<br>
+            |<br>
+            |Bob Barker &lt;bob@aol.com&gt; wrote:<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">
+            | a canal<br>
+            |<br>
+            | Dorothy Jo Gideon &lt;dorothy@aol.com&gt; espoused:<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;">
+            |A man, a plan...<br>
+            |</blockquote>
+            |Too easy!<br>
+            |</blockquote>
+            |<br>
+            |Nice job :)<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;">
+            |Guess!
+            |</blockquote>
+            |</blockquote>
+            |</pre>
+            """.trimMargin().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should retain indentation inside quoted text`() {
+        val message =
+            """
+            *facepalm*
+            
+            Bob Barker <bob@aol.com> wrote:
+            > A wise man once said...
+            >
+            >     LOL F1RST!!!!!
+            >
+            > :)
+            """.trimIndent().crlf()
+
+        val result = HtmlConverter.textToHtml(message)
+
+        assertThat(result).isEqualTo(
+            """
+            |<pre dir="auto" class="k9mail">
+            |*facepalm*<br>
+            |<br>
+            |Bob Barker &lt;bob@aol.com&gt; wrote:<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">
+            | A wise man once said...<br>
+            |<br>
+            |     LOL F1RST!!!!!<br>
+            |<br>
+            | :)
+            |</blockquote>
+            |</pre>
+            """.trimMargin().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() with various quotation depths`() {
+        val message =
+            """
+            zero
+            > one
+            >> two
+            >>> three
+            >>>> four
+            >>>>> five
+            >>>>>> six
+            """.trimIndent().crlf()
+
+        val result = HtmlConverter.textToHtml(message)
+
+        assertThat(result).isEqualTo(
+            """
+            |<pre dir="auto" class="k9mail">
+            |zero<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">
+            |one<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ad7fa8; padding-left: 1ex;">
+            |two<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #8ae234; padding-left: 1ex;">
+            |three<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #fcaf3e; padding-left: 1ex;">
+            |four<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #e9b96e; padding-left: 1ex;">
+            |five<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #ccc; padding-left: 1ex;">
+            |six
+            |</blockquote>
+            |</blockquote>
+            |</blockquote>
+            |</blockquote>
+            |</blockquote>
+            |</blockquote>
+            |</pre>
+            """.trimMargin().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should preserve spaces at the start of a line`() {
+        val message =
+            """
+            |foo
+            | bar
+            |  baz
+            |
+            """.trimMargin().crlf()
+
+        val result = HtmlConverter.textToHtml(message)
+
+        assertThat(result).isEqualTo(
+            """
+            |<pre dir="auto" class="k9mail">
+            |foo<br>
+            | bar<br>
+            |  baz<br>
+            |</pre>
+            """.trimMargin().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should preserve spaces at the start of a line followed by special characters`() {
+        val message =
+            """
+            | 
+            |  &
+            |   ${" "}
+            |   <
+            |  >${" "}
+            |
+            """.trimMargin().crlf()
+
+        val result = HtmlConverter.textToHtml(message)
+
+        assertThat(result).isEqualTo(
+            """
+            |<pre dir="auto" class="k9mail">
+            | <br>
+            |  &amp;<br>
+            |    <br>
+            |   &lt;<br>
+            |<blockquote class="gmail_quote" style="margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid #729fcf; padding-left: 1ex;">
+            |<br>
+            |</blockquote>
+            |</pre>
+            """.trimMargin().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should replace common horizontal divider ASCII patterns with HR tags`() {
+        val text =
+            """
+            text
+            ---------------------------
+            some other text
+            ===========================
+            more text
+            -=-=-=-=-=-=-=-=-=-=-=-=-=-
+            scissors below
+            -- >8 --
+            other direction
+            -- 8< --
+            end
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            text
+            <hr>
+            some other text
+            <hr>
+            more text
+            <hr>
+            scissors below
+            <hr>
+            other direction
+            <hr>
+            end
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should not convert dashes mixed with spaces to an HR tag`() {
+        val text =
+            """
+            hello
+            --- --- --- --- ---
+            foo bar
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            hello<br>
+            --- --- --- --- ---<br>
+            foo bar
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should merge consecutive horizontal dividers into a single HR tag`() {
+        val text =
+            """
+            hello
+            ------------
+            ---------------
+            foo bar
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            hello
+            <hr>
+            foo bar
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should not replace dashed horizontal divider prefixed with text`() {
+        val text = "hello----\n\n"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            hello----<br>
+            <br>
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should not replace double dash with an HR tag`() {
+        val text = "--\n"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo("""<pre dir="auto" class="k9mail">--<br></pre>""")
+    }
+
+    @Test
+    fun `textToHtml() should not replace double equal sign with an HR tag`() {
+        val text = "==\n"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo("""<pre dir="auto" class="k9mail">==<br></pre>""")
+    }
+
+    @Test
+    fun `textToHtml() should not replace double underscore with an HR tag`() {
+        val text = "__\n"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo("""<pre dir="auto" class="k9mail">__<br></pre>""")
+    }
+
+    @Test
+    fun `textToHtml() should replace any combination of three consecutive divider characters with an HR tag`() {
+        val text =
+            """
+            --=
+            -=-
+            ===
+            ___
+
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo("""<pre dir="auto" class="k9mail"><hr></pre>""")
+    }
+
+    @Test
+    fun `textToHtml() should replace dashes at the start of the input`() {
+        val text = "---------------------------\nfoo bar"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            <hr>
+            foo bar
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should replace dashes at the end of the input`() {
+        val text = "hello\n__________________________________"
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            hello
+            <hr>
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should replace horizontal divider using ASCII scissors with an HR tag`() {
+        val text =
+            """
+            hello
+            -- %< -------------- >8 --
+            world
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            hello
+            <hr>
+            world
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `textToHtml() should wrap email signature in a DIV`() {
+        val text =
+            """
+            text
+            --${" "}
+            signature with url: https://domain.example/
+            """.trimIndent()
+
+        val result = HtmlConverter.textToHtml(text)
+
+        assertThat(result).isEqualTo(
+            """
+            <pre dir="auto" class="k9mail">
+            text<br>
+            <div class='k9mail-signature'>
+            -- <br>
+            signature with url: <a href="https://domain.example/">https://domain.example/</a>
+            </div>
+            </pre>
+            """.trimIndent().removeLineBreaks()
+        )
+    }
+
+    @Test
+    fun `htmlToText() should convert BR tags to line breaks`() {
+        val input =
+            """
+            One<br>
+            Two<br>
+            <br>
+            Three
+            """.trimIndent().removeLineBreaks()
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo(
+            """
+            One
+            Two
+
+            Three
+            """.trimIndent()
+        )
+    }
+
+    @Test
+    fun `htmlToText() should insert line breaks after block elements`() {
+        val input =
+            """
+            <p>One</p>
+            <p>
+            Two<br>
+            Three
+            </p>
+            <div>Four</div>
+            """.trimIndent().removeLineBreaks()
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo(
+            """
+            One
+
+            Two
+            Three
+            
+            Four
+            """.trimIndent()
+        )
+    }
+
+    @Test
+    fun `htmlToText() should include link URIs`() {
+        val input = "<a href='https://domain.example/'>Link text</a>"
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo("Link text <https://domain.example/>")
+    }
+
+    @Test
+    fun `htmlToText() should not duplicate URI when link URI and text are the same`() {
+        val input = "Text <a href='https://domain.example/path/'>https://domain.example/path/</a> more text"
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo("Text https://domain.example/path/ more text")
+    }
+
+    @Test
+    fun `htmlToText() should not duplicate URI when the link text is just the link URI with some formatting`() {
+        val input = "<a href='https://domain.example/path/'>https://<b>domain.example</b>/path/</a>"
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo("https://domain.example/path/")
+    }
+
+    @Test
+    fun `htmlToText() should strip line breaks`() {
+        val input =
+            """
+            One
+            Two
+            Three
+            """.trimIndent()
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo("One Two Three")
+    }
+
+    @Test
+    fun `htmlToText() with long text line should not add line breaks to output`() {
+        val input =
+            """
+            |Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam sit amet finibus felis,
+            | viverra ullamcorper justo. Suspendisse potenti. Etiam erat sem, interdum a condimentum quis,
+            | fringilla quis orci.
+            """.trimMargin().removeLineBreaks()
+
+        val result = HtmlConverter.htmlToText(input)
+
+        assertThat(result).isEqualTo(input)
+    }
+}
diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
index 57ffc8aba4fa3cff55554af60b40bd6c73e343df..c3000f771114b9c93037b267559420b9f5195819 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
@@ -92,6 +92,38 @@ class NotificationDataStoreTest : RobolectricTest() {
         }
     }
 
+    @Test
+    fun `remove multiple notifications`() {
+        repeat(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) { index ->
+            notificationDataStore.addNotification(account, createNotificationContent(index.toString()), TIMESTAMP)
+        }
+
+        val result = notificationDataStore.removeNotifications(account) { it.dropLast(1) }
+
+        assertNotNull(result) { removeResult ->
+            assertThat(removeResult.notificationData.newMessagesCount).isEqualTo(1)
+            assertThat(removeResult.cancelNotificationIds).hasSize(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS)
+        }
+    }
+
+    @Test
+    fun `remove all notifications`() {
+        repeat(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) { index ->
+            notificationDataStore.addNotification(account, createNotificationContent(index.toString()), TIMESTAMP)
+        }
+
+        val result = notificationDataStore.removeNotifications(account) { it }
+
+        assertNotNull(result) { removeResult ->
+            assertThat(removeResult.notificationData.newMessagesCount).isEqualTo(0)
+            assertThat(removeResult.notificationHolders).hasSize(0)
+            assertThat(removeResult.notificationStoreOperations).hasSize(MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1)
+            for (notificationStoreOperation in removeResult.notificationStoreOperations) {
+                assertThat(notificationStoreOperation).isInstanceOf(NotificationStoreOperation.Remove::class.java)
+            }
+        }
+    }
+
     @Test
     fun testRemoveDoesNotLeakNotificationIds() {
         for (i in 1..MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS + 1) {
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
index 591fe1a17609fb539594b5575209dac2267d0655..e92089fc6813e999720a70f84be275ba18e61df9 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
@@ -9,7 +9,6 @@ import com.fsck.k9.Account
 import com.fsck.k9.RobolectricTest
 import com.fsck.k9.testing.MockHelper.mockBuilder
 import org.junit.Test
-import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mockito.verify
 import org.mockito.kotlin.any
@@ -88,8 +87,8 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
 
     private fun createActionBuilder(contentIntent: PendingIntent): NotificationActionCreator {
         return mock {
-            on { createViewFolderListPendingIntent(any(), anyInt()) } doReturn contentIntent
-            on { createViewFolderPendingIntent(any(), anyLong(), anyInt()) } doReturn contentIntent
+            on { createViewFolderListPendingIntent(any()) } doReturn contentIntent
+            on { createViewFolderPendingIntent(any(), anyLong()) } doReturn contentIntent
         }
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
index cde497225965a636e0bf2b691e01e4bc8d56acf2..18b5aa11cd1a382fdf0f79d1014d2b5fafda49cb 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
@@ -11,7 +11,6 @@ import com.fsck.k9.mailstore.LocalFolder
 import com.fsck.k9.notification.NotificationIds.getFetchingMailNotificationId
 import com.fsck.k9.testing.MockHelper.mockBuilder
 import org.junit.Test
-import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyLong
 import org.mockito.Mockito.verify
 import org.mockito.kotlin.any
@@ -140,7 +139,7 @@ class SyncNotificationControllerTest : RobolectricTest() {
 
     private fun createActionBuilder(contentIntent: PendingIntent): NotificationActionCreator {
         return mock {
-            on { createViewFolderPendingIntent(eq(account), anyLong(), anyInt()) } doReturn contentIntent
+            on { createViewFolderPendingIntent(eq(account), anyLong()) } doReturn contentIntent
         }
     }
 
diff --git a/app/k9mail-jmap/src/main/res/values/themes.xml b/app/k9mail-jmap/src/main/res/values/themes.xml
index 3b7ee3fdec095ed1ffbbde23e335848dc8d766a8..d76fd70e84aeee148121f989bb3faa8594677425 100644
--- a/app/k9mail-jmap/src/main/res/values/themes.xml
+++ b/app/k9mail-jmap/src/main/res/values/themes.xml
@@ -33,8 +33,6 @@
         <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>
-        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
@@ -154,8 +152,6 @@
         <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>
-        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index 979055c6dc5473580c9fb159b8a323ca1e16c51d..d594824ac1158dd0bd186eb4f9ab438684d3dbfd 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -48,13 +48,14 @@ android {
         applicationId "foundation.e.mail"
         testApplicationId "foundation.e.mail.tests"
 
-        versionCode 32002
-        versionName '6.202'
+        versionCode 33000
+        versionName '6.300'
 
         // Keep in sync with the resource string array 'supported_languages'
         resConfigs "in", "br", "ca", "cs", "cy", "da", "de", "et", "en", "en_GB", "es", "eo", "eu", "fr", "gd", "gl",
                 "hr", "is", "it", "lv", "lt", "hu", "nl", "nb", "pl", "pt_PT", "pt_BR", "ru", "ro", "sq", "sk", "sl",
-                "fi", "sv", "tr", "el", "be", "bg", "sr", "uk", "iw", "ar", "fa", "ml", "ko", "zh_CN", "zh_TW", "ja"
+                "fi", "sv", "tr", "el", "be", "bg", "sr", "uk", "iw", "ar", "fa", "ml", "ko", "zh_CN", "zh_TW", "ja",
+                "fy"
 
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
index 77a997ced20457241ed238c1c96a57b7cfd85b28..b08374a516d9cc8e4b6a1410972f54c207db5525 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
@@ -5,6 +5,7 @@ import android.app.PendingIntent.FLAG_CANCEL_CURRENT
 import android.app.PendingIntent.FLAG_UPDATE_CURRENT
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import com.fsck.k9.Account
 import com.fsck.k9.K9
 import com.fsck.k9.activity.MessageList
@@ -25,8 +26,10 @@ import com.fsck.k9.ui.notification.DeleteConfirmationActivity
  * We need to take special care to ensure the `PendingIntent`s are unique as defined in the documentation of
  * [PendingIntent]. Otherwise selecting a notification action might perform the action on the wrong message.
  *
- * We use the notification ID as `requestCode` argument to ensure each notification/action pair gets a unique
- * `PendingIntent`.
+ * We add unique values to `Intent.data` so we end up with unique `PendingIntent`s.
+ *
+ * In the past we've used the notification ID as `requestCode` argument when creating a `PendingIntent`. But since we're
+ * reusing notification IDs, it's safer to make sure the `Intent` itself is unique.
  */
 internal class K9NotificationActionCreator(
     private val context: Context,
@@ -34,25 +37,21 @@ internal class K9NotificationActionCreator(
     private val messageStoreManager: MessageStoreManager
 ) : NotificationActionCreator {
 
-    override fun createViewMessagePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
+    override fun createViewMessagePendingIntent(messageReference: MessageReference): PendingIntent {
         val openInUnifiedInbox = K9.isShowUnifiedInbox && isIncludedInUnifiedInbox(messageReference)
         val intent = createMessageViewIntent(messageReference, openInUnifiedInbox)
 
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createViewFolderPendingIntent(account: Account, folderId: Long, notificationId: Int): PendingIntent {
+    override fun createViewFolderPendingIntent(account: Account, folderId: Long): PendingIntent {
         val intent = createMessageListIntent(account, folderId)
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     override fun createViewMessagesPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
+        messageReferences: List<MessageReference>
     ): PendingIntent {
         val folderIds = extractFolderIds(messageReferences)
 
@@ -64,48 +63,51 @@ internal class K9NotificationActionCreator(
             createNewMessagesIntent(account)
         }
 
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createViewFolderListPendingIntent(account: Account, notificationId: Int): PendingIntent {
+    override fun createViewFolderListPendingIntent(account: Account): PendingIntent {
         val intent = createMessageListIntent(account)
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createDismissAllMessagesPendingIntent(account: Account, notificationId: Int): PendingIntent {
-        val intent = NotificationActionService.createDismissAllMessagesIntent(context, account)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createDismissAllMessagesPendingIntent(account: Account): PendingIntent {
+        val intent = NotificationActionService.createDismissAllMessagesIntent(context, account).apply {
+            data = Uri.parse("data:,dismissAll/${account.uuid}/${System.currentTimeMillis()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createDismissMessagePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = NotificationActionService.createDismissMessageIntent(context, messageReference)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createDismissMessagePendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = NotificationActionService.createDismissMessageIntent(context, messageReference).apply {
+            data = Uri.parse("data:,dismiss/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createReplyPendingIntent(messageReference: MessageReference, notificationId: Int): PendingIntent {
-        val intent = MessageActions.getActionReplyIntent(context, messageReference)
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createReplyPendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = MessageActions.getActionReplyIntent(context, messageReference).apply {
+            data = Uri.parse("data:,reply/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createMarkMessageAsReadPendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = NotificationActionService.createMarkMessageAsReadIntent(context, messageReference)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createMarkMessageAsReadPendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = NotificationActionService.createMarkMessageAsReadIntent(context, messageReference).apply {
+            data = Uri.parse("data:,markAsRead/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     override fun createMarkAllAsReadPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
+        messageReferences: List<MessageReference>
     ): PendingIntent {
         val accountUuid = account.uuid
-        val intent = NotificationActionService.createMarkAllAsReadIntent(context, accountUuid, messageReferences)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        val intent = NotificationActionService.createMarkAllAsReadIntent(context, accountUuid, messageReferences).apply {
+            data = Uri.parse("data:,markAllAsRead/$accountUuid/${System.currentTimeMillis()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     override fun getEditIncomingServerSettingsIntent(account: Account): PendingIntent {
@@ -118,86 +120,79 @@ internal class K9NotificationActionCreator(
         return PendingIntent.getActivity(context, account.accountNumber, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createDeleteMessagePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
+    override fun createDeleteMessagePendingIntent(messageReference: MessageReference): PendingIntent {
         return if (K9.isConfirmDeleteFromNotification) {
-            createDeleteConfirmationPendingIntent(messageReference, notificationId)
+            createDeleteConfirmationPendingIntent(messageReference)
         } else {
-            createDeleteServicePendingIntent(messageReference, notificationId)
+            createDeleteServicePendingIntent(messageReference)
         }
     }
 
-    private fun createDeleteServicePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = NotificationActionService.createDeleteMessageIntent(context, messageReference)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    private fun createDeleteServicePendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = NotificationActionService.createDeleteMessageIntent(context, messageReference).apply {
+            data = Uri.parse("data:,delete/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    private fun createDeleteConfirmationPendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = DeleteConfirmationActivity.getIntent(context, messageReference)
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    private fun createDeleteConfirmationPendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = DeleteConfirmationActivity.getIntent(context, messageReference).apply {
+            data = Uri.parse("data:,deleteConfirmation/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     override fun createDeleteAllPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
+        messageReferences: List<MessageReference>
     ): PendingIntent {
         return if (K9.isConfirmDeleteFromNotification) {
-            getDeleteAllConfirmationPendingIntent(messageReferences, notificationId)
+            getDeleteAllConfirmationPendingIntent(messageReferences)
         } else {
-            getDeleteAllServicePendingIntent(account, messageReferences, notificationId)
+            getDeleteAllServicePendingIntent(account, messageReferences)
         }
     }
 
-    private fun getDeleteAllConfirmationPendingIntent(
-        messageReferences: List<MessageReference>,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = DeleteConfirmationActivity.getIntent(context, messageReferences)
-        return PendingIntent.getActivity(context, notificationId, intent, FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE)
+    private fun getDeleteAllConfirmationPendingIntent(messageReferences: List<MessageReference>): PendingIntent {
+        val intent = DeleteConfirmationActivity.getIntent(context, messageReferences).apply {
+            data = Uri.parse("data:,deleteAllConfirmation/${System.currentTimeMillis()}")
+        }
+        return PendingIntent.getActivity(context, 0, intent, FLAG_CANCEL_CURRENT or FLAG_IMMUTABLE)
     }
 
     private fun getDeleteAllServicePendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
+        messageReferences: List<MessageReference>
     ): PendingIntent {
         val accountUuid = account.uuid
-        val intent = NotificationActionService.createDeleteAllMessagesIntent(context, accountUuid, messageReferences)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        val intent = NotificationActionService.createDeleteAllMessagesIntent(context, accountUuid, messageReferences).apply {
+            data = Uri.parse("data:,deleteAll/$accountUuid/${System.currentTimeMillis()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createArchiveMessagePendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = NotificationActionService.createArchiveMessageIntent(context, messageReference)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createArchiveMessagePendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = NotificationActionService.createArchiveMessageIntent(context, messageReference).apply {
+            data = Uri.parse("data:,archive/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     override fun createArchiveAllPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>,
-        notificationId: Int
+        messageReferences: List<MessageReference>
     ): PendingIntent {
-        val intent = NotificationActionService.createArchiveAllIntent(context, account, messageReferences)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+        val intent = NotificationActionService.createArchiveAllIntent(context, account, messageReferences).apply {
+            data = Uri.parse("data:,archiveAll/${account.uuid}/${System.currentTimeMillis()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
-    override fun createMarkMessageAsSpamPendingIntent(
-        messageReference: MessageReference,
-        notificationId: Int
-    ): PendingIntent {
-        val intent = NotificationActionService.createMarkMessageAsSpamIntent(context, messageReference)
-        return PendingIntent.getService(context, notificationId, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    override fun createMarkMessageAsSpamPendingIntent(messageReference: MessageReference): PendingIntent {
+        val intent = NotificationActionService.createMarkMessageAsSpamIntent(context, messageReference).apply {
+            data = Uri.parse("data:,spam/${messageReference.toIdentityString()}")
+        }
+        return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
     private fun createMessageListIntent(account: Account): Intent {
@@ -213,7 +208,9 @@ internal class K9NotificationActionCreator(
             noThreading = false,
             newTask = true,
             clearTop = true
-        )
+        ).apply {
+            data = Uri.parse("data:,messageList/${account.uuid}/$folderId")
+        }
     }
 
     private fun createMessageListIntent(account: Account, folderId: Long): Intent {
@@ -228,19 +225,27 @@ internal class K9NotificationActionCreator(
             noThreading = false,
             newTask = true,
             clearTop = true
-        )
+        ).apply {
+            data = Uri.parse("data:,messageList/${account.uuid}/$folderId")
+        }
     }
 
-    private fun createMessageViewIntent(message: MessageReference, openInUnifiedInbox: Boolean): Intent {
-        return MessageList.actionDisplayMessageIntent(context, message, openInUnifiedInbox)
+    private fun createMessageViewIntent(messageReference: MessageReference, openInUnifiedInbox: Boolean): Intent {
+        return MessageList.actionDisplayMessageIntent(context, messageReference, openInUnifiedInbox).apply {
+            data = Uri.parse("data:,messageView/${messageReference.toIdentityString()}")
+        }
     }
 
     private fun createUnifiedInboxIntent(account: Account): Intent {
-        return MessageList.createUnifiedInboxIntent(context, account)
+        return MessageList.createUnifiedInboxIntent(context, account).apply {
+            data = Uri.parse("data:,unifiedInbox/${account.uuid}")
+        }
     }
 
     private fun createNewMessagesIntent(account: Account): Intent {
-        return MessageList.createNewMessagesIntent(context, account)
+        return MessageList.createNewMessagesIntent(context, account).apply {
+            data = Uri.parse("data:,newMessages/${account.uuid}")
+        }
     }
 
     private fun extractFolderIds(messageReferences: List<MessageReference>): Set<Long> {
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 543cf607561951a13a16a83cc6fe03b9afbd67d4..9982756f2c75259e2f0ff5f0d0de7edda0cdf5d3 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -59,8 +59,6 @@
         <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>
-        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
@@ -185,8 +183,6 @@
         <item name="iconActionMove">@drawable/ic_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
-        <item name="iconActionNextMessage">@drawable/ic_chevron_right</item>
-        <item name="iconActionPreviousMessage">@drawable/ic_chevron_left</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
         <item name="iconActionSearch">@drawable/ic_magnify</item>
         <item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index d82501ae9f4c5e0e106710789a24ed86418d900a..da42725b5f57a9f49b845b9ef84b2d04d2f74a97 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -43,10 +43,10 @@ import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
 import androidx.fragment.app.commit
+import androidx.fragment.app.commitNow
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import com.fsck.k9.Account
-import com.fsck.k9.Account.SortType
 import com.fsck.k9.K9
 import com.fsck.k9.K9.SplitViewMode
 import com.fsck.k9.Preferences
@@ -72,13 +72,13 @@ import com.fsck.k9.ui.BuildConfig
 import com.fsck.k9.ui.K9Drawer
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.base.K9Activity
-import com.fsck.k9.ui.base.Theme
 import com.fsck.k9.ui.changelog.RecentChangesActivity
 import com.fsck.k9.ui.changelog.RecentChangesViewModel
 import com.fsck.k9.ui.managefolders.ManageFoldersActivity
 import com.fsck.k9.ui.messagelist.DefaultFolderProvider
-import com.fsck.k9.ui.messagesource.MessageSourceActivity
-import com.fsck.k9.ui.messageview.MessageViewFragment
+import com.fsck.k9.ui.messageview.Direction
+import com.fsck.k9.ui.messageview.MessageViewContainerFragment
+import com.fsck.k9.ui.messageview.MessageViewContainerFragment.MessageViewContainerListener
 import com.fsck.k9.ui.messageview.MessageViewFragment.MessageViewFragmentListener
 import com.fsck.k9.ui.messageview.PlaceholderFragment
 import com.fsck.k9.ui.permissions.K9PermissionUiHelper
@@ -105,6 +105,7 @@ open class MessageList :
     K9Activity(),
     MessageListFragmentListener,
     MessageViewFragmentListener,
+    MessageViewContainerListener,
     FragmentManager.OnBackStackChangedListener,
     OnSwitchCompleteListener,
     PermissionUiHelper {
@@ -124,15 +125,19 @@ open class MessageList :
     private lateinit var searchView: SearchView
     private var drawer: K9Drawer? = null
     private var openFolderTransaction: FragmentTransaction? = null
-    private var menu: Menu? = null
     private var progressBar: ProgressBar? = null
     private var messageViewPlaceHolder: PlaceholderFragment? = null
     private var messageListFragment: MessageListFragment? = null
-    private var messageViewFragment: MessageViewFragment? = null
+    private var messageViewContainerFragment: MessageViewContainerFragment? = null
     private var account: Account? = null
     private var search: LocalSearch? = null
     private var singleFolderMode = false
-    private var lastDirection = if (K9.isMessageViewShowNext) NEXT else PREVIOUS
+
+    private val lastDirection: Direction
+        get() {
+            return messageViewContainerFragment?.lastDirection
+                ?: if (K9.isMessageViewShowNext) Direction.NEXT else Direction.PREVIOUS
+        }
 
     private var messageListActivityAppearance: MessageListActivityAppearance? = null
 
@@ -245,7 +250,7 @@ open class MessageList :
         supportFragmentManager.popBackStackImmediate(FIRST_FRAGMENT_TRANSACTION, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
         removeMessageListFragment()
-        removeMessageViewFragment()
+        removeMessageViewContainerFragment()
 
         messageReference = null
         search = null
@@ -267,9 +272,11 @@ open class MessageList :
     private fun findFragments() {
         val fragmentManager = supportFragmentManager
         messageListFragment = fragmentManager.findFragmentById(R.id.message_list_container) as MessageListFragment?
-        messageViewFragment = fragmentManager.findFragmentByTag(FRAGMENT_TAG_MESSAGE_VIEW) as MessageViewFragment?
+        messageViewContainerFragment =
+            fragmentManager.findFragmentByTag(FRAGMENT_TAG_MESSAGE_VIEW_CONTAINER) as MessageViewContainerFragment?
 
         messageListFragment?.let { messageListFragment ->
+            messageViewContainerFragment?.setViewModel(messageListFragment.viewModel)
             initializeFromLocalSearch(messageListFragment.localSearch)
         }
     }
@@ -285,14 +292,14 @@ open class MessageList :
                 search!!, false, K9.isThreadedViewEnabled && !noThreading
             )
             fragmentTransaction.add(R.id.message_list_container, messageListFragment)
-            fragmentTransaction.commit()
+            fragmentTransaction.commitNow()
 
             this.messageListFragment = messageListFragment
         }
 
         // Check if the fragment wasn't restarted and has a MessageReference in the arguments.
         // If so, open the referenced message.
-        if (!hasMessageListFragment && messageViewFragment == null && messageReference != null) {
+        if (!hasMessageListFragment && messageViewContainerFragment == null && messageReference != null) {
             openMessage(messageReference!!)
         }
     }
@@ -318,7 +325,7 @@ open class MessageList :
             }
         }
 
-        displayMode = if (messageViewFragment != null || messageReference != null) {
+        displayMode = if (messageViewContainerFragment != null || messageReference != null) {
             DisplayMode.MESSAGE_VIEW
         } else {
             DisplayMode.MESSAGE_LIST
@@ -347,16 +354,21 @@ open class MessageList :
                 showMessageView()
             }
             DisplayMode.SPLIT_VIEW -> {
+                val messageListFragment = checkNotNull(this.messageListFragment)
+
                 messageListWasDisplayed = true
-                messageListFragment?.onListVisible()
-                if (messageViewFragment == null) {
-                    showMessageViewPlaceHolder()
-                } else {
-                    val activeMessage = messageViewFragment!!.messageReference
-                    if (activeMessage != null) {
-                        messageListFragment!!.setActiveMessage(activeMessage)
+                messageListFragment.isActive = true
+
+                messageViewContainerFragment.let { messageViewContainerFragment ->
+                    if (messageViewContainerFragment == null) {
+                        showMessageViewPlaceHolder()
+                    } else {
+                        messageViewContainerFragment.isActive = true
+                        val activeMessage = messageViewContainerFragment.messageReference
+                        messageListFragment.setActiveMessage(activeMessage)
                     }
                 }
+
                 setDrawerLockState()
                 onMessageListDisplayed()
             }
@@ -618,7 +630,7 @@ open class MessageList :
 
     fun openFolder(folderId: Long) {
         if (displayMode == DisplayMode.SPLIT_VIEW) {
-            removeMessageViewFragment()
+            removeMessageViewContainerFragment()
             showMessageViewPlaceHolder()
         }
 
@@ -638,7 +650,7 @@ open class MessageList :
         openFolderTransaction!!.commit()
         openFolderTransaction = null
 
-        messageListFragment!!.onListVisible()
+        messageListFragment!!.isActive = true
 
         onMessageListDisplayed()
     }
@@ -747,7 +759,7 @@ open class MessageList :
 
         when (event.keyCode) {
             KeyEvent.KEYCODE_VOLUME_UP -> {
-                if (messageViewFragment != null && displayMode != DisplayMode.MESSAGE_LIST &&
+                if (messageViewContainerFragment != null && displayMode != DisplayMode.MESSAGE_LIST &&
                     K9.isUseVolumeKeysForNavigation
                 ) {
                     showPreviousMessage()
@@ -758,7 +770,7 @@ open class MessageList :
                 }
             }
             KeyEvent.KEYCODE_VOLUME_DOWN -> {
-                if (messageViewFragment != null && displayMode != DisplayMode.MESSAGE_LIST &&
+                if (messageViewContainerFragment != null && displayMode != DisplayMode.MESSAGE_LIST &&
                     K9.isUseVolumeKeysForNavigation
                 ) {
                     showNextMessage()
@@ -773,14 +785,14 @@ open class MessageList :
                 return true
             }
             KeyEvent.KEYCODE_DPAD_LEFT -> {
-                return if (messageViewFragment != null && displayMode == DisplayMode.MESSAGE_VIEW) {
+                return if (messageViewContainerFragment != null && displayMode == DisplayMode.MESSAGE_VIEW) {
                     showPreviousMessage()
                 } else {
                     false
                 }
             }
             KeyEvent.KEYCODE_DPAD_RIGHT -> {
-                return if (messageViewFragment != null && displayMode == DisplayMode.MESSAGE_VIEW) {
+                return if (messageViewContainerFragment != null && displayMode == DisplayMode.MESSAGE_VIEW) {
                     showNextMessage()
                 } else {
                     false
@@ -812,69 +824,69 @@ open class MessageList :
             'g' -> {
                 if (displayMode == DisplayMode.MESSAGE_LIST) {
                     messageListFragment!!.onToggleFlagged()
-                } else if (messageViewFragment != null) {
-                    messageViewFragment!!.onToggleFlagged()
+                } else if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onToggleFlagged()
                 }
                 return true
             }
             'm' -> {
                 if (displayMode == DisplayMode.MESSAGE_LIST) {
                     messageListFragment!!.onMove()
-                } else if (messageViewFragment != null) {
-                    messageViewFragment!!.onMove()
+                } else if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onMove()
                 }
                 return true
             }
             'v' -> {
                 if (displayMode == DisplayMode.MESSAGE_LIST) {
                     messageListFragment!!.onArchive()
-                } else if (messageViewFragment != null) {
-                    messageViewFragment!!.onArchive()
+                } else if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onArchive()
                 }
                 return true
             }
             'y' -> {
                 if (displayMode == DisplayMode.MESSAGE_LIST) {
                     messageListFragment!!.onCopy()
-                } else if (messageViewFragment != null) {
-                    messageViewFragment!!.onCopy()
+                } else if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onCopy()
                 }
                 return true
             }
             'z' -> {
                 if (displayMode == DisplayMode.MESSAGE_LIST) {
                     messageListFragment!!.onToggleRead()
-                } else if (messageViewFragment != null) {
-                    messageViewFragment!!.onToggleRead()
+                } else if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onToggleRead()
                 }
                 return true
             }
             'f' -> {
-                if (messageViewFragment != null) {
-                    messageViewFragment!!.onForward()
+                if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onForward()
                 }
                 return true
             }
             'a' -> {
-                if (messageViewFragment != null) {
-                    messageViewFragment!!.onReplyAll()
+                if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onReplyAll()
                 }
                 return true
             }
             'r' -> {
-                if (messageViewFragment != null) {
-                    messageViewFragment!!.onReply()
+                if (messageViewContainerFragment != null) {
+                    messageViewContainerFragment!!.onReply()
                 }
                 return true
             }
             'j', 'p' -> {
-                if (messageViewFragment != null) {
+                if (messageViewContainerFragment != null) {
                     showPreviousMessage()
                 }
                 return true
             }
             'n', 'k' -> {
-                if (messageViewFragment != null) {
+                if (messageViewContainerFragment != null) {
                     showNextMessage()
                 }
                 return true
@@ -896,8 +908,8 @@ open class MessageList :
     private fun onDeleteHotKey() {
         if (displayMode == DisplayMode.MESSAGE_LIST) {
             messageListFragment!!.onDelete()
-        } else if (messageViewFragment != null) {
-            messageViewFragment!!.onDelete()
+        } else if (messageViewContainerFragment != null) {
+            messageViewContainerFragment!!.onDelete()
         }
     }
 
@@ -930,134 +942,13 @@ open class MessageList :
                 goBack()
             }
             return true
-        } else if (id == R.id.compose) {
-            messageListFragment!!.onCompose()
-            return true
-        } else if (id == R.id.toggle_message_view_theme) {
-            onToggleTheme()
-            return true
-        } else if (id == R.id.set_sort_date) { // MessageList
-            messageListFragment!!.changeSort(SortType.SORT_DATE)
-            return true
-        } else if (id == R.id.set_sort_arrival) {
-            messageListFragment!!.changeSort(SortType.SORT_ARRIVAL)
-            return true
-        } else if (id == R.id.set_sort_subject) {
-            messageListFragment!!.changeSort(SortType.SORT_SUBJECT)
-            return true
-        } else if (id == R.id.set_sort_sender) {
-            messageListFragment!!.changeSort(SortType.SORT_SENDER)
-            return true
-        } else if (id == R.id.set_sort_flag) {
-            messageListFragment!!.changeSort(SortType.SORT_FLAGGED)
-            return true
-        } else if (id == R.id.set_sort_unread) {
-            messageListFragment!!.changeSort(SortType.SORT_UNREAD)
-            return true
-        } else if (id == R.id.set_sort_attach) {
-            messageListFragment!!.changeSort(SortType.SORT_ATTACHMENT)
-            return true
-        } else if (id == R.id.select_all) {
-            messageListFragment!!.selectAll()
-            return true
-        } else if (id == R.id.search_remote) {
-            messageListFragment!!.onRemoteSearch()
-            return true
-        } else if (id == R.id.search_everywhere) {
-            searchEverywhere()
-            return true
-        } else if (id == R.id.mark_all_as_read) {
-            messageListFragment!!.confirmMarkAllAsRead()
-            return true
-        } else if (id == R.id.next_message) { // MessageView
-            showNextMessage()
-            return true
-        } else if (id == R.id.previous_message) {
-            showPreviousMessage()
-            return true
-        } else if (id == R.id.delete) {
-            messageViewFragment!!.onDelete()
-            return true
-        } else if (id == R.id.reply) {
-            messageViewFragment!!.onReply()
-            return true
-        } else if (id == R.id.reply_all) {
-            messageViewFragment!!.onReplyAll()
-            return true
-        } else if (id == R.id.forward) {
-            messageViewFragment!!.onForward()
-            return true
-        } else if (id == R.id.forward_as_attachment) {
-            messageViewFragment!!.onForwardAsAttachment()
-            return true
-        } else if (id == R.id.edit_as_new_message) {
-            messageViewFragment!!.onEditAsNewMessage()
-            return true
-        } else if (id == R.id.share) {
-            messageViewFragment!!.onSendAlternate()
-            return true
-        } else if (id == R.id.toggle_unread) {
-            messageViewFragment!!.onToggleRead()
-            return true
-        } else if (id == R.id.archive || id == R.id.refile_archive) {
-            messageViewFragment!!.onArchive()
-            return true
-        } else if (id == R.id.spam || id == R.id.refile_spam) {
-            messageViewFragment!!.onSpam()
-            return true
-        } else if (id == R.id.move || id == R.id.refile_move) {
-            messageViewFragment!!.onMove()
-            return true
-        } else if (id == R.id.copy || id == R.id.refile_copy) {
-            messageViewFragment!!.onCopy()
-            return true
-        } else if (id == R.id.move_to_drafts) {
-            messageViewFragment!!.onMoveToDrafts()
-            return true
-        } else if (id == R.id.unsubscribe) {
-            messageViewFragment!!.onUnsubscribe()
-            return true
-        } else if (id == R.id.show_headers) {
-            startActivity(MessageSourceActivity.createLaunchIntent(this, messageViewFragment!!.messageReference))
-            return true
         }
 
-        if (!singleFolderMode) {
-            // None of the options after this point are "safe" for search results
-            // TODO: This is not true for "unread" and "starred" searches in regular folders
-            return false
-        }
-
-        return when (id) {
-            R.id.send_messages -> {
-                messageListFragment!!.onSendPendingMessages()
-                true
-            }
-            R.id.expunge -> {
-                messageListFragment!!.onExpunge()
-                true
-            }
-            R.id.empty_trash -> {
-                messageListFragment!!.onEmptyTrash()
-                true
-            }
-            else -> {
-                super.onOptionsItemSelected(item)
-            }
-        }
-    }
-
-    private fun searchEverywhere() {
-        val searchIntent = Intent(this, Search::class.java).apply {
-            action = Intent.ACTION_SEARCH
-            putExtra(SearchManager.QUERY, intent.getStringExtra(SearchManager.QUERY))
-        }
-        onNewIntent(searchIntent)
+        return super.onOptionsItemSelected(item)
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.message_list_option, menu)
-        this.menu = menu
 
         // setup search view
         val searchItem = menu.findItem(R.id.search)
@@ -1084,171 +975,6 @@ open class MessageList :
         return true
     }
 
-    override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        super.onPrepareOptionsMenu(menu)
-        configureMenu(menu)
-        return true
-    }
-
-    /**
-     * Hide menu items not appropriate for the current context.
-     *
-     * **Note:**
-     * Please adjust the comments in `res/menu/message_list_option.xml` if you change the  visibility of a menu item
-     * in this method.
-     */
-    private fun configureMenu(menu: Menu?) {
-        if (menu == null) return
-
-        // Set visibility of menu items related to the message view
-        if (displayMode == DisplayMode.MESSAGE_LIST || messageViewFragment == null ||
-            !messageViewFragment!!.isInitialized
-        ) {
-            menu.findItem(R.id.next_message).isVisible = false
-            menu.findItem(R.id.previous_message).isVisible = false
-            menu.findItem(R.id.single_message_options).isVisible = false
-            menu.findItem(R.id.delete).isVisible = false
-            menu.findItem(R.id.compose).isVisible = false
-            menu.findItem(R.id.archive).isVisible = false
-            menu.findItem(R.id.move).isVisible = false
-            menu.findItem(R.id.copy).isVisible = false
-            menu.findItem(R.id.spam).isVisible = false
-            menu.findItem(R.id.refile).isVisible = false
-            menu.findItem(R.id.toggle_unread).isVisible = false
-            menu.findItem(R.id.toggle_message_view_theme).isVisible = false
-            menu.findItem(R.id.unsubscribe).isVisible = false
-            menu.findItem(R.id.show_headers).isVisible = false
-        } else {
-            // hide prev/next buttons in split mode
-            if (displayMode != DisplayMode.MESSAGE_VIEW) {
-                menu.findItem(R.id.next_message).isVisible = false
-                menu.findItem(R.id.previous_message).isVisible = false
-            } else {
-                val ref = messageViewFragment!!.messageReference
-                val initialized = messageListFragment != null &&
-                    messageListFragment!!.isLoadFinished
-                val canDoPrev = initialized && !messageListFragment!!.isFirst(ref)
-                val canDoNext = initialized && !messageListFragment!!.isLast(ref)
-                val prev = menu.findItem(R.id.previous_message)
-                prev.isEnabled = canDoPrev
-                prev.icon.alpha = if (canDoPrev) 255 else 127
-                val next = menu.findItem(R.id.next_message)
-                next.isEnabled = canDoNext
-                next.icon.alpha = if (canDoNext) 255 else 127
-            }
-
-            val toggleTheme = menu.findItem(R.id.toggle_message_view_theme)
-            if (generalSettingsManager.getSettings().fixedMessageViewTheme) {
-                toggleTheme.isVisible = false
-            } else {
-                // Set title of menu item to switch to dark/light theme
-                if (themeManager.messageViewTheme === Theme.DARK) {
-                    toggleTheme.setTitle(R.string.message_view_theme_action_light)
-                } else {
-                    toggleTheme.setTitle(R.string.message_view_theme_action_dark)
-                }
-                toggleTheme.isVisible = true
-            }
-
-            if (messageViewFragment!!.isOutbox) {
-                menu.findItem(R.id.toggle_unread).isVisible = false
-            } else {
-                // Set title of menu item to toggle the read state of the currently displayed message
-                val drawableAttr = if (messageViewFragment!!.isMessageRead) {
-                    menu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_unread_action)
-                    intArrayOf(R.attr.iconActionMarkAsUnread)
-                } else {
-                    menu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_read_action)
-                    intArrayOf(R.attr.iconActionMarkAsRead)
-                }
-                val typedArray = obtainStyledAttributes(drawableAttr)
-                menu.findItem(R.id.toggle_unread).icon = typedArray.getDrawable(0)
-                typedArray.recycle()
-            }
-
-            menu.findItem(R.id.delete).isVisible = K9.isMessageViewDeleteActionVisible
-
-            // Set visibility of copy, move, archive, spam in action bar and refile submenu
-            if (messageViewFragment!!.isCopyCapable) {
-                menu.findItem(R.id.copy).isVisible = K9.isMessageViewCopyActionVisible
-                menu.findItem(R.id.refile_copy).isVisible = true
-            } else {
-                menu.findItem(R.id.copy).isVisible = false
-                menu.findItem(R.id.refile_copy).isVisible = false
-            }
-
-            if (messageViewFragment!!.isMoveCapable) {
-                val canMessageBeArchived = messageViewFragment!!.canMessageBeArchived()
-                val canMessageBeMovedToSpam = messageViewFragment!!.canMessageBeMovedToSpam()
-
-                menu.findItem(R.id.move).isVisible = K9.isMessageViewMoveActionVisible
-                menu.findItem(R.id.archive).isVisible = canMessageBeArchived && K9.isMessageViewArchiveActionVisible
-                menu.findItem(R.id.spam).isVisible = canMessageBeMovedToSpam && K9.isMessageViewSpamActionVisible
-
-                menu.findItem(R.id.refile_move).isVisible = true
-                menu.findItem(R.id.refile_archive).isVisible = canMessageBeArchived
-                menu.findItem(R.id.refile_spam).isVisible = canMessageBeMovedToSpam
-            } else {
-                menu.findItem(R.id.move).isVisible = false
-                menu.findItem(R.id.archive).isVisible = false
-                menu.findItem(R.id.spam).isVisible = false
-
-                menu.findItem(R.id.refile).isVisible = false
-            }
-
-            if (messageViewFragment!!.isOutbox) {
-                menu.findItem(R.id.move_to_drafts).isVisible = true
-            }
-
-            menu.findItem(R.id.unsubscribe).isVisible = messageViewFragment!!.canMessageBeUnsubscribed()
-        }
-
-        // Set visibility of menu items related to the message list
-
-        // Hide search menu items by default and enable one when appropriate
-        menu.findItem(R.id.search).isVisible = false
-        menu.findItem(R.id.search_remote).isVisible = false
-        menu.findItem(R.id.search_everywhere).isVisible = false
-
-        if (displayMode == DisplayMode.MESSAGE_VIEW || messageListFragment == null ||
-            !messageListFragment!!.isInitialized
-        ) {
-            menu.findItem(R.id.set_sort).isVisible = false
-            menu.findItem(R.id.select_all).isVisible = false
-            menu.findItem(R.id.send_messages).isVisible = false
-            menu.findItem(R.id.expunge).isVisible = false
-            menu.findItem(R.id.empty_trash).isVisible = false
-            menu.findItem(R.id.mark_all_as_read).isVisible = false
-        } else {
-            menu.findItem(R.id.set_sort).isVisible = true
-            menu.findItem(R.id.select_all).isVisible = true
-            menu.findItem(R.id.compose).isVisible = true
-            menu.findItem(R.id.mark_all_as_read).isVisible = messageListFragment!!.isMarkAllAsReadSupported
-
-            if (!messageListFragment!!.isSingleAccountMode) {
-                menu.findItem(R.id.expunge).isVisible = false
-                menu.findItem(R.id.send_messages).isVisible = false
-            } else {
-                menu.findItem(R.id.send_messages).isVisible = messageListFragment!!.isOutbox
-                menu.findItem(R.id.expunge).isVisible = messageListFragment!!.isRemoteFolder &&
-                    messageListFragment!!.shouldShowExpungeAction()
-            }
-            menu.findItem(R.id.empty_trash).isVisible = messageListFragment!!.isShowingTrashFolder
-
-            // If this is an explicit local search, show the option to search on the server
-            if (!messageListFragment!!.isRemoteSearch && messageListFragment!!.isRemoteSearchAllowed) {
-                menu.findItem(R.id.search_remote).isVisible = true
-            } else if (!messageListFragment!!.isManualSearch) {
-                menu.findItem(R.id.search).isVisible = true
-            }
-
-            val messageListFragment = messageListFragment!!
-            if (messageListFragment.isManualSearch && !messageListFragment.localSearch.searchAllAccounts()) {
-                menu.findItem(R.id.search_everywhere).isVisible = true
-            }
-        }
-    }
-
     fun setActionBarTitle(title: String, subtitle: String? = null) {
         actionBar?.title = title
         actionBar?.subtitle = subtitle
@@ -1278,13 +1004,20 @@ open class MessageList :
         } else {
             messageListFragment?.setActiveMessage(messageReference)
 
-            val fragment = MessageViewFragment.newInstance(messageReference)
-            val fragmentTransaction = supportFragmentManager.beginTransaction()
-            fragmentTransaction.replace(R.id.message_view_container, fragment, FRAGMENT_TAG_MESSAGE_VIEW)
-            fragmentTransaction.commit()
-            messageViewFragment = fragment
+            val fragment = MessageViewContainerFragment.newInstance(messageReference)
+            supportFragmentManager.commitNow {
+                replace(R.id.message_view_container, fragment, FRAGMENT_TAG_MESSAGE_VIEW_CONTAINER)
+            }
+
+            messageViewContainerFragment = fragment
+
+            messageListFragment?.let { messageListFragment ->
+                fragment.setViewModel(messageListFragment.viewModel)
+            }
 
-            if (displayMode != DisplayMode.SPLIT_VIEW) {
+            if (displayMode == DisplayMode.SPLIT_VIEW) {
+                fragment.isActive = true
+            } else {
                 showMessageView()
             }
         }
@@ -1316,6 +1049,8 @@ open class MessageList :
 
     override fun onBackStackChanged() {
         findFragments()
+        messageListFragment?.isActive = true
+
         if (isDrawerEnabled && !isAdditionalMessageListDisplayed) {
             unlockDrawer()
         }
@@ -1323,8 +1058,6 @@ open class MessageList :
         if (displayMode == DisplayMode.SPLIT_VIEW) {
             showMessageViewPlaceHolder()
         }
-
-        configureMenu(menu)
     }
 
     private fun addMessageListFragment(fragment: MessageListFragment) {
@@ -1341,6 +1074,7 @@ open class MessageList :
         }
 
         messageListFragment = fragment
+        fragment.isActive = true
 
         if (isDrawerEnabled) {
             lockDrawer()
@@ -1384,7 +1118,7 @@ open class MessageList :
     }
 
     private fun showMessageViewPlaceHolder() {
-        removeMessageViewFragment()
+        removeMessageViewContainerFragment()
 
         // Add placeholder fragment if necessary
         val fragmentManager = supportFragmentManager
@@ -1397,11 +1131,11 @@ open class MessageList :
         messageListFragment!!.setActiveMessage(null)
     }
 
-    private fun removeMessageViewFragment() {
-        if (messageViewFragment != null) {
+    private fun removeMessageViewContainerFragment() {
+        if (messageViewContainerFragment != null) {
             val fragmentTransaction = supportFragmentManager.beginTransaction()
-            fragmentTransaction.remove(messageViewFragment!!)
-            messageViewFragment = null
+            fragmentTransaction.remove(messageViewContainerFragment!!)
+            messageViewContainerFragment = null
             fragmentTransaction.commit()
 
             showDefaultTitleView()
@@ -1415,11 +1149,6 @@ open class MessageList :
         fragmentTransaction.commit()
     }
 
-    override fun remoteSearchStarted() {
-        // Remove action button for remote search
-        configureMenu(menu)
-    }
-
     override fun goBack() {
         val fragmentManager = supportFragmentManager
         when {
@@ -1429,29 +1158,35 @@ open class MessageList :
         }
     }
 
+    override fun closeMessageView() {
+        returnToMessageList()
+    }
+
+    override fun setActiveMessage(messageReference: MessageReference) {
+        val messageListFragment = checkNotNull(messageListFragment)
+
+        messageListFragment.setActiveMessage(messageReference)
+    }
+
     override fun showNextMessageOrReturn() {
         if (K9.isMessageViewReturnToList || !showLogicalNextMessage()) {
-            if (displayMode == DisplayMode.SPLIT_VIEW) {
-                showMessageViewPlaceHolder()
-            } else {
-                showMessageList()
-            }
+            returnToMessageList()
         }
     }
 
-    private fun showLogicalNextMessage(): Boolean {
-        var result = false
-        if (lastDirection == NEXT) {
-            result = showNextMessage()
-        } else if (lastDirection == PREVIOUS) {
-            result = showPreviousMessage()
+    private fun returnToMessageList() {
+        if (displayMode == DisplayMode.SPLIT_VIEW) {
+            showMessageViewPlaceHolder()
+        } else {
+            showMessageList()
         }
+    }
 
-        if (!result) {
-            result = showNextMessage() || showPreviousMessage()
+    private fun showLogicalNextMessage(): Boolean {
+        return when (lastDirection) {
+            Direction.NEXT -> showNextMessage()
+            Direction.PREVIOUS -> showPreviousMessage()
         }
-
-        return result
     }
 
     override fun setProgress(enable: Boolean) {
@@ -1459,25 +1194,15 @@ open class MessageList :
     }
 
     private fun showNextMessage(): Boolean {
-        val ref = messageViewFragment!!.messageReference
-        if (ref != null) {
-            if (messageListFragment!!.openNext(ref)) {
-                lastDirection = NEXT
-                return true
-            }
-        }
-        return false
+        val messageViewContainerFragment = checkNotNull(messageViewContainerFragment)
+
+        return messageViewContainerFragment.showNextMessage()
     }
 
     private fun showPreviousMessage(): Boolean {
-        val ref = messageViewFragment!!.messageReference
-        if (ref != null) {
-            if (messageListFragment!!.openPrevious(ref)) {
-                lastDirection = PREVIOUS
-                return true
-            }
-        }
-        return false
+        val messageViewContainerFragment = checkNotNull(messageViewContainerFragment)
+
+        return messageViewContainerFragment.showPreviousMessage()
     }
 
     private fun showMessageList() {
@@ -1486,13 +1211,13 @@ open class MessageList :
         displayMode = DisplayMode.MESSAGE_LIST
         viewSwitcher!!.showFirstView()
 
-        messageListFragment!!.onListVisible()
+        messageViewContainerFragment?.isActive = false
+        messageListFragment!!.isActive = true
         messageListFragment!!.setActiveMessage(null)
 
         setDrawerLockState()
 
         showDefaultTitleView()
-        configureMenu(menu)
 
         onMessageListDisplayed()
     }
@@ -1508,8 +1233,11 @@ open class MessageList :
     }
 
     private fun showMessageView() {
+        val messageViewContainerFragment = checkNotNull(this.messageViewContainerFragment)
+
         displayMode = DisplayMode.MESSAGE_VIEW
-        messageListFragment?.onListHidden()
+        messageListFragment?.isActive = false
+        messageViewContainerFragment.isActive = true
 
         if (!messageListWasDisplayed) {
             viewSwitcher!!.animateFirstView = false
@@ -1521,20 +1249,6 @@ open class MessageList :
         }
 
         showMessageTitleView()
-        configureMenu(menu)
-    }
-
-    override fun updateMenu() {
-        invalidateOptionsMenu()
-    }
-
-    override fun disableDeleteAction() {
-        menu!!.findItem(R.id.delete).isEnabled = false
-    }
-
-    private fun onToggleTheme() {
-        themeManager.toggleMessageViewTheme()
-        recreateCompat()
     }
 
     private fun showDefaultTitleView() {
@@ -1549,7 +1263,7 @@ open class MessageList :
 
     override fun onSwitchComplete(displayedChild: Int) {
         if (displayedChild == 0) {
-            removeMessageViewFragment()
+            removeMessageViewContainerFragment()
         }
     }
 
@@ -1587,8 +1301,8 @@ open class MessageList :
 
         if (requestCode and REQUEST_FLAG_PENDING_INTENT != 0) {
             val originalRequestCode = requestCode xor REQUEST_FLAG_PENDING_INTENT
-            if (messageViewFragment != null) {
-                messageViewFragment!!.onPendingIntentResult(originalRequestCode, resultCode, data)
+            if (messageViewContainerFragment != null) {
+                messageViewContainerFragment!!.onPendingIntentResult(originalRequestCode, resultCode, data)
             }
         }
     }
@@ -1718,16 +1432,11 @@ open class MessageList :
         private const val STATE_DISPLAY_MODE = "displayMode"
         private const val STATE_MESSAGE_VIEW_ONLY = "messageViewOnly"
         private const val STATE_MESSAGE_LIST_WAS_DISPLAYED = "messageListWasDisplayed"
-        private const val STATE_FIRST_BACK_STACK_ID = "firstBackstackId"
 
         private const val FIRST_FRAGMENT_TRANSACTION = "first"
-        private const val FRAGMENT_TAG_MESSAGE_VIEW = "MessageViewFragment"
+        private const val FRAGMENT_TAG_MESSAGE_VIEW_CONTAINER = "MessageViewContainerFragment"
         private const val FRAGMENT_TAG_PLACEHOLDER = "MessageViewPlaceholder"
 
-        // Used for navigating to next/previous message
-        private const val PREVIOUS = 1
-        private const val NEXT = 2
-
         private const val REQUEST_CODE_MASK = 0xFFFF0000.toInt()
         private const val REQUEST_FLAG_PENDING_INTENT = 1 shl 15
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
index c6e88d1796213bf885df60f683ba01dae5d35a60..461865655afda274ee5b8cad54c9347effc4b0ab 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
@@ -388,7 +388,7 @@ class AccountSetupCheckSettings : K9Activity(), ConfirmationDialogFragmentListen
 
     /**
      * FIXME: Don't use an AsyncTask to perform network operations.
-     * See also discussion in https://github.com/k9mail/k-9/pull/560
+     * See also discussion in https://github.com/thundernest/k-9/pull/560
      */
     private inner class CheckAccountTask(private val account: Account) : AsyncTask<CheckDirection, Int, Unit>() {
         override fun doInBackground(vararg params: CheckDirection) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
index 92e15487fb07c7e98cef064065b13a02e76aa65c..c7e3d66a81efdbff6a642e0b1cced76cef1b863d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
@@ -1,6 +1,7 @@
 package com.fsck.k9.fragment
 
 import android.app.Activity
+import android.app.SearchManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
@@ -28,6 +29,7 @@ import com.fsck.k9.Clock
 import com.fsck.k9.K9
 import com.fsck.k9.Preferences
 import com.fsck.k9.activity.FolderInfoHolder
+import com.fsck.k9.activity.Search
 import com.fsck.k9.activity.misc.ContactPicture
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.controller.MessagingController
@@ -66,7 +68,7 @@ class MessageListFragment :
     MessageListItemActionListener {
 
     private val foldersViewModel: FoldersViewModel by sharedViewModel()
-    private val viewModel: MessageListViewModel by viewModel()
+    val viewModel: MessageListViewModel by viewModel()
     private val sortTypeToastProvider: SortTypeToastProvider by inject()
     private val folderNameFormatterFactory: FolderNameFormatterFactory by inject()
     private val folderNameFormatter: FolderNameFormatter by lazy { folderNameFormatterFactory.create(requireContext()) }
@@ -113,16 +115,12 @@ class MessageListFragment :
     private var isThreadDisplay = false
     private var activeMessage: MessageReference? = null
 
-    var isLoadFinished = false
-        private set
     lateinit var localSearch: LocalSearch
         private set
     var isSingleAccountMode = false
         private set
-    var isSingleFolderMode = false
-        private set
-    var isRemoteSearch = false
-        private set
+    private var isSingleFolderMode = false
+    private var isRemoteSearch = false
 
     private val isUnifiedInbox: Boolean
         get() = localSearch.id == SearchAccount.UNIFIED_INBOX
@@ -134,10 +132,19 @@ class MessageListFragment :
      * `true` after [.onCreate] was executed. Used in [.updateTitle] to
      * make sure we don't access member variables before initialization is complete.
      */
-    var isInitialized = false
-        private set
+    private var isInitialized = false
 
-    private var isListVisible = false
+    /**
+     * Set this to `true` when the fragment should be considered active. When active, the fragment adds its actions to
+     * the toolbar. When inactive, the fragment won't add its actions to the toolbar, even it is still visible, e.g. as
+     * part of an animation.
+     */
+    var isActive: Boolean = false
+        set(value) {
+            field = value
+            resetActionMode()
+            invalidateMenu()
+        }
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -151,6 +158,7 @@ class MessageListFragment :
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        setHasOptionsMenu(true)
 
         restoreInstanceState(savedInstanceState)
         decodeArguments() ?: return
@@ -533,7 +541,7 @@ class MessageListFragment :
         }
     }
 
-    fun changeSort(sortType: SortType) {
+    private fun changeSort(sortType: SortType) {
         val sortAscending = if (this.sortType == sortType) !sortAscending else null
         changeSort(sortType, sortAscending)
     }
@@ -555,7 +563,7 @@ class MessageListFragment :
             activityListener
         )
 
-        fragmentListener.remoteSearchStarted()
+        invalidateMenu()
     }
 
     /**
@@ -655,23 +663,19 @@ class MessageListFragment :
         }
     }
 
-    fun onExpunge() {
+    private fun onExpunge() {
         currentFolder?.let { folderInfoHolder ->
-            onExpunge(account, folderInfoHolder.databaseId)
+            messagingController.expunge(account, folderInfoHolder.databaseId)
         }
     }
 
-    private fun onExpunge(account: Account?, folderId: Long) {
-        messagingController.expunge(account, folderId)
-    }
-
-    fun onEmptyTrash() {
+    private fun onEmptyTrash() {
         if (isShowingTrashFolder) {
             showDialog(R.id.dialog_confirm_empty_trash)
         }
     }
 
-    val isShowingTrashFolder: Boolean
+    private val isShowingTrashFolder: Boolean
         get() {
             if (!isSingleFolderMode) return false
             return currentFolder!!.databaseId == account!!.trashFolderId
@@ -730,54 +734,86 @@ class MessageListFragment :
         return "dialog-$dialogId"
     }
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-        if (id == R.id.set_sort_date) {
-            changeSort(SortType.SORT_DATE)
-            return true
-        } else if (id == R.id.set_sort_arrival) {
-            changeSort(SortType.SORT_ARRIVAL)
-            return true
-        } else if (id == R.id.set_sort_subject) {
-            changeSort(SortType.SORT_SUBJECT)
-            return true
-        } else if (id == R.id.set_sort_sender) {
-            changeSort(SortType.SORT_SENDER)
-            return true
-        } else if (id == R.id.set_sort_flag) {
-            changeSort(SortType.SORT_FLAGGED)
-            return true
-        } else if (id == R.id.set_sort_unread) {
-            changeSort(SortType.SORT_UNREAD)
-            return true
-        } else if (id == R.id.set_sort_attach) {
-            changeSort(SortType.SORT_ATTACHMENT)
-            return true
-        } else if (id == R.id.select_all) {
-            selectAll()
-            return true
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        if (isActive) {
+            prepareMenu(menu)
+        } else {
+            hideMenu(menu)
         }
+    }
 
-        if (!isSingleAccountMode) {
-            // None of the options after this point are "safe" for search results
-            // TODO: This is not true for "unread" and "starred" searches in regular folders
-            return false
-        }
+    private fun prepareMenu(menu: Menu) {
+        menu.findItem(R.id.compose).isVisible = true
+        menu.findItem(R.id.set_sort).isVisible = true
+        menu.findItem(R.id.select_all).isVisible = true
+        menu.findItem(R.id.compose).isVisible = true
+        menu.findItem(R.id.mark_all_as_read).isVisible = isMarkAllAsReadSupported
+        menu.findItem(R.id.empty_trash).isVisible = isShowingTrashFolder
 
-        if (id == R.id.send_messages) {
-            onSendPendingMessages()
-            return true
-        } else if (id == R.id.expunge) {
-            currentFolder?.let { folderInfoHolder ->
-                onExpunge(account, folderInfoHolder.databaseId)
-            }
-            return true
+        if (isSingleAccountMode) {
+            menu.findItem(R.id.send_messages).isVisible = isOutbox
+            menu.findItem(R.id.expunge).isVisible = isRemoteFolder && shouldShowExpungeAction()
         } else {
-            return super.onOptionsItemSelected(item)
+            menu.findItem(R.id.send_messages).isVisible = false
+            menu.findItem(R.id.expunge).isVisible = false
         }
+
+        menu.findItem(R.id.search).isVisible = !isManualSearch
+        menu.findItem(R.id.search_remote).isVisible = !isRemoteSearch && isRemoteSearchAllowed
+        menu.findItem(R.id.search_everywhere).isVisible = isManualSearch && !localSearch.searchAllAccounts()
+    }
+
+    private fun hideMenu(menu: Menu) {
+        menu.findItem(R.id.compose).isVisible = false
+        menu.findItem(R.id.search).isVisible = false
+        menu.findItem(R.id.search_remote).isVisible = false
+        menu.findItem(R.id.set_sort).isVisible = false
+        menu.findItem(R.id.select_all).isVisible = false
+        menu.findItem(R.id.mark_all_as_read).isVisible = false
+        menu.findItem(R.id.send_messages).isVisible = false
+        menu.findItem(R.id.empty_trash).isVisible = false
+        menu.findItem(R.id.expunge).isVisible = false
+        menu.findItem(R.id.search_everywhere).isVisible = false
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.search_remote -> onRemoteSearch()
+            R.id.compose -> onCompose()
+            R.id.set_sort_date -> changeSort(SortType.SORT_DATE)
+            R.id.set_sort_arrival -> changeSort(SortType.SORT_ARRIVAL)
+            R.id.set_sort_subject -> changeSort(SortType.SORT_SUBJECT)
+            R.id.set_sort_sender -> changeSort(SortType.SORT_SENDER)
+            R.id.set_sort_flag -> changeSort(SortType.SORT_FLAGGED)
+            R.id.set_sort_unread -> changeSort(SortType.SORT_UNREAD)
+            R.id.set_sort_attach -> changeSort(SortType.SORT_ATTACHMENT)
+            R.id.select_all -> selectAll()
+            R.id.mark_all_as_read -> confirmMarkAllAsRead()
+            R.id.send_messages -> onSendPendingMessages()
+            R.id.empty_trash -> onEmptyTrash()
+            R.id.expunge -> onExpunge()
+            R.id.search_everywhere -> onSearchEverywhere()
+            else -> return super.onOptionsItemSelected(item)
+        }
+
+        return true
+    }
+
+    private fun onSearchEverywhere() {
+        val searchQuery = requireActivity().intent.getStringExtra(SearchManager.QUERY)
+
+        val searchIntent = Intent(requireContext(), Search::class.java).apply {
+            action = Intent.ACTION_SEARCH
+            putExtra(SearchManager.QUERY, searchQuery)
+
+            addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+        }
+
+        startActivity(searchIntent)
     }
 
-    fun onSendPendingMessages() {
+    private fun onSendPendingMessages() {
         messagingController.sendPendingMessages(account, null)
     }
 
@@ -1290,30 +1326,6 @@ class MessageListFragment :
         }
     }
 
-    fun openPrevious(messageReference: MessageReference): Boolean {
-        val position = getPosition(messageReference)
-        if (position <= 0) return false
-
-        openMessageAtPosition(position - 1)
-        return true
-    }
-
-    fun openNext(messageReference: MessageReference): Boolean {
-        val position = getPosition(messageReference)
-        if (position < 0 || position == adapter.count - 1) return false
-
-        openMessageAtPosition(position + 1)
-        return true
-    }
-
-    fun isFirst(messageReference: MessageReference): Boolean {
-        return adapter.isEmpty || messageReference == getReferenceForPosition(0)
-    }
-
-    fun isLast(messageReference: MessageReference): Boolean {
-        return adapter.isEmpty || messageReference == getReferenceForPosition(adapter.count - 1)
-    }
-
     private fun getReferenceForPosition(position: Int): MessageReference {
         val item = adapter.getItem(position)
         return MessageReference(item.account.uuid, item.folderId, item.messageUid)
@@ -1340,14 +1352,6 @@ class MessageListFragment :
         fragmentListener.openMessage(messageReference)
     }
 
-    private fun getPosition(messageReference: MessageReference): Int {
-        return adapter.messages.indexOfFirst { messageListItem ->
-            messageListItem.account.uuid == messageReference.accountUuid &&
-                messageListItem.folderId == messageReference.folderId &&
-                messageListItem.messageUid == messageReference.uid
-        }
-    }
-
     fun onReverseSort() {
         changeSort(sortType)
     }
@@ -1443,7 +1447,7 @@ class MessageListFragment :
         return currentFolder.databaseId == folderId
     }
 
-    val isRemoteFolder: Boolean
+    private val isRemoteFolder: Boolean
         get() {
             if (localSearch.isManualSearch || isOutbox) return false
 
@@ -1455,15 +1459,15 @@ class MessageListFragment :
             }
         }
 
-    val isManualSearch: Boolean
+    private val isManualSearch: Boolean
         get() = localSearch.isManualSearch
 
-    fun shouldShowExpungeAction(): Boolean {
+    private fun shouldShowExpungeAction(): Boolean {
         val account = this.account ?: return false
         return account.expungePolicy == Expunge.EXPUNGE_MANUALLY && messagingController.supportsExpunge(account)
     }
 
-    fun onRemoteSearch() {
+    private fun onRemoteSearch() {
         // Remote search is useless without the network.
         if (hasConnectivity == true) {
             onRemoteSearchRequested()
@@ -1472,7 +1476,7 @@ class MessageListFragment :
         }
     }
 
-    val isRemoteSearchAllowed: Boolean
+    private val isRemoteSearchAllowed: Boolean
         get() = isManualSearch && !isRemoteSearch && isSingleFolderMode && messagingController.isPushCapable(account)
 
     fun onSearchRequested(query: String): Boolean {
@@ -1480,7 +1484,7 @@ class MessageListFragment :
         return fragmentListener.startSearch(query, account, folderId)
     }
 
-    fun setMessageList(messageListInfo: MessageListInfo) {
+    private fun setMessageList(messageListInfo: MessageListInfo) {
         val messageListItems = messageListInfo.messageListItems
         if (isThreadDisplay && messageListItems.isEmpty()) {
             handler.goBack()
@@ -1513,14 +1517,12 @@ class MessageListFragment :
         computeBatchDirection()
         computeSelectAllVisibility()
 
-        isLoadFinished = true
-
         if (savedListState != null) {
             handler.restoreListPosition(savedListState)
             savedListState = null
         }
 
-        fragmentListener.updateMenu()
+        invalidateMenu()
 
         currentFolder?.let { currentFolder ->
             currentFolder.moreMessages = messageListInfo.hasMoreMessages
@@ -1541,7 +1543,7 @@ class MessageListFragment :
     private fun resetActionMode() {
         if (!isResumed) return
 
-        if (!isListVisible || selected.isEmpty()) {
+        if (!isActive || selected.isEmpty()) {
             actionMode?.finish()
             actionMode = null
             return
@@ -1589,13 +1591,35 @@ class MessageListFragment :
         if (::adapter.isInitialized) {
             adapter.activeMessage = activeMessage
             adapter.notifyDataSetChanged()
+
+            if (messageReference != null) {
+                scrollToMessage(messageReference)
+            }
         }
     }
 
-    val isMarkAllAsReadSupported: Boolean
+    private fun scrollToMessage(messageReference: MessageReference) {
+        val position = getPosition(messageReference)
+        val viewPosition = adapterToListViewPosition(position)
+        if (viewPosition != AdapterView.INVALID_POSITION &&
+            (viewPosition <= listView.firstVisiblePosition || viewPosition >= listView.lastVisiblePosition)
+        ) {
+            listView.smoothScrollToPosition(viewPosition)
+        }
+    }
+
+    private fun getPosition(messageReference: MessageReference): Int {
+        return adapter.messages.indexOfFirst { messageListItem ->
+            messageListItem.account.uuid == messageReference.accountUuid &&
+                messageListItem.folderId == messageReference.folderId &&
+                messageListItem.messageUid == messageReference.uid
+        }
+    }
+
+    private val isMarkAllAsReadSupported: Boolean
         get() = isSingleAccountMode && isSingleFolderMode && !isOutbox
 
-    fun confirmMarkAllAsRead() {
+    private fun confirmMarkAllAsRead() {
         if (K9.isConfirmMarkAllRead) {
             showDialog(R.id.dialog_confirm_mark_all_as_read)
         } else {
@@ -1609,17 +1633,11 @@ class MessageListFragment :
         }
     }
 
-    fun onListVisible() {
-        isListVisible = true
-        resetActionMode()
-    }
-
-    fun onListHidden() {
-        isListVisible = false
-        resetActionMode()
+    private fun invalidateMenu() {
+        activity?.invalidateMenu()
     }
 
-    val isCheckMailSupported: Boolean
+    private val isCheckMailSupported: Boolean
         get() = allAccounts || !isSingleAccountMode || !isSingleFolderMode || isRemoteFolder
 
     private val isCheckMailAllowed: Boolean
@@ -1975,9 +1993,7 @@ class MessageListFragment :
         fun setMessageListTitle(title: String, subtitle: String?)
         fun onCompose(account: Account?)
         fun startSearch(query: String, account: Account?, folderId: Long?): Boolean
-        fun remoteSearchStarted()
         fun goBack()
-        fun updateMenu()
         fun onFolderNotFoundError()
 
         companion object {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
index 4398ead62174c88cf160ba029235c78de043338e..b0b9fb039d4fbea76bdedaafda5dadcca9a34289 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
@@ -619,7 +619,7 @@ public class MessageCryptoHelper {
 
     private void onCryptoOperationCanceled() {
         // there are weird states that get us here when we're not actually processing any part. just skip in that case
-        // see https://github.com/k9mail/k-9/issues/1878
+        // see https://github.com/thundernest/k-9/issues/1878
         if (currentCryptoPart != null) {
             CryptoResultAnnotation errorPart = CryptoResultAnnotation.createOpenPgpCanceledAnnotation();
             addCryptoResultAnnotationToMessage(errorPart);
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
index fab62cbab326b485e5fdd684f444ace7b60e7eb6..7eaf4167826ea336d1283b4d03ab48a927f46452 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentController.java
@@ -40,9 +40,9 @@ public class AttachmentController {
     private final AttachmentViewInfo attachment;
 
 
-    AttachmentController(MessagingController controller, MessageViewFragment messageViewFragment,
+    AttachmentController(Context context, MessagingController controller, MessageViewFragment messageViewFragment,
             AttachmentViewInfo attachment) {
-        this.context = messageViewFragment.getApplicationContext();
+        this.context = context;
         this.controller = controller;
         this.messageViewFragment = messageViewFragment;
         this.attachment = attachment;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java
index 43c2e40e6daacb1c36063f3d8c5c2811196a6a04..e78fe3a09dc4ff4a9191b898dcf203a3a02e7a71 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/AttachmentViewCallback.java
@@ -4,7 +4,7 @@ package com.fsck.k9.ui.messageview;
 import com.fsck.k9.mailstore.AttachmentViewInfo;
 
 
-interface AttachmentViewCallback {
+public interface AttachmentViewCallback {
     void onViewAttachment(AttachmentViewInfo attachment);
     void onSaveAttachment(AttachmentViewInfo attachment);
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt
new file mode 100644
index 0000000000000000000000000000000000000000..62431d3871643db0b849e5a78881d9d57d72a4d3
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt
@@ -0,0 +1,6 @@
+package com.fsck.k9.ui.messageview
+
+enum class Direction {
+    PREVIOUS,
+    NEXT
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
deleted file mode 100644
index 3efcff567c454e2f6bdf6117e654f66a24d00d3a..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.java
+++ /dev/null
@@ -1,551 +0,0 @@
-package com.fsck.k9.ui.messageview;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import android.app.DownloadManager;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Environment;
-import android.os.Message;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MenuItem.OnMenuItemClickListener;
-import android.view.View;
-import android.view.View.OnCreateContextMenuListener;
-import android.webkit.WebView;
-import android.webkit.WebView.HitTestResult;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import androidx.core.app.ShareCompat;
-import com.fsck.k9.DI;
-import com.fsck.k9.message.html.DisplayHtml;
-import com.fsck.k9.ui.R;
-import com.fsck.k9.helper.ClipboardManager;
-import com.fsck.k9.helper.Contacts;
-import com.fsck.k9.helper.Utility;
-import com.fsck.k9.mail.Address;
-import com.fsck.k9.mailstore.AttachmentResolver;
-import com.fsck.k9.mailstore.AttachmentViewInfo;
-import com.fsck.k9.mailstore.MessageViewInfo;
-import com.fsck.k9.ui.helper.DisplayHtmlUiFactory;
-import com.fsck.k9.view.MessageWebView;
-import com.fsck.k9.view.MessageWebView.OnPageFinishedListener;
-import com.fsck.k9.view.WebViewConfigProvider;
-
-import static android.app.DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED;
-
-
-public class MessageContainerView extends LinearLayout implements OnCreateContextMenuListener {
-    private static final int MENU_ITEM_LINK_VIEW = Menu.FIRST;
-    private static final int MENU_ITEM_LINK_SHARE = Menu.FIRST + 1;
-    private static final int MENU_ITEM_LINK_COPY = Menu.FIRST + 2;
-    private static final int MENU_ITEM_LINK_TEXT_COPY = Menu.FIRST + 3;
-
-    private static final int MENU_ITEM_IMAGE_VIEW = Menu.FIRST;
-    private static final int MENU_ITEM_IMAGE_SAVE = Menu.FIRST + 1;
-    private static final int MENU_ITEM_IMAGE_COPY = Menu.FIRST + 2;
-
-    private static final int MENU_ITEM_PHONE_CALL = Menu.FIRST;
-    private static final int MENU_ITEM_PHONE_SAVE = Menu.FIRST + 1;
-    private static final int MENU_ITEM_PHONE_COPY = Menu.FIRST + 2;
-
-    private static final int MENU_ITEM_EMAIL_SEND = Menu.FIRST;
-    private static final int MENU_ITEM_EMAIL_SAVE = Menu.FIRST + 1;
-    private static final int MENU_ITEM_EMAIL_COPY = Menu.FIRST + 2;
-
-    private final DisplayHtml displayHtml = DI.get(DisplayHtmlUiFactory.class).createForMessageView();
-    private final WebViewConfigProvider webViewConfigProvider = DI.get(WebViewConfigProvider.class);
-    private final ClipboardManager clipboardManager = DI.get(ClipboardManager.class);
-
-    private MessageWebView mMessageContentView;
-    private LinearLayout mAttachments;
-    private View unsignedTextContainer;
-    private View unsignedTextDivider;
-    private TextView unsignedText;
-    private View mAttachmentsContainer;
-
-    private boolean showingPictures;
-    private LayoutInflater mInflater;
-    private AttachmentViewCallback attachmentCallback;
-    private Map<AttachmentViewInfo, AttachmentView> attachmentViewMap = new HashMap<>();
-    private Map<Uri, AttachmentViewInfo> attachments = new HashMap<>();
-    private boolean hasHiddenExternalImages;
-
-    private String currentHtmlText;
-    private AttachmentResolver currentAttachmentResolver;
-
-
-    @Override
-    public void onFinishInflate() {
-        super.onFinishInflate();
-
-        mMessageContentView = findViewById(R.id.message_content);
-        if (!isInEditMode()) {
-            mMessageContentView.configure(webViewConfigProvider.createForMessageView());
-        }
-        mMessageContentView.setOnCreateContextMenuListener(this);
-        mMessageContentView.setVisibility(View.VISIBLE);
-
-        mAttachmentsContainer = findViewById(R.id.attachments_container);
-        mAttachments = findViewById(R.id.attachments);
-
-        unsignedTextContainer = findViewById(R.id.message_unsigned_container);
-        unsignedTextDivider = findViewById(R.id.message_unsigned_divider);
-        unsignedText = findViewById(R.id.message_unsigned_text);
-
-        showingPictures = false;
-
-        Context context = getContext();
-        mInflater = LayoutInflater.from(context);
-    }
-
-    @Override
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-        super.onCreateContextMenu(menu);
-
-        WebView webview = (WebView) v;
-        WebView.HitTestResult result = webview.getHitTestResult();
-
-        if (result == null) {
-            return;
-        }
-
-        int type = result.getType();
-        Context context = getContext();
-
-        switch (type) {
-            case HitTestResult.SRC_ANCHOR_TYPE: {
-                final String url = result.getExtra();
-                OnMenuItemClickListener listener = new OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        switch (item.getItemId()) {
-                            case MENU_ITEM_LINK_VIEW: {
-                                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-                                startActivityIfAvailable(getContext(), intent);
-                                break;
-                            }
-                            case MENU_ITEM_LINK_SHARE: {
-                                new ShareCompat.IntentBuilder(getContext())
-                                        .setType("text/plain")
-                                        .setText(url)
-                                        .startChooser();
-                                break;
-                            }
-                            case MENU_ITEM_LINK_COPY: {
-                                String label = getContext().getString(
-                                        R.string.webview_contextmenu_link_clipboard_label);
-                                clipboardManager.setText(label, url);
-                                break;
-                            }
-                            case MENU_ITEM_LINK_TEXT_COPY: {
-                                LinkTextHandler linkTextHandler = DI.get(LinkTextHandler.class);
-                                Message message = linkTextHandler.obtainMessage();
-                                webview.requestFocusNodeHref(message);
-                                break;
-                            }
-                        }
-                        return true;
-                    }
-                };
-
-                menu.setHeaderTitle(url);
-
-                menu.add(Menu.NONE, MENU_ITEM_LINK_VIEW, 0,
-                        context.getString(R.string.webview_contextmenu_link_view_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_LINK_SHARE, 1,
-                        context.getString(R.string.webview_contextmenu_link_share_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_LINK_COPY, 2,
-                        context.getString(R.string.webview_contextmenu_link_copy_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_LINK_TEXT_COPY, 3,
-                        context.getString(R.string.webview_contextmenu_link_text_copy_action))
-                        .setOnMenuItemClickListener(listener);
-
-                break;
-            }
-            case HitTestResult.IMAGE_TYPE:
-            case HitTestResult.SRC_IMAGE_ANCHOR_TYPE: {
-                final Uri uri = Uri.parse(result.getExtra());
-                if (uri == null) {
-                    return;
-                }
-                
-                final AttachmentViewInfo attachmentViewInfo = getAttachmentViewInfoIfCidUri(uri);
-                final boolean inlineImage = attachmentViewInfo != null;
-
-                OnMenuItemClickListener listener = new OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        switch (item.getItemId()) {
-                            case MENU_ITEM_IMAGE_VIEW: {
-                                if (inlineImage) {
-                                    attachmentCallback.onViewAttachment(attachmentViewInfo);
-                                } else {
-                                    Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                                    startActivityIfAvailable(getContext(), intent);
-                                }
-                                break;
-                            }
-                            case MENU_ITEM_IMAGE_SAVE: {
-                                if (inlineImage) {
-                                    attachmentCallback.onSaveAttachment(attachmentViewInfo);
-                                } else {
-                                    downloadImage(uri);
-                                }
-                                break;
-                            }
-                            case MENU_ITEM_IMAGE_COPY: {
-                                String label = getContext().getString(
-                                        R.string.webview_contextmenu_image_clipboard_label);
-                                clipboardManager.setText(label, uri.toString());
-                                break;
-                            }
-                        }
-                        return true;
-                    }
-                };
-
-                menu.setHeaderTitle(inlineImage ?
-                        context.getString(R.string.webview_contextmenu_image_title) : uri.toString());
-
-                menu.add(Menu.NONE, MENU_ITEM_IMAGE_VIEW, 0,
-                        context.getString(R.string.webview_contextmenu_image_view_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_IMAGE_SAVE, 1,
-                        inlineImage ?
-                                context.getString(R.string.webview_contextmenu_image_save_action) :
-                                context.getString(R.string.webview_contextmenu_image_download_action))
-                        .setOnMenuItemClickListener(listener);
-
-                if (!inlineImage) {
-                    menu.add(Menu.NONE, MENU_ITEM_IMAGE_COPY, 2,
-                            context.getString(R.string.webview_contextmenu_image_copy_action))
-                            .setOnMenuItemClickListener(listener);
-                }
-
-                break;
-            }
-            case HitTestResult.PHONE_TYPE: {
-                final String phoneNumber = result.getExtra();
-                OnMenuItemClickListener listener = new OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        switch (item.getItemId()) {
-                            case MENU_ITEM_PHONE_CALL: {
-                                Uri uri = Uri.parse(WebView.SCHEME_TEL + phoneNumber);
-                                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                                startActivityIfAvailable(getContext(), intent);
-                                break;
-                            }
-                            case MENU_ITEM_PHONE_SAVE: {
-                                Contacts contacts = Contacts.getInstance(getContext());
-                                contacts.addPhoneContact(phoneNumber);
-                                break;
-                            }
-                            case MENU_ITEM_PHONE_COPY: {
-                                String label = getContext().getString(
-                                        R.string.webview_contextmenu_phone_clipboard_label);
-                                clipboardManager.setText(label, phoneNumber);
-                                break;
-                            }
-                        }
-
-                        return true;
-                    }
-                };
-
-                menu.setHeaderTitle(phoneNumber);
-
-                menu.add(Menu.NONE, MENU_ITEM_PHONE_CALL, 0,
-                        context.getString(R.string.webview_contextmenu_phone_call_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_PHONE_SAVE, 1,
-                        context.getString(R.string.webview_contextmenu_phone_save_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_PHONE_COPY, 2,
-                        context.getString(R.string.webview_contextmenu_phone_copy_action))
-                        .setOnMenuItemClickListener(listener);
-
-                break;
-            }
-            case WebView.HitTestResult.EMAIL_TYPE: {
-                final String email = result.getExtra();
-                OnMenuItemClickListener listener = new OnMenuItemClickListener() {
-                    @Override
-                    public boolean onMenuItemClick(MenuItem item) {
-                        switch (item.getItemId()) {
-                            case MENU_ITEM_EMAIL_SEND: {
-                                Uri uri = Uri.parse(WebView.SCHEME_MAILTO + email);
-                                Intent intent = new Intent(Intent.ACTION_VIEW, uri);
-                                startActivityIfAvailable(getContext(), intent);
-                                break;
-                            }
-                            case MENU_ITEM_EMAIL_SAVE: {
-                                Contacts contacts = Contacts.getInstance(getContext());
-                                contacts.createContact(new Address(email));
-                                break;
-                            }
-                            case MENU_ITEM_EMAIL_COPY: {
-                                String label = getContext().getString(
-                                        R.string.webview_contextmenu_email_clipboard_label);
-                                clipboardManager.setText(label, email);
-                                break;
-                            }
-                        }
-
-                        return true;
-                    }
-                };
-
-                menu.setHeaderTitle(email);
-
-                menu.add(Menu.NONE, MENU_ITEM_EMAIL_SEND, 0,
-                        context.getString(R.string.webview_contextmenu_email_send_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_EMAIL_SAVE, 1,
-                        context.getString(R.string.webview_contextmenu_email_save_action))
-                        .setOnMenuItemClickListener(listener);
-
-                menu.add(Menu.NONE, MENU_ITEM_EMAIL_COPY, 2,
-                        context.getString(R.string.webview_contextmenu_email_copy_action))
-                        .setOnMenuItemClickListener(listener);
-
-                break;
-            }
-        }
-    }
-
-    private void downloadImage(Uri uri) {
-        DownloadManager.Request request = new DownloadManager.Request(uri);
-        if (Build.VERSION.SDK_INT >= 29) {
-            String filename = uri.getLastPathSegment();
-            request.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename);
-        }
-        request.setNotificationVisibility(VISIBILITY_VISIBLE_NOTIFY_COMPLETED);
-
-        DownloadManager downloadManager = (DownloadManager) getContext().getSystemService(Context.DOWNLOAD_SERVICE);
-        downloadManager.enqueue(request);
-    }
-
-    private AttachmentViewInfo getAttachmentViewInfoIfCidUri(Uri uri) {
-        if (!"cid".equals(uri.getScheme())) {
-            return null;
-        }
-
-        String cid = uri.getSchemeSpecificPart();
-        Uri internalUri = currentAttachmentResolver.getAttachmentUriForContentId(cid);
-
-        return attachments.get(internalUri);
-    }
-
-    private void startActivityIfAvailable(Context context, Intent intent) {
-        try {
-            context.startActivity(intent);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(context, R.string.error_activity_not_found, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    public MessageContainerView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-
-    private boolean isShowingPictures() {
-        return showingPictures;
-    }
-
-    private void setLoadPictures(boolean enable) {
-        mMessageContentView.blockNetworkData(!enable);
-        showingPictures = enable;
-    }
-
-    public void showPictures() {
-        setLoadPictures(true);
-        refreshDisplayedContent();
-    }
-
-    public void enableAttachmentButtons() {
-        for (AttachmentView attachmentView : attachmentViewMap.values()) {
-            attachmentView.enableButtons();
-        }
-    }
-
-    public void disableAttachmentButtons() {
-        for (AttachmentView attachmentView : attachmentViewMap.values()) {
-            attachmentView.disableButtons();
-        }
-    }
-
-    public void displayMessageViewContainer(MessageViewInfo messageViewInfo,
-            final OnRenderingFinishedListener onRenderingFinishedListener, boolean loadPictures,
-            boolean hideUnsignedTextDivider, AttachmentViewCallback attachmentCallback) {
-
-        this.attachmentCallback = attachmentCallback;
-
-        resetView();
-
-        renderAttachments(messageViewInfo);
-
-        String textToDisplay = messageViewInfo.text;
-        if (textToDisplay != null && !isShowingPictures()) {
-            if (Utility.hasExternalImages(textToDisplay)) {
-                if (loadPictures) {
-                    setLoadPictures(true);
-                } else {
-                    hasHiddenExternalImages = true;
-                }
-            }
-        }
-
-        if (textToDisplay == null) {
-            String noTextMessage = getContext().getString(R.string.webview_empty_message);
-            textToDisplay = displayHtml.wrapStatusMessage(noTextMessage);
-        }
-
-        OnPageFinishedListener onPageFinishedListener = new OnPageFinishedListener() {
-            @Override
-            public void onPageFinished() {
-                onRenderingFinishedListener.onLoadFinished();
-            }
-        };
-
-        displayHtmlContentWithInlineAttachments(
-                textToDisplay, messageViewInfo.attachmentResolver, onPageFinishedListener);
-
-        if (!TextUtils.isEmpty(messageViewInfo.extraText)) {
-            unsignedTextContainer.setVisibility(View.VISIBLE);
-            unsignedTextDivider.setVisibility(hideUnsignedTextDivider ? View.GONE : View.VISIBLE);
-            unsignedText.setText(messageViewInfo.extraText);
-        }
-    }
-
-    public boolean hasHiddenExternalImages() {
-        return hasHiddenExternalImages;
-    }
-
-    private void displayHtmlContentWithInlineAttachments(String htmlText, AttachmentResolver attachmentResolver,
-            OnPageFinishedListener onPageFinishedListener) {
-        currentHtmlText = htmlText;
-        currentAttachmentResolver = attachmentResolver;
-        mMessageContentView.displayHtmlContentWithInlineAttachments(htmlText, attachmentResolver, onPageFinishedListener);
-    }
-
-    private void refreshDisplayedContent() {
-        mMessageContentView.displayHtmlContentWithInlineAttachments(currentHtmlText, currentAttachmentResolver, null);
-    }
-
-    private void clearDisplayedContent() {
-        mMessageContentView.displayHtmlContentWithInlineAttachments("", null, null);
-        unsignedTextContainer.setVisibility(View.GONE);
-        unsignedText.setText("");
-    }
-
-    public void renderAttachments(MessageViewInfo messageViewInfo) {
-        if (messageViewInfo.attachments != null) {
-            for (AttachmentViewInfo attachment : messageViewInfo.attachments) {
-                attachments.put(attachment.internalUri, attachment);
-                if (attachment.inlineAttachment) {
-                    continue;
-                }
-
-                AttachmentView view =
-                        (AttachmentView) mInflater.inflate(R.layout.message_view_attachment, mAttachments, false);
-                view.setCallback(attachmentCallback);
-                view.setAttachment(attachment);
-
-                attachmentViewMap.put(attachment, view);
-                mAttachments.addView(view);
-            }
-        }
-
-        if (messageViewInfo.extraAttachments != null) {
-            for (AttachmentViewInfo attachment : messageViewInfo.extraAttachments) {
-                attachments.put(attachment.internalUri, attachment);
-                if (attachment.inlineAttachment) {
-                    continue;
-                }
-
-                LockedAttachmentView view = (LockedAttachmentView) mInflater
-                        .inflate(R.layout.message_view_attachment_locked, mAttachments, false);
-                view.setCallback(attachmentCallback);
-                view.setAttachment(attachment);
-
-                // attachments.put(attachment, view);
-                mAttachments.addView(view);
-            }
-        }
-    }
-
-    public void zoom(KeyEvent event) {
-        if (event.isShiftPressed()) {
-            mMessageContentView.zoomIn();
-        } else {
-            mMessageContentView.zoomOut();
-        }
-    }
-
-    public void beginSelectingText() {
-        mMessageContentView.emulateShiftHeld();
-    }
-
-    public void resetView() {
-        setLoadPictures(false);
-        mAttachments.removeAllViews();
-
-        currentHtmlText = null;
-        currentAttachmentResolver = null;
-
-        /*
-         * Clear the WebView content
-         *
-         * For some reason WebView.clearView() doesn't clear the contents when the WebView changes
-         * its size because the button to download the complete message was previously shown and
-         * is now hidden.
-         */
-        clearDisplayedContent();
-    }
-
-    public void enableAttachmentButtons(AttachmentViewInfo attachment) {
-        getAttachmentView(attachment).enableButtons();
-    }
-
-    public void disableAttachmentButtons(AttachmentViewInfo attachment) {
-        getAttachmentView(attachment).disableButtons();
-    }
-
-    public void refreshAttachmentThumbnail(AttachmentViewInfo attachment) {
-        getAttachmentView(attachment).refreshThumbnail();
-    }
-
-    private AttachmentView getAttachmentView(AttachmentViewInfo attachment) {
-        return attachmentViewMap.get(attachment);
-    }
-
-    interface OnRenderingFinishedListener {
-        void onLoadFinished();
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
new file mode 100644
index 0000000000000000000000000000000000000000..0d3534f26927b2808619a468414ff8cb2fc35493
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
@@ -0,0 +1,538 @@
+package com.fsck.k9.ui.messageview
+
+import android.app.DownloadManager
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.util.AttributeSet
+import android.view.ContextMenu
+import android.view.ContextMenu.ContextMenuInfo
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.View.OnCreateContextMenuListener
+import android.view.ViewGroup
+import android.webkit.WebView
+import android.webkit.WebView.HitTestResult
+import android.widget.LinearLayout
+import android.widget.TextView
+import android.widget.Toast
+import androidx.core.app.ShareCompat.IntentBuilder
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
+import com.fsck.k9.helper.ClipboardManager
+import com.fsck.k9.helper.Contacts
+import com.fsck.k9.helper.Utility
+import com.fsck.k9.mail.Address
+import com.fsck.k9.mailstore.AttachmentResolver
+import com.fsck.k9.mailstore.AttachmentViewInfo
+import com.fsck.k9.mailstore.MessageViewInfo
+import com.fsck.k9.ui.R
+import com.fsck.k9.ui.helper.DisplayHtmlUiFactory
+import com.fsck.k9.view.MessageWebView
+import com.fsck.k9.view.MessageWebView.OnPageFinishedListener
+import com.fsck.k9.view.WebViewConfigProvider
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.get
+import org.koin.core.component.inject
+
+class MessageContainerView(context: Context, attrs: AttributeSet?) :
+    LinearLayout(context, attrs),
+    OnCreateContextMenuListener,
+    KoinComponent {
+
+    private val displayHtml by lazy(mode = LazyThreadSafetyMode.NONE) {
+        get<DisplayHtmlUiFactory>().createForMessageView()
+    }
+    private val webViewConfigProvider: WebViewConfigProvider by inject()
+    private val clipboardManager: ClipboardManager by inject()
+    private val linkTextHandler: LinkTextHandler by inject()
+
+    private lateinit var layoutInflater: LayoutInflater
+
+    private lateinit var messageContentView: MessageWebView
+    private lateinit var attachmentsContainer: ViewGroup
+    private lateinit var unsignedTextContainer: View
+    private lateinit var unsignedTextDivider: View
+    private lateinit var unsignedText: TextView
+
+    private var isShowingPictures = false
+    private var currentHtmlText: String? = null
+    private val attachmentViewMap = mutableMapOf<AttachmentViewInfo, AttachmentView>()
+    private val attachments = mutableMapOf<Uri, AttachmentViewInfo>()
+    private var attachmentCallback: AttachmentViewCallback? = null
+    private var currentAttachmentResolver: AttachmentResolver? = null
+
+    @get:JvmName("hasHiddenExternalImages")
+    var hasHiddenExternalImages = false
+        private set
+
+    public override fun onFinishInflate() {
+        super.onFinishInflate()
+
+        layoutInflater = LayoutInflater.from(context)
+
+        messageContentView = findViewById<MessageWebView>(R.id.message_content).apply {
+            if (!isInEditMode) {
+                configure(webViewConfigProvider.createForMessageView())
+            }
+
+            setOnCreateContextMenuListener(this@MessageContainerView)
+            visibility = VISIBLE
+        }
+
+        attachmentsContainer = findViewById(R.id.attachments_container)
+        unsignedTextContainer = findViewById(R.id.message_unsigned_container)
+        unsignedTextDivider = findViewById(R.id.message_unsigned_divider)
+        unsignedText = findViewById(R.id.message_unsigned_text)
+    }
+
+    override fun onCreateContextMenu(menu: ContextMenu, view: View, menuInfo: ContextMenuInfo?) {
+        super.onCreateContextMenu(menu)
+
+        val webView = view as WebView
+        val hitTestResult = webView.hitTestResult
+
+        when (hitTestResult.type) {
+            HitTestResult.SRC_ANCHOR_TYPE -> {
+                createLinkMenu(menu, webView, linkUrl = hitTestResult.extra)
+            }
+            HitTestResult.IMAGE_TYPE, HitTestResult.SRC_IMAGE_ANCHOR_TYPE -> {
+                createImageMenu(menu, imageUrl = hitTestResult.extra)
+            }
+            HitTestResult.PHONE_TYPE -> {
+                createPhoneNumberMenu(menu, phoneNumber = hitTestResult.extra)
+            }
+            HitTestResult.EMAIL_TYPE -> {
+                createEmailMenu(menu, email = hitTestResult.extra)
+            }
+        }
+    }
+
+    private fun createLinkMenu(
+        menu: ContextMenu,
+        webView: WebView,
+        linkUrl: String?
+    ) {
+        if (linkUrl == null) return
+
+        val listener = MenuItem.OnMenuItemClickListener { item ->
+            when (item.itemId) {
+                MENU_ITEM_LINK_VIEW -> {
+                    val intent = Intent(Intent.ACTION_VIEW, Uri.parse(linkUrl))
+                    startActivityIfAvailable(context, intent)
+                }
+                MENU_ITEM_LINK_SHARE -> {
+                    IntentBuilder(context)
+                        .setType("text/plain")
+                        .setText(linkUrl)
+                        .startChooser()
+                }
+                MENU_ITEM_LINK_COPY -> {
+                    val label = context.getString(R.string.webview_contextmenu_link_clipboard_label)
+                    clipboardManager.setText(label, linkUrl)
+                }
+                MENU_ITEM_LINK_TEXT_COPY -> {
+                    val message = linkTextHandler.obtainMessage()
+                    webView.requestFocusNodeHref(message)
+                }
+            }
+            true
+        }
+
+        menu.setHeaderTitle(linkUrl)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_LINK_VIEW,
+            0,
+            context.getString(R.string.webview_contextmenu_link_view_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_LINK_SHARE,
+            1,
+            context.getString(R.string.webview_contextmenu_link_share_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_LINK_COPY,
+            2,
+            context.getString(R.string.webview_contextmenu_link_copy_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_LINK_TEXT_COPY,
+            3,
+            context.getString(R.string.webview_contextmenu_link_text_copy_action)
+        ).setOnMenuItemClickListener(listener)
+    }
+
+    private fun createImageMenu(menu: ContextMenu, imageUrl: String?) {
+        if (imageUrl == null) return
+
+        val imageUri = Uri.parse(imageUrl)
+        val attachmentViewInfo = getAttachmentViewInfoIfCidUri(imageUri)
+        val inlineImage = attachmentViewInfo != null
+
+        val listener = MenuItem.OnMenuItemClickListener { item ->
+            val attachmentCallback = checkNotNull(attachmentCallback)
+
+            when (item.itemId) {
+                MENU_ITEM_IMAGE_VIEW -> {
+                    if (inlineImage) {
+                        attachmentCallback.onViewAttachment(attachmentViewInfo)
+                    } else {
+                        val intent = Intent(Intent.ACTION_VIEW, imageUri)
+                        startActivityIfAvailable(context, intent)
+                    }
+                }
+                MENU_ITEM_IMAGE_SAVE -> {
+                    if (inlineImage) {
+                        attachmentCallback.onSaveAttachment(attachmentViewInfo)
+                    } else {
+                        downloadImage(imageUri)
+                    }
+                }
+                MENU_ITEM_IMAGE_COPY -> {
+                    val label = context.getString(R.string.webview_contextmenu_image_clipboard_label)
+                    clipboardManager.setText(label, imageUri.toString())
+                }
+            }
+            true
+        }
+
+        if (inlineImage) {
+            menu.setHeaderTitle(R.string.webview_contextmenu_image_title)
+        } else {
+            menu.setHeaderTitle(imageUrl)
+        }
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_IMAGE_VIEW,
+            0,
+            context.getString(R.string.webview_contextmenu_image_view_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_IMAGE_SAVE,
+            1,
+            if (inlineImage) {
+                context.getString(R.string.webview_contextmenu_image_save_action)
+            } else {
+                context.getString(R.string.webview_contextmenu_image_download_action)
+            }
+        ).setOnMenuItemClickListener(listener)
+
+        if (!inlineImage) {
+            menu.add(
+                Menu.NONE,
+                MENU_ITEM_IMAGE_COPY,
+                2,
+                context.getString(R.string.webview_contextmenu_image_copy_action)
+            ).setOnMenuItemClickListener(listener)
+        }
+    }
+
+    private fun createPhoneNumberMenu(menu: ContextMenu, phoneNumber: String?) {
+        if (phoneNumber == null) return
+
+        val listener = MenuItem.OnMenuItemClickListener { item ->
+            when (item.itemId) {
+                MENU_ITEM_PHONE_CALL -> {
+                    val uri = Uri.parse(WebView.SCHEME_TEL + phoneNumber)
+                    val intent = Intent(Intent.ACTION_VIEW, uri)
+                    startActivityIfAvailable(context, intent)
+                }
+                MENU_ITEM_PHONE_SAVE -> {
+                    val contacts = Contacts.getInstance(context)
+                    contacts.addPhoneContact(phoneNumber)
+                }
+                MENU_ITEM_PHONE_COPY -> {
+                    val label = context.getString(R.string.webview_contextmenu_phone_clipboard_label)
+                    clipboardManager.setText(label, phoneNumber)
+                }
+            }
+            true
+        }
+
+        menu.setHeaderTitle(phoneNumber)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_PHONE_CALL,
+            0,
+            context.getString(R.string.webview_contextmenu_phone_call_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_PHONE_SAVE,
+            1,
+            context.getString(R.string.webview_contextmenu_phone_save_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_PHONE_COPY,
+            2,
+            context.getString(R.string.webview_contextmenu_phone_copy_action)
+        ).setOnMenuItemClickListener(listener)
+    }
+
+    private fun createEmailMenu(menu: ContextMenu, email: String?) {
+        if (email == null) return
+
+        val listener = MenuItem.OnMenuItemClickListener { item ->
+            when (item.itemId) {
+                MENU_ITEM_EMAIL_SEND -> {
+                    val uri = Uri.parse(WebView.SCHEME_MAILTO + email)
+                    val intent = Intent(Intent.ACTION_VIEW, uri)
+                    startActivityIfAvailable(context, intent)
+                }
+                MENU_ITEM_EMAIL_SAVE -> {
+                    val contacts = Contacts.getInstance(context)
+                    contacts.createContact(Address(email))
+                }
+                MENU_ITEM_EMAIL_COPY -> {
+                    val label = context.getString(R.string.webview_contextmenu_email_clipboard_label)
+                    clipboardManager.setText(label, email)
+                }
+            }
+            true
+        }
+
+        menu.setHeaderTitle(email)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_EMAIL_SEND,
+            0,
+            context.getString(R.string.webview_contextmenu_email_send_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_EMAIL_SAVE,
+            1,
+            context.getString(R.string.webview_contextmenu_email_save_action)
+        ).setOnMenuItemClickListener(listener)
+
+        menu.add(
+            Menu.NONE,
+            MENU_ITEM_EMAIL_COPY,
+            2,
+            context.getString(R.string.webview_contextmenu_email_copy_action)
+        ).setOnMenuItemClickListener(listener)
+    }
+
+    private fun downloadImage(uri: Uri) {
+        val request = DownloadManager.Request(uri).apply {
+            if (Build.VERSION.SDK_INT >= 29) {
+                val filename = uri.lastPathSegment
+                setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, filename)
+            }
+
+            setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE_NOTIFY_COMPLETED)
+        }
+
+        val downloadManager = context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
+        downloadManager.enqueue(request)
+    }
+
+    private fun getAttachmentViewInfoIfCidUri(uri: Uri): AttachmentViewInfo? {
+        if (uri.scheme != "cid") return null
+
+        val attachmentResolver = checkNotNull(currentAttachmentResolver)
+
+        val cid = uri.schemeSpecificPart
+        val internalUri = attachmentResolver.getAttachmentUriForContentId(cid)
+
+        return attachments[internalUri]
+    }
+
+    private fun startActivityIfAvailable(context: Context, intent: Intent) {
+        try {
+            context.startActivity(intent)
+        } catch (e: ActivityNotFoundException) {
+            Toast.makeText(context, R.string.error_activity_not_found, Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun setLoadPictures(enable: Boolean) {
+        messageContentView.blockNetworkData(!enable)
+        isShowingPictures = enable
+    }
+
+    fun showPictures() {
+        setLoadPictures(true)
+        refreshDisplayedContent()
+    }
+
+    fun displayMessageViewContainer(
+        messageViewInfo: MessageViewInfo,
+        onRenderingFinishedListener: OnRenderingFinishedListener,
+        loadPictures: Boolean,
+        hideUnsignedTextDivider: Boolean,
+        attachmentCallback: AttachmentViewCallback?
+    ) {
+        this.attachmentCallback = attachmentCallback
+
+        resetView()
+        renderAttachments(messageViewInfo)
+
+        val messageText = messageViewInfo.text
+        if (messageText != null && !isShowingPictures) {
+            if (Utility.hasExternalImages(messageText)) {
+                if (loadPictures) {
+                    setLoadPictures(true)
+                } else {
+                    hasHiddenExternalImages = true
+                }
+            }
+        }
+
+        val textToDisplay = messageText
+            ?: displayHtml.wrapStatusMessage(context.getString(R.string.webview_empty_message))
+
+        displayHtmlContentWithInlineAttachments(
+            htmlText = textToDisplay,
+            attachmentResolver = messageViewInfo.attachmentResolver,
+            onPageFinishedListener = onRenderingFinishedListener::onLoadFinished
+        )
+
+        if (!messageViewInfo.extraText.isNullOrEmpty()) {
+            unsignedTextContainer.isVisible = true
+            unsignedTextDivider.isGone = hideUnsignedTextDivider
+            unsignedText.text = messageViewInfo.extraText
+        }
+    }
+
+    private fun displayHtmlContentWithInlineAttachments(
+        htmlText: String,
+        attachmentResolver: AttachmentResolver,
+        onPageFinishedListener: OnPageFinishedListener
+    ) {
+        currentHtmlText = htmlText
+        currentAttachmentResolver = attachmentResolver
+        messageContentView.displayHtmlContentWithInlineAttachments(htmlText, attachmentResolver, onPageFinishedListener)
+    }
+
+    private fun refreshDisplayedContent() {
+        val htmlText = checkNotNull(currentHtmlText)
+
+        messageContentView.displayHtmlContentWithInlineAttachments(
+            htmlText = htmlText,
+            attachmentResolver = currentAttachmentResolver,
+            onPageFinishedListener = null
+        )
+    }
+
+    private fun clearDisplayedContent() {
+        messageContentView.displayHtmlContentWithInlineAttachments(
+            htmlText = "",
+            attachmentResolver = null,
+            onPageFinishedListener = null
+        )
+
+        unsignedTextContainer.isVisible = false
+        unsignedText.text = ""
+    }
+
+    private fun renderAttachments(messageViewInfo: MessageViewInfo) {
+        if (messageViewInfo.attachments != null) {
+            for (attachment in messageViewInfo.attachments) {
+                attachments[attachment.internalUri] = attachment
+                if (attachment.inlineAttachment) {
+                    continue
+                }
+
+                val attachmentView = layoutInflater.inflate(
+                    R.layout.message_view_attachment,
+                    attachmentsContainer,
+                    false
+                ) as AttachmentView
+
+                attachmentView.setCallback(attachmentCallback)
+                attachmentView.setAttachment(attachment)
+
+                attachmentViewMap[attachment] = attachmentView
+                attachmentsContainer.addView(attachmentView)
+            }
+        }
+
+        if (messageViewInfo.extraAttachments != null) {
+            for (attachment in messageViewInfo.extraAttachments) {
+                attachments[attachment.internalUri] = attachment
+                if (attachment.inlineAttachment) {
+                    continue
+                }
+
+                val lockedAttachmentView = layoutInflater.inflate(
+                    R.layout.message_view_attachment_locked,
+                    attachmentsContainer,
+                    false
+                ) as LockedAttachmentView
+
+                lockedAttachmentView.setCallback(attachmentCallback)
+                lockedAttachmentView.setAttachment(attachment)
+
+                attachmentsContainer.addView(lockedAttachmentView)
+            }
+        }
+    }
+
+    private fun resetView() {
+        setLoadPictures(false)
+        attachmentsContainer.removeAllViews()
+
+        currentHtmlText = null
+        currentAttachmentResolver = null
+
+        /*
+         * Clear the WebView content
+         *
+         * For some reason WebView.clearView() doesn't clear the contents when the WebView changes
+         * its size because the button to download the complete message was previously shown and
+         * is now hidden.
+         */
+        clearDisplayedContent()
+    }
+
+    fun refreshAttachmentThumbnail(attachment: AttachmentViewInfo) {
+        getAttachmentView(attachment)?.refreshThumbnail()
+    }
+
+    private fun getAttachmentView(attachment: AttachmentViewInfo): AttachmentView? {
+        return attachmentViewMap[attachment]
+    }
+
+    interface OnRenderingFinishedListener {
+        fun onLoadFinished()
+    }
+
+    companion object {
+        private const val MENU_ITEM_LINK_VIEW = Menu.FIRST
+        private const val MENU_ITEM_LINK_SHARE = Menu.FIRST + 1
+        private const val MENU_ITEM_LINK_COPY = Menu.FIRST + 2
+        private const val MENU_ITEM_LINK_TEXT_COPY = Menu.FIRST + 3
+        private const val MENU_ITEM_IMAGE_VIEW = Menu.FIRST
+        private const val MENU_ITEM_IMAGE_SAVE = Menu.FIRST + 1
+        private const val MENU_ITEM_IMAGE_COPY = Menu.FIRST + 2
+        private const val MENU_ITEM_PHONE_CALL = Menu.FIRST
+        private const val MENU_ITEM_PHONE_SAVE = Menu.FIRST + 1
+        private const val MENU_ITEM_PHONE_COPY = Menu.FIRST + 2
+        private const val MENU_ITEM_EMAIL_SEND = Menu.FIRST
+        private const val MENU_ITEM_EMAIL_SAVE = Menu.FIRST + 1
+        private const val MENU_ITEM_EMAIL_COPY = Menu.FIRST + 2
+    }
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..6c4e79a388273204c01c0a111ed2e7d23e560941
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt
@@ -0,0 +1,311 @@
+package com.fsck.k9.ui.messageview
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.fsck.k9.controller.MessageReference
+import com.fsck.k9.ui.R
+import com.fsck.k9.ui.messagelist.MessageListItem
+import com.fsck.k9.ui.messagelist.MessageListViewModel
+import com.fsck.k9.ui.withArguments
+
+/**
+ * A fragment that uses [ViewPager2] to allow the user to swipe between messages.
+ *
+ * Individual messages are displayed using a [MessageViewFragment].
+ */
+class MessageViewContainerFragment : Fragment() {
+    var isActive: Boolean = false
+        set(value) {
+            field = value
+            setMenuVisibility(value)
+        }
+
+    lateinit var messageReference: MessageReference
+        private set
+
+    var lastDirection: Direction? = null
+        private set
+
+    private lateinit var fragmentListener: MessageViewContainerListener
+    private lateinit var viewPager: ViewPager2
+    private lateinit var adapter: MessageViewContainerAdapter
+
+    private var currentPosition: Int? = null
+
+    private val messageViewFragment: MessageViewFragment
+        get() {
+            check(isResumed)
+            val itemId = adapter.getItemId(messageReference)
+
+            // ViewPager2/FragmentStateAdapter don't provide an easy way to get hold of the Fragment for the active
+            // page. So we're using an implementation detail (the fragment tag) to find the fragment.
+            return childFragmentManager.findFragmentByTag("f$itemId") as MessageViewFragment
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setHasOptionsMenu(true)
+
+        if (savedInstanceState == null) {
+            messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))
+                ?: error("Missing argument $ARG_REFERENCE")
+        } else {
+            messageReference = MessageReference.parse(savedInstanceState.getString(STATE_MESSAGE_REFERENCE))
+                ?: error("Missing state $STATE_MESSAGE_REFERENCE")
+
+            lastDirection = savedInstanceState.getSerializable(STATE_LAST_DIRECTION) as Direction?
+        }
+
+        adapter = MessageViewContainerAdapter(this)
+    }
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        fragmentListener = try {
+            context as MessageViewContainerListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException("This fragment must be attached to a MessageViewContainerListener")
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val view = inflater.inflate(R.layout.message_view_container, container, false)
+
+        viewPager = view.findViewById(R.id.message_viewpager)
+        viewPager.isUserInputEnabled = true
+        viewPager.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
+        viewPager.addItemDecoration(DividerItemDecoration(context, DividerItemDecoration.HORIZONTAL))
+        viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            // The message list is updated each time the active message is changed. To avoid message list updates
+            // during the animation, we only set the active message after the animation has finished.
+            override fun onPageScrollStateChanged(state: Int) {
+                if (state == ViewPager2.SCROLL_STATE_IDLE) {
+                    setActiveMessage(viewPager.currentItem)
+                }
+            }
+
+            override fun onPageSelected(position: Int) {
+                if (viewPager.scrollState == ViewPager2.SCROLL_STATE_IDLE) {
+                    setActiveMessage(position)
+                }
+            }
+        })
+
+        return view
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(STATE_MESSAGE_REFERENCE, messageReference.toIdentityString())
+        outState.putSerializable(STATE_LAST_DIRECTION, lastDirection)
+    }
+
+    fun setViewModel(viewModel: MessageListViewModel) {
+        viewModel.getMessageListLiveData().observe(this) { messageListInfo ->
+            updateMessageList(messageListInfo.messageListItems)
+        }
+    }
+
+    private fun updateMessageList(messageListItems: List<MessageListItem>) {
+        if (messageListItems.isEmpty() || messageListItems.none { it.messageReference == messageReference }) {
+            fragmentListener.closeMessageView()
+            return
+        }
+
+        adapter.messageList = messageListItems
+
+        // We only set the adapter on ViewPager2 after the message list has been loaded. This way ViewPager2 can
+        // restore its saved state after a configuration change.
+        if (viewPager.adapter == null) {
+            viewPager.adapter = adapter
+        }
+
+        val position = adapter.getPosition(messageReference)
+        viewPager.setCurrentItem(position, false)
+    }
+
+    private fun setActiveMessage(position: Int) {
+        rememberNavigationDirection(position, messageReference)
+
+        messageReference = adapter.getMessageReference(position)
+
+        fragmentListener.setActiveMessage(messageReference)
+    }
+
+    private fun rememberNavigationDirection(newPosition: Int, currentMessageReference: MessageReference) {
+        // When messages are added or removed from the list, the current position will change even though we're still
+        // displaying the same message. In those cases we don't want to update `lastDirection`.
+        val newMessageReference = adapter.getMessageReference(newPosition)
+        if (newMessageReference == currentMessageReference) {
+            currentPosition = newPosition
+            return
+        }
+
+        currentPosition?.let { currentPosition ->
+            lastDirection = if (newPosition < currentPosition) Direction.PREVIOUS else Direction.NEXT
+        }
+        currentPosition = newPosition
+    }
+
+    fun showPreviousMessage(): Boolean {
+        val newPosition = viewPager.currentItem - 1
+        return if (newPosition >= 0) {
+            setActiveMessage(newPosition)
+
+            val smoothScroll = true
+            viewPager.setCurrentItem(newPosition, smoothScroll)
+            true
+        } else {
+            false
+        }
+    }
+
+    fun showNextMessage(): Boolean {
+        val newPosition = viewPager.currentItem + 1
+        return if (newPosition < adapter.itemCount) {
+            setActiveMessage(newPosition)
+
+            val smoothScroll = true
+            viewPager.setCurrentItem(newPosition, smoothScroll)
+            true
+        } else {
+            false
+        }
+    }
+
+    fun onToggleFlagged() {
+        messageViewFragment.onToggleFlagged()
+    }
+
+    fun onMove() {
+        messageViewFragment.onMove()
+    }
+
+    fun onArchive() {
+        messageViewFragment.onArchive()
+    }
+
+    fun onCopy() {
+        messageViewFragment.onCopy()
+    }
+
+    fun onToggleRead() {
+        messageViewFragment.onToggleRead()
+    }
+
+    fun onForward() {
+        messageViewFragment.onForward()
+    }
+
+    fun onReplyAll() {
+        messageViewFragment.onReplyAll()
+    }
+
+    fun onReply() {
+        messageViewFragment.onReply()
+    }
+
+    fun onDelete() {
+        messageViewFragment.onDelete()
+    }
+
+    fun onPendingIntentResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        messageViewFragment.onPendingIntentResult(requestCode, resultCode, data)
+    }
+
+    private class MessageViewContainerAdapter(fragment: Fragment) : FragmentStateAdapter(fragment) {
+        var messageList: List<MessageListItem> = emptyList()
+            set(value) {
+                val diffResult = DiffUtil.calculateDiff(
+                    MessageListDiffCallback(oldMessageList = messageList, newMessageList = value)
+                )
+
+                field = value
+
+                diffResult.dispatchUpdatesTo(this)
+            }
+
+        override fun getItemCount(): Int {
+            return messageList.size
+        }
+
+        override fun getItemId(position: Int): Long {
+            return messageList[position].uniqueId
+        }
+
+        override fun containsItem(itemId: Long): Boolean {
+            return messageList.any { it.uniqueId == itemId }
+        }
+
+        override fun createFragment(position: Int): Fragment {
+            check(position in messageList.indices)
+
+            val messageReference = messageList[position].messageReference
+            return MessageViewFragment.newInstance(messageReference)
+        }
+
+        fun getMessageReference(position: Int): MessageReference {
+            check(position in messageList.indices)
+
+            return messageList[position].messageReference
+        }
+
+        fun getPosition(messageReference: MessageReference): Int {
+            return messageList.indexOfFirst { it.messageReference == messageReference }
+        }
+
+        fun getItemId(messageReference: MessageReference): Long {
+            return messageList.first { it.messageReference == messageReference }.uniqueId
+        }
+    }
+
+    private class MessageListDiffCallback(
+        private val oldMessageList: List<MessageListItem>,
+        private val newMessageList: List<MessageListItem>
+    ) : DiffUtil.Callback() {
+        override fun getOldListSize(): Int = oldMessageList.size
+
+        override fun getNewListSize(): Int = newMessageList.size
+
+        override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            return oldMessageList[oldItemPosition].uniqueId == newMessageList[newItemPosition].uniqueId
+        }
+
+        override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+            // Let MessageViewFragment deal with content changes
+            return areItemsTheSame(oldItemPosition, newItemPosition)
+        }
+    }
+
+    interface MessageViewContainerListener {
+        fun closeMessageView()
+        fun setActiveMessage(messageReference: MessageReference)
+    }
+
+    companion object {
+        private const val ARG_REFERENCE = "reference"
+
+        private const val STATE_MESSAGE_REFERENCE = "messageReference"
+        private const val STATE_LAST_DIRECTION = "lastDirection"
+
+        fun newInstance(reference: MessageReference): MessageViewContainerFragment {
+            return MessageViewContainerFragment().withArguments(
+                ARG_REFERENCE to reference.toIdentityString()
+            )
+        }
+    }
+}
+
+private val MessageListItem.messageReference: MessageReference
+    get() = MessageReference(account.uuid, folderId, messageUid)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
deleted file mode 100644
index e1ce84d49d4e084b78e028ad9cf0c34e7c655534..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
+++ /dev/null
@@ -1,890 +0,0 @@
-package com.fsck.k9.ui.messageview;
-
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
-import android.app.Activity;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentSender;
-import android.content.IntentSender.SendIntentException;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Parcelable;
-import android.os.SystemClock;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.appcompat.widget.PopupMenu.OnMenuItemClickListener;
-import android.text.TextUtils;
-import android.view.ContextThemeWrapper;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Toast;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.DI;
-import com.fsck.k9.K9;
-import com.fsck.k9.Preferences;
-import com.fsck.k9.activity.MessageCompose;
-import com.fsck.k9.helper.MailtoUnsubscribeUri;
-import com.fsck.k9.helper.UnsubscribeUri;
-import com.fsck.k9.ui.choosefolder.ChooseFolderActivity;
-import com.fsck.k9.activity.MessageLoaderHelper;
-import com.fsck.k9.activity.MessageLoaderHelper.MessageLoaderCallbacks;
-import com.fsck.k9.activity.MessageLoaderHelperFactory;
-import com.fsck.k9.controller.MessageReference;
-import com.fsck.k9.controller.MessagingController;
-import com.fsck.k9.fragment.AttachmentDownloadDialogFragment;
-import com.fsck.k9.fragment.ConfirmationDialogFragment;
-import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
-import com.fsck.k9.mail.Flag;
-import com.fsck.k9.mailstore.AttachmentViewInfo;
-import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.mailstore.MessageViewInfo;
-import com.fsck.k9.ui.R;
-import com.fsck.k9.ui.base.ThemeManager;
-import com.fsck.k9.ui.messageview.CryptoInfoDialog.OnClickShowCryptoKeyListener;
-import com.fsck.k9.ui.messageview.MessageCryptoPresenter.MessageCryptoMvpView;
-import com.fsck.k9.ui.settings.account.AccountSettingsActivity;
-import com.fsck.k9.ui.share.ShareIntentBuilder;
-import com.fsck.k9.view.MessageCryptoDisplayStatus;
-import timber.log.Timber;
-
-
-public class MessageViewFragment extends Fragment implements ConfirmationDialogFragmentListener,
-        AttachmentViewCallback, OnClickShowCryptoKeyListener {
-
-    private static final String ARG_REFERENCE = "reference";
-
-    private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
-    private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
-    private static final int REQUEST_CODE_CREATE_DOCUMENT = 3;
-
-    public static final int REQUEST_MASK_LOADER_HELPER = (1 << 8);
-    public static final int REQUEST_MASK_CRYPTO_PRESENTER = (1 << 9);
-
-    public static final int PROGRESS_THRESHOLD_MILLIS = 500 * 1000;
-
-    public static MessageViewFragment newInstance(MessageReference reference) {
-        MessageViewFragment fragment = new MessageViewFragment();
-
-        Bundle args = new Bundle();
-        args.putString(ARG_REFERENCE, reference.toIdentityString());
-        fragment.setArguments(args);
-
-        return fragment;
-    }
-
-    private final ThemeManager themeManager = DI.get(ThemeManager.class);
-    private final MessageLoaderHelperFactory messageLoaderHelperFactory = DI.get(MessageLoaderHelperFactory.class);
-
-    private MessageTopView mMessageView;
-
-    private Account mAccount;
-    private MessageReference mMessageReference;
-    private LocalMessage mMessage;
-    private MessagingController mController;
-    private Handler handler = new Handler();
-    private MessageLoaderHelper messageLoaderHelper;
-    private MessageCryptoPresenter messageCryptoPresenter;
-    private Long showProgressThreshold;
-    private UnsubscribeUri preferredUnsubscribeUri;
-
-    /**
-     * Used to temporarily store the destination folder for refile operations if a confirmation
-     * dialog is shown.
-     */
-    private Long destinationFolderId;
-
-    private MessageViewFragmentListener mFragmentListener;
-
-    /**
-     * {@code true} after {@link #onCreate(Bundle)} has been executed. This is used by
-     * {@code MessageList.configureMenu()} to make sure the fragment has been initialized before
-     * it is used.
-     */
-    private boolean mInitialized = false;
-
-    private Context mContext;
-
-    private AttachmentViewInfo currentAttachmentViewInfo;
-
-    @Override
-    public void onAttach(Context context) {
-        super.onAttach(context);
-
-        mContext = context.getApplicationContext();
-
-        try {
-            mFragmentListener = (MessageViewFragmentListener) getActivity();
-        } catch (ClassCastException e) {
-            throw new ClassCastException("This fragment must be attached to a MessageViewFragmentListener");
-        }
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // This fragments adds options to the action bar
-        setHasOptionsMenu(true);
-
-        Context context = getActivity().getApplicationContext();
-        mController = MessagingController.getInstance(context);
-        messageCryptoPresenter = new MessageCryptoPresenter(messageCryptoMvpView);
-        messageLoaderHelper = messageLoaderHelperFactory.createForMessageView(
-                context, getLoaderManager(), getParentFragmentManager(), messageLoaderCallbacks);
-        mInitialized = true;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-
-        messageCryptoPresenter.onResume();
-    }
-
-    @Override
-    public void onDestroy() {
-        super.onDestroy();
-
-        Activity activity = getActivity();
-        boolean isChangingConfigurations = activity != null && activity.isChangingConfigurations();
-        if (isChangingConfigurations) {
-            messageLoaderHelper.onDestroyChangingConfigurations();
-            return;
-        }
-
-        messageLoaderHelper.onDestroy();
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        int messageViewThemeResourceId = themeManager.getMessageViewThemeResourceId();
-        Context context = new ContextThemeWrapper(inflater.getContext(), messageViewThemeResourceId);
-        LayoutInflater layoutInflater = LayoutInflater.from(context);
-        View view = layoutInflater.inflate(R.layout.message, container, false);
-
-        mMessageView = view.findViewById(R.id.message_view);
-        mMessageView.setAttachmentCallback(this);
-        mMessageView.setMessageCryptoPresenter(messageCryptoPresenter);
-
-        mMessageView.setOnToggleFlagClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onToggleFlagged();
-            }
-        });
-
-        mMessageView.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem item) {
-                int id = item.getItemId();
-                if (id == R.id.reply) {
-                    onReply();
-                    return true;
-                } else if (id == R.id.reply_all) {
-                    onReplyAll();
-                    return true;
-                } else if (id == R.id.forward) {
-                    onForward();
-                    return true;
-                } else if (id == R.id.forward_as_attachment) {
-                    onForwardAsAttachment();
-                    return true;
-                } else if (id == R.id.share) {
-                    onSendAlternate();
-                    return true;
-                }
-                return false;
-            }
-        });
-
-        mMessageView.setOnDownloadButtonClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mMessageView.disableDownloadButton();
-                messageLoaderHelper.downloadCompleteMessage();
-            }
-        });
-
-        return view;
-    }
-
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        Bundle arguments = getArguments();
-        String messageReferenceString = arguments.getString(ARG_REFERENCE);
-        MessageReference messageReference = MessageReference.parse(messageReferenceString);
-
-        displayMessage(messageReference);
-    }
-
-    private void displayMessage(MessageReference messageReference) {
-        mMessageReference = messageReference;
-        Timber.d("MessageView displaying message %s", mMessageReference);
-
-        mAccount = Preferences.getPreferences(getApplicationContext()).getAccount(mMessageReference.getAccountUuid());
-        messageLoaderHelper.asyncStartOrResumeLoadingMessage(messageReference, null);
-
-        mFragmentListener.updateMenu();
-    }
-
-    private void hideKeyboard() {
-        Activity activity = getActivity();
-        if (activity == null) {
-            return;
-        }
-        InputMethodManager imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-        View decorView = activity.getWindow().getDecorView();
-        if (decorView != null) {
-            imm.hideSoftInputFromWindow(decorView.getApplicationWindowToken(), 0);
-        }
-    }
-
-    private void showMessage(MessageViewInfo messageViewInfo) {
-        hideKeyboard();
-
-        boolean handledByCryptoPresenter = messageCryptoPresenter.maybeHandleShowMessage(
-                mMessageView, mAccount, messageViewInfo);
-        if (!handledByCryptoPresenter) {
-            mMessageView.showMessage(mAccount, messageViewInfo);
-            if (mAccount.isOpenPgpProviderConfigured()) {
-                mMessageView.getMessageHeaderView().setCryptoStatusDisabled();
-            } else {
-                mMessageView.getMessageHeaderView().hideCryptoStatus();
-            }
-        }
-
-        if (messageViewInfo.subject != null) {
-            displaySubject(messageViewInfo.subject);
-        }
-    }
-
-    private void displayHeaderForLoadingMessage(LocalMessage message) {
-        boolean showStar = !isOutbox();
-        mMessageView.setHeaders(message, mAccount, showStar);
-        if (mAccount.isOpenPgpProviderConfigured()) {
-            mMessageView.getMessageHeaderView().setCryptoStatusLoading();
-        }
-        displaySubject(message.getSubject());
-        mFragmentListener.updateMenu();
-    }
-
-    private void displaySubject(String subject) {
-        if (TextUtils.isEmpty(subject)) {
-            subject = mContext.getString(R.string.general_no_subject);
-        }
-
-        mMessageView.setSubject(subject);
-    }
-
-    /**
-     * Called from UI thread when user select Delete
-     */
-    public void onDelete() {
-        if (K9.isConfirmDelete() || (K9.isConfirmDeleteStarred() && mMessage.isSet(Flag.FLAGGED))) {
-            showDialog(R.id.dialog_confirm_delete);
-        } else {
-            delete();
-        }
-    }
-
-    private void delete() {
-        if (mMessage != null) {
-            // Disable the delete button after it's tapped (to try to prevent
-            // accidental clicks)
-            mFragmentListener.disableDeleteAction();
-            LocalMessage messageToDelete = mMessage;
-            mFragmentListener.showNextMessageOrReturn();
-            mController.deleteMessage(mMessageReference);
-        }
-    }
-
-    public void onRefile(Long dstFolderId) {
-        if (dstFolderId == null || !mController.isMoveCapable(mAccount)) {
-            return;
-        }
-        if (!mController.isMoveCapable(mMessageReference)) {
-            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        if (dstFolderId.equals(mAccount.getSpamFolderId()) && K9.isConfirmSpam()) {
-            destinationFolderId = dstFolderId;
-            showDialog(R.id.dialog_confirm_spam);
-        } else {
-            refileMessage(dstFolderId);
-        }
-    }
-
-    private void refileMessage(long dstFolderId) {
-        long srcFolderId = mMessageReference.getFolderId();
-        MessageReference messageToMove = mMessageReference;
-        mFragmentListener.showNextMessageOrReturn();
-        mController.moveMessage(mAccount, srcFolderId, messageToMove, dstFolderId);
-    }
-
-    public void onReply() {
-        if (mMessage != null) {
-            mFragmentListener.onReply(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
-        }
-    }
-
-    public void onReplyAll() {
-        if (mMessage != null) {
-            mFragmentListener.onReplyAll(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
-        }
-    }
-
-    public void onForward() {
-        if (mMessage != null) {
-            mFragmentListener.onForward(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
-        }
-    }
-
-    public void onForwardAsAttachment() {
-        if (mMessage != null) {
-            mFragmentListener.onForwardAsAttachment(mMessage.makeMessageReference(), messageCryptoPresenter.getDecryptionResultForReply());
-        }
-    }
-
-    public void onEditAsNewMessage() {
-        if (mMessage != null) {
-            mFragmentListener.onEditAsNewMessage(mMessage.makeMessageReference());
-        }
-    }
-
-    public void onToggleFlagged() {
-        if (mMessage != null && !isOutbox()) {
-            boolean newState = !mMessage.isSet(Flag.FLAGGED);
-            mController.setFlag(mAccount, mMessage.getFolder().getDatabaseId(),
-                    Collections.singletonList(mMessage), Flag.FLAGGED, newState);
-            mMessageView.setHeaders(mMessage, mAccount, true);
-        }
-    }
-
-    public void onMove() {
-        if ((!mController.isMoveCapable(mAccount))
-                || (mMessage == null)) {
-            return;
-        }
-        if (!mController.isMoveCapable(mMessageReference)) {
-            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        startRefileActivity(FolderOperation.MOVE, ACTIVITY_CHOOSE_FOLDER_MOVE);
-
-    }
-
-    public void onCopy() {
-        if ((!mController.isCopyCapable(mAccount))
-                || (mMessage == null)) {
-            return;
-        }
-        if (!mController.isCopyCapable(mMessageReference)) {
-            Toast toast = Toast.makeText(getActivity(), R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG);
-            toast.show();
-            return;
-        }
-
-        startRefileActivity(FolderOperation.COPY, ACTIVITY_CHOOSE_FOLDER_COPY);
-    }
-
-    public void onMoveToDrafts() {
-        Account account = mAccount;
-        long folderId = mMessageReference.getFolderId();
-        List<MessageReference> messages = Collections.singletonList(mMessageReference);
-
-        mFragmentListener.showNextMessageOrReturn();
-
-        mController.moveToDraftsFolder(account, folderId, messages);
-    }
-
-    public void onArchive() {
-        onRefile(mAccount.getArchiveFolderId());
-    }
-
-    public void onSpam() {
-        onRefile(mAccount.getSpamFolderId());
-    }
-
-    private void startRefileActivity(FolderOperation operation, int requestCode) {
-        String accountUuid = mAccount.getUuid();
-        long currentFolderId = mMessageReference.getFolderId();
-        Long scrollToFolderId = mAccount.getLastSelectedFolderId();
-        final ChooseFolderActivity.Action action;
-        if (operation == FolderOperation.MOVE) {
-            action = ChooseFolderActivity.Action.MOVE;
-        } else {
-            action = ChooseFolderActivity.Action.COPY;
-        }
-
-        Intent intent = ChooseFolderActivity.buildLaunchIntent(requireActivity(), action, accountUuid, currentFolderId,
-                scrollToFolderId, false, mMessageReference);
-
-        startActivityForResult(intent, requestCode);
-    }
-
-    public void onPendingIntentResult(int requestCode, int resultCode, Intent data) {
-        if ((requestCode & REQUEST_MASK_LOADER_HELPER) == REQUEST_MASK_LOADER_HELPER) {
-            requestCode ^= REQUEST_MASK_LOADER_HELPER;
-            messageLoaderHelper.onActivityResult(requestCode, resultCode, data);
-            return;
-        }
-
-        if ((requestCode & REQUEST_MASK_CRYPTO_PRESENTER) == REQUEST_MASK_CRYPTO_PRESENTER) {
-            requestCode ^= REQUEST_MASK_CRYPTO_PRESENTER;
-            messageCryptoPresenter.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != Activity.RESULT_OK) {
-            return;
-        }
-
-        // Note: because fragments do not have a startIntentSenderForResult method, pending intent activities are
-        // launched through the MessageList activity, and delivered back via onPendingIntentResult()
-
-        switch (requestCode) {
-            case REQUEST_CODE_CREATE_DOCUMENT: {
-                if (data != null && data.getData() != null) {
-                    getAttachmentController(currentAttachmentViewInfo).saveAttachmentTo(data.getData());
-                }
-                break;
-            }
-            case ACTIVITY_CHOOSE_FOLDER_MOVE:
-            case ACTIVITY_CHOOSE_FOLDER_COPY: {
-                if (data == null) {
-                    return;
-                }
-
-                long destFolderId = data.getLongExtra(ChooseFolderActivity.RESULT_SELECTED_FOLDER_ID, -1L);
-                String messageReferenceString = data.getStringExtra(ChooseFolderActivity.RESULT_MESSAGE_REFERENCE);
-                MessageReference ref = MessageReference.parse(messageReferenceString);
-                if (mMessageReference.equals(ref)) {
-                    mAccount.setLastSelectedFolderId(destFolderId);
-                    switch (requestCode) {
-                        case ACTIVITY_CHOOSE_FOLDER_MOVE: {
-                            mFragmentListener.showNextMessageOrReturn();
-                            moveMessage(ref, destFolderId);
-                            break;
-                        }
-                        case ACTIVITY_CHOOSE_FOLDER_COPY: {
-                            copyMessage(ref, destFolderId);
-                            break;
-                        }
-                    }
-                }
-                break;
-            }
-        }
-    }
-
-    public void onSendAlternate() {
-        if (mMessage != null) {
-            ShareIntentBuilder shareIntentBuilder = DI.get(ShareIntentBuilder.class);
-            Intent shareIntent = shareIntentBuilder.createShareIntent(mMessage);
-
-            String shareTitle = getString(R.string.send_alternate_chooser_title);
-            Intent chooserIntent = Intent.createChooser(shareIntent, shareTitle);
-
-            startActivity(chooserIntent);
-        }
-    }
-
-    public void onToggleRead() {
-        if (mMessage != null && !isOutbox()) {
-            mController.setFlag(mAccount, mMessage.getFolder().getDatabaseId(),
-                    Collections.singletonList(mMessage), Flag.SEEN, !mMessage.isSet(Flag.SEEN));
-
-            mMessageView.setHeaders(mMessage, mAccount, true);
-            mFragmentListener.updateMenu();
-        }
-    }
-
-    private void setProgress(boolean enable) {
-        if (mFragmentListener != null) {
-            mFragmentListener.setProgress(enable);
-        }
-    }
-
-    public void moveMessage(MessageReference reference, long folderId) {
-        mController.moveMessage(mAccount, mMessageReference.getFolderId(), reference, folderId);
-    }
-
-    public void copyMessage(MessageReference reference, long folderId) {
-        mController.copyMessage(mAccount, mMessageReference.getFolderId(), reference, folderId);
-    }
-
-    private void showDialog(int dialogId) {
-        DialogFragment fragment;
-        if (dialogId == R.id.dialog_confirm_delete) {
-            String title = getString(R.string.dialog_confirm_delete_title);
-            String message = getString(R.string.dialog_confirm_delete_message);
-            String confirmText = getString(R.string.dialog_confirm_delete_confirm_button);
-            String cancelText = getString(R.string.dialog_confirm_delete_cancel_button);
-
-            fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
-                    confirmText, cancelText);
-        } else if (dialogId == R.id.dialog_confirm_spam) {
-            String title = getString(R.string.dialog_confirm_spam_title);
-            String message = getResources().getQuantityString(R.plurals.dialog_confirm_spam_message, 1);
-            String confirmText = getString(R.string.dialog_confirm_spam_confirm_button);
-            String cancelText = getString(R.string.dialog_confirm_spam_cancel_button);
-
-            fragment = ConfirmationDialogFragment.newInstance(dialogId, title, message,
-                    confirmText, cancelText);
-        } else if (dialogId == R.id.dialog_attachment_progress) {
-            String message = getString(R.string.dialog_attachment_progress_title);
-            long size = currentAttachmentViewInfo.size;
-            fragment = AttachmentDownloadDialogFragment.newInstance(size, message);
-        } else {
-            throw new RuntimeException("Called showDialog(int) with unknown dialog id.");
-        }
-
-        fragment.setTargetFragment(this, dialogId);
-        fragment.show(getParentFragmentManager(), getDialogTag(dialogId));
-    }
-
-    private void removeDialog(int dialogId) {
-        if (!isAdded()) {
-            return;
-        }
-
-        FragmentManager fm = getParentFragmentManager();
-
-        // Make sure the "show dialog" transaction has been processed when we call
-        // findFragmentByTag() below. Otherwise the fragment won't be found and the dialog will
-        // never be dismissed.
-        fm.executePendingTransactions();
-
-        DialogFragment fragment = (DialogFragment) fm.findFragmentByTag(getDialogTag(dialogId));
-
-        if (fragment != null) {
-            fragment.dismissAllowingStateLoss();
-        }
-    }
-
-    private String getDialogTag(int dialogId) {
-        return String.format(Locale.US, "dialog-%d", dialogId);
-    }
-
-    public void zoom(KeyEvent event) {
-        // mMessageView.zoom(event);
-    }
-
-    @Override
-    public void doPositiveClick(int dialogId) {
-        if (dialogId == R.id.dialog_confirm_delete) {
-            delete();
-        } else if (dialogId == R.id.dialog_confirm_spam) {
-            refileMessage(destinationFolderId);
-            destinationFolderId = null;
-        }
-    }
-
-    @Override
-    public void doNegativeClick(int dialogId) {
-        /* do nothing */
-    }
-
-    @Override
-    public void dialogCancelled(int dialogId) {
-        /* do nothing */
-    }
-
-    /**
-     * Get the {@link MessageReference} of the currently displayed message.
-     */
-    public MessageReference getMessageReference() {
-        return mMessageReference;
-    }
-
-    public boolean isOutbox() {
-        if (mMessage == null || mAccount == null) {
-            return false;
-        }
-
-        long folderId = mMessage.getFolder().getDatabaseId();
-        Long outboxFolderId = mAccount.getOutboxFolderId();
-        return outboxFolderId != null && outboxFolderId == folderId;
-    }
-
-    public boolean isMessageRead() {
-        return (mMessage != null) && mMessage.isSet(Flag.SEEN);
-    }
-
-    public boolean isCopyCapable() {
-        return !isOutbox() && mController.isCopyCapable(mAccount);
-    }
-
-    public boolean isMoveCapable() {
-        return !isOutbox() && mController.isMoveCapable(mAccount);
-    }
-
-    public boolean canMessageBeArchived() {
-        Long archiveFolderId = mAccount.getArchiveFolderId();
-        if (archiveFolderId == null) {
-            return false;
-        }
-
-        return mMessageReference.getFolderId() != archiveFolderId;
-    }
-
-    public boolean canMessageBeMovedToSpam() {
-        Long spamFolderId = mAccount.getSpamFolderId();
-        if (spamFolderId == null) {
-            return false;
-        }
-
-        return mMessageReference.getFolderId() != spamFolderId;
-    }
-
-    public boolean canMessageBeUnsubscribed() {
-        return preferredUnsubscribeUri != null;
-    }
-
-    public void onUnsubscribe() {
-        if (preferredUnsubscribeUri instanceof MailtoUnsubscribeUri) {
-            Intent intent = new Intent(mContext, MessageCompose.class);
-            intent.setAction(Intent.ACTION_VIEW);
-            intent.setData(preferredUnsubscribeUri.getUri());
-            intent.putExtra(MessageCompose.EXTRA_ACCOUNT, mMessageReference.getAccountUuid());
-            startActivity(intent);
-        } else {
-            Intent intent = new Intent(Intent.ACTION_VIEW, preferredUnsubscribeUri.getUri());
-            startActivity(intent);
-        }
-    }
-
-    public Context getApplicationContext() {
-        return mContext;
-    }
-
-    public void disableAttachmentButtons(AttachmentViewInfo attachment) {
-        // mMessageView.disableAttachmentButtons(attachment);
-    }
-
-    public void enableAttachmentButtons(AttachmentViewInfo attachment) {
-        // mMessageView.enableAttachmentButtons(attachment);
-    }
-
-    public void runOnMainThread(Runnable runnable) {
-        handler.post(runnable);
-    }
-
-    public void showAttachmentLoadingDialog() {
-        // mMessageView.disableAttachmentButtons();
-        showDialog(R.id.dialog_attachment_progress);
-    }
-
-    public void hideAttachmentLoadingDialogOnMainThread() {
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                removeDialog(R.id.dialog_attachment_progress);
-                // mMessageView.enableAttachmentButtons();
-            }
-        });
-    }
-
-    public void refreshAttachmentThumbnail(AttachmentViewInfo attachment) {
-        mMessageView.refreshAttachmentThumbnail(attachment);
-    }
-
-    private MessageCryptoMvpView messageCryptoMvpView = new MessageCryptoMvpView() {
-        @Override
-        public void redisplayMessage() {
-            messageLoaderHelper.asyncReloadMessage();
-        }
-
-        @Override
-        public void startPendingIntentForCryptoPresenter(IntentSender si, Integer requestCode, Intent fillIntent,
-                int flagsMask, int flagValues, int extraFlags) throws SendIntentException {
-            if (requestCode == null) {
-                getActivity().startIntentSender(si, fillIntent, flagsMask, flagValues, extraFlags);
-                return;
-            }
-
-            requestCode |= REQUEST_MASK_CRYPTO_PRESENTER;
-            getActivity().startIntentSenderForResult(
-                    si, requestCode, fillIntent, flagsMask, flagValues, extraFlags);
-        }
-
-        @Override
-        public void showCryptoInfoDialog(MessageCryptoDisplayStatus displayStatus, boolean hasSecurityWarning) {
-            CryptoInfoDialog dialog = CryptoInfoDialog.newInstance(displayStatus, hasSecurityWarning);
-            dialog.setTargetFragment(MessageViewFragment.this, 0);
-            dialog.show(getParentFragmentManager(), "crypto_info_dialog");
-        }
-
-        @Override
-        public void restartMessageCryptoProcessing() {
-            mMessageView.setToLoadingState();
-            messageLoaderHelper.asyncRestartMessageCryptoProcessing();
-        }
-
-        @Override
-        public void showCryptoConfigDialog() {
-            AccountSettingsActivity.startCryptoSettings(getActivity(), mAccount.getUuid());
-        }
-    };
-
-    @Override
-    public void onClickShowSecurityWarning() {
-        messageCryptoPresenter.onClickShowCryptoWarningDetails();
-    }
-
-    @Override
-    public void onClickSearchKey() {
-        messageCryptoPresenter.onClickSearchKey();
-    }
-
-    @Override
-    public void onClickShowCryptoKey() {
-        messageCryptoPresenter.onClickShowCryptoKey();
-    }
-
-    public interface MessageViewFragmentListener {
-        void onForward(MessageReference messageReference, @Nullable Parcelable decryptionResultForReply);
-        void onForwardAsAttachment(MessageReference messageReference, @Nullable Parcelable decryptionResultForReply);
-        void onEditAsNewMessage(MessageReference messageReference);
-        void disableDeleteAction();
-        void onReplyAll(MessageReference messageReference, @Nullable Parcelable decryptionResultForReply);
-        void onReply(MessageReference messageReference, @Nullable Parcelable decryptionResultForReply);
-        void setProgress(boolean b);
-        void showNextMessageOrReturn();
-        void updateMenu();
-    }
-
-    public boolean isInitialized() {
-        return mInitialized ;
-    }
-
-
-    private MessageLoaderCallbacks messageLoaderCallbacks = new MessageLoaderCallbacks() {
-        @Override
-        public void onMessageDataLoadFinished(LocalMessage message) {
-            mMessage = message;
-
-            displayHeaderForLoadingMessage(message);
-            mMessageView.setToLoadingState();
-            showProgressThreshold = null;
-        }
-
-        @Override
-        public void onMessageDataLoadFailed() {
-            Toast.makeText(getActivity(), R.string.status_loading_error, Toast.LENGTH_LONG).show();
-            showProgressThreshold = null;
-        }
-
-        @Override
-        public void onMessageViewInfoLoadFinished(MessageViewInfo messageViewInfo) {
-            showMessage(messageViewInfo);
-            preferredUnsubscribeUri = messageViewInfo.preferredUnsubscribeUri;
-            showProgressThreshold = null;
-        }
-
-        @Override
-        public void onMessageViewInfoLoadFailed(MessageViewInfo messageViewInfo) {
-            showMessage(messageViewInfo);
-            preferredUnsubscribeUri = null;
-            showProgressThreshold = null;
-        }
-
-        @Override
-        public void setLoadingProgress(int current, int max) {
-            if (showProgressThreshold == null) {
-                showProgressThreshold = SystemClock.elapsedRealtime() + PROGRESS_THRESHOLD_MILLIS;
-            } else if (showProgressThreshold == 0L || SystemClock.elapsedRealtime() > showProgressThreshold) {
-                showProgressThreshold = 0L;
-                mMessageView.setLoadingProgress(current, max);
-            }
-        }
-
-        @Override
-        public void onDownloadErrorMessageNotFound() {
-            mMessageView.enableDownloadButton();
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(getActivity(), R.string.status_invalid_id_error, Toast.LENGTH_LONG).show();
-                }
-            });
-        }
-
-        @Override
-        public void onDownloadErrorNetworkError() {
-            mMessageView.enableDownloadButton();
-            getActivity().runOnUiThread(new Runnable() {
-                @Override
-                public void run() {
-                    Toast.makeText(getActivity(), R.string.status_network_error, Toast.LENGTH_LONG).show();
-                }
-            });
-        }
-
-        @Override
-        public void startIntentSenderForMessageLoaderHelper(IntentSender si, int requestCode, Intent fillIntent,
-                int flagsMask, int flagValues, int extraFlags) {
-            showProgressThreshold = null;
-            try {
-                requestCode |= REQUEST_MASK_LOADER_HELPER;
-                getActivity().startIntentSenderForResult(
-                        si, requestCode, fillIntent, flagsMask, flagValues, extraFlags);
-            } catch (SendIntentException e) {
-                Timber.e(e, "Irrecoverable error calling PendingIntent!");
-            }
-        }
-    };
-
-
-    @Override
-    public void onViewAttachment(AttachmentViewInfo attachment) {
-        currentAttachmentViewInfo = attachment;
-        getAttachmentController(attachment).viewAttachment();
-    }
-
-    @Override
-    public void onSaveAttachment(final AttachmentViewInfo attachment) {
-        currentAttachmentViewInfo = attachment;
-
-        Intent intent = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-        intent.setType(attachment.mimeType);
-        intent.putExtra(Intent.EXTRA_TITLE, attachment.displayName);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-
-        try {
-            startActivityForResult(intent, REQUEST_CODE_CREATE_DOCUMENT);
-        } catch (ActivityNotFoundException e) {
-            Toast.makeText(requireContext(), R.string.error_activity_not_found, Toast.LENGTH_LONG).show();
-        }
-    }
-
-    private AttachmentController getAttachmentController(AttachmentViewInfo attachment) {
-        return new AttachmentController(mController, this, attachment);
-    }
-
-    private enum FolderOperation {
-        COPY, MOVE
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
new file mode 100644
index 0000000000000000000000000000000000000000..9eec05e6f5314cc3ca2bd01237e4f27097609306
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -0,0 +1,958 @@
+package com.fsck.k9.ui.messageview
+
+import android.app.Activity
+import android.content.ActivityNotFoundException
+import android.content.Context
+import android.content.Intent
+import android.content.IntentSender
+import android.content.IntentSender.SendIntentException
+import android.os.Bundle
+import android.os.Parcelable
+import android.os.SystemClock
+import android.view.ContextThemeWrapper
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.view.inputmethod.InputMethodManager
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.core.content.withStyledAttributes
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import com.fsck.k9.Account
+import com.fsck.k9.K9
+import com.fsck.k9.activity.MessageCompose
+import com.fsck.k9.activity.MessageLoaderHelper
+import com.fsck.k9.activity.MessageLoaderHelper.MessageLoaderCallbacks
+import com.fsck.k9.activity.MessageLoaderHelperFactory
+import com.fsck.k9.controller.MessageReference
+import com.fsck.k9.controller.MessagingController
+import com.fsck.k9.fragment.AttachmentDownloadDialogFragment
+import com.fsck.k9.fragment.ConfirmationDialogFragment
+import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
+import com.fsck.k9.helper.HttpsUnsubscribeUri
+import com.fsck.k9.helper.MailtoUnsubscribeUri
+import com.fsck.k9.helper.UnsubscribeUri
+import com.fsck.k9.mail.Flag
+import com.fsck.k9.mailstore.AttachmentViewInfo
+import com.fsck.k9.mailstore.LocalMessage
+import com.fsck.k9.mailstore.MessageViewInfo
+import com.fsck.k9.preferences.AccountManager
+import com.fsck.k9.preferences.GeneralSettingsManager
+import com.fsck.k9.ui.R
+import com.fsck.k9.ui.base.Theme
+import com.fsck.k9.ui.base.ThemeManager
+import com.fsck.k9.ui.choosefolder.ChooseFolderActivity
+import com.fsck.k9.ui.messagesource.MessageSourceActivity
+import com.fsck.k9.ui.messageview.CryptoInfoDialog.OnClickShowCryptoKeyListener
+import com.fsck.k9.ui.messageview.MessageCryptoPresenter.MessageCryptoMvpView
+import com.fsck.k9.ui.settings.account.AccountSettingsActivity
+import com.fsck.k9.ui.share.ShareIntentBuilder
+import com.fsck.k9.ui.withArguments
+import com.fsck.k9.view.MessageCryptoDisplayStatus
+import java.util.Locale
+import org.koin.android.ext.android.inject
+import timber.log.Timber
+
+class MessageViewFragment :
+    Fragment(),
+    ConfirmationDialogFragmentListener,
+    AttachmentViewCallback,
+    OnClickShowCryptoKeyListener {
+
+    private val themeManager: ThemeManager by inject()
+    private val messageLoaderHelperFactory: MessageLoaderHelperFactory by inject()
+    private val accountManager: AccountManager by inject()
+    private val messagingController: MessagingController by inject()
+    private val shareIntentBuilder: ShareIntentBuilder by inject()
+    private val generalSettingsManager: GeneralSettingsManager by inject()
+
+    private lateinit var messageTopView: MessageTopView
+
+    private var message: LocalMessage? = null
+    private lateinit var messageLoaderHelper: MessageLoaderHelper
+    private lateinit var messageCryptoPresenter: MessageCryptoPresenter
+    private var showProgressThreshold: Long? = null
+    private var preferredUnsubscribeUri: UnsubscribeUri? = null
+
+    /**
+     * Used to temporarily store the destination folder for refile operations if a confirmation
+     * dialog is shown.
+     */
+    private var destinationFolderId: Long? = null
+    private lateinit var fragmentListener: MessageViewFragmentListener
+
+    private lateinit var account: Account
+    lateinit var messageReference: MessageReference
+
+    private var currentAttachmentViewInfo: AttachmentViewInfo? = null
+    private var isDeleteMenuItemDisabled: Boolean = false
+    private var wasMessageMarkedAsOpened: Boolean = false
+
+    override fun onAttach(context: Context) {
+        super.onAttach(context)
+
+        fragmentListener = try {
+            activity as MessageViewFragmentListener
+        } catch (e: ClassCastException) {
+            throw ClassCastException("This fragment must be attached to a MessageViewFragmentListener")
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        setHasOptionsMenu(true)
+
+        messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))
+            ?: error("Invalid argument '$ARG_REFERENCE'")
+
+        if (savedInstanceState != null) {
+            wasMessageMarkedAsOpened = savedInstanceState.getBoolean(STATE_WAS_MESSAGE_MARKED_AS_OPENED)
+        }
+
+        messageCryptoPresenter = MessageCryptoPresenter(messageCryptoMvpView)
+        messageLoaderHelper = messageLoaderHelperFactory.createForMessageView(
+            context = requireContext().applicationContext,
+            loaderManager = loaderManager,
+            fragmentManager = parentFragmentManager,
+            callback = messageLoaderCallbacks
+        )
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val messageViewThemeResourceId = themeManager.messageViewThemeResourceId
+        val themedContext = ContextThemeWrapper(inflater.context, messageViewThemeResourceId)
+        val layoutInflater = LayoutInflater.from(themedContext)
+
+        val view = layoutInflater.inflate(R.layout.message, container, false)
+        messageTopView = view.findViewById(R.id.message_view)
+
+        initializeMessageTopView(messageTopView)
+
+        return view
+    }
+
+    private fun initializeMessageTopView(messageTopView: MessageTopView) {
+        messageTopView.setAttachmentCallback(this)
+        messageTopView.setMessageCryptoPresenter(messageCryptoPresenter)
+
+        messageTopView.setOnToggleFlagClickListener {
+            onToggleFlagged()
+        }
+
+        messageTopView.setOnMenuItemClickListener { item ->
+            onReplyMenuItemClicked(item.itemId)
+        }
+
+        messageTopView.setOnDownloadButtonClickListener {
+            onDownloadButtonClicked()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        loadMessage(messageReference)
+    }
+
+    private fun loadMessage(messageReference: MessageReference) {
+        Timber.d("MessageViewFragment displaying message %s", messageReference)
+
+        account = accountManager.getAccount(messageReference.accountUuid)
+            ?: error("Account ${messageReference.accountUuid} not found")
+
+        messageLoaderHelper.asyncStartOrResumeLoadingMessage(messageReference, null)
+
+        invalidateMenu()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean(STATE_WAS_MESSAGE_MARKED_AS_OPENED, wasMessageMarkedAsOpened)
+    }
+
+    override fun setMenuVisibility(menuVisible: Boolean) {
+        super.setMenuVisibility(menuVisible)
+
+        // When the menu is hidden, the message associated with this fragment is no longer active. If the user returns
+        // to it, we want to mark the message as opened again.
+        if (!menuVisible) {
+            wasMessageMarkedAsOpened = false
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        markMessageAsOpened()
+        messageCryptoPresenter.onResume()
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+
+        if (requireActivity().isChangingConfigurations) {
+            messageLoaderHelper.onDestroyChangingConfigurations()
+        } else {
+            messageLoaderHelper.onDestroy()
+        }
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        menu.findItem(R.id.delete).apply {
+            isVisible = K9.isMessageViewDeleteActionVisible
+            isEnabled = !isDeleteMenuItemDisabled
+        }
+
+        val showToggleUnread = !isOutbox
+        menu.findItem(R.id.toggle_unread).isVisible = showToggleUnread
+
+        if (showToggleUnread) {
+            // Set title of menu item to toggle the read state of the currently displayed message
+            if (isMessageRead) {
+                menu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_unread_action)
+            } else {
+                menu.findItem(R.id.toggle_unread).setTitle(R.string.mark_as_read_action)
+            }
+
+            val drawableAttr = if (isMessageRead) {
+                intArrayOf(R.attr.iconActionMarkAsUnread)
+            } else {
+                intArrayOf(R.attr.iconActionMarkAsRead)
+            }
+
+            requireContext().withStyledAttributes(attrs = drawableAttr) {
+                menu.findItem(R.id.toggle_unread).icon = getDrawable(0)
+            }
+        }
+
+        if (isMoveCapable) {
+            val canMessageBeArchived = canMessageBeArchived()
+            val canMessageBeMovedToSpam = canMessageBeMovedToSpam()
+
+            menu.findItem(R.id.move).isVisible = K9.isMessageViewMoveActionVisible
+            menu.findItem(R.id.archive).isVisible = canMessageBeArchived && K9.isMessageViewArchiveActionVisible
+            menu.findItem(R.id.spam).isVisible = canMessageBeMovedToSpam && K9.isMessageViewSpamActionVisible
+
+            menu.findItem(R.id.refile_move).isVisible = true
+            menu.findItem(R.id.refile_archive).isVisible = canMessageBeArchived
+            menu.findItem(R.id.refile_spam).isVisible = canMessageBeMovedToSpam
+
+            menu.findItem(R.id.refile).isVisible = true
+        } else {
+            menu.findItem(R.id.move).isVisible = false
+            menu.findItem(R.id.archive).isVisible = false
+            menu.findItem(R.id.spam).isVisible = false
+
+            menu.findItem(R.id.refile).isVisible = false
+        }
+
+        if (isCopyCapable) {
+            menu.findItem(R.id.copy).isVisible = K9.isMessageViewCopyActionVisible
+            menu.findItem(R.id.refile_copy).isVisible = true
+        } else {
+            menu.findItem(R.id.copy).isVisible = false
+            menu.findItem(R.id.refile_copy).isVisible = false
+        }
+
+        menu.findItem(R.id.move_to_drafts).isVisible = isOutbox
+        menu.findItem(R.id.single_message_options).isVisible = true
+        menu.findItem(R.id.unsubscribe).isVisible = canMessageBeUnsubscribed()
+        menu.findItem(R.id.show_headers).isVisible = true
+        menu.findItem(R.id.compose).isVisible = true
+
+        val toggleTheme = menu.findItem(R.id.toggle_message_view_theme)
+        if (generalSettingsManager.getSettings().fixedMessageViewTheme) {
+            toggleTheme.isVisible = false
+        } else {
+            // Set title of menu item to switch to dark/light theme
+            if (themeManager.messageViewTheme === Theme.DARK) {
+                toggleTheme.setTitle(R.string.message_view_theme_action_light)
+            } else {
+                toggleTheme.setTitle(R.string.message_view_theme_action_dark)
+            }
+            toggleTheme.isVisible = true
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            R.id.toggle_message_view_theme -> onToggleTheme()
+            R.id.delete -> onDelete()
+            R.id.reply -> onReply()
+            R.id.reply_all -> onReplyAll()
+            R.id.forward -> onForward()
+            R.id.forward_as_attachment -> onForwardAsAttachment()
+            R.id.edit_as_new_message -> onEditAsNewMessage()
+            R.id.share -> onSendAlternate()
+            R.id.toggle_unread -> onToggleRead()
+            R.id.archive, R.id.refile_archive -> onArchive()
+            R.id.spam, R.id.refile_spam -> onSpam()
+            R.id.move, R.id.refile_move -> onMove()
+            R.id.copy, R.id.refile_copy -> onCopy()
+            R.id.move_to_drafts -> onMoveToDrafts()
+            R.id.unsubscribe -> onUnsubscribe()
+            R.id.show_headers -> onShowHeaders()
+            else -> return false
+        }
+
+        return true
+    }
+
+    private fun onShowHeaders() {
+        val launchIntent = MessageSourceActivity.createLaunchIntent(requireActivity(), messageReference)
+        startActivity(launchIntent)
+    }
+
+    private fun onToggleTheme() {
+        themeManager.toggleMessageViewTheme()
+        ActivityCompat.recreate(requireActivity())
+    }
+
+    private fun showMessage(messageViewInfo: MessageViewInfo) {
+        hideKeyboard()
+
+        val handledByCryptoPresenter = messageCryptoPresenter.maybeHandleShowMessage(
+            messageTopView, account, messageViewInfo
+        )
+
+        if (!handledByCryptoPresenter) {
+            messageTopView.showMessage(account, messageViewInfo)
+
+            if (account.isOpenPgpProviderConfigured) {
+                messageTopView.messageHeaderView.setCryptoStatusDisabled()
+            } else {
+                messageTopView.messageHeaderView.hideCryptoStatus()
+            }
+        }
+
+        if (messageViewInfo.subject != null) {
+            displaySubject(messageViewInfo.subject)
+        }
+    }
+
+    private fun hideKeyboard() {
+        val activity = activity ?: return
+
+        val inputMethodManager = activity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        val decorView = activity.window.decorView
+        inputMethodManager.hideSoftInputFromWindow(decorView.applicationWindowToken, 0)
+    }
+
+    private fun displayHeaderForLoadingMessage(message: LocalMessage) {
+        val showStar = !isOutbox
+        messageTopView.setHeaders(message, account, showStar)
+
+        if (account.isOpenPgpProviderConfigured) {
+            messageTopView.messageHeaderView.setCryptoStatusLoading()
+        }
+
+        displaySubject(message.subject)
+        invalidateMenu()
+    }
+
+    private fun displaySubject(subject: String) {
+        val displaySubject = subject.ifEmpty { getString(R.string.general_no_subject) }
+        messageTopView.setSubject(displaySubject)
+    }
+
+    private fun onReplyMenuItemClicked(itemId: Int): Boolean {
+        when (itemId) {
+            R.id.reply -> onReply()
+            R.id.reply_all -> onReplyAll()
+            R.id.forward -> onForward()
+            R.id.forward_as_attachment -> onForwardAsAttachment()
+            R.id.share -> onSendAlternate()
+            else -> error("Missing handler for reply menu item $itemId")
+        }
+
+        return true
+    }
+
+    private fun onDownloadButtonClicked() {
+        messageTopView.disableDownloadButton()
+        messageLoaderHelper.downloadCompleteMessage()
+    }
+
+    /**
+     * Called from UI thread when user select Delete
+     */
+    fun onDelete() {
+        val message = checkNotNull(message)
+
+        if (K9.isConfirmDelete || K9.isConfirmDeleteStarred && message.isSet(Flag.FLAGGED)) {
+            showDialog(R.id.dialog_confirm_delete)
+        } else {
+            delete()
+        }
+    }
+
+    private fun delete() {
+        disableDeleteMenuItem()
+
+        fragmentListener.showNextMessageOrReturn()
+
+        messagingController.deleteMessage(messageReference)
+    }
+
+    private fun disableDeleteMenuItem() {
+        isDeleteMenuItemDisabled = true
+        invalidateMenu()
+    }
+
+    private fun onRefile(destinationFolderId: Long?) {
+        if (destinationFolderId == null || !messagingController.isMoveCapable(account)) {
+            return
+        }
+
+        if (!messagingController.isMoveCapable(messageReference)) {
+            Toast.makeText(activity, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        if (destinationFolderId == account.spamFolderId && K9.isConfirmSpam) {
+            this.destinationFolderId = destinationFolderId
+            showDialog(R.id.dialog_confirm_spam)
+        } else {
+            refileMessage(destinationFolderId)
+        }
+    }
+
+    private fun refileMessage(destinationFolderId: Long) {
+        fragmentListener.showNextMessageOrReturn()
+
+        val sourceFolderId = messageReference.folderId
+        messagingController.moveMessage(account, sourceFolderId, messageReference, destinationFolderId)
+    }
+
+    fun onReply() {
+        val message = this.message ?: return
+
+        fragmentListener.onReply(
+            messageReference = message.makeMessageReference(),
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+        )
+    }
+
+    fun onReplyAll() {
+        val message = checkNotNull(this.message)
+
+        fragmentListener.onReplyAll(
+            messageReference = message.makeMessageReference(),
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+        )
+    }
+
+    fun onForward() {
+        val message = checkNotNull(this.message)
+
+        fragmentListener.onForward(
+            messageReference = message.makeMessageReference(),
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+        )
+    }
+
+    private fun onForwardAsAttachment() {
+        val message = checkNotNull(this.message)
+
+        fragmentListener.onForwardAsAttachment(
+            messageReference = message.makeMessageReference(),
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+        )
+    }
+
+    private fun onEditAsNewMessage() {
+        val message = checkNotNull(this.message)
+
+        fragmentListener.onEditAsNewMessage(message.makeMessageReference())
+    }
+
+    fun onMove() {
+        check(messagingController.isMoveCapable(account))
+        checkNotNull(message)
+
+        if (!messagingController.isMoveCapable(messageReference)) {
+            Toast.makeText(activity, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        startRefileActivity(FolderOperation.MOVE, ACTIVITY_CHOOSE_FOLDER_MOVE)
+    }
+
+    fun onCopy() {
+        check(messagingController.isCopyCapable(account))
+        checkNotNull(message)
+
+        if (!messagingController.isCopyCapable(messageReference)) {
+            Toast.makeText(activity, R.string.move_copy_cannot_copy_unsynced_message, Toast.LENGTH_LONG).show()
+            return
+        }
+
+        startRefileActivity(FolderOperation.COPY, ACTIVITY_CHOOSE_FOLDER_COPY)
+    }
+
+    private fun onMoveToDrafts() {
+        fragmentListener.showNextMessageOrReturn()
+
+        val account = account
+        val folderId = messageReference.folderId
+        val messages = listOf(messageReference)
+        messagingController.moveToDraftsFolder(account, folderId, messages)
+    }
+
+    fun onArchive() {
+        onRefile(account.archiveFolderId)
+    }
+
+    private fun onSpam() {
+        onRefile(account.spamFolderId)
+    }
+
+    private fun startRefileActivity(operation: FolderOperation, requestCode: Int) {
+        val action = if (operation == FolderOperation.MOVE) {
+            ChooseFolderActivity.Action.MOVE
+        } else {
+            ChooseFolderActivity.Action.COPY
+        }
+
+        val intent = ChooseFolderActivity.buildLaunchIntent(
+            context = requireActivity(),
+            action = action,
+            accountUuid = account.uuid,
+            currentFolderId = messageReference.folderId,
+            scrollToFolderId = account.lastSelectedFolderId,
+            showDisplayableOnly = false,
+            messageReference = messageReference
+        )
+
+        startActivityForResult(intent, requestCode)
+    }
+
+    fun onPendingIntentResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode and REQUEST_MASK_LOADER_HELPER == REQUEST_MASK_LOADER_HELPER) {
+            val maskedRequestCode = requestCode xor REQUEST_MASK_LOADER_HELPER
+            messageLoaderHelper.onActivityResult(maskedRequestCode, resultCode, data)
+        } else if (requestCode and REQUEST_MASK_CRYPTO_PRESENTER == REQUEST_MASK_CRYPTO_PRESENTER) {
+            val maskedRequestCode = requestCode xor REQUEST_MASK_CRYPTO_PRESENTER
+            messageCryptoPresenter.onActivityResult(maskedRequestCode, resultCode, data)
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (resultCode != Activity.RESULT_OK) return
+
+        when (requestCode) {
+            REQUEST_CODE_CREATE_DOCUMENT -> onCreateDocumentResult(data)
+            ACTIVITY_CHOOSE_FOLDER_MOVE -> onChooseFolderMoveResult(data)
+            ACTIVITY_CHOOSE_FOLDER_COPY -> onChooseFolderCopyResult(data)
+        }
+    }
+
+    private fun onCreateDocumentResult(data: Intent?) {
+        if (data != null && data.data != null) {
+            createAttachmentController(currentAttachmentViewInfo).saveAttachmentTo(data.data)
+        }
+    }
+
+    private fun onChooseFolderMoveResult(data: Intent?) {
+        if (data == null) return
+
+        val destinationFolderId = data.getLongExtra(ChooseFolderActivity.RESULT_SELECTED_FOLDER_ID, -1L)
+        val messageReferenceString = data.getStringExtra(ChooseFolderActivity.RESULT_MESSAGE_REFERENCE)
+        val messageReference = MessageReference.parse(messageReferenceString)
+        if (this.messageReference != messageReference) return
+
+        account.setLastSelectedFolderId(destinationFolderId)
+
+        fragmentListener.showNextMessageOrReturn()
+
+        moveMessage(messageReference, destinationFolderId)
+    }
+
+    private fun onChooseFolderCopyResult(data: Intent?) {
+        if (data == null) return
+
+        val destinationFolderId = data.getLongExtra(ChooseFolderActivity.RESULT_SELECTED_FOLDER_ID, -1L)
+        val messageReferenceString = data.getStringExtra(ChooseFolderActivity.RESULT_MESSAGE_REFERENCE)
+        val messageReference = MessageReference.parse(messageReferenceString)
+        if (this.messageReference != messageReference) return
+
+        account.setLastSelectedFolderId(destinationFolderId)
+
+        copyMessage(messageReference, destinationFolderId)
+    }
+
+    private fun onSendAlternate() {
+        val message = checkNotNull(message)
+
+        val shareIntent = shareIntentBuilder.createShareIntent(message)
+        val shareTitle = getString(R.string.send_alternate_chooser_title)
+        val chooserIntent = Intent.createChooser(shareIntent, shareTitle)
+
+        startActivity(chooserIntent)
+    }
+
+    fun onToggleRead() {
+        toggleFlag(Flag.SEEN)
+    }
+
+    fun onToggleFlagged() {
+        toggleFlag(Flag.FLAGGED)
+    }
+
+    private fun toggleFlag(flag: Flag) {
+        check(!isOutbox)
+        val message = checkNotNull(this.message)
+
+        val newState = !message.isSet(flag)
+        messagingController.setFlag(account, message.folder.databaseId, listOf(message), flag, newState)
+
+        messageTopView.setHeaders(message, account, true)
+
+        invalidateMenu()
+    }
+
+    private fun moveMessage(reference: MessageReference?, folderId: Long) {
+        messagingController.moveMessage(account, messageReference.folderId, reference, folderId)
+    }
+
+    private fun copyMessage(reference: MessageReference?, folderId: Long) {
+        messagingController.copyMessage(account, messageReference.folderId, reference, folderId)
+    }
+
+    private fun showDialog(dialogId: Int) {
+        val fragment = when (dialogId) {
+            R.id.dialog_confirm_delete -> {
+                val title = getString(R.string.dialog_confirm_delete_title)
+                val message = getString(R.string.dialog_confirm_delete_message)
+                val confirmText = getString(R.string.dialog_confirm_delete_confirm_button)
+                val cancelText = getString(R.string.dialog_confirm_delete_cancel_button)
+                ConfirmationDialogFragment.newInstance(
+                    dialogId, title, message,
+                    confirmText, cancelText
+                )
+            }
+            R.id.dialog_confirm_spam -> {
+                val title = getString(R.string.dialog_confirm_spam_title)
+                val message = resources.getQuantityString(R.plurals.dialog_confirm_spam_message, 1)
+                val confirmText = getString(R.string.dialog_confirm_spam_confirm_button)
+                val cancelText = getString(R.string.dialog_confirm_spam_cancel_button)
+                ConfirmationDialogFragment.newInstance(
+                    dialogId, title, message,
+                    confirmText, cancelText
+                )
+            }
+            R.id.dialog_attachment_progress -> {
+                val currentAttachmentViewInfo = checkNotNull(this.currentAttachmentViewInfo)
+
+                val message = getString(R.string.dialog_attachment_progress_title)
+                val size = currentAttachmentViewInfo.size
+                AttachmentDownloadDialogFragment.newInstance(size, message)
+            }
+            else -> {
+                throw RuntimeException("Called showDialog(int) with unknown dialog id.")
+            }
+        }
+
+        fragment.setTargetFragment(this, dialogId)
+        fragment.show(parentFragmentManager, getDialogTag(dialogId))
+    }
+
+    private fun removeDialog(dialogId: Int) {
+        if (!isAdded) return
+
+        val fragmentManager = parentFragmentManager
+
+        // Make sure the "show dialog" transaction has been processed when we call  findFragmentByTag() below.
+        // Otherwise the fragment won't be found and the dialog will never be dismissed.
+        fragmentManager.executePendingTransactions()
+
+        val fragment = fragmentManager.findFragmentByTag(getDialogTag(dialogId)) as DialogFragment?
+        fragment?.dismissAllowingStateLoss()
+    }
+
+    private fun getDialogTag(dialogId: Int): String {
+        return String.format(Locale.US, "dialog-%d", dialogId)
+    }
+
+    override fun doPositiveClick(dialogId: Int) {
+        if (dialogId == R.id.dialog_confirm_delete) {
+            delete()
+        } else if (dialogId == R.id.dialog_confirm_spam) {
+            val destinationFolderId = checkNotNull(this.destinationFolderId)
+
+            refileMessage(destinationFolderId)
+            this.destinationFolderId = null
+        }
+    }
+
+    override fun doNegativeClick(dialogId: Int) = Unit
+
+    override fun dialogCancelled(dialogId: Int) = Unit
+
+    private val isOutbox: Boolean
+        get() = messageReference.folderId == account.outboxFolderId
+
+    private val isMessageRead: Boolean
+        get() = message?.isSet(Flag.SEEN) == true
+
+    private val isCopyCapable: Boolean
+        get() = !isOutbox && messagingController.isCopyCapable(account)
+
+    private val isMoveCapable: Boolean
+        get() = !isOutbox && messagingController.isMoveCapable(account)
+
+    private fun canMessageBeArchived(): Boolean {
+        val archiveFolderId = account.archiveFolderId ?: return false
+        return messageReference.folderId != archiveFolderId
+    }
+
+    private fun canMessageBeMovedToSpam(): Boolean {
+        val spamFolderId = account.spamFolderId ?: return false
+        return messageReference.folderId != spamFolderId
+    }
+
+    private fun canMessageBeUnsubscribed(): Boolean {
+        return preferredUnsubscribeUri != null
+    }
+
+    private fun onUnsubscribe() {
+        val intent = when (val unsubscribeUri = preferredUnsubscribeUri) {
+            is MailtoUnsubscribeUri -> {
+                Intent(requireContext(), MessageCompose::class.java).apply {
+                    action = Intent.ACTION_VIEW
+                    data = unsubscribeUri.uri
+                    putExtra(MessageCompose.EXTRA_ACCOUNT, messageReference.accountUuid)
+                }
+            }
+            is HttpsUnsubscribeUri -> {
+                Intent(Intent.ACTION_VIEW, unsubscribeUri.uri)
+            }
+            else -> error("Unknown UnsubscribeUri - $unsubscribeUri")
+        }
+
+        startActivity(intent)
+    }
+
+    fun disableAttachmentButtons(attachment: AttachmentViewInfo?) = Unit
+
+    fun enableAttachmentButtons(attachment: AttachmentViewInfo?) = Unit
+
+    fun runOnMainThread(runnable: Runnable) {
+        requireActivity().runOnUiThread(runnable)
+    }
+
+    fun showAttachmentLoadingDialog() {
+        showDialog(R.id.dialog_attachment_progress)
+    }
+
+    fun hideAttachmentLoadingDialogOnMainThread() {
+        runOnMainThread {
+            removeDialog(R.id.dialog_attachment_progress)
+        }
+    }
+
+    fun refreshAttachmentThumbnail(attachment: AttachmentViewInfo?) {
+        messageTopView.refreshAttachmentThumbnail(attachment)
+    }
+
+    private fun markMessageAsOpened() {
+        val message = message ?: return
+
+        if (!wasMessageMarkedAsOpened) {
+            messagingController.markMessageAsOpened(account, message)
+            wasMessageMarkedAsOpened = true
+        }
+    }
+
+    private val messageCryptoMvpView: MessageCryptoMvpView = object : MessageCryptoMvpView {
+        override fun redisplayMessage() {
+            messageLoaderHelper.asyncReloadMessage()
+        }
+
+        @Throws(SendIntentException::class)
+        override fun startPendingIntentForCryptoPresenter(
+            intentSender: IntentSender,
+            requestCode: Int?,
+            fillIntent: Intent?,
+            flagsMask: Int,
+            flagValues: Int,
+            extraFlags: Int
+        ) {
+            if (requestCode == null) {
+                requireActivity().startIntentSender(intentSender, fillIntent, flagsMask, flagValues, extraFlags)
+                return
+            }
+
+            val maskedRequestCode = requestCode or REQUEST_MASK_CRYPTO_PRESENTER
+            requireActivity().startIntentSenderForResult(
+                intentSender, maskedRequestCode, fillIntent, flagsMask, flagValues, extraFlags
+            )
+        }
+
+        override fun showCryptoInfoDialog(displayStatus: MessageCryptoDisplayStatus, hasSecurityWarning: Boolean) {
+            val dialog = CryptoInfoDialog.newInstance(displayStatus, hasSecurityWarning)
+            dialog.setTargetFragment(this@MessageViewFragment, 0)
+            dialog.show(parentFragmentManager, "crypto_info_dialog")
+        }
+
+        override fun restartMessageCryptoProcessing() {
+            messageTopView.setToLoadingState()
+            messageLoaderHelper.asyncRestartMessageCryptoProcessing()
+        }
+
+        override fun showCryptoConfigDialog() {
+            AccountSettingsActivity.startCryptoSettings(requireActivity(), account.uuid)
+        }
+    }
+
+    override fun onClickShowSecurityWarning() {
+        messageCryptoPresenter.onClickShowCryptoWarningDetails()
+    }
+
+    override fun onClickSearchKey() {
+        messageCryptoPresenter.onClickSearchKey()
+    }
+
+    override fun onClickShowCryptoKey() {
+        messageCryptoPresenter.onClickShowCryptoKey()
+    }
+
+    interface MessageViewFragmentListener {
+        fun onForward(messageReference: MessageReference, decryptionResultForReply: Parcelable?)
+        fun onForwardAsAttachment(messageReference: MessageReference, decryptionResultForReply: Parcelable?)
+        fun onEditAsNewMessage(messageReference: MessageReference)
+        fun onReplyAll(messageReference: MessageReference, decryptionResultForReply: Parcelable?)
+        fun onReply(messageReference: MessageReference, decryptionResultForReply: Parcelable?)
+        fun setProgress(enable: Boolean)
+        fun showNextMessageOrReturn()
+    }
+
+    private val messageLoaderCallbacks: MessageLoaderCallbacks = object : MessageLoaderCallbacks {
+        override fun onMessageDataLoadFinished(message: LocalMessage) {
+            this@MessageViewFragment.message = message
+
+            displayHeaderForLoadingMessage(message)
+            messageTopView.setToLoadingState()
+            showProgressThreshold = null
+
+            // Only mark the message as opened when the fragment is resumed, i.e. when this is the active message.
+            if (isResumed) {
+                markMessageAsOpened()
+            }
+        }
+
+        override fun onMessageDataLoadFailed() {
+            Toast.makeText(activity, R.string.status_loading_error, Toast.LENGTH_LONG).show()
+            showProgressThreshold = null
+        }
+
+        override fun onMessageViewInfoLoadFinished(messageViewInfo: MessageViewInfo) {
+            showMessage(messageViewInfo)
+            preferredUnsubscribeUri = messageViewInfo.preferredUnsubscribeUri
+            showProgressThreshold = null
+        }
+
+        override fun onMessageViewInfoLoadFailed(messageViewInfo: MessageViewInfo) {
+            showMessage(messageViewInfo)
+            preferredUnsubscribeUri = null
+            showProgressThreshold = null
+        }
+
+        override fun setLoadingProgress(current: Int, max: Int) {
+            val oldShowProgressThreshold = showProgressThreshold
+
+            if (oldShowProgressThreshold == null) {
+                showProgressThreshold = SystemClock.elapsedRealtime() + PROGRESS_THRESHOLD_MILLIS
+            } else if (oldShowProgressThreshold == 0L || SystemClock.elapsedRealtime() > oldShowProgressThreshold) {
+                showProgressThreshold = 0L
+                messageTopView.setLoadingProgress(current, max)
+            }
+        }
+
+        override fun onDownloadErrorMessageNotFound() {
+            messageTopView.enableDownloadButton()
+            Toast.makeText(requireContext(), R.string.status_invalid_id_error, Toast.LENGTH_LONG).show()
+        }
+
+        override fun onDownloadErrorNetworkError() {
+            messageTopView.enableDownloadButton()
+            Toast.makeText(requireContext(), R.string.status_network_error, Toast.LENGTH_LONG).show()
+        }
+
+        override fun startIntentSenderForMessageLoaderHelper(
+            intentSender: IntentSender,
+            requestCode: Int,
+            fillIntent: Intent?,
+            flagsMask: Int,
+            flagValues: Int,
+            extraFlags: Int
+        ) {
+            showProgressThreshold = null
+            try {
+                val maskedRequestCode = requestCode or REQUEST_MASK_LOADER_HELPER
+                requireActivity().startIntentSenderForResult(
+                    intentSender, maskedRequestCode, fillIntent, flagsMask, flagValues, extraFlags
+                )
+            } catch (e: SendIntentException) {
+                Timber.e(e, "Irrecoverable error calling PendingIntent!")
+            }
+        }
+    }
+
+    override fun onViewAttachment(attachment: AttachmentViewInfo) {
+        currentAttachmentViewInfo = attachment
+
+        createAttachmentController(attachment).viewAttachment()
+    }
+
+    override fun onSaveAttachment(attachment: AttachmentViewInfo) {
+        currentAttachmentViewInfo = attachment
+
+        val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
+            type = attachment.mimeType
+            putExtra(Intent.EXTRA_TITLE, attachment.displayName)
+            addCategory(Intent.CATEGORY_OPENABLE)
+        }
+
+        try {
+            startActivityForResult(intent, REQUEST_CODE_CREATE_DOCUMENT)
+        } catch (e: ActivityNotFoundException) {
+            Toast.makeText(requireContext(), R.string.error_activity_not_found, Toast.LENGTH_LONG).show()
+        }
+    }
+
+    private fun createAttachmentController(attachment: AttachmentViewInfo?): AttachmentController {
+        return AttachmentController(requireContext(), messagingController, this, attachment)
+    }
+
+    private fun invalidateMenu() {
+        activity?.invalidateMenu()
+    }
+
+    private enum class FolderOperation {
+        COPY, MOVE
+    }
+
+    companion object {
+        const val REQUEST_MASK_LOADER_HELPER = 1 shl 8
+        const val REQUEST_MASK_CRYPTO_PRESENTER = 1 shl 9
+        const val PROGRESS_THRESHOLD_MILLIS = 500 * 1000
+
+        private const val ARG_REFERENCE = "reference"
+
+        private const val STATE_WAS_MESSAGE_MARKED_AS_OPENED = "wasMessageMarkedAsOpened"
+
+        private const val ACTIVITY_CHOOSE_FOLDER_MOVE = 1
+        private const val ACTIVITY_CHOOSE_FOLDER_COPY = 2
+        private const val REQUEST_CODE_CREATE_DOCUMENT = 3
+
+        fun newInstance(reference: MessageReference): MessageViewFragment {
+            return MessageViewFragment().withArguments(
+                ARG_REFERENCE to reference.toIdentityString()
+            )
+        }
+    }
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt
new file mode 100644
index 0000000000000000000000000000000000000000..df6fe2c015c86d6cfed10f81e1b97a1fd0ed7662
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/TouchInterceptView.kt
@@ -0,0 +1,69 @@
+package com.fsck.k9.ui.messageview
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.MotionEvent
+import android.view.ViewConfiguration
+import android.webkit.WebView
+import android.widget.FrameLayout
+import android.widget.ScrollView
+import com.fsck.k9.ui.R
+import kotlin.math.absoluteValue
+
+/**
+ * A view that listens to touch events to make sure [R.id.message_viewpager] doesn't get to see events that should be
+ * handled by [R.id.message_scrollview] or [R.id.message_content].
+ *
+ * We allow the view pager to listen to touch events until we know it's a gesture that will be handled by the scroll
+ * view or the web view.
+ * If we instead hid events from the view pager until we knew the scroll view or the web view don't want to handle the
+ * gesture, we'd risk minimal fling gestures ([MotionEvent.ACTION_DOWN], [MotionEvent.ACTION_MOVE],
+ * [MotionEvent.ACTION_UP]) not working because the single [MotionEvent.ACTION_MOVE] event would be invisible to the
+ * view pager.
+ */
+class TouchInterceptView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
+    private val touchSlop = ViewConfiguration.get(context).scaledTouchSlop
+
+    private var initialX: Float = 0f
+    private var initialY: Float = 0f
+
+    override fun onInterceptTouchEvent(event: MotionEvent): Boolean {
+        handleOnInterceptTouchEvent(event)
+        return super.onInterceptTouchEvent(event)
+    }
+
+    private fun handleOnInterceptTouchEvent(event: MotionEvent) {
+        val webView = findViewById<WebView>(R.id.message_content) ?: return
+        val scrollView = findViewById<ScrollView>(R.id.message_scrollview) ?: return
+        val scrollViewParent = scrollView.parent ?: return
+
+        when (event.actionMasked) {
+            MotionEvent.ACTION_DOWN -> {
+                initialX = event.x
+                initialY = event.y
+                scrollViewParent.requestDisallowInterceptTouchEvent(false)
+            }
+            MotionEvent.ACTION_POINTER_DOWN -> {
+                // If a second finger/pointer is involved, never allow parents of the ScrollView to intercept
+                scrollViewParent.requestDisallowInterceptTouchEvent(true)
+            }
+            MotionEvent.ACTION_MOVE -> {
+                val deltaX = initialX - event.x
+                val deltaY = initialY - event.y
+
+                val absoluteDeltaX = deltaX.absoluteValue
+                val absoluteDeltaY = deltaY.absoluteValue
+
+                if (absoluteDeltaY > touchSlop && absoluteDeltaY > absoluteDeltaX &&
+                    (scrollView.canScrollVertically(deltaY.toInt()) || webView.canScrollVertically(deltaY.toInt()))
+                ) {
+                    scrollViewParent.requestDisallowInterceptTouchEvent(true)
+                } else if (absoluteDeltaX > touchSlop && absoluteDeltaX > absoluteDeltaY &&
+                    webView.canScrollHorizontally(deltaX.toInt())
+                ) {
+                    scrollViewParent.requestDisallowInterceptTouchEvent(true)
+                }
+            }
+        }
+    }
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.java b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.java
deleted file mode 100644
index 206785237fa09824a23419d4176408d0c56d1bb4..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.fsck.k9.view;
-
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import android.util.AttributeSet;
-import timber.log.Timber;
-import android.view.KeyEvent;
-import android.webkit.WebSettings;
-import android.webkit.WebSettings.LayoutAlgorithm;
-import android.webkit.WebSettings.RenderPriority;
-import android.webkit.WebView;
-import android.widget.Toast;
-
-import com.fsck.k9.ui.R;
-import com.fsck.k9.mailstore.AttachmentResolver;
-
-
-public class MessageWebView extends WebView {
-
-    public MessageWebView(Context context) {
-        super(context);
-    }
-
-    public MessageWebView(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public MessageWebView(Context context, AttributeSet attrs, int defStyle) {
-        super(context, attrs, defStyle);
-    }
-
-    /**
-     * Configure a web view to load or not load network data. A <b>true</b> setting here means that
-     * network data will be blocked.
-     * @param shouldBlockNetworkData True if network data should be blocked, false to allow network data.
-     */
-    public void blockNetworkData(final boolean shouldBlockNetworkData) {
-        /*
-         * Block network loads.
-         *
-         * Images with content: URIs will not be blocked, nor
-         * will network images that are already in the WebView cache.
-         *
-         */
-        try {
-            getSettings().setBlockNetworkLoads(shouldBlockNetworkData);
-        } catch (SecurityException e) {
-            Timber.e(e, "Failed to unblock network loads. Missing INTERNET permission?");
-        }
-    }
-
-
-    /**
-     * Configure a {@link WebView} to display a Message. This method takes into account a user's
-     * preferences when configuring the view. This message is used to view a message and to display a message being
-     * replied to.
-     */
-    public void configure(WebViewConfig config) {
-        this.setVerticalScrollBarEnabled(true);
-        this.setVerticalScrollbarOverlay(true);
-        this.setScrollBarStyle(SCROLLBARS_INSIDE_OVERLAY);
-        this.setLongClickable(true);
-
-        if (config.getUseDarkMode()) {
-            // Black theme should get a black webview background
-            // we'll set the background of the messages on load
-            this.setBackgroundColor(0xff000000);
-        }
-
-        final WebSettings webSettings = this.getSettings();
-
-        /* TODO this might improve rendering smoothness when webview is animated into view
-        if (VERSION.SDK_INT >= VERSION_CODES.M) {
-            webSettings.setOffscreenPreRaster(true);
-        }
-        */
-
-        webSettings.setSupportZoom(true);
-        webSettings.setBuiltInZoomControls(true);
-        webSettings.setUseWideViewPort(true);
-        if (config.getAutoFitWidth()) {
-            webSettings.setLoadWithOverviewMode(true);
-        }
-
-        disableDisplayZoomControls();
-
-        webSettings.setJavaScriptEnabled(false);
-        webSettings.setLoadsImagesAutomatically(true);
-        webSettings.setRenderPriority(RenderPriority.HIGH);
-
-        // TODO:  Review alternatives.  NARROW_COLUMNS is deprecated on KITKAT
-        webSettings.setLayoutAlgorithm(LayoutAlgorithm.NARROW_COLUMNS);
-
-        setOverScrollMode(OVER_SCROLL_NEVER);
-
-        webSettings.setTextZoom(config.getTextZoom());
-
-        // Disable network images by default.  This is overridden by preferences.
-        blockNetworkData(true);
-    }
-
-    /**
-     * Disable on-screen zoom controls on devices that support zooming via pinch-to-zoom.
-     */
-    private void disableDisplayZoomControls() {
-        PackageManager pm = getContext().getPackageManager();
-        boolean supportsMultiTouch =
-                pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
-                pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT);
-
-        getSettings().setDisplayZoomControls(!supportsMultiTouch);
-    }
-
-    public void displayHtmlContentWithInlineAttachments(@NonNull String htmlText,
-            @Nullable AttachmentResolver attachmentResolver, @Nullable OnPageFinishedListener onPageFinishedListener) {
-        setWebViewClient(attachmentResolver, onPageFinishedListener);
-        setHtmlContent(htmlText);
-    }
-
-    private void setWebViewClient(@Nullable AttachmentResolver attachmentResolver,
-            @Nullable OnPageFinishedListener onPageFinishedListener) {
-        K9WebViewClient webViewClient = K9WebViewClient.newInstance(attachmentResolver);
-        if (onPageFinishedListener != null) {
-            webViewClient.setOnPageFinishedListener(onPageFinishedListener);
-        }
-        setWebViewClient(webViewClient);
-    }
-
-    private void setHtmlContent(@NonNull String htmlText) {
-        loadDataWithBaseURL("about:blank", htmlText, "text/html", "utf-8", null);
-        resumeTimers();
-    }
-
-    /*
-     * Emulate the shift key being pressed to trigger the text selection mode
-     * of a WebView.
-     */
-    public void emulateShiftHeld() {
-        try {
-
-            KeyEvent shiftPressEvent = new KeyEvent(0, 0, KeyEvent.ACTION_DOWN,
-                                                    KeyEvent.KEYCODE_SHIFT_LEFT, 0, 0);
-            shiftPressEvent.dispatch(this, null, null);
-            Toast.makeText(getContext() , R.string.select_text_now, Toast.LENGTH_SHORT).show();
-        } catch (Exception e) {
-            Timber.e(e, "Exception in emulateShiftHeld()");
-        }
-    }
-
-    public interface OnPageFinishedListener {
-        void onPageFinished();
-    }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fde796689ff6f096de00cd1ecb29376253de97c9
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
@@ -0,0 +1,99 @@
+package com.fsck.k9.view
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.util.AttributeSet
+import android.webkit.WebSettings.LayoutAlgorithm
+import android.webkit.WebSettings.RenderPriority
+import android.webkit.WebView
+import com.fsck.k9.mailstore.AttachmentResolver
+import timber.log.Timber
+
+class MessageWebView : WebView {
+    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
+
+    fun blockNetworkData(shouldBlockNetworkData: Boolean) {
+        // Images with content: URIs will not be blocked, nor will network images that are already in the WebView cache.
+        try {
+            settings.blockNetworkLoads = shouldBlockNetworkData
+        } catch (e: SecurityException) {
+            Timber.e(e, "Failed to unblock network loads. Missing INTERNET permission?")
+        }
+    }
+
+    fun configure(config: WebViewConfig) {
+        isVerticalScrollBarEnabled = true
+        setVerticalScrollbarOverlay(true)
+        scrollBarStyle = SCROLLBARS_INSIDE_OVERLAY
+        isLongClickable = true
+
+        if (config.useDarkMode) {
+            setBackgroundColor(0xff000000L.toInt())
+        }
+
+        with(settings) {
+            setSupportZoom(true)
+            builtInZoomControls = true
+            useWideViewPort = true
+
+            if (config.autoFitWidth) {
+                loadWithOverviewMode = true
+            }
+
+            disableDisplayZoomControls()
+
+            javaScriptEnabled = false
+            loadsImagesAutomatically = true
+            setRenderPriority(RenderPriority.HIGH)
+
+            // TODO: Review alternatives. NARROW_COLUMNS is deprecated on KITKAT
+            layoutAlgorithm = LayoutAlgorithm.NARROW_COLUMNS
+
+            overScrollMode = OVER_SCROLL_NEVER
+
+            textZoom = config.textZoom
+        }
+
+        // Disable network images by default. This is overridden by preferences.
+        blockNetworkData(true)
+    }
+
+    private fun disableDisplayZoomControls() {
+        val packageManager = context.packageManager
+        val supportsMultiTouch = packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN_MULTITOUCH) ||
+            packageManager.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT)
+
+        settings.displayZoomControls = !supportsMultiTouch
+    }
+
+    fun displayHtmlContentWithInlineAttachments(
+        htmlText: String,
+        attachmentResolver: AttachmentResolver?,
+        onPageFinishedListener: OnPageFinishedListener?
+    ) {
+        setWebViewClient(attachmentResolver, onPageFinishedListener)
+        setHtmlContent(htmlText)
+    }
+
+    private fun setWebViewClient(
+        attachmentResolver: AttachmentResolver?,
+        onPageFinishedListener: OnPageFinishedListener?
+    ) {
+        val webViewClient = K9WebViewClient.newInstance(attachmentResolver)
+        if (onPageFinishedListener != null) {
+            webViewClient.setOnPageFinishedListener(onPageFinishedListener)
+        }
+        setWebViewClient(webViewClient)
+    }
+
+    private fun setHtmlContent(htmlText: String) {
+        loadDataWithBaseURL("about:blank", htmlText, "text/html", "utf-8", null)
+        resumeTimers()
+    }
+
+    fun interface OnPageFinishedListener {
+        fun onPageFinished()
+    }
+}
diff --git a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml b/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml
deleted file mode 100644
index 87bba8ff11814a9c90ac2c406909da6a65a9a02d..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/res/drawable/ic_chevron_left.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/default_icon_color"
-        android:pathData="M15.705,7.41L14.295,6L8.295,12L14.295,18L15.705,16.59L11.125,12L15.705,7.41Z" />
-</vector>
diff --git a/app/ui/legacy/src/main/res/layout/message.xml b/app/ui/legacy/src/main/res/layout/message.xml
index 8deb75ec0690c371c4d22a4cc63c27df3034517e..c2e0590901b431d90b35728b305d33b27266b487 100644
--- a/app/ui/legacy/src/main/res/layout/message.xml
+++ b/app/ui/legacy/src/main/res/layout/message.xml
@@ -12,6 +12,7 @@
     tools:context=".messageview.MessageViewFragment">
 
     <com.fsck.k9.view.NonLockingScrollView
+        android:id="@+id/message_scrollview"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
         android:layout_weight="1">
diff --git a/app/ui/legacy/src/main/res/layout/message_container.xml b/app/ui/legacy/src/main/res/layout/message_container.xml
index 1e3278c15e62dbb7c7137585ac040aa8058ed8f4..1a5db6d58c0d733d3f6f5f1cbb44b6e7aed24512 100644
--- a/app/ui/legacy/src/main/res/layout/message_container.xml
+++ b/app/ui/legacy/src/main/res/layout/message_container.xml
@@ -65,13 +65,6 @@
         android:id="@+id/attachments_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:id="@+id/attachments"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical" />
-    </LinearLayout>
+        android:orientation="vertical" />
 
 </com.fsck.k9.ui.messageview.MessageContainerView>
diff --git a/app/ui/legacy/src/main/res/layout/message_view_container.xml b/app/ui/legacy/src/main/res/layout/message_view_container.xml
new file mode 100644
index 0000000000000000000000000000000000000000..99ce488fa26d5d38243b36bcfa660e978035215b
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/message_view_container.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.fsck.k9.ui.messageview.TouchInterceptView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/message_viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</com.fsck.k9.ui.messageview.TouchInterceptView>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/menu/message_list_option.xml b/app/ui/legacy/src/main/res/menu/message_list_option.xml
index 0049b3750304f432e59ec0bdc2b37cdb590dbc26..5aaa60b3daded7668d935996801d0813293d0d6b 100644
--- a/app/ui/legacy/src/main/res/menu/message_list_option.xml
+++ b/app/ui/legacy/src/main/res/menu/message_list_option.xml
@@ -1,45 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <!--
     The comments preceding the (top level) menu items denote which part of the combined message
     list/view activity the item belongs to. Either "MessageList", "MessageView", or "always" (as in:
     always show this item, no matter what display mode we're in).
-
-    The comments are for informational purposes only. Please make sure to adjust the code in
-    MessageList.configureMenu() if you make any changes to this file.
     -->
 
     <!-- MessageList -->
     <item
         android:id="@+id/search"
         android:icon="?attr/iconActionSearch"
-        app:showAsAction="always"
+        android:title="@string/search_action"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
-        android:title="@string/search_action"/>
+        app:showAsAction="always" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/search_remote"
         android:icon="?attr/iconActionRemoteSearch"
-        app:showAsAction="always"
         android:title="@string/action_remote_search"
-        android:visible="false"/>
+        android:visible="false"
+        app:showAsAction="always" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/archive"
         android:icon="?attr/iconActionArchive"
-        app:showAsAction="always"
-        android:title="@string/archive_action"/>
+        android:title="@string/archive_action"
+        android:visible="false"
+        app:showAsAction="always" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/delete"
         android:icon="?attr/iconActionDelete"
-        app:showAsAction="always"
-        android:title="@string/delete_action"/>
+        android:title="@string/delete_action"
+        android:visible="false"
+        app:showAsAction="always" />
 
     <!-- MessageView -->
     <item
@@ -48,74 +47,63 @@
         app:showAsAction="never"
         android:title="@string/mark_as_unread_action"/>
 
-    <!-- MessageView -->
-    <item
-        android:id="@+id/previous_message"
-        android:title="@string/previous_action"
-        android:icon="?attr/iconActionPreviousMessage"
-        app:showAsAction="always" />
-
-    <!-- MessageView -->
-    <item
-        android:id="@+id/next_message"
-        android:title="@string/next_action"
-        android:icon="?attr/iconActionNextMessage"
-        app:showAsAction="always"
-        />
-
     <!-- MessageView -->
     <item
         android:id="@+id/spam"
         android:icon="?attr/iconActionSpam"
-        app:showAsAction="ifRoom"
-        android:title="@string/spam_action"/>
+        android:title="@string/spam_action"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/move"
         android:icon="?attr/iconActionMove"
-        app:showAsAction="ifRoom"
-        android:title="@string/move_action"/>
+        android:title="@string/move_action"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/copy"
         android:icon="?attr/iconActionCopy"
-        app:showAsAction="ifRoom"
-        android:title="@string/copy_action"/>
+        android:title="@string/copy_action"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/move_to_drafts"
         android:title="@string/move_to_drafts_action"
-        app:showAsAction="never"
-        android:visible="false"/>
+        android:visible="false"
+        app:showAsAction="never" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/single_message_options"
         android:icon="?attr/iconActionSingleMessageOptions"
-        app:showAsAction="always"
+        android:visible="false"
+        app:showAsAction="ifRoom"
         android:title="@string/single_message_options_action">
         <menu>
             <item
                 android:id="@+id/reply"
-                android:title="@string/reply_action"/>
+                android:title="@string/reply_action" />
             <item
                 android:id="@+id/reply_all"
-                android:title="@string/reply_all_action"/>
+                android:title="@string/reply_all_action" />
             <item
                 android:id="@+id/forward"
-                android:title="@string/forward_action"/>
+                android:title="@string/forward_action" />
             <item
                 android:id="@+id/forward_as_attachment"
-                android:title="@string/forward_as_attachment_action"/>
+                android:title="@string/forward_as_attachment_action" />
             <item
                 android:id="@+id/edit_as_new_message"
-                android:title="@string/edit_as_new_message_action"/>
+                android:title="@string/edit_as_new_message_action" />
             <item
                 android:id="@+id/share"
-                android:title="@string/send_alternate_action"/>
+                android:title="@string/send_alternate_action" />
         </menu>
     </item>
 
@@ -123,73 +111,77 @@
     <item
         android:id="@+id/refile"
         android:icon="?attr/iconActionSingleMessageOptions"
-        app:showAsAction="never"
-        android:title="@string/refile_action">
+        android:title="@string/refile_action"
+        android:visible="false"
+        app:showAsAction="never">
         <menu>
             <item
                 android:id="@+id/refile_archive"
-                android:title="@string/archive_action"/>
+                android:title="@string/archive_action" />
 
-            <!-- MessageView -->
             <item
                 android:id="@+id/refile_spam"
-                android:title="@string/spam_action"/>
+                android:title="@string/spam_action" />
 
-            <!-- MessageView -->
             <item
                 android:id="@+id/refile_move"
-                android:title="@string/move_action"/>
+                android:title="@string/move_action" />
 
-            <!-- MessageView -->
             <item
                 android:id="@+id/refile_copy"
-                android:title="@string/copy_action"/>
+                android:title="@string/copy_action" />
         </menu>
     </item>
 
-    <item android:id="@+id/unsubscribe"
-          app:showAsAction="never"
-          android:title="@string/unsubscribe_action"/>
+    <!-- MessageView -->
+    <item
+        android:id="@+id/unsubscribe"
+        android:title="@string/unsubscribe_action"
+        android:visible="false"
+        app:showAsAction="never" />
 
-    <item android:id="@+id/show_headers"
-          app:showAsAction="never"
-          android:title="@string/show_headers_action"/>
+    <!-- MessageView -->
+    <item
+        android:id="@+id/show_headers"
+        android:title="@string/show_headers_action"
+        android:visible="false"
+        app:showAsAction="never" />
 
     <!-- always -->
     <item
         android:id="@+id/compose"
         android:icon="?attr/iconActionCompose"
-        app:showAsAction="ifRoom"
-        android:title="@string/compose_action"/>
+        android:title="@string/compose_action"
+        app:showAsAction="ifRoom" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/set_sort"
         android:icon="?attr/iconActionSort"
-        app:showAsAction="ifRoom"
-        android:title="@string/sort_by">
+        android:title="@string/sort_by"
+        app:showAsAction="ifRoom">
         <menu>
             <item
                 android:id="@+id/set_sort_date"
-                android:title="@string/sort_by_date"/>
+                android:title="@string/sort_by_date" />
             <item
                 android:id="@+id/set_sort_arrival"
-                android:title="@string/sort_by_arrival"/>
+                android:title="@string/sort_by_arrival" />
             <item
                 android:id="@+id/set_sort_subject"
-                android:title="@string/sort_by_subject"/>
+                android:title="@string/sort_by_subject" />
             <item
                 android:id="@+id/set_sort_sender"
-                android:title="@string/sort_by_sender"/>
+                android:title="@string/sort_by_sender" />
             <item
                 android:id="@+id/set_sort_flag"
-                android:title="@string/sort_by_flag"/>
+                android:title="@string/sort_by_flag" />
             <item
                 android:id="@+id/set_sort_unread"
-                android:title="@string/sort_by_unread"/>
+                android:title="@string/sort_by_unread" />
             <item
                 android:id="@+id/set_sort_attach"
-                android:title="@string/sort_by_attach"/>
+                android:title="@string/sort_by_attach" />
         </menu>
     </item>
 
@@ -197,21 +189,21 @@
     <item
         android:id="@+id/select_all"
         android:icon="?attr/iconActionSelectAll"
-        app:showAsAction="never"
-        android:title="@string/batch_select_all"/>
+        android:title="@string/batch_select_all"
+        app:showAsAction="never" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/mark_all_as_read"
-        app:showAsAction="never"
-        android:title="@string/mark_all_as_read"/>
+        android:title="@string/mark_all_as_read"
+        app:showAsAction="never" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/send_messages"
         android:icon="?attr/iconActionUpload"
-        app:showAsAction="never"
-        android:title="@string/send_messages_action"/>
+        android:title="@string/send_messages_action"
+        app:showAsAction="never" />
 
     <!-- MessageList -->
     <item
@@ -222,19 +214,20 @@
     <!-- MessageList -->
     <item
         android:id="@+id/expunge"
-        app:showAsAction="never"
-        android:title="@string/expunge_action"/>
+        android:title="@string/expunge_action"
+        app:showAsAction="never" />
 
     <!-- MessageView -->
     <item
         android:id="@+id/toggle_message_view_theme"
-        app:showAsAction="never"
-        android:title="@string/message_view_theme_action_dark"/>
+        android:title="@string/message_view_theme_action_dark"
+        android:visible="false"
+        app:showAsAction="never" />
 
     <!-- MessageList -->
     <item
         android:id="@+id/search_everywhere"
-        app:showAsAction="never"
-        android:title="@string/search_everywhere_action"/>
+        android:title="@string/search_everywhere_action"
+        app:showAsAction="never" />
 
 </menu>
diff --git a/app/ui/legacy/src/main/res/raw/changelog_master.xml b/app/ui/legacy/src/main/res/raw/changelog_master.xml
index 5947dea9bec2298f2715b46f7044849e43cebcda..433c2511ca348f17358b3b96b78cfea7b83effe9 100644
--- a/app/ui/legacy/src/main/res/raw/changelog_master.xml
+++ b/app/ui/legacy/src/main/res/raw/changelog_master.xml
@@ -5,6 +5,12 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.300" versioncode="33000" date="2022-08-04">
+        <change>Added support for swiping between messages</change>
+        <change>Fixed multiple bugs when there are notifications for more than 8 messages</change>
+        <change>Fixed bug that could lead to broken attachment names when large messages were only partially downloaded (IMAP)</change>
+        <change>Added Western Frisian translation</change>
+    </release>
     <release version="6.202" versioncode="32002" date="2022-07-26">
         <change>Increased timeout when sending messages because some users have reported problems with sending large attachments</change>
         <change>Allow all URI schemes in HTML links</change>
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ad2c4723a2ccf948bfc8bf83d8db78ebbf311e3e
--- /dev/null
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -0,0 +1,1043 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!--=== App-specific strings =============================================================-->
+  <!--This should make it easier for forks to change the branding-->
+  <!--Used in AndroidManifest.xml-->
+  <string name="app_name">K-9 Mail</string>
+  <string name="shortcuts_title">K-9-accounts</string>
+  <string name="unread_widget_label">K-9 Net lêzen</string>
+  <!--Used in the about dialog-->
+  <string name="app_authors">It K-9-ûntwikkelteam</string>
+  <string name="source_code">Boarnekoade</string>
+  <string name="app_license">Apache-lisinsje, ferzje 2.0</string>
+  <string name="about_project_title">Iepenboarnekoade-projekt</string>
+  <string name="about_website_title">Website</string>
+  <string name="user_manual_title">Brûkershantlieding</string>
+  <string name="get_help_title">Help krije</string>
+  <string name="user_forum_title">Brûkersfoarum</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
+  <string name="about_libraries">Biblioteken</string>
+  <string name="license">Lisinsje</string>
+  <string name="changelog_title">Wizigingsloch</string>
+  <string name="changelog_loading_error">It laden fan it wizigingsloch is mislearre.</string>
+  <string name="changelog_version_title">Ferzje %s</string>
+  <string name="changelog_recent_changes_title">Wat is der nij</string>
+  <string name="changelog_show_recent_changes">Lit wizigingen sjen as de app resint bywurke is</string>
+  <string name="changelog_snackbar_text">Untdek wat der nij is yn dizze ferzje</string>
+  <!--Welcome message-->
+  <string name="welcome_message_title">Wolkom by K-9 Mail</string>
+  <string name="accounts_welcome"><![CDATA[ <p> K-9 Mail is in fergees krêftige e-mailclient foar Android. </p><p> De ferbettere mooglikheden bestean ûnder oare út:
+</p>
+<ul>
+<li>Pushmail middels IMAP IDLE</li> 
+<li>Bettere prestaasjes</li> 
+<li>Berjocht werklassifikaasje</li> 
+<li>E-mailhantekeningen</li> 
+<li>Bcc nei josels</li> 
+<li>Mapabonneminten</li> 
+<li>Syngronisaasje fan alle mappen</li> 
+<li>Antwurdadres ynstelle</li> 
+<li>Toetseboerd fluchkeppelingen</li> 
+<li>Bettere stipe IMAP</li> 
+<li>Bylage bewarje nei SD</li> 
+<li>Jiskefet leegje</li> 
+<li>Berjochten sortearje</li> 
+<li>en mear…</li> 
+</ul> 
+<p> 
+Hâld der rekkening mei dat K-9 de measte fergeze Hotmail-accounts net stipet, en krekt as in protte e-mailclients, problemen hawwe kin om te ferbinen mei Microsoft Exchange. 
+</p><p> 
+Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op 
+<a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>. 
+</p> 
+]]></string>
+  <!--Default signature-->
+  <string name="default_signature">-- \nFerstjoerd fan myn Android-apparaat ôf mei K-9 Mail.</string>
+  <!--General strings that include the app name-->
+  <string name="account_delete_dlg_instructions_fmt">De account ‘<xliff:g id="account">%s</xliff:g>’ wurdt út K-9 Mail fuortsmiten.</string>
+  <!--=== General strings ==================================================================-->
+  <string name="authors">Auteurs</string>
+  <string name="about_title">Oer K-9 mail</string>
+  <string name="accounts_title">Accounts</string>
+  <string name="advanced">Avansearre</string>
+  <string name="compose_title_compose">Nij berjocht</string>
+  <string name="compose_title_reply">Beäntwurdzje</string>
+  <string name="compose_title_reply_all">Alle beäntwurdzje</string>
+  <string name="compose_title_forward">Trochstjoere</string>
+  <string name="compose_title_forward_as_attachment">Trochstjoere as bylage</string>
+  <string name="choose_account_title">Kies in account</string>
+  <string name="choose_folder_title">Kies in map</string>
+  <string name="choose_folder_move_title">Ferpleatse nei…</string>
+  <string name="choose_folder_copy_title">Kopiearje nei…</string>
+  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> selektearre</string>
+  <string name="next_action">Folgjende</string>
+  <string name="previous_action">Foarige</string>
+  <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
+  <string name="okay_action">OK</string>
+  <string name="cancel_action">Annulearje</string>
+  <string name="send_action">Ferstjoere</string>
+  <string name="empty_subject">Der is gjin ûnderwerp ynfierd. Tik nochris om dochs te ferstjoeren.</string>
+  <string name="reply_action">Antwurdzje</string>
+  <string name="reply_all_action">Allen beäntwurdzje</string>
+  <string name="delete_action">Fuortsmite</string>
+  <string name="archive_action">Argyf</string>
+  <string name="spam_action">Net-winske</string>
+  <string name="forward_action">Trochstjoere</string>
+  <string name="forward_as_attachment_action">Trochstjoere as bylage</string>
+  <string name="edit_as_new_message_action">As nij berjocht bewurkje</string>
+  <string name="move_action">Ferpleatse</string>
+  <string name="move_to_drafts_action">Nei konsepten ferpleatse</string>
+  <string name="single_message_options_action">Ferstjoere…</string>
+  <string name="refile_action">Opnij bewarje…</string>
+  <string name="done_action">Dien</string>
+  <string name="discard_action">Ferjitte</string>
+  <string name="save_draft_action">As konsept bewarje</string>
+  <string name="check_mail_action">Op e-mailberjochten kontrolearje</string>
+  <string name="send_messages_action">Berjochten ferstjoere</string>
+  <string name="refresh_folders_action">Maplist ferfarskje</string>
+  <string name="filter_folders_action">Map sykje</string>
+  <string name="add_account_action">Account tafoegje</string>
+  <string name="compose_action">Nij berjocht</string>
+  <string name="search_action">Sykje</string>
+  <string name="search_everywhere_action">Oeral sykje</string>
+  <string name="search_results">Sykresultaten</string>
+  <string name="new_messages_title">Nije berjochten</string>
+  <string name="preferences_action">Ynstellingen</string>
+  <string name="folders_action">Mappen beheare</string>
+  <string name="account_settings_action">Accountynstellingen</string>
+  <string name="remove_account_action">Account fuortsmite</string>
+  <string name="mark_as_read_action">As lêzen markearje</string>
+  <string name="send_alternate_action">Diele</string>
+  <string name="send_alternate_chooser_title">Ofstjoerder kieze</string>
+  <string name="flag_action">Stjer tafoegje</string>
+  <string name="unflag_action">Stjer fuortsmite</string>
+  <string name="copy_action">Kopiearje</string>
+  <string name="unsubscribe_action">Utskriuwe</string>
+  <string name="show_headers_action">Berjochtkoppen toane</string>
+  <plurals name="copy_address_to_clipboard">
+    <item quantity="one">Adres nei klamboerd kopiearre</item>
+    <item quantity="other">Adressen nei klamboerd kopiearre</item>
+  </plurals>
+  <string name="copy_subject_to_clipboard">It ûnderwerp is nei it klamboerd kopiearre</string>
+  <string name="message_view_theme_action_dark">Nei donker tema wikselje</string>
+  <string name="message_view_theme_action_light">Nei ljocht tema wikselje</string>
+  <string name="mark_as_unread_action">As net-lêzen markearje</string>
+  <string name="read_receipt">Untfangstbefêstiging</string>
+  <string name="read_receipt_enabled">Untfangstbefêstiging freegje</string>
+  <string name="read_receipt_disabled">Gjin ûntfangstbefêstiging freegje</string>
+  <string name="add_attachment_action">Bylage tafoegje</string>
+  <string name="empty_trash_action">Jiskefet leegje</string>
+  <string name="expunge_action">Wiskje</string>
+  <string name="about_action">Oer</string>
+  <string name="prefs_title">Ynstellingen</string>
+  <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
+  <string name="general_no_subject">(Gjin ûnderwerp)</string>
+  <string name="general_no_sender">Gjin ôfstjoerder</string>
+  <string name="status_loading_more">Berjochten oan it laden\u2026</string>
+  <string name="status_network_error">Netwurkflater</string>
+  <string name="status_invalid_id_error">Berjocht net fûn</string>
+  <string name="status_loading_error">Berjocht laden is mislearre</string>
+  <string name="load_more_messages_fmt">Folgjende <xliff:g id="messages_to_load">%d</xliff:g> berjochten</string>
+  <string name="size_format_gigabytes">%.1f GB</string>
+  <string name="size_format_megabytes">%.1f MB</string>
+  <string name="size_format_kilobytes">%.1f kB</string>
+  <string name="size_format_bytes">%d B</string>
+  <string name="notification_new_title">Nij berjocht</string>
+  <plurals name="notification_new_messages_title">
+    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> nije berjocht</item>
+    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> nije berjochten</item>
+  </plurals>
+  <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%d</xliff:g> Net lêzen (<xliff:g id="account">%s</xliff:g>)</string>
+  <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%1$d</xliff:g> mear by <xliff:g id="account">%2$s</xliff:g></string>
+  <string name="notification_action_reply">Beäntwurdzje</string>
+  <string name="notification_action_mark_as_read">As lêzen markearje</string>
+  <string name="notification_action_mark_all_as_read">Alles as lêzen markearje</string>
+  <string name="notification_action_delete">Fuortsmite</string>
+  <string name="notification_action_delete_all">Alle fuortsmite</string>
+  <string name="notification_action_archive">Argivearje</string>
+  <string name="notification_action_archive_all">Alles argivearje</string>
+  <string name="notification_action_spam">Net-winske</string>
+  <string name="notification_certificate_error_public">Sertifikaatflater</string>
+  <string name="notification_certificate_error_title">Sertifikaatflater foar <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_certificate_error_text">Kontrolearje de serverynstellingen</string>
+  <string name="notification_authentication_error_title">Autentikaasje mislearre</string>
+  <string name="notification_authentication_error_text">Autentikaasje foar <xliff:g id="account">%s</xliff:g> mislearre. Wurkje de serverynstellingen by.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <string name="notification_notify_error_title">Meldingsflater</string>
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
+  <string name="notification_notify_error_text">Der is in flater bard wylst it meitsje fan in systeemmelding foar in nij berjocht. De reden is wierskynlik in ûntbrekken fan in meldingslûd.\n\nTik om meldingsynstellingen te iepenjen.</string>
+  <string name="notification_bg_sync_ticker">Berjochten kontrolearje: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
+  <string name="notification_bg_sync_title">Berjochten kontrolearje</string>
+  <string name="notification_bg_send_ticker">Berjochten ferstjoere: <xliff:g id="account">%s</xliff:g></string>
+  <string name="notification_bg_send_title">Berjochten ferstjoere</string>
+  <string name="notification_bg_title_separator">:</string>
+  <string name="notification_channel_push_title">Syngronisearje (Push)</string>
+  <string name="notification_channel_push_description">Wurdt yn ôfwachting fan nije berjochten werjûn</string>
+  <string name="notification_channel_messages_title">Berjochten</string>
+  <string name="notification_channel_messages_description">Meldingen relatearre oan berjochten</string>
+  <string name="notification_channel_miscellaneous_title">Diversken</string>
+  <string name="notification_channel_miscellaneous_description">Oare meldingen, lykas flaters en soksawat.</string>
+  <string name="special_mailbox_name_inbox">Postfek YN</string>
+  <string name="special_mailbox_name_outbox">Postfek ÚT</string>
+  <string name="special_mailbox_name_drafts">Konsepten</string>
+  <string name="special_mailbox_name_trash">Jiskefet</string>
+  <string name="special_mailbox_name_sent">Ferstjoerd</string>
+  <string name="send_failure_subject">Flater by ferstjoeren fan berjochten</string>
+  <string name="version">Ferzje</string>
+  <string name="debug_enable_debug_logging_title">Debuglog tastean</string>
+  <string name="debug_enable_debug_logging_summary">Ekstra diagnostyske ynformaasje logge</string>
+  <string name="debug_enable_sensitive_logging_title">Gefoelige ynformaasje logge</string>
+  <string name="debug_enable_sensitive_logging_summary">Kin wachtwurden yn logs toane.</string>
+  <string name="debug_export_logs_title">Logs eksportearje</string>
+  <string name="debug_export_logs_success">Eksportearjen is slagge. Der sit mooglik persoanlike ynformaasje yn de logs. Kies ferstannich nei wa’t jo jo logs stjoere.</string>
+  <string name="debug_export_logs_failure">Eksportearjen is mislearre</string>
+  <string name="message_list_load_more_messages_action">Mear berjochten lade</string>
+  <string name="message_to_fmt">Oan:<xliff:g id="counterParty">%s</xliff:g></string>
+  <string name="message_compose_subject_hint">Underwerp</string>
+  <string name="message_compose_content_hint">Berjochttekst</string>
+  <string name="message_compose_signature_hint">Hantekening</string>
+  <string name="message_compose_quote_header_separator">-------- Orizjineel berjocht --------</string>
+  <string name="message_compose_quote_header_subject">Underwerp:</string>
+  <string name="message_compose_quote_header_send_date">Ferstjoerd:</string>
+  <string name="message_compose_quote_header_from">Fan:</string>
+  <string name="message_compose_quote_header_to">Oan:</string>
+  <string name="message_compose_quote_header_cc">Cc:</string>
+  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> skriuw:</string>
+  <string name="message_compose_reply_header_fmt_with_date"><xliff:g id="sender">%2$s</xliff:g> skreau op <xliff:g id="sent_date">%1$s</xliff:g>:</string>
+  <string name="message_compose_error_no_recipients">Foegje minimaal 1 ûntfanger ta.</string>
+  <string name="compose_error_incomplete_recipient">De ûntfanger is net (folslein) ynfolle!</string>
+  <string name="error_contact_address_not_found">Gjin e-mailadres fûn.</string>
+  <string name="message_compose_attachments_skipped_toast">Guon bylagen kinne net trochstjoerd wurde, omdat se net download binne.</string>
+  <string name="message_compose_attachments_forward_toast">Dit berjocht kin net trochstjoerd wurde, omdat bylagen net download binne.</string>
+  <string name="message_compose_show_quoted_text_action">Sitearre berjocht tafoegje</string>
+  <string name="message_compose_description_delete_quoted_text">Sitaattekst fuortsmite</string>
+  <string name="message_compose_description_edit_quoted_text">Sitaattekst bewurkje</string>
+  <string name="remove_attachment_action">Bylage fuortsmite</string>
+  <string name="message_view_from_format">Fan: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
+  <string name="message_to_label">Oan:</string>
+  <string name="message_view_cc_label">Cc:</string>
+  <string name="message_view_bcc_label">Bcc:</string>
+  <string name="message_view_status_attachment_not_saved">Kin bylage net bewarje.</string>
+  <string name="message_view_show_pictures_action">Ofbyldingen toane</string>
+  <string name="message_view_no_viewer">Gjin viewer te finen foar <xliff:g id="mimetype">%s</xliff:g>.</string>
+  <string name="message_view_download_remainder">Folslein berjocht downloade</string>
+  <string name="message_view_sender_label">fia %1$s</string>
+  <string name="from_same_sender">Mear fan dizze ôfstjoerder</string>
+  <string name="search_from_format">Fan <xliff:g id="sender">%s</xliff:g></string>
+  <string name="message_discarded_toast">Berjocht fuortsmiten</string>
+  <string name="message_saved_toast">Berjocht as konsept bewarre</string>
+  <string name="global_settings_flag_label">Stjerren toane</string>
+  <string name="global_settings_flag_summary">Stjerren jouwe markearre berjochten oan</string>
+  <string name="global_settings_preview_lines_label">Rigels yn it foar besjen</string>
+  <string name="global_settings_show_correspondent_names_label">Namme by berjocht toane</string>
+  <string name="global_settings_show_correspondent_names_summary">Toan by foarkar namme fan ôfstjoerder/adressearre y.s.f. e-mailadres</string>
+  <string name="global_settings_sender_above_subject_label">Korrespondint boppe ûnderwerp</string>
+  <string name="global_settings_sender_above_subject_summary">Nammen korrespondinten boppe de ûnderwerprigel toane, net derûnder</string>
+  <string name="global_settings_show_contact_name_label">Namme út adreslist toane</string>
+  <string name="global_settings_show_contact_name_summary">Brûk namme út it adresboek</string>
+  <string name="global_settings_registered_name_color_label">Kontakten kleur jaan</string>
+  <string name="global_settings_registered_name_color_changed">Nammen yn jo kontaktlist kleur jaan</string>
+  <string name="general_settings_contact_name_color_label">Kleur foar nammen fan kontaktpersoanen</string>
+  <string name="global_settings_messageview_fixedwidth_label">Fêste breedte lettertypen</string>
+  <string name="global_settings_messageview_fixedwidth_summary">Brûk in lettertype mei fêste breedte by it werjaan fan platte-tekstberjochten</string>
+  <string name="global_settings_messageview_autofit_width_label">Berjochten auto-passe</string>
+  <string name="global_settings_messageview_autofit_width_summary">Berjochten passend meitsje op it skerm</string>
+  <string name="global_settings_messageview_return_to_list_label">Werom nei list nei fuortsmiten</string>
+  <string name="global_settings_messageview_return_to_list_summary">Werom nei berjochtelist nei fuortsmiten berjocht</string>
+  <string name="global_settings_messageview_show_next_label">Folgjend berjocht toane nei fuortsmiten</string>
+  <string name="global_settings_messageview_show_next_summary">Standert folgjend berjocht toane nei fuortsmiten</string>
+  <string name="global_settings_confirm_actions_title">Aksjes befêstigje</string>
+  <string name="global_settings_confirm_actions_summary">Altyd in dialoochfinster toane wannear’t jo de selektearre aksjes útfiere</string>
+  <string name="global_settings_confirm_action_delete">Fuortsmite</string>
+  <string name="global_settings_confirm_action_delete_starred">Berjochten mei in stjer fuortsmite (yn berjochtwerjefte)</string>
+  <string name="global_settings_confirm_action_spam">Net-winske</string>
+  <string name="global_settings_confirm_menu_discard">Berjocht ôfbrekke</string>
+  <string name="global_settings_confirm_menu_mark_all_read">Alles as lêzen markearje</string>
+  <string name="global_settings_confirm_action_delete_notif">Fuortsmite (fan meldingen)</string>
+  <string name="global_settings_privacy_hide_useragent">E-mailclient ferstopje</string>
+  <string name="global_settings_privacy_hide_useragent_detail">K-9-brûkersagent fan e-mailkopteksten fuortsmite</string>
+  <string name="global_settings_privacy_hide_timezone">Tiidsône ferstopje</string>
+  <string name="global_settings_privacy_hide_timezone_detail">UTC brûke yn stee fan de lokale tiidsône yn de e-mailkopteksten en by it beäntwurdzjen fan e-mailberjochten</string>
+  <string name="global_settings_notification_quick_delete_title">Knop ‘Fuortsmite’ toane</string>
+  <string name="global_settings_notification_quick_delete_never">Nea</string>
+  <string name="global_settings_notification_quick_delete_when_single_msg">Melding foar los berjocht</string>
+  <string name="global_settings_notification_quick_delete_always">Altyd</string>
+  <string name="global_settings_lock_screen_notification_visibility_title">Startskermmelding</string>
+  <string name="global_settings_lock_screen_notification_visibility_nothing">Gjin startskermmelding</string>
+  <string name="global_settings_lock_screen_notification_visibility_app_name">Applikaasjenamme</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Oantal nije berjochten</string>
+  <string name="global_settings_lock_screen_notification_visibility_senders">Berjochteteller (ek ferstjoerd)</string>
+  <string name="global_settings_lock_screen_notification_visibility_everything">Itselde. Ek nei skermûntskoatteling</string>
+  <string name="quiet_time">Stilteperioade</string>
+  <string name="quiet_time_description">Beltoan, trille en leds yn de nacht útskeakelje</string>
+  <string name="quiet_time_notification">Notifikaasjes útsette</string>
+  <string name="quiet_time_notification_description">Meldingen wylst stilteperioade folslein útskeakelje</string>
+  <string name="quiet_time_starts">Stilteperioade start</string>
+  <string name="quiet_time_ends">Stilteperioade ein</string>
+  <string name="account_setup_basics_title">In nij account ynstelle</string>
+  <string name="account_setup_basics_email_hint">E-mailadres</string>
+  <string name="account_setup_basics_password_hint">Wachtwurd</string>
+  <string name="account_setup_oauth_description">Om mei K-9 dit e-mailaccount te brûken moatte jo jo oanmelde om K-9 tagong te jaan ta jo e-mailberjochten.</string>
+  <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in">Oanmelde</string>
+  <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in_with_google">Oanmelde mei Google</string>
+  <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
+  <string name="account_setup_basics_show_password_need_lock">Skeakelje op dit apparaat in skermbeskoatteling yn om hjir jo wachtwurd sjen te kinnen.</string>
+  <string name="account_setup_basics_show_password_biometrics_title">Jo identiteit ferifiearje</string>
+  <string name="account_setup_basics_show_password_biometrics_subtitle">Untskoattelje om jo wachtwurd te sjen</string>
+  <string name="account_setup_basics_manual_setup_action">Hânmjittich ynstelle</string>
+  <string name="account_setup_check_settings_title"/>
+  <string name="account_setup_check_settings_retr_info_msg">Accountynformaasje ophelje\u2026</string>
+  <string name="account_setup_check_settings_check_incoming_msg">Kontrôle fan ynstellingen ynkommende server\u2026</string>
+  <string name="account_setup_check_settings_check_outgoing_msg">Kontrôle fan ynstellingen útgeande server\u2026</string>
+  <string name="account_setup_check_settings_authenticate">Autentikaasje\u2026</string>
+  <string name="account_setup_check_settings_fetch">Accountynstellingen ophelje\u2026</string>
+  <string name="account_setup_check_settings_canceling_msg">Annulearje\u2026</string>
+  <string name="account_setup_names_title">Hast klear!</string>
+  <string name="account_setup_names_account_name_label">Jou dit account in namme (opsjoneel):</string>
+  <string name="account_setup_names_user_name_label">Typ jo namme (sichtber by útgeande berjochten):</string>
+  <string name="account_setup_account_type_title">Accounttype</string>
+  <string name="account_setup_account_type_instructions">Hokker type account is dit?</string>
+  <string name="account_setup_account_type_pop_action">POP3</string>
+  <string name="account_setup_account_type_imap_action">IMAP</string>
+  <string name="account_setup_auth_type_normal_password">Normaal wachtwurd</string>
+  <string name="account_setup_auth_type_insecure_password">Wachtwurd, net feilich ferstjoerd</string>
+  <string name="account_setup_auth_type_encrypted_password">Fersifere wachtwurd</string>
+  <string name="account_setup_auth_type_tls_client_certificate">Clientsertifikaat</string>
+  <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
+  <string name="account_setup_incoming_title">Ynkommende serverynstellingen</string>
+  <string name="account_setup_incoming_username_label">Brûkersnamme</string>
+  <string name="account_setup_incoming_password_label">Wachtwurd</string>
+  <string name="account_setup_incoming_client_certificate_label">Clientsertifikaat</string>
+  <string name="account_setup_incoming_pop_server_label">POP3-server</string>
+  <string name="account_setup_incoming_imap_server_label">IMAP-server</string>
+  <string name="account_setup_incoming_webdav_server_label">WebDAV (Exchange)-server</string>
+  <string name="account_setup_incoming_port_label">Poarte</string>
+  <string name="account_setup_incoming_security_label">Befeiligingstype</string>
+  <string name="account_setup_incoming_auth_type_label">Autentikaasjetype</string>
+  <string name="account_setup_incoming_security_none_label">Gjin</string>
+  <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+  <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+  <string name="account_setup_incoming_invalid_setting_combo_notice">‘<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>’ is net jildich mei ‘<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>’</string>
+  <string name="account_setup_incoming_delete_policy_label">Wannear ik in berjocht fuortsmyt</string>
+  <string name="account_setup_incoming_delete_policy_never_label">Net fan server fuortsmite</string>
+  <string name="account_setup_incoming_delete_policy_delete_label">Fan server fuortsmite</string>
+  <string name="account_setup_incoming_delete_policy_markread_label">Op server as lêzen markearje </string>
+  <string name="account_setup_incoming_use_compression">Kompresje brûke</string>
+  <string name="account_setup_expunge_policy_label">Op server fuortsmiten berjochten wiskje </string>
+  <string name="account_setup_expunge_policy_immediately">Daliks nei it fuortsmiten of ferpleatsen</string>
+  <string name="account_setup_expunge_policy_on_poll">By elke berjochtkontrôle</string>
+  <string name="account_setup_expunge_policy_manual">Hânmjittich</string>
+  <string name="account_setup_incoming_autodetect_namespace_label">IMAP-namespace automatysk detektearje</string>
+  <string name="account_setup_incoming_imap_path_prefix_label">IMAP-paadfoarfoegsel</string>
+  <string name="drafts_folder_label">Konseptmap</string>
+  <string name="sent_folder_label">Ferstjoerdmap</string>
+  <string name="trash_folder_label">Jiskefetmap</string>
+  <string name="archive_folder_label">Argyfmap</string>
+  <string name="spam_folder_label">Net-winskemap</string>
+  <string name="account_setup_incoming_subscribed_folders_only_label">Allinnich abonnearre mappen toane</string>
+  <string name="account_setup_auto_expand_folder">Map automatysk útklappe</string>
+  <string name="account_setup_incoming_webdav_path_prefix_label">WebDAV (Exchange) path</string>
+  <string name="account_setup_incoming_webdav_auth_path_label">Autentikaasjepaad</string>
+  <string name="account_setup_incoming_webdav_mailbox_path_label">Postbusalias</string>
+  <string name="account_setup_outgoing_title">Utgeande serverynstellingen</string>
+  <string name="account_setup_outgoing_smtp_server_label">SMTP-server</string>
+  <string name="account_setup_outgoing_port_label">Poarte</string>
+  <string name="account_setup_outgoing_security_label">Befeiligingstype</string>
+  <string name="account_setup_outgoing_require_login_label">Oanmelden fereaske</string>
+  <string name="account_setup_outgoing_username_label">Brûkersnamme</string>
+  <string name="account_setup_outgoing_password_label">Wachtwurd</string>
+  <string name="account_setup_outgoing_authentication_label">Autentikaasjetype</string>
+  <string name="account_setup_outgoing_invalid_setting_combo_notice">‘<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>’ is net jildich mei ‘<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>’</string>
+  <string name="account_setup_bad_uri">Unjildige ynstellingen: <xliff:g id="err_mess">%s</xliff:g></string>
+  <string name="account_setup_options_title">Accountopsjes</string>
+  <string name="account_setup_options_mail_check_frequency_label">Frekwinsje mapkontrôle</string>
+  <string name="account_setup_options_mail_check_frequency_never">Nea</string>
+  <string name="account_setup_options_mail_check_frequency_15min">Elke 15 minuten</string>
+  <string name="account_setup_options_mail_check_frequency_30min">Elke 30 minuten</string>
+  <string name="account_setup_options_mail_check_frequency_1hour">Elk oere</string>
+  <string name="account_setup_options_mail_check_frequency_2hour">Elke 2 oeren</string>
+  <string name="account_setup_options_mail_check_frequency_3hour">Elke 3 oeren</string>
+  <string name="account_setup_options_mail_check_frequency_6hour">Elke 6 oeren</string>
+  <string name="account_setup_options_mail_check_frequency_12hour">Elke 12 oeren</string>
+  <string name="account_setup_options_mail_check_frequency_24hour">Elke 24 oeren</string>
+  <string name="idle_refresh_period_label">Ynaktive ferbining fernije</string>
+  <string name="idle_refresh_period_2min">Elke 2 minuten</string>
+  <string name="idle_refresh_period_3min">Elke 3 minuten</string>
+  <string name="idle_refresh_period_6min">Elke 6 minuten</string>
+  <string name="idle_refresh_period_12min">Elke 12 minuten</string>
+  <string name="idle_refresh_period_24min">Elke 24 minuten</string>
+  <string name="idle_refresh_period_36min">Elke 36 minuten</string>
+  <string name="idle_refresh_period_48min">Elke 48 minuten</string>
+  <string name="idle_refresh_period_60min">Elke 60 minuten</string>
+  <string name="account_setup_options_notify_label">Warskôgje my wannear nije e-mailberjochten ynkomme</string>
+  <string name="account_setup_options_mail_display_count_label">Oantal berjochten om te toanen</string>
+  <string name="account_setup_options_mail_display_count_10">10 berjochten</string>
+  <string name="account_setup_options_mail_display_count_25">25 berjochten</string>
+  <string name="account_setup_options_mail_display_count_50">50 berjochten</string>
+  <string name="account_setup_options_mail_display_count_100">100 berjochten</string>
+  <string name="account_setup_options_mail_display_count_250">250 berjochten</string>
+  <string name="account_setup_options_mail_display_count_500">500 berjochten</string>
+  <string name="account_setup_options_mail_display_count_1000">1000 berjochten</string>
+  <string name="account_setup_options_mail_display_count_2500">2500 berjochten</string>
+  <string name="account_setup_options_mail_display_count_5000">5000 berjochten</string>
+  <string name="account_setup_options_mail_display_count_10000">10000 berjochten</string>
+  <string name="account_setup_options_mail_display_count_all">alle berjochten</string>
+  <string name="move_copy_cannot_copy_unsynced_message">Kin berjocht net kopiearje of ferpleatse, omdat dizze net syngronisearre is mei de server</string>
+  <string name="account_setup_failed_dlg_title">Ynstellen koe net foltôgje</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Brûkersnamme of wachtwurd ûnjildich.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_certificate_message_fmt">De server presintearre in ûnjildich SSL-sertifikaat. Dit kin barre troch in ferkeard konfigurearre server. Dit kin ek barre trochdat ien jo e-mailserver probearret oan te fallen. As jo net wis binne wat der oan de hân is, klik dan op Reject en nim kontakt op mei de behearder fan de e-mailserver.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_server_message_fmt">Kin gjin ferbining mei server meitsje.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_oauth_flow_canceled">Autorisaasje is annulearre</string>
+  <string name="account_setup_failed_dlg_oauth_flow_failed">Autorisaasje is mislearre mei de folgjende flater: <xliff:g id="error">%s</xliff:g></string>
+  <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 wurdt op dit stuit net stipe troch dizze tsjinstferliener.</string>
+  <string name="account_setup_failed_dlg_browser_not_found">Dizze app kin gjin browser fine. In browser is nedich om tagong te jaan ta jo account.</string>
+  <string name="account_setup_failed_dlg_edit_details_action">Details oanpasse</string>
+  <string name="account_setup_failed_dlg_continue_action">Trochgean</string>
+  <string name="account_settings_push_advanced_title">Avansearre</string>
+  <string name="account_settings_title_fmt">Accountynstellingen</string>
+  <string name="account_settings_notify_label">Nije-e-mailmelding</string>
+  <string name="account_settings_folder_notify_new_mail_mode_label">Meldingsmappen</string>
+  <string name="account_settings_folder_notify_new_mail_mode_all">Alles</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">Allinnich 1e-klassemappen</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1e- en 2e-klassemappen</string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Alle útsein 2e-klassemappen</string>
+  <string name="account_settings_folder_notify_new_mail_mode_none">Gjin</string>
+  <string name="account_settings_notify_sync_label">Syngronisaasjemeldingen</string>
+  <string name="account_settings_email_label">Jo e-mailadres</string>
+  <string name="account_settings_notify_summary">Melding yn steatbalke by in nij e-mailberjocht</string>
+  <string name="account_settings_notify_sync_summary">Yn steatbalke melding werjaan wannear op nije e-mail kontrolearre wurdt</string>
+  <string name="account_settings_notify_self_label">By eigen berjochten</string>
+  <string name="account_settings_notify_self_summary">Melding ek foar e-mail ferstjoerd fan in identiteit ôf</string>
+  <string name="account_notify_contacts_mail_only_label">Allinnich kontakten</string>
+  <string name="account_notify_contacts_mail_only_summary">Meldingen allinnich werjaan foar bekende kontakten</string>
+  <string name="account_settings_ignore_chat_messages_label">Petearberjochten negearje</string>
+  <string name="account_settings_ignore_chat_messages_summary">Gjin meldingen toane foar berjochten dy’t ûnderdiel binne fan in e-mailpetear</string>
+  <string name="account_settings_mark_message_as_read_on_view_label">As lêzen markearje as iepene</string>
+  <string name="account_settings_mark_message_as_read_on_view_summary">As lêzen markearje as besjoen</string>
+  <string name="account_settings_mark_message_as_read_on_delete_label">As lêzen markearje by wiskjen</string>
+  <string name="account_settings_mark_message_as_read_on_delete_summary">Markearje in berjocht as lêzen wannear’t dy wiske wurdt</string>
+  <string name="account_settings_notification_channels_label">Meldingskategoryen</string>
+  <string name="account_settings_open_notification_settings_messages_summary">Meldingen foar nije berjochten ynstelle</string>
+  <string name="account_settings_open_notification_settings_miscellaneous_summary">Flater- en steatmeldingen ynstelle</string>
+  <string name="account_settings_show_pictures_label">Ofbyldingen automatysk toane</string>
+  <string name="account_settings_show_pictures_never">Nea</string>
+  <string name="account_settings_show_pictures_only_from_contacts">Allinnich fan kontakten</string>
+  <string name="account_settings_show_pictures_always">Altyd</string>
+  <string name="account_settings_composition">Berjochten ferstjoere</string>
+  <string name="account_settings_default_quoted_text_shown_label">Berjocht by beäntwurdzjen sitearje</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Orizjinele berjocht yn it antwurd meinimme.</string>
+  <string name="account_settings_reply_after_quote_label">Beäntwurdzje nei sitaat</string>
+  <string name="account_settings_reply_after_quote_summary">Wannear’t jo antwurdzje op in berjocht, sil it orizjinele berjocht boppe jo antwurd stean.</string>
+  <string name="account_settings_strip_signature_label">Hantekening by reaksje fuortsmite</string>
+  <string name="account_settings_strip_signature_summary">Hantekeningen wurde by sitearre berjochten fuortsmiten</string>
+  <string name="account_settings_message_format_label">Berjochtopmaak</string>
+  <string name="account_settings_message_format_text">Platte tekst (ôfbyldingen en opmaak wurde fuortsmiten)</string>
+  <string name="account_settings_message_format_html">HTML (ôfbyldingen en opmaak bliuwe behâlden)</string>
+  <string name="account_settings_message_format_auto">Automatysk</string>
+  <string name="account_settings_always_show_cc_bcc_label">Cc/Bcc altyd toane</string>
+  <string name="account_settings_message_read_receipt_label">Untfangstbefêstiging</string>
+  <string name="account_settings_message_read_receipt_summary">Altyd in lêsbefêstiging freegje</string>
+  <string name="account_settings_quote_style_label">Sitaatstyl by beäntwurdzjen</string>
+  <string name="account_settings_quote_style_prefix">Prefix (lykas Gmail, Pine)</string>
+  <string name="account_settings_quote_style_header">Kop (lykas Outlook)</string>
+  <string name="account_settings_upload_sent_messages_label">Ferstjoerde berjochten oplade</string>
+  <string name="account_settings_upload_sent_messages_summary">Berjochten nei ferstjoeren nei ‘Ferstjoerd’-map oplade</string>
+  <string name="account_settings_general_title">Algemiene ynstellingen</string>
+  <string name="account_settings_reading_mail">Berjochten lêze</string>
+  <string name="account_settings_sync">Berjochten ophelje</string>
+  <string name="account_settings_folders">Mappen</string>
+  <string name="account_settings_quote_prefix_label">Sitaatfoarfoegsel</string>
+  <string name="account_settings_crypto">Ein-ta-einfersifering</string>
+  <string name="account_settings_crypto_app">OpenPGP-stipe ynskeakelje</string>
+  <string name="account_settings_crypto_app_select_title">OpenPGP-app selektearje</string>
+  <string name="account_settings_crypto_key">Ein-ta-einkaai ynstelle</string>
+  <string name="account_settings_crypto_summary_off">Gjin OpenPGP-app ynsteld</string>
+  <string name="account_settings_crypto_summary_on">Ferbûn mei %s</string>
+  <string name="account_settings_crypto_summary_config">Konfiguraasje dwaande…</string>
+  <string name="account_settings_crypto_encrypt_all_drafts">Alle konsepten fersifere bewarje.</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_on">Alle konsepten sille fersifere bewarre wurde</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_off">Konsepten allinnich fersiferje as fersifering ynskeakele is</string>
+  <string name="account_settings_mail_check_frequency_label">Frekwinsje mapkontrôle</string>
+  <string name="account_settings_color_label">Accountkleur</string>
+  <string name="account_settings_color_summary">De accountkleur brûkt by mappen en accountlist</string>
+  <string name="account_settings_mail_display_count_label">Grutte fan lokale map</string>
+  <string name="account_settings_autodownload_message_size_label">Automatysk berjochten downloade oant</string>
+  <string name="account_settings_autodownload_message_size_1">1 KiB</string>
+  <string name="account_settings_autodownload_message_size_2">2 KiB</string>
+  <string name="account_settings_autodownload_message_size_4">4 KiB</string>
+  <string name="account_settings_autodownload_message_size_8">8 KiB</string>
+  <string name="account_settings_autodownload_message_size_16">16 KiB</string>
+  <string name="account_settings_autodownload_message_size_32">32 KiB</string>
+  <string name="account_settings_autodownload_message_size_64">64 KiB</string>
+  <string name="account_settings_autodownload_message_size_128">128 KiB</string>
+  <string name="account_settings_autodownload_message_size_256">256 KiB</string>
+  <string name="account_settings_autodownload_message_size_512">512 KiB</string>
+  <string name="account_settings_autodownload_message_size_1024">1 MiB</string>
+  <string name="account_settings_autodownload_message_size_2048">2 MiB</string>
+  <string name="account_settings_autodownload_message_size_5120">5 MiB</string>
+  <string name="account_settings_autodownload_message_size_10240">10 MiB</string>
+  <string name="account_settings_autodownload_message_size_any">elke grutte (gjin limyt)</string>
+  <string name="account_settings_message_age_label">Berjochten syngronisearje fan</string>
+  <string name="account_settings_message_age_any">alles (gjin limyt)</string>
+  <string name="account_settings_message_age_0">hjoed</string>
+  <string name="account_settings_message_age_1">lêste 2 dagen</string>
+  <string name="account_settings_message_age_2">lêtste 3 dagen</string>
+  <string name="account_settings_message_age_7">ôfrûne wike</string>
+  <string name="account_settings_message_age_14">ôfrûne 2 wiken</string>
+  <string name="account_settings_message_age_21">ôfrûne 3 wiken</string>
+  <string name="account_settings_message_age_1_month">ôfrûne moanne</string>
+  <string name="account_settings_message_age_2_months">ôfrûne 2 moannen</string>
+  <string name="account_settings_message_age_3_months">ôfrûne 3 moannen</string>
+  <string name="account_settings_message_age_6_months">ôfrûne 6 moannen</string>
+  <string name="account_settings_message_age_1_year">ôfrûne jier</string>
+  <string name="account_settings_folder_display_mode_label">Mappen om te toanen</string>
+  <string name="account_settings_folder_display_mode_all">Alles</string>
+  <string name="account_settings_folder_display_mode_first_class">Allinnich 1e-klassemappen</string>
+  <string name="account_settings_folder_display_mode_first_and_second_class">1e- en 2e-klassemappen</string>
+  <string name="account_settings_folder_display_mode_not_second_class">Alle útsein 2e-klassemappen</string>
+  <string name="account_settings_folder_sync_mode_label">Peiling mappen</string>
+  <string name="account_settings_folder_sync_mode_all">Alles</string>
+  <string name="account_settings_folder_sync_mode_first_class">Allinnich 1e-klassemappen</string>
+  <string name="account_settings_folder_sync_mode_first_and_second_class">1e- en 2e-klassemappen</string>
+  <string name="account_settings_folder_sync_mode_not_second_class">Alle útsein 2e-klassemappen</string>
+  <string name="account_settings_folder_sync_mode_none">Gjin</string>
+  <string name="account_settings_folder_push_mode_label">Push-mappen</string>
+  <string name="account_settings_folder_push_mode_all">Alles</string>
+  <string name="account_settings_folder_push_mode_first_class">Allinnich 1e-klassemappen</string>
+  <string name="account_settings_folder_push_mode_first_and_second_class">1e- en 2e-klassemappen</string>
+  <string name="account_settings_folder_push_mode_not_second_class">Alle útsein 2e-klassemappen</string>
+  <string name="account_settings_folder_push_mode_none">Gjin</string>
+  <string name="account_settings_folder_target_mode_label">Ferpleats/kopiearje doelmappen</string>
+  <string name="account_settings_folder_target_mode_all">Alles</string>
+  <string name="account_settings_folder_target_mode_first_class">Allinnich 1e-klassemappen</string>
+  <string name="account_settings_folder_target_mode_first_and_second_class">1e- en 2e-klassemappen</string>
+  <string name="account_settings_folder_target_mode_not_second_class">Alle útsein 2e-klassemappen</string>
+  <string name="account_settings_sync_remote_deletetions_label">Ferwideringen op server syngronisearje</string>
+  <string name="account_settings_sync_remote_deletetions_summary">Berjochten fuortsmite as fuortsmiten fan server</string>
+  <string name="account_settings_openpgp_missing">OpenPGP-app net oanwêzich – is de app fuortsmiten?</string>
+  <string name="folder_settings_title">Mapynstellingen</string>
+  <string name="folder_settings_in_top_group_label">Yn topgroep toane</string>
+  <string name="folder_settings_in_top_group_summary">By top fan de maplist toane</string>
+  <string name="folder_settings_folder_display_mode_label">Mapwerjefteklasse</string>
+  <string name="folder_settings_folder_display_mode_normal">Gjin klasse</string>
+  <string name="folder_settings_folder_display_mode_first_class">1e klasse</string>
+  <string name="folder_settings_folder_display_mode_second_class">2e klasse</string>
+  <string name="folder_settings_folder_sync_mode_label">Mappeilingklasse</string>
+  <string name="folder_settings_folder_sync_mode_normal">Gjin</string>
+  <string name="folder_settings_folder_sync_mode_first_class">1e klasse</string>
+  <string name="folder_settings_folder_sync_mode_second_class">2e klasse</string>
+  <string name="folder_settings_folder_sync_mode_inherited">Selde as werjefteklasse</string>
+  <string name="folder_settings_folder_push_mode_label">Pushklassemap</string>
+  <string name="folder_settings_folder_push_mode_normal">Gjin klasse</string>
+  <string name="folder_settings_folder_push_mode_first_class">1e klasse</string>
+  <string name="folder_settings_folder_push_mode_second_class">2e klasse</string>
+  <string name="folder_settings_folder_push_mode_inherited">Selde as peilingklasse</string>
+  <string name="folder_settings_folder_notify_mode_label">Mapmeldingsklasse</string>
+  <string name="folder_settings_folder_notify_mode_normal">Gjin klasse</string>
+  <string name="folder_settings_folder_notify_mode_first_class">1e klasse</string>
+  <string name="folder_settings_folder_notify_mode_second_class">2e klasse</string>
+  <string name="folder_settings_folder_notify_mode_inherited">Selde as pushklasse</string>
+  <string name="folder_settings_clear_local_folder_action">Lokale berjochten wiskje</string>
+  <string name="account_settings_incoming_label">Ynkommende server</string>
+  <string name="account_settings_incoming_summary">Ynstellen fan de ynkommende mailserver</string>
+  <string name="account_settings_outgoing_label">Utgeande server</string>
+  <string name="account_settings_outgoing_summary">Ynstellen fan de útgeande (SMTP) server</string>
+  <string name="account_settings_description_label">Accountnamme</string>
+  <string name="account_settings_name_label">Jo namme</string>
+  <string name="notifications_title">Meldingen</string>
+  <string name="account_settings_vibration">Trille</string>
+  <string name="account_settings_vibrate_enable">Trille</string>
+  <string name="account_settings_vibrate_pattern_label">Trilpatroan</string>
+  <string name="account_settings_vibrate_pattern_default">Standert</string>
+  <string name="account_settings_vibrate_pattern_1">Patroan 1</string>
+  <string name="account_settings_vibrate_pattern_2">Patroan 2</string>
+  <string name="account_settings_vibrate_pattern_3">Patroan 3</string>
+  <string name="account_settings_vibrate_pattern_4">Patroan 4</string>
+  <string name="account_settings_vibrate_pattern_5">Patroan 5</string>
+  <string name="account_settings_vibrate_times">Oantal trillingen</string>
+  <string name="account_settings_vibrate_summary_disabled">Utskeakele</string>
+  <string name="account_settings_ringtone">Beltoan nij e-mailberjocht</string>
+  <string name="account_settings_notification_light_label">Meldingsljocht</string>
+  <string name="account_settings_notification_light_disabled">Utskeakele</string>
+  <string name="account_settings_notification_light_account_color">Accountkleur</string>
+  <string name="account_settings_notification_light_default_color">Systeemstandertkleur</string>
+  <string name="account_settings_notification_light_white">Wyt</string>
+  <string name="account_settings_notification_light_red">Read</string>
+  <string name="account_settings_notification_light_green">Grien</string>
+  <string name="account_settings_notification_light_blue">Blau</string>
+  <string name="account_settings_notification_light_yellow">Giel</string>
+  <string name="account_settings_notification_light_cyan">Syaan</string>
+  <string name="account_settings_notification_light_magenta">Maginta</string>
+  <string name="account_settings_composition_title">Opsjes berjochtgearstalling</string>
+  <string name="account_settings_composition_label">Standert gearstalling</string>
+  <string name="account_settings_composition_summary">Stel standert yn foar: Fan, Bcc en hântekening</string>
+  <string name="account_settings_identities_label">Identiteiten beheare</string>
+  <string name="account_settings_identities_summary">Ynstellen alternative ‘Fan’-adressen en hantekeningen</string>
+  <string name="manage_identities_title">Identiteiten beheare</string>
+  <string name="manage_identities_context_menu_title">Identiteit beheare</string>
+  <string name="edit_identity_title">Identiteit oanpasse</string>
+  <string name="edit_identity_save">Bewarje</string>
+  <string name="new_identity_action">Nije identiteit</string>
+  <string name="account_settings_always_bcc_label">Alle berjochten Bcc nei</string>
+  <string name="manage_identities_edit_action">Bewurkje</string>
+  <string name="manage_identities_move_up_action">Omheech ferpleatse</string>
+  <string name="manage_identities_move_down_action">Omleech ferpleatse</string>
+  <string name="manage_identities_move_top_action">Nei boppe ferpleatse / standert meitsje</string>
+  <string name="manage_identities_remove_action">Fuortsmite</string>
+  <string name="edit_identity_description_label">Identiteitsbeskriuwing</string>
+  <string name="edit_identity_description_hint">(Opsjoneel)</string>
+  <string name="edit_identity_name_label">Jo namme</string>
+  <string name="edit_identity_name_hint">(Opsjoneel)</string>
+  <string name="edit_identity_email_label">E-mailadres</string>
+  <string name="edit_identity_email_hint">(Fereaske)</string>
+  <string name="edit_identity_reply_to_label">Antwurdadres</string>
+  <string name="edit_identity_reply_to_hint">(Opsjoneel)</string>
+  <string name="edit_identity_signature_label">Hantekening</string>
+  <string name="edit_identity_signature_hint">(Opsjoneel)</string>
+  <string name="account_settings_signature_use_label">Hantekening brûke</string>
+  <string name="account_settings_signature_label">Hantekening</string>
+  <string name="default_identity_description">Inisjele identiteit</string>
+  <string name="choose_identity_title">Identiteit kieze</string>
+  <string name="send_as">Ferstjoere as</string>
+  <string name="no_removable_identity">Jo kinne jo eigen identiteit net fuosrtsmite</string>
+  <string name="identity_has_no_email">Jo kinne in identiteit net brûke sûnder e-mailadres</string>
+  <string name="sort_earliest_first">Aldste berjochten earst</string>
+  <string name="sort_latest_first">Nijste berjochten earst</string>
+  <string name="sort_subject_alpha">Underwerp alfabetysk</string>
+  <string name="sort_subject_re_alpha">Underwerp omkeard alfabetysk</string>
+  <string name="sort_sender_alpha">Ofstjoerder alfabetysk</string>
+  <string name="sort_sender_re_alpha">Ofstjoerder omkeard alfabetysk</string>
+  <string name="sort_flagged_first">Berjochten mei stjer earst</string>
+  <string name="sort_flagged_last">Berjochten sûnder stjer earst</string>
+  <string name="sort_unread_first">Net-lêzen berjochten earst</string>
+  <string name="sort_unread_last">Lêzen berjochten earst</string>
+  <string name="sort_attach_first">Berjochten mei bylagen earst</string>
+  <string name="sort_unattached_first">Berjochten sûnder bylagen earst</string>
+  <string name="sort_by">Sortearje op…</string>
+  <string name="sort_by_date">Datum</string>
+  <string name="sort_by_arrival">Oankomst</string>
+  <string name="sort_by_subject">Underwerp</string>
+  <string name="sort_by_sender">Ofstjoerder</string>
+  <string name="sort_by_flag">Stjer</string>
+  <string name="sort_by_unread">Lêzen/net-lêzen</string>
+  <string name="sort_by_attach">Bylagen</string>
+  <string name="account_delete_dlg_title">Account fuortsmite</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_title">Unbekend sertifikaat</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_accept">Kaai akseptearje</string>
+  <string name="account_setup_failed_dlg_invalid_certificate_reject">Kaai wegerje</string>
+  <string name="message_view_help_key">Del (of D) - Fuortsmite\nR - Beäntwurdzje\nA - Elkenien beäntwurdzje\nC - Opstelle\nF - Trochstjoere\nM - Ferpleatse\nV - Argivearje\nY - Kopiearje\nZ - (net)lêzen markearje\nG - Stjer\nO - Sorteartype\nI - Sortearfolchoarder\nQ - Tebek nei Mappen\nS - Selektearje/deselektearje\nJ of P - Foarich berjocht\nK of N - Folgjende berjocht</string>
+  <string name="message_list_help_key">Del (of D) - Fuortsmite\nC - Opstelle\nM - Ferpleatse\nV - Argivearje\nY - Kopiearje\nZ - (net)lêzen markearje\nG - Stjer\nO - Sorteartype\nI - Sortearfolchoarder\nQ - Tebek nei Mappen\nS - Selektearje/deselektearje</string>
+  <string name="folder_list_filter_hint">Mapnamme befettet</string>
+  <string name="folder_list_display_mode_label">Mappen</string>
+  <string name="folder_list_display_mode_all">Alle mappen</string>
+  <string name="folder_list_display_mode_first_class">1e-klassemappen</string>
+  <string name="folder_list_display_mode_first_and_second_class">1e- &amp; 2e-klassemappen</string>
+  <string name="folder_list_display_mode_not_second_class">2e-klassemappen ferstopje</string>
+  <string name="account_settings_signature__location_label">Posysje hantekening</string>
+  <string name="account_settings_signature__location_before_quoted_text">Foar sitearre berjocht</string>
+  <string name="account_settings_signature__location_after_quoted_text">Nei sitearre berjocht</string>
+  <string name="setting_theme_global">App-tema brûke</string>
+  <string name="setting_theme_dark">Donker</string>
+  <string name="setting_theme_light">Ljocht</string>
+  <string name="setting_theme_follow_system">Systeemstandert brûke</string>
+  <string name="display_preferences">Algemiene ynstellingen</string>
+  <string name="global_preferences">Algemien</string>
+  <string name="debug_preferences">Debugge</string>
+  <string name="privacy_preferences">Privacy</string>
+  <string name="network_preferences">Netwurk</string>
+  <string name="interaction_preferences">Ynteraksje</string>
+  <string name="accountlist_preferences">Accountlist</string>
+  <string name="messagelist_preferences">Berjochtlisten</string>
+  <string name="messageview_preferences">Berjochten</string>
+  <string name="settings_theme_label">Tema</string>
+  <string name="settings_message_theme_label">Tema om berjochten te sjen</string>
+  <string name="settings_compose_theme_label">Tema om berjochten te skriuwen</string>
+  <string name="settings_language_label">Taal</string>
+  <string name="preference_search_no_results">Gjin ynstellingen fûn</string>
+  <string name="settings_message_theme_selection_label">Fêst berjochtetema</string>
+  <string name="settings_message_theme_selection_summary_off">Kies it tema wylst it besjen fan it berjocht</string>
+  <string name="settings_message_theme_selection_summary_on">Fêst tema brûke om it berjocht te besjen</string>
+  <string name="setting_language_system">Systeemstandert</string>
+  <string name="background_ops_label">Eftergrûnsyngronisaasje</string>
+  <string name="background_ops_never">Nea</string>
+  <string name="background_ops_always">Altyd</string>
+  <string name="background_ops_auto_sync_only">As ‘Auto-sync’ selektearre is</string>
+  <string name="batch_select_all">Alle selektearje</string>
+  <string name="account_setup_push_limit_label">Maks. mappen om te kontrolearjen mei push</string>
+  <string name="account_setup_push_limit_5">5 mappen</string>
+  <string name="account_setup_push_limit_10">10 mappen</string>
+  <string name="account_setup_push_limit_25">25 mappen</string>
+  <string name="account_setup_push_limit_50">50 mappen</string>
+  <string name="account_setup_push_limit_100">100 mappen</string>
+  <string name="account_setup_push_limit_250">250 mappen</string>
+  <string name="account_setup_push_limit_500">500 mappen</string>
+  <string name="account_setup_push_limit_1000">1000 mappen</string>
+  <string name="animations_title">Animaasje</string>
+  <string name="animations_summary">Opsichtige fisuele effekten brûke</string>
+  <string name="volume_navigation_title">Folumetoetsnavigaasje</string>
+  <string name="volume_navigation_message">Berjochtbyld</string>
+  <string name="volume_navigation_list">Fariabele listwerjefte</string>
+  <string name="show_unified_inbox_title">Kombinearre Postfek Yn werjaan</string>
+  <string name="show_starred_count_title">It oantal berjochten mei in stjer werjaan</string>
+  <string name="integrated_inbox_title">Kombinearre Postfek Yn</string>
+  <string name="integrated_inbox_detail">Alle berjochten yn kombinearre mappen</string>
+  <string name="folder_settings_include_in_integrated_inbox_label">Kombinearje</string>
+  <string name="folder_settings_include_in_integrated_inbox_summary">Alle berjochten wurde yn it kombinearre Postfek Yn werjûn</string>
+  <string name="account_settings_searchable_label">Sykmappen</string>
+  <string name="account_settings_searchable_all">Alles</string>
+  <string name="account_settings_searchable_displayable">Sichtbere</string>
+  <string name="account_settings_searchable_none">Gjin</string>
+  <string name="account_settings_no_folder_selected">Gjin</string>
+  <string name="account_settings_automatic_special_folder">Automatysk (%s)</string>
+  <string name="font_size_settings_title">Lettergrutte</string>
+  <string name="font_size_settings_description">Lettergrutte ynstelle</string>
+  <string name="font_size_account_list">Accountlist</string>
+  <string name="font_size_account_name">Accountnamme</string>
+  <string name="font_size_account_description">Accountbeskriuwing</string>
+  <string name="font_size_folder_list">Maplisten</string>
+  <string name="font_size_folder_name">Mapnamme</string>
+  <string name="font_size_folder_status">Mapsteat</string>
+  <string name="font_size_message_list">Berjochtlisten</string>
+  <string name="font_size_message_list_subject">Underwerp</string>
+  <string name="font_size_message_list_sender">Ofstjoerder</string>
+  <string name="font_size_message_list_date">Datum</string>
+  <string name="font_size_message_list_preview">Foarbyld</string>
+  <string name="font_size_message_view">Berjochten</string>
+  <string name="font_size_message_view_sender">Ofstjoerder</string>
+  <string name="font_size_message_view_to">Oan</string>
+  <string name="font_size_message_view_cc">Cc</string>
+  <string name="font_size_message_view_bcc">Bcc</string>
+  <string name="font_size_message_view_additional_headers">Ekstra koppen</string>
+  <string name="font_size_message_view_subject">Underwerp</string>
+  <string name="font_size_message_view_date">Tiid en datum</string>
+  <string name="font_size_message_view_content">Berichtynhâld</string>
+  <string name="font_size_message_compose">Berjocht opstelle</string>
+  <string name="font_size_message_compose_input">Tekst ynfierfjilden</string>
+  <string name="font_size_default">Standert</string>
+  <string name="font_size_tiniest">Meast lytse</string>
+  <string name="font_size_tiny">Hiel lyts</string>
+  <string name="font_size_smaller">Lytser</string>
+  <string name="font_size_small">Lyts</string>
+  <string name="font_size_medium">Gemiddeld</string>
+  <string name="font_size_large">Grut</string>
+  <string name="font_size_larger">Grutter</string>
+  <string name="error_activity_not_found">Gjin geskikte applikaasje fûn foar dizze aksje.</string>
+  <string name="send_failed_reason">Ferstjoeren mislearre: %s</string>
+  <string name="save_or_discard_draft_message_dlg_title">Konsept bewarje?</string>
+  <string name="save_or_discard_draft_message_instructions_fmt">Dit berjocht bewarje of ferwerpe?</string>
+  <string name="save_or_discard_draft_message_changes">Wizigingen bewarje of ferwerpe?</string>
+  <string name="confirm_discard_draft_message_title">Berjocht ôfbrekke?</string>
+  <string name="confirm_discard_draft_message">Binne jo wis dat jo dit berjocht fuortsmite wolle</string>
+  <string name="select_text_now">Selektearje tekst om te kopiearjen.</string>
+  <string name="dialog_confirm_clear_local_folder_title">Lokale berjochten wiskje?</string>
+  <string name="dialog_confirm_clear_local_folder_message">Dit sil alle lokale berjochten út dizze map wiskje. Der wurde gjin berjochten fan de server wiske.</string>
+  <string name="dialog_confirm_clear_local_folder_action">Berjochten wiskje</string>
+  <string name="dialog_confirm_delete_title">Fuortsmiten befêstigje</string>
+  <string name="dialog_confirm_delete_message">Wolle jo dit berjocht fuortsmite?</string>
+  <plurals name="dialog_confirm_delete_messages">
+    <item quantity="one">Wolle jo dit berjocht echt fuortsmite?</item>
+    <item quantity="other">Wolle jo echt <xliff:g id="message_count">%1$d</xliff:g> berjochten fuortsmite?</item>
+  </plurals>
+  <string name="dialog_confirm_delete_confirm_button">Ja</string>
+  <string name="dialog_confirm_delete_cancel_button">Nea</string>
+  <string name="dialog_confirm_mark_all_as_read_title">Alles as lêzen markearje</string>
+  <string name="dialog_confirm_mark_all_as_read_message">Wolle jo alle berjochten as lêzen markearje?</string>
+  <string name="dialog_confirm_empty_trash_title">Jiskefet leegje befêstigje</string>
+  <string name="dialog_confirm_empty_trash_message">Wolle jo it jiskefet leech smite?</string>
+  <string name="dialog_confirm_mark_all_as_read_confirm_button">Ja</string>
+  <string name="dialog_confirm_mark_all_as_read_cancel_button">Nea</string>
+  <string name="dialog_confirm_spam_title">Ferpleatsing nei net-winskemap befêstigje</string>
+  <plurals name="dialog_confirm_spam_message">
+    <item quantity="one">Wolle jo dit berjocht echt ferpleatse nei de map Net-winske?</item>
+    <item quantity="other">Wolle jo echt <xliff:g id="message_count">%1$d</xliff:g>ferpleatse nei de map Net-winske?</item>
+  </plurals>
+  <string name="dialog_confirm_spam_confirm_button">Ja</string>
+  <string name="dialog_confirm_spam_cancel_button">Nea</string>
+  <string name="dialog_attachment_progress_title">Bylage wurdt ophelle</string>
+  <string name="messagelist_sent_to_me_sigil">»</string>
+  <string name="messagelist_sent_cc_me_sigil">›</string>
+  <string name="settings_list_backup_category">Reservekopy</string>
+  <string name="settings_list_miscellaneous_category">Diversken</string>
+  <string name="settings_export_title">Eksportynstellingen</string>
+  <string name="settings_export_button">Eksportearje</string>
+  <string name="settings_export_share_button">Diele</string>
+  <string name="settings_export_progress_text">Eksportynstellingen…</string>
+  <string name="settings_export_success_generic">Ynstellingen mei sukses eksportearre</string>
+  <string name="settings_export_failure">Ynstellingen eksportearjen mislearre</string>
+  <string name="settings_import_title">Ymportynstellingen</string>
+  <string name="settings_import_pick_document_button">Bestân selektearje</string>
+  <string name="settings_import_button">Ymportearje</string>
+  <string name="settings_import_success_generic">Ynstellingen mei sukses ymportearre</string>
+  <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
+  <string name="settings_import_password_required">Fier de wachtwurden yn</string>
+  <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_required">Oanmelde</string>
+  <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_and_password_required">Meld jo oan en fier it wachtwurd yn</string>
+  <string name="settings_import_failure">Ynstellingen ymportearjen mislearre</string>
+  <string name="settings_import_read_failure">Lêzen fan ynstellingenbestân mislearre</string>
+  <string name="settings_import_partial_failure">Ymportearjen fan guon ynstellingen mislearre</string>
+  <string name="settings_import_status_success">Mei sukses ymportearre</string>
+  <string name="settings_import_status_password_required">Wachtwurd fereaske</string>
+  <!--Content description for the icon that is displayed next to an imported account that requires sign-in-->
+  <string name="settings_import_status_log_in_required">Oanmelden fereaske</string>
+  <string name="settings_import_status_not_imported">Net ymportearre</string>
+  <string name="settings_import_status_error">Ymportearjen mislearre</string>
+  <string name="settings_import_later_button">Letter</string>
+  <string name="settings_import">Ymportynstellingen</string>
+  <string name="settings_importing">Ymportynstellingen…</string>
+  <plurals name="settings_import_password_prompt">
+    <item quantity="one">Om de account ‘<xliff:g id="account">%s</xliff:g>’ te brûken moatte jo it wachtwurd fan de server opjaan.</item>
+    <item quantity="other">Om de account ‘<xliff:g id="account">%s</xliff:g>’ te brûken moatte jo de wachtwurden fan de server opjaan.</item>
+  </plurals>
+  <string name="settings_import_incoming_server_password_hint">Wachtwurd ynkommende server</string>
+  <string name="settings_import_outgoing_server_password_hint">Wachtwurd útgeande server</string>
+  <string name="settings_import_use_same_password_for_outgoing_server">Brûk itselde wachtwurd foar de útgeande server</string>
+  <string name="server_name_format">Servernamme: <xliff:g id="hostname">%s</xliff:g></string>
+  <string name="unread_widget_select_account">Oantal net-lêzen werjaan foar…</string>
+  <string name="unread_widget_account_title">Account</string>
+  <string name="unread_widget_account_summary">De account wêrfan it oantal net-lêzen berjochten toand wurdt</string>
+  <string name="unread_widget_unified_inbox_account_summary">Kombinearre Postfek Yn</string>
+  <string name="unread_widget_folder_enabled_title">Mapoantal</string>
+  <string name="unread_widget_folder_enabled_summary">Toan it oantal net-lêzen berjochten fan in inkelde map</string>
+  <string name="unread_widget_folder_title">Map</string>
+  <string name="unread_widget_folder_summary">De map wêrby oantal net-lêzen berjochten toand wurdt</string>
+  <string name="unread_widget_action_done">Dien</string>
+  <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> - <xliff:g id="folder_name">%2$s</xliff:g></string>
+  <string name="unread_widget_account_not_selected">Gjin account keazen</string>
+  <string name="unread_widget_folder_not_selected">Gjin map keazen</string>
+  <string name="webview_empty_message">Gjin tekst</string>
+  <string name="webview_contextmenu_link_view_action">Keppeling iepenje</string>
+  <string name="webview_contextmenu_link_share_action">Keppeling diele</string>
+  <string name="webview_contextmenu_link_copy_action">Keppeling nei klamboerd kopiearje</string>
+  <string name="webview_contextmenu_link_clipboard_label">Keppeling</string>
+  <string name="webview_contextmenu_link_text_copy_action">Keppelingtekst nei klamboerd kopiearje</string>
+  <string name="webview_contextmenu_link_text_clipboard_label">Keppelingstekst</string>
+  <string name="webview_contextmenu_image_title">Ofbylding</string>
+  <string name="webview_contextmenu_image_view_action">Ofbylding toane</string>
+  <string name="webview_contextmenu_image_save_action">Ofbylding bewarje</string>
+  <string name="webview_contextmenu_image_download_action">Ofbylding downloade</string>
+  <string name="webview_contextmenu_image_copy_action">Ofbylding-URL nei klamboerd kopiearje</string>
+  <string name="webview_contextmenu_image_clipboard_label">Ofbylding-URL</string>
+  <string name="webview_contextmenu_phone_call_action">Nûmer belje</string>
+  <string name="webview_contextmenu_phone_save_action">Yn kontakten bewarje</string>
+  <string name="webview_contextmenu_phone_copy_action">Nûmer nei klamboerd kopiearje</string>
+  <string name="webview_contextmenu_phone_clipboard_label">Telefoannûmer</string>
+  <string name="webview_contextmenu_email_send_action">E-mailberjocht stjoere</string>
+  <string name="webview_contextmenu_email_save_action">Yn kontakten bewarje</string>
+  <string name="webview_contextmenu_email_copy_action">Adres nei klamboerd kopiearje</string>
+  <string name="webview_contextmenu_email_clipboard_label">E-mailadres</string>
+  <string name="account_settings_remote_search_num_results_entries_all">Alles</string>
+  <string name="account_settings_remote_search_num_results_entries_10">10</string>
+  <string name="account_settings_remote_search_num_results_entries_25">25</string>
+  <string name="account_settings_remote_search_num_results_entries_50">50</string>
+  <string name="account_settings_remote_search_num_results_entries_100">100</string>
+  <string name="account_settings_remote_search_num_results_entries_250">250</string>
+  <string name="account_settings_remote_search_num_results_entries_500">500</string>
+  <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
+  <string name="account_settings_remote_search_num_label">Server-sykklimyt</string>
+  <string name="remote_search_sending_query">Sykopdracht nei server stjoere</string>
+  <plurals name="remote_search_downloading">
+    <item quantity="one">%d resultaat ophelje</item>
+    <item quantity="other">%d resultaten ophelje</item>
+  </plurals>
+  <plurals name="remote_search_downloading_limited">
+    <item quantity="one">%1$d fan %2$d berjochten ophelje</item>
+    <item quantity="other">%1$d fan %2$d berjochten ophelje</item>
+  </plurals>
+  <string name="remote_search_error">Sykopdracht mislearre</string>
+  <string name="account_settings_search">Sykje</string>
+  <string name="action_remote_search">Berjochten op server sykje</string>
+  <string name="remote_search_unavailable_no_network">In netwurkferbining is foar sykjen op server nedich.</string>
+  <string name="global_settings_background_as_unread_indicator_label">Kleur wizigje nei lêzen</string>
+  <string name="global_settings_background_as_unread_indicator_summary">In oare eftergrûn toane neidat it e-mailberjocht lêzen is</string>
+  <string name="global_settings_threaded_view_label">Petearoersjoch</string>
+  <string name="global_settings_threaded_view_summary">Berjochten per petear groepearje</string>
+  <string name="upgrade_databases_title">Databases bywurkje</string>
+  <string name="upgrade_databases_unspecified">Databases bywurkje dwaande…</string>
+  <string name="upgrade_database_format">Databases fan account ‘<xliff:g id="account">%s</xliff:g>’ bywurkje</string>
+  <string name="global_settings_splitview_mode_label">Splitst skerm toane</string>
+  <string name="global_settings_splitview_always">Altyd</string>
+  <string name="global_settings_splitview_never">Nea</string>
+  <string name="global_settings_splitview_when_in_landscape">Yn lizzende oriïntaasje</string>
+  <string name="message_view_empty">Selektearje in berjocht oan de linker kant</string>
+  <string name="global_settings_show_contact_picture_label">Kontaktôfbyldingen toane</string>
+  <string name="global_settings_show_contact_picture_summary">Kontactôfbyldingen yn de berjochtelist toane</string>
+  <string name="mark_all_as_read">Alles as lêzen markearje</string>
+  <string name="global_settings_colorize_missing_contact_pictures_label">Kontaktôfbyldingen kleurje</string>
+  <string name="global_settings_colorize_missing_contact_pictures_summary">Ofwêzige kontaktôfbyldingen in kleur jaan</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Sichtbere berjochtaksjes</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Selektearre aksjes yn it Berjochte-menu</string>
+  <string name="loading_attachment">Bylage oan it laden…</string>
+  <string name="fetching_attachment_dialog_title_send">Berjocht wurdt ferstjoerd</string>
+  <string name="fetching_attachment_dialog_title_save">Konsept wurdt bewarre</string>
+  <string name="fetching_attachment_dialog_message">Bylage oan it opheljen…</string>
+  <string name="auth_external_error">Kin net autentisearje. De server stipet gjin SASL EXTERNAL. Dit kin komme troch in probleem mei it clientsertifikaat (ferrûn of ûnbekende CA) of in oar konfiguraasjeprobleem.</string>
+  <!--=== Client certificates specific ==================================================================-->
+  <string name="account_setup_basics_client_certificate">Clientsertifikaat brûke</string>
+  <string name="client_certificate_spinner_empty">Gjin clientsertifikaat</string>
+  <string name="client_certificate_spinner_delete">Clientsertifikaatseleksje fuortsmite</string>
+  <string name="client_certificate_retrieval_failure">Clientsertifikaat net ûntfongen foar alias \‘<xliff:g id="alias">%s</xliff:g>\’</string>
+  <string name="client_certificate_advanced_options">Avansearre opsjes</string>
+  <string name="client_certificate_expired">Clientsertifikaat \‘<xliff:g id="certificate_alias">%1$s</xliff:g>\’ is ferrûn of net jildich (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
+  <!--Note: This references message_view_download_remainder-->
+  <string name="preview_encrypted">*Fersifere*</string>
+  <string name="add_from_contacts">Fan kontakten út tafoegje</string>
+  <string name="recipient_cc">Bericht ontvanger (CC)</string>
+  <string name="recipient_bcc">Bericht ontvanger (BCC)</string>
+  <string name="recipient_to">Oan</string>
+  <string name="recipient_from">Fan</string>
+  <string name="reply_to_label">Antwurdzje nei</string>
+  <string name="unknown_recipient">&lt;Unbekende ûntfanger&gt;</string>
+  <string name="unknown_sender">&lt;Unbekende ôfstjoerder&gt;</string>
+  <string name="address_type_home">Privee</string>
+  <string name="address_type_work">Wurk</string>
+  <string name="address_type_other">Oars</string>
+  <string name="address_type_mobile">Mobyl</string>
+  <string name="compose_error_no_draft_folder">Gjin konseptemap ynsteld foar dit account!</string>
+  <string name="compose_error_no_key_configured">Gjin kaai ynsteld foar dit account! Kontrolearje jo ynstellingen.</string>
+  <string name="error_crypto_provider_incompatible">Cryptoprovider brûkt ynkompatibele ferzje. Kontrolearje jo ynstellingen!</string>
+  <string name="error_crypto_provider_connect">Kin gjin ferbining meitsje mei de cryptoprovider. Kontrolearje de ynstellingen of klik op it cryptopiktogram om nochris te probearjen.</string>
+  <string name="error_crypto_provider_ui_required">Inisjalisaasje fan ein-ta-einfersifering is mislearre, kontrolearje de ynstellingen</string>
+  <string name="error_crypto_inline_attach">PGP/MIME-ynstelling stipet gjin bylagen!</string>
+  <string name="enable_inline_pgp">PGP/INLINE tastean</string>
+  <string name="disable_inline_pgp">PGP/INLINE útskeakelje</string>
+  <string name="enable_sign_only">PGP-hantekening tastean</string>
+  <string name="disable_sign_only">PGP-hantekening útskeakelje</string>
+  <string name="openpgp_inline_title">PGP/INLINE-ynstellingen</string>
+  <string name="openpgp_inline_text">It e-mailberjocht is ferstjoerd yn PGP/INLINE-formaat.\nDit wurdt allinnich brûkt foar kompatibiliteit:</string>
+  <string name="openpgp_inline_plus_compat">Guon clients stypje allinnich dit formaat</string>
+  <string name="openpgp_inline_minus_transit">Hantekeningen kinne ûnderweis brekke</string>
+  <string name="openpgp_inline_minus_attach">Bylagen wurde net stipe</string>
+  <string name="openpgp_inline_ok">Begrepen!</string>
+  <string name="openpgp_inline_disable">Utskeakelje</string>
+  <string name="openpgp_inline_keep_enabled">Ynskeakele hâlde</string>
+  <string name="openpgp_sign_only_ok">Begrepen!</string>
+  <string name="openpgp_sign_only_disable">Utskeakelje</string>
+  <string name="openpgp_sign_only_keep_enabled">Ynskeakele hâlde</string>
+  <string name="openpgp_dialog_sign_only_title">allinnich PGP-hantekeningmodus</string>
+  <string name="openpgp_dialog_sign_only_text">Yn dizze modus wurdt dyn PGP-kaai brûkt foar in kryptografyske hantekening of in net-kodearre e-mailberjocht.</string>
+  <string name="openpgp_dialog_sign_only_plus_verified">Dit fersiferet net it e-mailberjocht, mar kontrolearret dat jo eigen kaai brûkt is.</string>
+  <string name="openpgp_dialog_sign_only_minus_break">Hantekeningen kinne by ferstjoeren nei mailinglist brekke</string>
+  <string name="openpgp_dialog_sign_only_minus_attach">Hantekeningen kinne by guon programma\'s as ‘signature.asc’-bylage werjûn wurde</string>
+  <string name="openpgp_dialog_sign_only_neutral_encsigned">Fersifere berjochten befetsje altyd in hantekening.</string>
+  <string name="crypto_msg_title_plaintext">Platte tekst</string>
+  <string name="crypto_msg_unencrypted_sign_error">ein-ta-ein-hantekening befettet in flater</string>
+  <string name="crypto_msg_incomplete_signed">moat berjocht folslein downloade om hantekening te ferwurkjen</string>
+  <string name="crypto_msg_unsupported_signed">befettet net-stipe ein-ta-ein-hantekening</string>
+  <string name="crypto_msg_unsupported_encrypted">Berjocht is fersifere, mar yn in net-stipe formaat.</string>
+  <string name="crypto_msg_cancelled">Berjocht is fersifere, mar ûntsiferjen is annulearre.</string>
+  <string name="crypto_msg_title_unencrypted_signed_e2e">Ein-ta-ein tekene platte tekst</string>
+  <string name="crypto_msg_unencrypted_sign_verified">fan ferifiearre ûndertekener</string>
+  <string name="crypto_msg_title_unencrypted_signed">Platte tekst tekene</string>
+  <string name="crypto_msg_unencrypted_sign_mismatch">mar ein-ta-ein-kaai komt net oerien mei ôfstjoerder</string>
+  <string name="crypto_msg_unencrypted_sign_expired">mar ein-ta-ein-kaai is ferrûn</string>
+  <string name="crypto_msg_unencrypted_sign_revoked">mar ein-ta-ein-kaai is ynlutsen</string>
+  <string name="crypto_msg_unencrypted_sign_insecure">mar ein-ta-ein-kaai is net feilich</string>
+  <string name="crypto_msg_unencrypted_sign_unknown">fan in ûnbekende ein-ta-ein-kaai</string>
+  <string name="crypto_msg_title_encrypted_unknown">Fersifere</string>
+  <string name="crypto_msg_encrypted_error">mar der is in ûntsiferflater bard</string>
+  <string name="crypto_msg_encrypted_incomplete">moat berjocht folslein downloade foar ûntsifering</string>
+  <string name="crypto_msg_encrypted_no_provider">mar der is gjin crypto-app konfigurearre</string>
+  <string name="crypto_msg_title_encrypted_unsigned">Fersifere</string>
+  <string name="crypto_msg_encrypted_unsigned">mar net ein-ta-ein</string>
+  <string name="crypto_msg_title_encrypted_signed_e2e">Ein-ta-ein fersifere</string>
+  <string name="crypto_msg_encrypted_sign_verified">fan ferifiearre ôfstjoerder</string>
+  <string name="crypto_msg_title_encrypted_signed">Fersifere</string>
+  <string name="crypto_msg_encrypted_sign_unknown">fan in ûnbekende ein-ta-ein-kaai</string>
+  <string name="crypto_msg_encrypted_sign_mismatch">mar ein-ta-ein-kaai komt net oerien mei ôfstjoerder</string>
+  <string name="crypto_msg_encrypted_sign_expired">mar ein-ta-ein-kaai is ferrûn</string>
+  <string name="crypto_msg_encrypted_sign_revoked">mar ein-ta-ein-kaai is ynlutsen</string>
+  <string name="crypto_msg_encrypted_sign_insecure">mar ein-ta-ein-kaai is net feilich</string>
+  <string name="crypto_msg_encrypted_sign_error">mar ein-ta-ein-gegevens befetsje flaters</string>
+  <string name="crypto_msg_encrypted_insecure">mar fersifering is net feilich</string>
+  <string name="crypto_info_ok">OK</string>
+  <string name="crypto_info_search_key">Kaai sykje</string>
+  <string name="crypto_info_view_signer">Undertekener besjen</string>
+  <string name="crypto_info_view_sender">Ofstjoerder besjen</string>
+  <string name="crypto_info_view_security_warning">Details</string>
+  <string name="locked_attach_unlock">Deblokkearje</string>
+  <string name="locked_attach_unencrypted">Dit ûnderdiel is net fersifere en is miskien net feilich.</string>
+  <string name="locked_attach_title">Unbefeilige bylage</string>
+  <string name="message_progress_text">Lade…</string>
+  <string name="messageview_decrypt_cancelled">Untsifering is stoppe</string>
+  <string name="messageview_decrypt_retry">Opnij</string>
+  <string name="messageview_decrypt_incomplete">Fersifere berjocht moat download wêze foar ûntsifering.</string>
+  <string name="messageview_crypto_error_title">Flater wylst ûntsiferjen e-mailberjocht</string>
+  <string name="recipient_error_non_ascii">Spesjale lêstekens wurde noch net stipe!</string>
+  <string name="recipient_error_parse_failed">Flater by ferwurkjen fan adres!</string>
+  <string name="account_settings_crypto_hide_sign_only">Net-fersifere hantekeningen ferstopje </string>
+  <string name="account_settings_crypto_hide_sign_only_on">Allinnich fersifere hantekeningen wurde werjûn</string>
+  <string name="account_settings_crypto_hide_sign_only_off">Alle hantekeningen wurde werjûn</string>
+  <string name="error_sign_only_no_encryption">Fersifering net mooglik yn sign-only-modus!</string>
+  <string name="unsigned_text_divider_label">net ûndertekene tekst</string>
+  <string name="crypto_no_provider_title">Dit e-mailberjocht is fersifere</string>
+  <string name="crypto_no_provider_message">Dit e-mailberjocht is OpenPGP-fersifere.\nYnstallearje en stel in OpenPGP-app yn om it e-mailberjocht te lêzen.</string>
+  <string name="crypto_no_provider_button">Gean nei Ynstellingen</string>
+  <string name="mail_list_widget_text">K-9-berjochtelist</string>
+  <string name="mail_list_widget_loading">Berjochten oan it laden…</string>
+  <string name="openpgp_enabled_error_title">Fersifering net mooglik</string>
+  <string name="openpgp_enabled_error_msg">Guon fan de ûntfangers stypje dizze funksje net!</string>
+  <string name="enable_encryption">Fersifering ynskeakelje</string>
+  <string name="disable_encryption">Fersifering útskeakelje</string>
+  <string name="openpgp_description_text1">Fersifering makket dat berjochten allinnich troch de ûntfanger lêzen wurde kin en nearne oars.</string>
+  <string name="openpgp_description_text3">Fersifering is allinnich beskikber as alle ûntfangers dit stypje en dyjinge moatte jo al earder in e-mailberjocht stjoerd hawwe.</string>
+  <string name="openpgp_description_text2">Skeakelje fersifering yn of út mei dit piktogram.</string>
+  <string name="openpgp_enabled_error_gotit">Ik begryp it</string>
+  <string name="openpgp_enabled_error_back">Tebek</string>
+  <string name="openpgp_enabled_error_disable">Fersifering útskeakelje</string>
+  <string name="openpgp_encryption">OpenPGP-fersifering</string>
+  <string name="account_settings_crypto_prefer_encrypt">Autocrypt fan wjerskantenmodus</string>
+  <string name="dialog_autocrypt_mutual_title">Autocrypt fan wjerskantenmodus</string>
+  <string name="dialog_autocrypt_mutual_description_1">Berjochten wurde op fersyk fersifere, of by beäntwurdzjen fan in fersifere berjocht.</string>
+  <string name="dialog_autocrypt_mutual_description_2">As ôfstjoerder en ûntfanger de fan-wjerskantenmodus ynskeakelje, dan wurdt standert fersifering ynsteld.</string>
+  <string name="dialog_autocrypt_mutual_learn_more"><a href="https://k9mail.app/2018/02/26/OpenPGP-Considerations-Part-III-Autocrypt.html">Klik hjir</a> foar mear ynformaasje.</string>
+  <string name="general_settings_title">Algemiene ynstellingen</string>
+  <string name="dialog_openkeychain_info_title">Gjin OpenPGP-app ynstallearre</string>
+  <string name="dialog_openkeychain_info_install">Ynstallearje</string>
+  <string name="dialog_openkeychain_info_text">K-9 Mail fereasket OpenKeychain foar ein-ta-ein-fersifering.</string>
+  <string name="encrypted_subject">Fersifere berjocht</string>
+  <string name="account_settings_crypto_encrypt_subject">Underwerp fan berjocht fersiferje</string>
+  <string name="account_settings_crypto_encrypt_subject_subtitle">Mooglik net stipe troch alle ûntfangers</string>
+  <string name="toast_account_not_found">Ynterne flater: Unjildich account!</string>
+  <string name="toast_openpgp_provider_error">Flater by it ferbinen mei %s!</string>
+  <string name="ac_transfer_setting_title">Autocrypt ynstelberjocht ferstjoere</string>
+  <string name="ac_transfer_setting_summary">Feilich dielen fan ein-ta-ein-ynstellingen mei oare apparaten</string>
+  <string name="ac_transfer_title">Autocrypt ynstelberjocht</string>
+  <string name="ac_transfer_intro">In Autocrypt ynstelberjocht dielt jo ein-ta-ein-ynstellingen op in befeilige manier mei oare apparaten.</string>
+  <string name="ac_transfer_button_send">Ynstelberjocht ferstjoere</string>
+  <string name="ac_transfer_will_be_sent">It berjocht wurdt ferstjoerd nei jo adres:</string>
+  <string name="ac_transfer_generating">Ynstelberjocht oan it generearjen…</string>
+  <string name="ac_transfer_sending_to">Berjocht stjoere nei:</string>
+  <string name="ac_transfer_finish">Om te foltôgjen, iepenje it berjocht op jo oare apparaat en fier de ynstelkoade yn.</string>
+  <string name="ac_transfer_show_code">Ynstelkoade werjaan</string>
+  <string name="ac_transfer_msg_subject">Autocrypt ynstelberjocht</string>
+  <string name="ac_transfer_msg_body">Dit berjocht befettet alle ynformaasje om jo Autocrypt-ynstellingen mei geheime kaai befeilige oer te bringen fan jo oarspronklike apparaat ôf.
+
+Folgje de ynstruksjes op jo nije apparaat om dêrop Autocrypt yn te stellen.
+
+Jo kinne dit berjocht bewarje as reservekopy foar jo geheime kaai. As jo dit dwaan wolle, skriuw dan it wachtwurd op en bewarje it op in feilich plak.
+</string>
+  <string name="ac_transfer_error_send">Der is in flater bard wylst it ferstjoeren fan it berjocht. Kontrolearje de netwurkferbining en útgeande serverkonfiguraasje.</string>
+  <string name="switch_on">Oan</string>
+  <string name="switch_off">Ut</string>
+  <!--permissions-->
+  <string name="permission_contacts_rationale_title">Tagong ta kontakten tastean</string>
+  <string name="permission_contacts_rationale_message">Om kontaktsuggestjes biede te kinnen en om nammen en/of foto\'s fan kontakten wer te jaan, hat de app tagong nedich ta jo kontaktelist.</string>
+  <string name="generic_loading_error">Der is in flater bard by it laden fan de gegevens</string>
+  <string name="push_notification_state_initializing">Oan it inisjalisearjen…</string>
+  <string name="push_notification_state_listening">Yn ôfwachting fan nije e-mailberjochten</string>
+  <string name="push_notification_state_wait_background_sync">Docht neat oant eftergrûnsyngronisaasje tastien wurdt</string>
+  <string name="push_notification_state_wait_network">Docht neat oant der in netwurk beskikber is</string>
+  <string name="push_notification_info">Tik hjir om der mear oer te lêzen.</string>
+  <string name="push_info_title">Push-ynformaasje</string>
+  <string name="push_info_notification_explanation_text">As jo push brûke, dan hâld K-9 Mail in ferbining iepen mei de e-mailserver. Android fereasket dat in app dy op de eftergrûn aktyf bliuwt in melding pleatst. %s</string>
+  <string name="push_info_configure_notification_text">Android makket it echter ek mooglik om meldingen te ferstopjen.</string>
+  <string name="push_info_learn_more_text">Mear ynfo</string>
+  <string name="push_info_configure_notification_action">Melding ynstelle</string>
+  <string name="push_info_disable_push_text">As jo it net nedich fine om daliks meldingen te ûntfangen fan nije berjochten, dan kinne jo better push útskeakelje en yn stee dêrfan kieze foar peilen. Mei peilen wurdt der om de sa folle tiid kontrolearre oft der nije e-mailberjochten ynkommen binne. Dêrfoar is it werjaan fan in melding net kontinu nedich.</string>
+  <string name="push_info_disable_push_action">Push útskeakelje</string>
+</resources>
diff --git a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
index d2e38b39c2e1c833af8c6010180cbbf39753efde..328f4cce3bd66d86abcd97ddaebc20ee615bfe63 100644
--- a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
+++ b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
@@ -23,6 +23,7 @@
         <item>Ɛʋɛ</item>
         <item>Français</item>
         <item>Français (Canada)</item>
+        <item>Frysk</item>
         <item>Fulfulde, Pulaar, Pular</item>
         <item>Gaeilge</item>
         <item>Gàidhlig</item>
@@ -47,7 +48,6 @@
         <item>Polski</item>
         <item>Português</item>
         <item>Português (Brasil)</item>
-        <item>Pyccĸий</item>
         <item>Română</item>
         <item>Shqip</item>
         <item>Slovenčina</item>
@@ -66,6 +66,7 @@
         <item>Кыргыз</item>
         <item>Қазақ</item>
         <item>Македонски</item>
+        <item>Русский</item>
         <item>Српски</item>
         <item>Українська</item>
         <item>Հայերեն</item>
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index 0e2a9d7c286a3e6cd1ba1af7ff032f3f9be76f36..9c695e98122e35d8d059777ae94ba996b6982a71 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -20,8 +20,6 @@
         <attr name="iconActionMove" format="reference" />
         <attr name="iconActionCopy" format="reference" />
         <attr name="iconActionNextStatus" format="reference" />
-        <attr name="iconActionNextMessage" format="reference" />
-        <attr name="iconActionPreviousMessage" format="reference" />
         <attr name="iconActionRefresh" format="reference" />
         <attr name="iconActionSearch" format="reference" />
         <attr name="iconActionSearchFolder" format="reference" />
diff --git a/app/ui/legacy/src/main/res/values/constants.xml b/app/ui/legacy/src/main/res/values/constants.xml
index c38ff525a075d5e6120d89066f3e0a3fef65b7ad..ce4bd8ea4fc14a29ae3d6269c2c41e745eb657d7 100644
--- a/app/ui/legacy/src/main/res/values/constants.xml
+++ b/app/ui/legacy/src/main/res/values/constants.xml
@@ -4,8 +4,8 @@
     <string name="user_manual_url" translatable="false">https://docs.k9mail.app/</string>
     <string name="user_forum_url" translatable="false">https://forum.k9mail.app/</string>
     <string name="message_header_mua" translatable="false">Mail for Android</string>
-    <string name="app_authors_url" translatable="false">https://github.com/k9mail/k-9/graphs/contributors</string>
-    <string name="app_source_url" translatable="false">https://github.com/k9mail/k-9</string>
+    <string name="app_authors_url" translatable="false">https://github.com/thundernest/k-9/graphs/contributorshttps://github.com/thundernest/k-9/graphs/contributors</string>
+    <string name="app_source_url" translatable="false">https://gitlab.e.foundation/e/os/mail</string>
     <string name="app_license_url" translatable="false">https://www.apache.org/licenses/LICENSE-2.0</string>
     <string name="fediverse_handle" translatable="false">\@k9mail@fosstodon.org</string>
     <string name="fediverse_url" translatable="false">https://fosstodon.org/@k9mail</string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 0b93288661f907f006583b0ebbacf7722fb8631c..6f5075db60958ef7153ae34087ea8011b49897f0 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -867,8 +867,6 @@
     <string name="confirm_discard_draft_message_title">Confirm deletion</string>
     <string name="confirm_discard_draft_message">Do you want to delete this message?</string>
 
-    <string name="select_text_now">Select text to copy.</string>
-
     <string name="dialog_confirm_clear_local_folder_title">Clear local messages?</string>
     <string name="dialog_confirm_clear_local_folder_message">This will remove all local messages from the folder. No messages will be deleted from the server.</string>
     <string name="dialog_confirm_clear_local_folder_action">Clear messages</string>
diff --git a/docs/google-play/full_description.txt b/docs/google-play/full_description.txt
index 9571ebdd9db60b52726c53ddd49b14d65275d64b..c51bb041981b74c922ed1988946bd3f2933ad4de 100644
--- a/docs/google-play/full_description.txt
+++ b/docs/google-play/full_description.txt
@@ -4,10 +4,10 @@ K-9 supports IMAP, POP3 and Exchange 2003/2007 (with WebDAV).
 
 Install the app "OpenKeychain: Easy PGP" to encrypt/decrypt your emails using OpenPGP.
 
-K-9 is a community developed project.  If you're interested in helping to make the most popular open source email client on Android even better, please join us!  You can find our bug tracker, source code, mailing list and wiki at https://github.com/k9mail/k-9
+K-9 is a community developed project.  If you're interested in helping to make the most popular open source email client on Android even better, please join us!  You can find our bug tracker, source code, mailing list and wiki at https://github.com/thundernest/k-9
 We're always happy to welcome new developers, designers, documenters, bug triagers and friends. 
 
-If you're having trouble with K-9, please report a bug at https://github.com/k9mail/k-9 rather than just leaving a one-star review. We don't mind you telling the world that you're frustrated, but if you use our bug tracker, we have a better chance of fixing whatever's giving you a hard time.
+If you're having trouble with K-9, please report a bug at https://github.com/thundernest/k-9 rather than just leaving a one-star review. We don't mind you telling the world that you're frustrated, but if you use our bug tracker, we have a better chance of fixing whatever's giving you a hard time.
 
 You can find K-9's release notes at: https://bit.ly/new-k9
 
diff --git a/fastlane/metadata/android/en-US/changelogs/33000.txt b/fastlane/metadata/android/en-US/changelogs/33000.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8b5c3a67c0ee3a4accbaf35486b51c6f1dd5d3f2
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33000.txt
@@ -0,0 +1,4 @@
+- Added support for swiping between messages
+- Fixed multiple bugs when there are notifications for more than 8 messages
+- Fixed bug that could lead to broken attachment names when large messages were only partially downloaded (IMAP)
+- Added Western Frisian translation
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index 732e4f72723d080f64ed725d4848a7107a71cfd2..06bc26e2a8c6b1ad7e74efe8b554a537d52b803c 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -20,5 +20,5 @@ If you're having trouble with K-9 Mail, ask for help in our <a href="https://for
 <b>Want to help?</b>
 
 K-9 Mail is a community developed project. If you're interested in helping to improve the app, please join us!
-You can find our bug tracker, source code, and wiki at <a href="https://github.com/k9mail/k-9">https://github.com/k9mail/k-9</a>.
+You can find our bug tracker, source code, and wiki at <a href="https://github.com/thundernest/k-9">https://github.com/thundernest/k-9</a>.
 We're always happy to welcome new developers, designers, documenters, translators, bug triagers and friends.
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterEncoder.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterEncoder.kt
index b4023de0f4167f8ef70fff7c4e76e55dde3fad4e..51e0505ac7fea2d0a9e71b8fb093ee7777372543 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterEncoder.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterEncoder.kt
@@ -138,14 +138,14 @@ object MimeParameterEncoder {
         return length
     }
 
-    private fun String.isToken() = when {
+    fun String.isToken() = when {
         isEmpty() -> false
         else -> all { it.isTokenChar() }
     }
 
     private fun String.isQuotable() = all { it.isQuotable() }
 
-    private fun String.quoted(): String {
+    fun String.quoted(): String {
         // quoted-string = [CFWS] DQUOTE *([FWS] qcontent) [FWS] DQUOTE [CFWS]
         // qcontent      = qtext / quoted-pair
         // quoted-pair   = ("\" (VCHAR / WSP))
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
index 9508716b77de824036be59a6ee0f8838701c3304..c67605f645d7f8e0a958517e89cc8f3e88e85508 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
@@ -15,6 +15,8 @@ import com.fsck.k9.mail.internet.MimeBodyPart
 import com.fsck.k9.mail.internet.MimeHeader
 import com.fsck.k9.mail.internet.MimeMessageHelper
 import com.fsck.k9.mail.internet.MimeMultipart
+import com.fsck.k9.mail.internet.MimeParameterEncoder.isToken
+import com.fsck.k9.mail.internet.MimeParameterEncoder.quoted
 import com.fsck.k9.mail.internet.MimeUtility
 import java.io.IOException
 import java.io.InputStream
@@ -889,7 +891,8 @@ internal class RealImapFolder(
                 for (i in bodyParams.indices step 2) {
                     val paramName = bodyParams.getString(i)
                     val paramValue = bodyParams.getString(i + 1)
-                    contentType.append(String.format(";\r\n %s=\"%s\"", paramName, paramValue))
+                    val encodedValue = if (paramValue.isToken()) paramValue else paramValue.quoted()
+                    contentType.append(String.format(";\r\n %s=%s", paramName, encodedValue))
                 }
             }
 
@@ -915,7 +918,8 @@ internal class RealImapFolder(
                     for (i in bodyDispositionParams.indices step 2) {
                         val paramName = bodyDispositionParams.getString(i).lowercase()
                         val paramValue = bodyDispositionParams.getString(i + 1)
-                        contentDisposition.append(String.format(";\r\n %s=\"%s\"", paramName, paramValue))
+                        val encodedValue = if (paramValue.isToken()) paramValue else paramValue.quoted()
+                        contentDisposition.append(String.format(";\r\n %s=%s", paramName, encodedValue))
                     }
                 }
             }
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
index 1fea9ae2ca0725c7ecf0a4c97c88b5daf62d548b..5b2251fc57fa44c070c69945673f8a694f22c962 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
@@ -731,7 +731,83 @@ class RealImapFolderTest {
 
         folder.fetch(messages, fetchProfile, null, MAX_DOWNLOAD_SIZE)
 
-        verify(messages[0]).setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/plain;\r\n CHARSET=\"US-ASCII\"")
+        verify(messages[0]).setHeader(MimeHeader.HEADER_CONTENT_TYPE, "text/plain;\r\n CHARSET=US-ASCII")
+    }
+
+    @Test
+    fun `fetch() with simple content type parameter`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("text" "plain" ("name" "token") NIL NIL "7bit" 42 23)""",
+            headerName = MimeHeader.HEADER_CONTENT_TYPE,
+            expectedHeaderValue = "text/plain;\r\n name=token"
+        )
+    }
+
+    @Test
+    fun `fetch() with content type parameter that needs to be a quoted string`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("text" "plain" ("name" "one two three") NIL NIL "7bit" 42 23)""",
+            headerName = MimeHeader.HEADER_CONTENT_TYPE,
+            expectedHeaderValue = "text/plain;\r\n name=\"one two three\""
+        )
+    }
+
+    @Test
+    fun `fetch() with content type parameter that needs to be a quoted string with escaped characters`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("text" "plain" ("name" "one \"two\" three") NIL NIL "7bit" 42 23)""",
+            headerName = MimeHeader.HEADER_CONTENT_TYPE,
+            expectedHeaderValue = "text/plain;\r\n name=\"one \\\"two\\\" three\""
+        )
+    }
+
+    @Test
+    fun `fetch() with RFC 2231 encoded content type parameter`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("text" "plain" ("name*" "utf-8''filen%C3%A4me.ext") NIL NIL "7bit" 42 23)""",
+            headerName = MimeHeader.HEADER_CONTENT_TYPE,
+            expectedHeaderValue = "text/plain;\r\n name*=utf-8''filen%C3%A4me.ext"
+        )
+    }
+
+    @Test
+    fun `fetch() with simple content disposition parameter`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
+                """("attachment" ("filename" "token")) NIL NIL)""",
+            headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
+            expectedHeaderValue = "attachment;\r\n filename=token;\r\n size=23"
+        )
+    }
+
+    @Test
+    fun `fetch() with content disposition parameter that needs to be a quoted string`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
+                """("attachment" ("filename" "one two three")) NIL NIL)""",
+            headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
+            expectedHeaderValue = "attachment;\r\n filename=\"one two three\";\r\n size=23"
+        )
+    }
+
+    @Test
+    fun `fetch() with content disposition parameter that needs to be a quoted string with escaped characters`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
+                """("attachment" ("filename" "one \"two\" three")) NIL NIL)""",
+            headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
+            expectedHeaderValue = "attachment;\r\n filename=\"one \\\"two\\\" three\";\r\n size=23"
+        )
+    }
+
+    @Test
+    fun `fetch() with RFC 2231 encoded content disposition parameter`() {
+        testHeaderFromBodyStructure(
+            bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
+                """("attachment" ("filename*" "utf-8''filen%C3%A4me.ext")) NIL NIL)""",
+            headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
+            expectedHeaderValue = "attachment;\r\n filename*=utf-8''filen%C3%A4me.ext;\r\n size=23"
+        )
     }
 
     @Test
@@ -1118,6 +1194,22 @@ class RealImapFolderTest {
             .thenReturn(imapResponses)
     }
 
+    private fun testHeaderFromBodyStructure(bodyStructure: String, headerName: String, expectedHeaderValue: String) {
+        val folder = createFolder("Folder")
+        prepareImapFolderForOpen(OpenMode.READ_ONLY)
+        folder.open(OpenMode.READ_ONLY)
+        whenever(imapConnection.readResponse(anyOrNull()))
+            .thenReturn(createImapResponse("* 1 FETCH (BODYSTRUCTURE $bodyStructure UID 1)"))
+            .thenReturn(createImapResponse("x OK"))
+        val imapMessage = ImapMessage("1")
+        val messages = listOf(imapMessage)
+        val fetchProfile = createFetchProfile(FetchProfile.Item.STRUCTURE)
+
+        folder.fetch(messages, fetchProfile, null, MAX_DOWNLOAD_SIZE)
+
+        assertThat(imapMessage.getHeader(headerName)).asList().containsExactly(expectedHeaderValue)
+    }
+
     companion object {
         private const val MAX_DOWNLOAD_SIZE = -1
     }
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
index e5b142f9c065a95621bee8e8658ac8f8c6920fd8..b62b3a0458e2dff8a75e8b5ce76bee25723a8a8c 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
@@ -277,7 +277,7 @@ class SmtpTransport(
     private fun buildHostnameToReport(): String {
         val localAddress = socket!!.localAddress
 
-        // We use local IP statically for privacy reasons, see https://github.com/k9mail/k-9/pull/3798
+        // We use local IP statically for privacy reasons, see https://github.com/thundernest/k-9/pull/3798
         return if (localAddress is Inet6Address) {
             "[IPv6:::1]"
         } else {
diff --git a/mail/testing/src/main/java/com/fsck/k9/mail/StringHelper.kt b/mail/testing/src/main/java/com/fsck/k9/mail/StringHelper.kt
index 73766b23eeab4e3038671d895aa070c493c69df6..cada3ad040713c065535628b16d18bfa7f72c92a 100644
--- a/mail/testing/src/main/java/com/fsck/k9/mail/StringHelper.kt
+++ b/mail/testing/src/main/java/com/fsck/k9/mail/StringHelper.kt
@@ -1,3 +1,5 @@
 package com.fsck.k9.mail
 
 fun String.crlf() = replace("\n", "\r\n")
+
+fun String.removeLineBreaks() = replace(Regex("""\r|\n"""), "")