diff --git a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
index de6797b498682e2119d74ea859eac95eb604aee7..f0ac2f20ec6ad63ec33dee04d05ce7e5f988517a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
@@ -18,7 +18,9 @@ val coreNotificationModule = module {
         )
     }
     single { NotificationManagerCompat.from(get()) }
-    single { NotificationHelper(context = get(), notificationManager = get(), channelUtils = get()) }
+    single {
+        NotificationHelper(context = get(), notificationManager = get(), notificationChannelManager = get(), resourceProvider = get())
+    }
     single {
         NotificationChannelManager(
             preferences = get(),
@@ -82,8 +84,7 @@ val coreNotificationModule = module {
             notificationHelper = get(),
             actionCreator = get(),
             resourceProvider = get(),
-            lockScreenNotificationCreator = get(),
-            notificationManager = get()
+            lockScreenNotificationCreator = get()
         )
     }
     factory {
@@ -92,8 +93,7 @@ val coreNotificationModule = module {
             actionCreator = get(),
             lockScreenNotificationCreator = get(),
             singleMessageNotificationCreator = get(),
-            resourceProvider = get(),
-            notificationManager = get()
+            resourceProvider = get()
         )
     }
     factory { LockScreenNotificationCreator(notificationHelper = get(), resourceProvider = get()) }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
index c51736c6c1978f102e7f52b2f935078ed10b4118..eef470e8d9f58cec97b107a34296974a9dde79c9 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
@@ -1,17 +1,25 @@
 package com.fsck.k9.notification
 
+import android.app.Notification
+import android.app.PendingIntent
 import android.content.Context
+import android.content.Intent
 import android.net.Uri
 import android.os.Build
+import android.provider.Settings
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import com.fsck.k9.Account
 import com.fsck.k9.K9
+import com.fsck.k9.helper.PendingIntentCompat
+import com.fsck.k9.notification.NotificationChannelManager.ChannelType
+import timber.log.Timber
 
 class NotificationHelper(
     private val context: Context,
     private val notificationManager: NotificationManagerCompat,
-    private val channelUtils: NotificationChannelManager
+    private val notificationChannelManager: NotificationChannelManager,
+    private val resourceProvider: NotificationResourceProvider
 ) {
     fun getContext(): Context {
         return context
@@ -21,14 +29,59 @@ class NotificationHelper(
         return notificationManager
     }
 
-    fun createNotificationBuilder(
-        account: Account,
-        channelType: NotificationChannelManager.ChannelType
-    ): NotificationCompat.Builder {
-        return NotificationCompat.Builder(
-            context,
-            channelUtils.getChannelIdFor(account, channelType)
-        )
+    fun createNotificationBuilder(account: Account, channelType: ChannelType): NotificationCompat.Builder {
+        val notificationChannel = notificationChannelManager.getChannelIdFor(account, channelType)
+        return NotificationCompat.Builder(context, notificationChannel)
+    }
+
+    fun notify(account: Account, notificationId: Int, notification: Notification) {
+        try {
+            notificationManager.notify(notificationId, notification)
+        } catch (e: SecurityException) {
+            // When importing settings from another device, we could end up with a NotificationChannel that references a
+            // non-existing notification sound. In that case, we end up with a SecurityException with a message similar
+            // to this:
+            // UID 123 does not have permission to content://media/external_primary/audio/media/42?title=Coins&canonical=1 [user 0]
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O &&
+                e.message?.contains("does not have permission to") == true
+            ) {
+                Timber.e(e, "Failed to create a notification for a new message")
+                showNotifyErrorNotification(account)
+            } else {
+                throw e
+            }
+        }
+    }
+
+    private fun showNotifyErrorNotification(account: Account) {
+        val title = resourceProvider.notifyErrorTitle()
+        val text = resourceProvider.notifyErrorText()
+
+        val messagesNotificationChannelId = notificationChannelManager.getChannelIdFor(account, ChannelType.MESSAGES)
+        val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS).apply {
+            putExtra(Settings.EXTRA_CHANNEL_ID, messagesNotificationChannelId)
+            putExtra(Settings.EXTRA_APP_PACKAGE, context.packageName)
+        }
+
+        val notificationSettingsPendingIntent =
+            PendingIntent.getActivity(context, account.accountNumber, intent, PendingIntentCompat.FLAG_IMMUTABLE)
+
+        val notification = createNotificationBuilder(account, ChannelType.MISCELLANEOUS)
+            .setSmallIcon(resourceProvider.iconWarning)
+            .setColor(account.chipColor)
+            .setWhen(System.currentTimeMillis())
+            .setAutoCancel(true)
+            .setTicker(title)
+            .setContentTitle(title)
+            .setContentText(text)
+            .setContentIntent(notificationSettingsPendingIntent)
+            .setStyle(NotificationCompat.BigTextStyle().bigText(text))
+            .setCategory(NotificationCompat.CATEGORY_ERROR)
+            .setErrorAppearance()
+            .build()
+
+        val notificationId = NotificationIds.getNewMailSummaryNotificationId(account)
+        notificationManager.notify(notificationId, notification)
     }
 
     companion object {
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt
index e558cd5e74e25f26d33cf12bb235fe5daa5bb4ab..d33055a7af8e679731b882199fc8fc40c41eaa97 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationResourceProvider.kt
@@ -24,6 +24,9 @@ interface NotificationResourceProvider {
     fun authenticationErrorTitle(): String
     fun authenticationErrorBody(accountName: String): String
 
+    fun notifyErrorTitle(): String
+    fun notifyErrorText(): String
+
     fun certificateErrorTitle(): String
     fun certificateErrorTitle(accountName: String): String
     fun certificateErrorBody(): String
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 45027ec8206f8af71f42647ab547c5967faa9f34..21553997b709d73b9f68b23cc93b8859b723ab4f 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
@@ -3,7 +3,6 @@ package com.fsck.k9.notification
 import android.app.PendingIntent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.WearableExtender
-import androidx.core.app.NotificationManagerCompat
 import com.fsck.k9.notification.NotificationChannelManager.ChannelType
 import timber.log.Timber
 import androidx.core.app.NotificationCompat.Builder as NotificationBuilder
@@ -12,8 +11,7 @@ internal class SingleMessageNotificationCreator(
     private val notificationHelper: NotificationHelper,
     private val actionCreator: NotificationActionCreator,
     private val resourceProvider: NotificationResourceProvider,
-    private val lockScreenNotificationCreator: LockScreenNotificationCreator,
-    private val notificationManager: NotificationManagerCompat
+    private val lockScreenNotificationCreator: LockScreenNotificationCreator
 ) {
     fun createSingleNotification(
         baseNotificationData: BaseNotificationData,
@@ -52,7 +50,7 @@ internal class SingleMessageNotificationCreator(
                 notification
             )
         }
-        notificationManager.notify(notificationId, notification)
+        notificationHelper.notify(account, notificationId, notification)
     }
 
     private fun NotificationBuilder.setBigText(text: CharSequence) = apply {
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 bcd4f72b3f9da82e2f40f115b7538ee43a2e1948..eb55bc9eda9bcc839bbdeebe98b4cdc34160faf7 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
@@ -3,7 +3,6 @@ package com.fsck.k9.notification
 import android.app.PendingIntent
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationCompat.WearableExtender
-import androidx.core.app.NotificationManagerCompat
 import com.fsck.k9.Account
 import com.fsck.k9.notification.NotificationChannelManager.ChannelType
 import com.fsck.k9.notification.NotificationIds.getNewMailSummaryNotificationId
@@ -15,8 +14,7 @@ internal class SummaryNotificationCreator(
     private val actionCreator: NotificationActionCreator,
     private val lockScreenNotificationCreator: LockScreenNotificationCreator,
     private val singleMessageNotificationCreator: SingleMessageNotificationCreator,
-    private val resourceProvider: NotificationResourceProvider,
-    private val notificationManager: NotificationManagerCompat
+    private val resourceProvider: NotificationResourceProvider
 ) {
     fun createSummaryNotification(
         baseNotificationData: BaseNotificationData,
@@ -75,7 +73,7 @@ internal class SummaryNotificationCreator(
             .build()
 
         Timber.v("Creating inbox-style summary notification (silent=%b): %s", notificationData.isSilent, notification)
-        notificationManager.notify(notificationData.notificationId, notification)
+        notificationHelper.notify(account, notificationData.notificationId, notification)
     }
 
     private fun buildInboxSummaryText(accountName: String, notificationData: SummaryInboxNotificationData): String {
diff --git a/app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt b/app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt
index ab235bbac5e74a93ce10a8ad5045b6df57575a99..ec8e9b59d92a72ee01d273701b444a835bc2f119 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/TestNotificationResourceProvider.kt
@@ -26,6 +26,15 @@ class TestNotificationResourceProvider : NotificationResourceProvider {
     override fun authenticationErrorBody(accountName: String): String =
         "Authentication failed for $accountName. Update your server settings."
 
+    override fun notifyErrorTitle(): String = "Notification error"
+
+    override fun notifyErrorText(): String {
+        return "An error has occurred while trying to create a system notification for a new message. " +
+            "The reason is most likely a missing notification sound.\n" +
+            "\n" +
+            "Tap to open notification settings."
+    }
+
     override fun certificateErrorTitle(): String = "Certificate error"
 
     override fun certificateErrorTitle(accountName: String): String = "Certificate error for $accountName"
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index b7211c87f7e937c905d5ad5741d9ed2157c89907..0822e98820accf1db2264e15455e4384918beab5 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -48,8 +48,8 @@ android {
         applicationId "foundation.e.mail"
         testApplicationId "foundation.e.mail.tests"
 
-        versionCode 32000
-        versionName '6.200'
+        versionCode 32001
+        versionName '6.201'
 
         // 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",
@@ -80,7 +80,7 @@ android {
             buildConfigField "String", "OAUTH_GMAIL_CLIENT_ID", "\"262622259280-hhmh92rhklkg2k1tjil69epo0o9a12jm.apps.googleusercontent.com\""
             buildConfigField "String", "OAUTH_YAHOO_CLIENT_ID", "\"dj0yJmk9aHNUb3d2MW5TQnpRJmQ9WVdrOWVYbHpaRWM0YkdnbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWIz\""
             buildConfigField "String", "OAUTH_AOL_CLIENT_ID", "\"dj0yJmk9dUNqYXZhYWxOYkdRJmQ9WVdrOU1YQnZVRFZoY1ZrbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PWIw\""
-            buildConfigField "String", "OAUTH_MICROSOFT_CLIENT_ID", "\"62b5988d-b86f-48e1-aba4-5e71d36c5b6a\""
+            buildConfigField "String", "OAUTH_MICROSOFT_CLIENT_ID", "\"e647013a-ada4-4114-b419-e43d250f99c5\""
             buildConfigField "String", "OAUTH_MICROSOFT_REDIRECT_URI", "\"msauth://com.fsck.k9/Dx8yUsuhyU3dYYba1aA16Wxu5eM%3D\""
 
             manifestPlaceholders = ['appAuthRedirectScheme': 'foundation.e.mail']
@@ -95,7 +95,7 @@ android {
             buildConfigField "String", "OAUTH_GMAIL_CLIENT_ID", "\"262622259280-5qb3vtj68d5dtudmaif4g9vd3cpar8r3.apps.googleusercontent.com\""
             buildConfigField "String", "OAUTH_YAHOO_CLIENT_ID", "\"dj0yJmk9ejRCRU1ybmZjQlVBJmQ9WVdrOVVrZEViak4xYmxZbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTZj\""
             buildConfigField "String", "OAUTH_AOL_CLIENT_ID", "\"dj0yJmk9cHYydkJkTUxHcXlYJmQ9WVdrOWVHZHhVVXN4VVV3bWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTdm\""
-            buildConfigField "String", "OAUTH_MICROSOFT_CLIENT_ID", "\"62b5988d-b86f-48e1-aba4-5e71d36c5b6a\""
+            buildConfigField "String", "OAUTH_MICROSOFT_CLIENT_ID", "\"e647013a-ada4-4114-b419-e43d250f99c5\""
             buildConfigField "String", "OAUTH_MICROSOFT_REDIRECT_URI", "\"msauth://com.fsck.k9.debug/VZF2DYuLYAu4TurFd6usQB2JPts%3D\""
 
             manifestPlaceholders = ['appAuthRedirectScheme': 'foundation.e.mail.debug']
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
index ca6fd4e9a02549a2413f2707d5da06ab14270108..f57748eb3cb2003102584a044db0404e74b0f8fe 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
@@ -6,10 +6,13 @@ import com.fsck.k9.mail.AuthenticationFailedException
 import com.fsck.k9.mail.oauth.OAuth2TokenProvider
 import com.fsck.k9.preferences.AccountManager
 import com.fsck.k9.setup.EeloAccountHelper
+import java.io.IOException
 import java.util.concurrent.CountDownLatch
 import java.util.concurrent.TimeUnit
 import net.openid.appauth.AuthState
 import net.openid.appauth.AuthorizationException
+import net.openid.appauth.AuthorizationException.AuthorizationRequestErrors
+import net.openid.appauth.AuthorizationException.GeneralErrors
 import net.openid.appauth.AuthorizationService
 
 class RealOAuth2TokenProvider(
@@ -47,9 +50,21 @@ class RealOAuth2TokenProvider(
 
         latch.await(timeoutMillis, TimeUnit.MILLISECONDS)
 
-        if (exception != null) {
+        val authException = exception
+        if (authException == GeneralErrors.NETWORK_ERROR ||
+            authException == GeneralErrors.SERVER_ERROR ||
+            authException == AuthorizationRequestErrors.SERVER_ERROR ||
+            authException == AuthorizationRequestErrors.TEMPORARILY_UNAVAILABLE
+        ) {
+            throw IOException("Error while fetching an access token", authException)
+        } else if (authException != null) {
             account.oAuthState = null
             accountManager.saveAccount(account)
+            throw AuthenticationFailedException(
+                message = "Failed to fetch an access token",
+                throwable = authException,
+                messageFromServer = authException.error
+            )
         } else if (token != oldAccessToken) {
             requestFreshToken = false
             account.oAuthState = authState.jsonSerializeString()
@@ -62,14 +77,6 @@ class RealOAuth2TokenProvider(
             )
         }
 
-        exception?.let { authException ->
-            throw AuthenticationFailedException(
-                message = "Failed to fetch an access token",
-                throwable = authException,
-                messageFromServer = authException.error
-            )
-        }
-
         return token ?: throw AuthenticationFailedException("Failed to fetch an access token")
     }
 
diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
index 5304232375691c51aea6ec314d9515c96231b627..033030e8d0e06fd18f515a750622204b9dfd244b 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
@@ -36,6 +36,10 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio
     override fun authenticationErrorBody(accountName: String): String =
         context.getString(R.string.notification_authentication_error_text, accountName)
 
+    override fun notifyErrorTitle(): String = context.getString(R.string.notification_notify_error_title)
+
+    override fun notifyErrorText(): String = context.getString(R.string.notification_notify_error_text)
+
     override fun certificateErrorTitle(): String = context.getString(R.string.notification_certificate_error_public)
 
     override fun certificateErrorTitle(accountName: String): String =
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 5c99c460c12cc190970a0369710fd15040adb635..b8ca57ad9a218de858ef49905639ebb2fa2b789c 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
@@ -42,6 +42,7 @@ import androidx.drawerlayout.widget.DrawerLayout
 import androidx.drawerlayout.widget.DrawerLayout.DrawerListener
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
+import androidx.fragment.app.commit
 import androidx.lifecycle.Observer
 import androidx.lifecycle.lifecycleScope
 import com.fsck.k9.Account
@@ -128,7 +129,6 @@ open class MessageList :
     private var messageViewPlaceHolder: PlaceholderFragment? = null
     private var messageListFragment: MessageListFragment? = null
     private var messageViewFragment: MessageViewFragment? = null
-    private var firstBackStackId = -1
     private var account: Account? = null
     private var search: LocalSearch? = null
     private var singleFolderMode = false
@@ -241,10 +241,8 @@ open class MessageList :
 
         setIntent(intent)
 
-        if (firstBackStackId >= 0) {
-            supportFragmentManager.popBackStackImmediate(firstBackStackId, FragmentManager.POP_BACK_STACK_INCLUSIVE)
-            firstBackStackId = -1
-        }
+        // Start with a fresh fragment back stack
+        supportFragmentManager.popBackStackImmediate(FIRST_FRAGMENT_TRANSACTION, FragmentManager.POP_BACK_STACK_INCLUSIVE)
 
         removeMessageListFragment()
         removeMessageViewFragment()
@@ -578,7 +576,6 @@ open class MessageList :
         outState.putSerializable(STATE_DISPLAY_MODE, displayMode)
         outState.putBoolean(STATE_MESSAGE_VIEW_ONLY, messageViewOnly)
         outState.putBoolean(STATE_MESSAGE_LIST_WAS_DISPLAYED, messageListWasDisplayed)
-        outState.putInt(STATE_FIRST_BACK_STACK_ID, firstBackStackId)
     }
 
     public override fun onRestoreInstanceState(savedInstanceState: Bundle) {
@@ -586,7 +583,6 @@ open class MessageList :
 
         messageViewOnly = savedInstanceState.getBoolean(STATE_MESSAGE_VIEW_ONLY)
         messageListWasDisplayed = savedInstanceState.getBoolean(STATE_MESSAGE_LIST_WAS_DISPLAYED)
-        firstBackStackId = savedInstanceState.getInt(STATE_FIRST_BACK_STACK_ID)
     }
 
     private fun initializeActionBar() {
@@ -608,8 +604,7 @@ open class MessageList :
         return object : DrawerListener {
             override fun onDrawerClosed(drawerView: View) {
                 if (openFolderTransaction != null) {
-                    openFolderTransaction!!.commit()
-                    openFolderTransaction = null
+                    commitOpenFolderTransaction()
                 }
             }
 
@@ -632,14 +627,20 @@ open class MessageList :
         search.addAllowedFolder(folderId)
 
         performSearch(search)
-
-        onMessageListDisplayed()
     }
 
     private fun openFolderImmediately(folderId: Long) {
         openFolder(folderId)
+        commitOpenFolderTransaction()
+    }
+
+    private fun commitOpenFolderTransaction() {
         openFolderTransaction!!.commit()
         openFolderTransaction = null
+
+        messageListFragment!!.onListVisible()
+
+        onMessageListDisplayed()
     }
 
     fun openUnifiedInbox() {
@@ -1328,12 +1329,17 @@ open class MessageList :
         configureMenu(menu)
     }
 
-    private fun addMessageListFragment(fragment: MessageListFragment, addToBackStack: Boolean) {
-        val fragmentTransaction = supportFragmentManager.beginTransaction()
+    private fun addMessageListFragment(fragment: MessageListFragment) {
+        supportFragmentManager.commit {
+            replace(R.id.message_list_container, fragment)
 
-        fragmentTransaction.replace(R.id.message_list_container, fragment)
-        if (addToBackStack) {
-            fragmentTransaction.addToBackStack(null)
+            setReorderingAllowed(true)
+
+            if (supportFragmentManager.backStackEntryCount == 0) {
+                addToBackStack(FIRST_FRAGMENT_TRANSACTION)
+            } else {
+                addToBackStack(null)
+            }
         }
 
         messageListFragment = fragment
@@ -1341,11 +1347,6 @@ open class MessageList :
         if (isDrawerEnabled) {
             lockDrawer()
         }
-
-        val transactionId = fragmentTransaction.commit()
-        if (transactionId >= 0 && firstBackStackId < 0) {
-            firstBackStackId = transactionId
-        }
     }
 
     override fun startSearch(query: String, account: Account?, folderId: Long?): Boolean {
@@ -1381,7 +1382,7 @@ open class MessageList :
         initializeFromLocalSearch(tmpSearch)
 
         val fragment = MessageListFragment.newInstance(tmpSearch, true, false)
-        addMessageListFragment(fragment, true)
+        addMessageListFragment(fragment)
     }
 
     private fun showMessageViewPlaceHolder() {
@@ -1721,6 +1722,7 @@ open class MessageList :
         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_PLACEHOLDER = "MessageViewPlaceholder"
 
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 ed55e4fad82b3ca1ace66875cf002efbd64deba9..2cfc51986f5710718fe6f928845a290974f52412 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,14 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.201" versioncode="32001" date="2022-07-15">
+        <change>Added support for using OAuth 2.0 with Office365 accounts</change>
+        <change>Fixed a bug that could lead to two message lists being displayed on top of each other</change>
+        <change>Avoid a crash when trying to create new message notifications but the notification sound couldn't be accessed</change>
+        <change>Fixed a bug where multi-select mode was exited early in some cases</change>
+        <change>Don't require re-authorization when getting an OAuth token fails due to a temporary error</change>
+        <change>Updated translations</change>
+    </release>
     <release version="6.200" versioncode="32000" date="2022-07-08">
         <change>Added support for using OAuth 2.0 with Google, Yahoo, AOL, and personal Microsoft accounts (Office365 accounts are not supported yet)</change>
         <change>Added "Unsubscribe" action that is displayed in the menu when viewing a message that contains an Unsubscribe header</change>
diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index fe922be9f518fd444385563fca59a248c93879b2..16638d9b174898cdb4e479ceb56844049db9279e 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -131,6 +131,8 @@
   <string name="notification_certificate_error_text">تأكد من إعدادات الخادم</string>
   <string name="notification_authentication_error_title">فشل المصادقة</string>
   <string name="notification_authentication_error_text">فشل مصادقة <xliff:g id="account">%s</xliff:g>. يرجى تحديث إعدادات الخادم.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">تفقد البريد: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">التحقق من البريد</string>
   <string name="notification_bg_send_ticker">إرسال البريد: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index bca2e76104c3034f07209c11979c1a06fb65b789..d246f6a979e1a46f7b5b70c3a61bc49843599f30 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -40,7 +40,7 @@
   <string name="compose_title_reply">Адказаць</string>
   <string name="compose_title_reply_all">Адказаць усім</string>
   <string name="compose_title_forward">Пераслаць</string>
-  <string name="compose_title_forward_as_attachment">Пераслаць як укладзены</string>
+  <string name="compose_title_forward_as_attachment">Пераслаць як далучаны файл</string>
   <string name="choose_account_title">Абраць акаўнт</string>
   <string name="choose_folder_title">Абраць каталог</string>
   <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> абрана</string>
@@ -57,7 +57,7 @@
   <string name="archive_action">Архіў</string>
   <string name="spam_action">Спам</string>
   <string name="forward_action">Пераслаць</string>
-  <string name="forward_as_attachment_action">Пераслаць як укладзены</string>
+  <string name="forward_as_attachment_action">Пераслаць як далучаны файл</string>
   <string name="edit_as_new_message_action">Рэдагаваць як новы ліст</string>
   <string name="move_action">Перамясціць</string>
   <string name="move_to_drafts_action">Перамясціць у чарнавікі</string>
@@ -97,7 +97,7 @@
   <string name="read_receipt">Апавяшчэнне</string>
   <string name="read_receipt_enabled">Запытаць апавяшчэнне пра чытанне</string>
   <string name="read_receipt_disabled">Без апавяшчэння пра чытанне</string>
-  <string name="add_attachment_action">Укласці файлы</string>
+  <string name="add_attachment_action">Далучыць файлы</string>
   <string name="empty_trash_action">Ачысціць сметніцу</string>
   <string name="expunge_action">Выдаліць</string>
   <string name="about_action">About</string>
@@ -136,6 +136,8 @@
   <string name="notification_certificate_error_text">Праверце налады сервера</string>
   <string name="notification_authentication_error_title">Аўтэнтыфікацыя схібіла</string>
   <string name="notification_authentication_error_text">Няўдалая аўтарызацыя для <xliff:g id="account">%s</xliff:g>. Змяніце налады сервера.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Праверка пошты: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Праверка пошты</string>
   <string name="notification_bg_send_ticker">Адпраўка пошты: <xliff:g id="account">%s</xliff:g></string>
@@ -177,12 +179,12 @@
   <string name="message_compose_show_quoted_text_action">Уключыць цытаваны ліст</string>
   <string name="message_compose_description_delete_quoted_text">Выдаліць цытату</string>
   <string name="message_compose_description_edit_quoted_text">Рэдагаваць цытату</string>
-  <string name="remove_attachment_action">Выдаліць укладзеныя файлы</string>
+  <string name="remove_attachment_action">Выдаліць далучаныя файлы</string>
   <string name="message_view_from_format">Ад: <xliff:g id="name">%s</xliff:g> &lt;<xliff:g id="email">%s</xliff:g>&gt;</string>
   <string name="message_to_label">Каму:</string>
   <string name="message_view_cc_label">Копія:</string>
   <string name="message_view_bcc_label">Схаваная копія:</string>
-  <string name="message_view_status_attachment_not_saved">Немагчыма захаваць укладзеныя файлы.</string>
+  <string name="message_view_status_attachment_not_saved">Немагчыма захаваць далучаныя файлы.</string>
   <string name="message_view_show_pictures_action">Прагляд малюнкаў</string>
   <string name="message_view_no_viewer">Няма праграмы для прагляду <xliff:g id="mimetype">%s</xliff:g>.</string>
   <string name="message_view_download_remainder">Спампаваць ліст цалкам</string>
@@ -540,7 +542,7 @@
   <string name="sort_flagged_last">Спачатку не адзначаныя лісты</string>
   <string name="sort_unread_first">Спачатку непрачытаныя лісты</string>
   <string name="sort_unread_last">Спачатку прачытаныя лісты</string>
-  <string name="sort_attach_first">Спачатку лісты з укладзенымі файламі</string>
+  <string name="sort_attach_first">Спачатку лісты з далучанымі файламі</string>
   <string name="sort_unattached_first">Спачатку лісты без укладзеных файлаў</string>
   <string name="sort_by">Сартаваць па…</string>
   <string name="sort_by_date">Дата</string>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index e65cbdd330a678add5406f67228d8142c883a03b..95407ea386cc7485fec979f0739a141712b858b0 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -139,6 +139,8 @@
   <string name="notification_certificate_error_text">Проверете настройките на сървара</string>
   <string name="notification_authentication_error_title">Неуспешна идентификация</string>
   <string name="notification_authentication_error_text">Идентификацията за <xliff:g id="account">%s</xliff:g> е неуспешна. Обновете сървърните настройки.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Проверка на поща: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Проверка на поща</string>
   <string name="notification_bg_send_ticker">Изпраща писмо: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index 664de8653a961dc8be7fd19c52968e113d70d225..6c2b053ba70a7627fd37c7a0e433dd9b2ebb8dd3 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -123,6 +123,8 @@
   <string name="notification_certificate_error_text">Gwiriit an arventennoù dafariad</string>
   <string name="notification_authentication_error_title">C’hwiadenn war an dilesa</string>
   <string name="notification_authentication_error_text">C’hwitadenn war an dilesa evit <xliff:g id="account">%s</xliff:g>. Hizivait an arventennoù dafariad.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">O kerc’hat ar posteloù: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kerc’hat ar posteloù</string>
   <string name="notification_bg_send_ticker">O kas ar postel: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index a0ca7cb03f4710a3551531c3250d50191e1fb7e6..06db7ef7dacb9f42d386955d9d0b77f49771a1ed 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -140,6 +140,8 @@
   <string name="notification_certificate_error_text">Comproveu la configuració del servidor.</string>
   <string name="notification_authentication_error_title">Ha fallat l\'autenticació</string>
   <string name="notification_authentication_error_text">Ha fallat l\'autenticació de <xliff:g id="account">%s</xliff:g>. Actualitzeu la configuració del servidor.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">S\'està comprovant el correu: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">S\'està comprovant el correu</string>
   <string name="notification_bg_send_ticker">S\'està enviant correu: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index a3def44b264ad53448f2bf064137624b6a11c7e5..25b33af7fa02c81ef72d196474cb6e48084d72bb 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache License, verze 2.0</string>
   <string name="about_project_title">Projekt s otevřeným zdrojovým kódem</string>
   <string name="about_website_title">Webová stránka</string>
+  <string name="user_manual_title">Uživatelská příručka</string>
+  <string name="get_help_title">Získat nápovědu</string>
   <string name="user_forum_title">Uživatelské fórum</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -146,6 +148,10 @@
   <string name="notification_certificate_error_text">Zkontrolujte nastavení serveru</string>
   <string name="notification_authentication_error_title">Přihlášení se nezdařilo</string>
   <string name="notification_authentication_error_text">Přihlášení k <xliff:g id="account">%s</xliff:g> se nezdařilo. Aktualizujte svá nastavení pro server.</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">Chyba upozornění</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">Vyskytla se chyba při pokusu o vytvoření systémového upozornění pro novou zprávu. Důvodem je nejspíš chybějící zvuk upozornění.\n\nKlepnutím otevřete nastavení upozorňování.</string>
   <string name="notification_bg_sync_ticker">Zjišťování pošty: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Zjišťování pošty</string>
   <string name="notification_bg_send_ticker">Odesílání pošty: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index b30c8bf1642b507ec28a796007065c1b66e5e639..bfaf52376709b49211c727547149d670defa797a 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -145,6 +145,8 @@
   <string name="notification_certificate_error_text">Gwiria osodiadau\'r gweinydd</string>
   <string name="notification_authentication_error_title">Methwyd a dilysu</string>
   <string name="notification_authentication_error_text">Methodd y dilysiad ar gyfer <xliff:g id="account">%s</xliff:g>. Diweddara dy osodiadau gweinydd.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Yn gwirio am negeseuon: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Yn gwirio am negeseuon</string>
   <string name="notification_bg_send_ticker">Yn anfon negeseuon: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index f92e44480791230517a750db5d64711b6514eaea..c1efd24cc1a748b04e9459bf0bb09da8a4dafc11 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -141,6 +141,8 @@
   <string name="notification_certificate_error_text">Kontroller dine serverindstillinger</string>
   <string name="notification_authentication_error_title">Godkendelse mislykkedes</string>
   <string name="notification_authentication_error_text">Godkendelse mislykkedes for <xliff:g id="account">%s</xliff:g>. Opdater dine serverindstillinger.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Synkroniserer mail: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kontrollere post</string>
   <string name="notification_bg_send_ticker">Sender mail: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index 779b1c7799d89d9c06bf2d88457f6f887fcf714f..1f439cd86bdd20d09df57cf28c40d63cbce4bae8 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -1,31 +1,33 @@
 <?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">Mail</string>
-    <string name="shortcuts_title">E-Mail-Konten</string>
-    <string name="unread_widget_label">Ungelesene E-Mails</string>
-    <!--Used in the about dialog-->
-    <string name="app_authors">The Mail Dog Walkers</string>
-    <string name="source_code">Quellcode</string>
-    <string name="app_license">Apache-Lizenz, Version 2.0</string>
-    <string name="about_project_title">Open Source Projekt</string>
-    <string name="about_website_title">Webseite</string>
-    <string name="user_forum_title">Anwenderforum</string>
-    <string name="about_fediverse_title">Fediverse</string>
-    <string name="about_twitter_title">Twitter</string>
-    <string name="about_libraries">Bibliotheken</string>
-    <string name="license">Lizenz</string>
-    <string name="changelog_title">Changelog</string>
-    <string name="changelog_loading_error">Changelog konnte nicht geladen werden.</string>
-    <string name="changelog_version_title">Version %s</string>
-    <string name="changelog_recent_changes_title">Was gibt es Neues</string>
-    <string name="changelog_show_recent_changes">Zeige die neuesten Änderungen nach einem App-Update</string>
-    <string name="changelog_snackbar_text">Finde heraus, was es Neues in diesem Release gibt</string>
-    <!--Welcome message-->
-    <string name="welcome_message_title">Willkommen bei Mail</string>
-    <string name="accounts_welcome"><![CDATA[
+  <!--=== App-specific strings =============================================================-->
+  <!--This should make it easier for forks to change the branding-->
+  <!--Used in AndroidManifest.xml-->
+  <string name="app_name">Mail</string>
+  <string name="shortcuts_title">E-Mail-Konten</string>
+  <string name="unread_widget_label">Ungelesene E-Mails</string>
+  <!--Used in the about dialog-->
+  <string name="app_authors">The Mail Dog Walkers</string>
+  <string name="source_code">Quellcode</string>
+  <string name="app_license">Apache-Lizenz, Version 2.0</string>
+  <string name="about_project_title">Open Source Projekt</string>
+  <string name="about_website_title">Webseite</string>
+  <string name="user_manual_title">Benutzerhandbuch</string>
+  <string name="get_help_title">Hilfe erhalten</string>
+  <string name="user_forum_title">Anwenderforum</string>
+  <string name="about_fediverse_title">Fediverse</string>
+  <string name="about_twitter_title">Twitter</string>
+  <string name="about_libraries">Bibliotheken</string>
+  <string name="license">Lizenz</string>
+  <string name="changelog_title">Changelog</string>
+  <string name="changelog_loading_error">Changelog konnte nicht geladen werden.</string>
+  <string name="changelog_version_title">Version %s</string>
+  <string name="changelog_recent_changes_title">Was gibt es Neues</string>
+  <string name="changelog_show_recent_changes">Zeige die neuesten Änderungen nach einem App-Update</string>
+  <string name="changelog_snackbar_text">Finde heraus, was es Neues in diesem Release gibt</string>
+  <!--Welcome message-->
+  <string name="welcome_message_title">Willkommen bei Mail</string>
+  <string name="accounts_welcome"><![CDATA[
 <p>
 Mail ist ein leistungsstarker, freier E-Mail-Client für Android.
 </p><p>
@@ -1016,7 +1018,6 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
     <string name="ac_transfer_show_code">Setup-Code anzeigen</string>
     <string name="ac_transfer_msg_subject">Autocrypt-Setup-Nachricht</string>
     <string name="ac_transfer_msg_body">Diese Nachricht enthält alle Informationen, um Ihre Autocrypt-Einstellungen zusammen mit Ihrem geheimen Schlüssel von Ihrem ursprünglichen Gerät sicher zu übertragen.
-
 Um Ihr neues Gerät für Autocrypt einzurichten, folgen Sie bitte den Anweisungen, die auf dem neuen Gerät angezeigt werden.
 
 Sie können diese Nachricht aufheben und sie als Backup für Ihren geheimen Schlüssel nutzen. Wenn Sie das tun möchten, sollten Sie sich das Passwort notieren und sicher verwahren.
@@ -1057,7 +1058,5 @@ Sie können diese Nachricht aufheben und sie als Backup für Ihren geheimen Schl
     <string name="delete_messages_label">E-Mails löschen</string>
     <string name="read_messages_desc">Dieser App erlauben, E-Mails zu lesen.</string>
     <string name="read_messages_label">E-Mails lesen</string>
-    <string name="get_help_title">Hilfe erhalten</string>
-    <string name="user_manual_title">Benutzerhandbuch</string>
     <string name="clear">LÖSCHEN</string>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index 008d562210dca245636c5ef2deff9ff9f582508d..2ca0287c3c4efc9df72e965e985279b5d664bd95 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -137,6 +137,8 @@
   <string name="notification_certificate_error_text">Ελέγξτε τις ρυθμίσεις του εξυπηρετητή</string>
   <string name="notification_authentication_error_title">Αποτυχία πιστοποίησης</string>
   <string name="notification_authentication_error_text">Αποτυχία πιστοποίησης <xliff:g id="account">%s</xliff:g>. Ενημερώστε τις ρυθμίσεις του εξυπηρετητή σας.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Έλεγχος μηνύματος: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Έλεγχος μηνύματος</string>
   <string name="notification_bg_send_ticker">Αποστολή μηνύματος: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
index acae234b02f2986f6f3bc4a67ae313260820aa11..4e77e4be5af60c28c5e249c7ba18f262c21e60d8 100644
--- a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
+++ b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
@@ -13,6 +13,8 @@
   <!--=== General strings ==================================================================-->
   <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
   <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="global_settings_registered_name_color_label">Colourise contacts</string>
   <string name="global_settings_registered_name_color_changed">Colourise names in your contact list</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index 5c03408147d56c96963bae4b36ec833adf982856..17e6f6663ef269e1ce017b0de00cdd7df9ec0f64 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -138,6 +138,8 @@
   <string name="notification_certificate_error_text">Kontrolu agordojn de servilo</string>
   <string name="notification_authentication_error_title">Aŭtentigo malsukcesis</string>
   <string name="notification_authentication_error_text">Aŭtentigo por <xliff:g id="account">%s</xliff:g> malsukcesis. Aktualigu agordojn de servilo.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Kontrolado de retpoŝto: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kontrolado de retpoŝto</string>
   <string name="notification_bg_send_ticker">Sendado de retletero: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index 0b5c901c0ec9fc30441cc51559b386d157c343ef..ec13cbc93382961cedef5ffab483f7af928bd918 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -12,7 +12,9 @@
   <string name="app_license">Apache License, Version 2.0</string>
   <string name="about_project_title">Proyecto de Código Abierto</string>
   <string name="about_website_title">Sitio web</string>
-  <string name="user_forum_title">Usuario del foro</string>
+  <string name="user_manual_title">Manual de uso</string>
+  <string name="get_help_title">Ayuda</string>
+  <string name="user_forum_title">Foro de usuarios</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Librerías</string>
@@ -138,7 +140,7 @@
   <string name="notification_certificate_error_title">Error de certificado para <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_certificate_error_text">Compruebe su configuración del servidor</string>
   <string name="notification_authentication_error_title">Fallo de autenticación</string>
-  <string name="notification_authentication_error_text">Fallo de autenticación para <xliff:g id="account">%s</xliff:g>. Actualice la configuración del servidor.</string>
+  <string name="notification_authentication_error_text">Fallo de autenticación en <xliff:g id="account">%s</xliff:g>. Actualiza y revisa los ajustes del servidor.</string>
   <string name="notification_bg_sync_ticker">Comprobando correo: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Comprobando correo</string>
   <string name="notification_bg_send_ticker">Enviando correo: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index afbc23085c1b1ad4d8c81d0e6e15aaa75e23b8bd..8668149b9a219bcb18731acd8d4f395c8e6dd22a 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -136,6 +136,8 @@
   <string name="notification_certificate_error_text">Kontrolli serveri sätteid</string>
   <string name="notification_authentication_error_title">Autentimine ebaõnnestus</string>
   <string name="notification_authentication_error_text">Autentimine ebaõnnestus konto <xliff:g id="account">%s</xliff:g> puhul. Uuenda serveri seadeid.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Kontrollib e-kirju: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kontrollib e-kirju</string>
   <string name="notification_bg_send_ticker">Saadab e-kirja: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index 4f35c485dbc7ce56cdb737effb5339710374d24d..084e693de8aa0cfe6d910c289becc5afd3a42a19 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -136,6 +136,8 @@
   <string name="notification_certificate_error_text">Egiaztatu zerbitzariaren ezarpenak</string>
   <string name="notification_authentication_error_title">Autentifikazioak huts egin du</string>
   <string name="notification_authentication_error_text">Autentifikazioak huts egin du <xliff:g id="account">%s</xliff:g>-(e)rako. Eguneratu zerbitzariaren ezarpenak.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Posta egiaztatzen: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Posta egiaztatzen</string>
   <string name="notification_bg_send_ticker">Posta bidaltzen: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index f2cf73558a4bf9a7a05e2c3c0bfa97e5c2099d79..c966ca96d1fca670995623d3aa1b92b9a1ad82e9 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -126,6 +126,8 @@
   <string name="notification_certificate_error_text">تنظیمات کارساز خود را بررسی کنید</string>
   <string name="notification_authentication_error_title">احراز هویت ناموفق بود</string>
   <string name="notification_authentication_error_text">اعتبارسنجی <xliff:g id="account">%s</xliff:g> ناموفق بود. تنظیمات کارساز خود را به‌روز کنید.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">به‌روزآوری رایانامه‌ها: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">به‌روزآوری رایانامه‌ها</string>
   <string name="notification_bg_send_ticker">ارسال رایانامه: <xliff:g id="account">%s</xliff:g></string>
@@ -238,6 +240,7 @@
   <string name="account_setup_basics_title">راه‌اندازی حساب کاربری جدید</string>
   <string name="account_setup_basics_email_hint">نشانی رایانامه </string>
   <string name="account_setup_basics_password_hint">گذرواژه</string>
+  <string name="account_setup_oauth_description">جهت استفاده‌ این حساب کاربری از K-9 Mail، نیاز است که وارد حساب کاربری خود شوید و اجازه دسترسی اپلیکیشن به ایمیل‌ها را صادر کنید.</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
   <!--Displayed below the 'account_setup_oauth_description' text-->
   <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index 3530ddbfd7fbd232b4a76cb4e58ac7b79d192b3e..6b23917e43401ca16337864c7307d888d340efc2 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache-lisenssi, versio 2.0</string>
   <string name="about_project_title">Avoimen lähdekoodin projekti</string>
   <string name="about_website_title">Verkkosivusto</string>
+  <string name="user_manual_title">Käyttäjäopas</string>
+  <string name="get_help_title">Tuki</string>
   <string name="user_forum_title">Käyttäjäfoorumi</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -165,6 +167,10 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
   <string name="notification_certificate_error_text">Tarkista palvelinasetuksesi</string>
   <string name="notification_authentication_error_title">Tunnistautuminen epäonnistui</string>
   <string name="notification_authentication_error_text">Tilin <xliff:g id="account">%s</xliff:g> tunnistautuminen epäonnistui. Päivitä palvelinasetuksesi.</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">Ilmoitusvirhe</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">Uuteen viestiin liittyvää järjestelmäilmoitusta luotaessa tapahtui virhe. Syy on mitä luultavimmin puuttuva ilmoitusääni.\n\nNapauta avataksesi ilmoitusasetukset.</string>
   <string name="notification_bg_sync_ticker">Tarkistetaan viestejä: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Tarkistetaan viestejä</string>
   <string name="notification_bg_send_ticker">Lähetetään viestejä: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index 1eb6dd0e15092100e8cb2a0517ef4a1ba3277818..9bf2da248d616f8808a4ad587bea37a2961567b6 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Licence Apache, Version 2.0</string>
   <string name="about_project_title">Projet à code source ouvert</string>
   <string name="about_website_title">Site Web</string>
+  <string name="user_manual_title">Guide d’utilisation</string>
+  <string name="get_help_title">Obtenir de l’aide</string>
   <string name="user_forum_title">Forum des utilisateurs</string>
   <string name="about_fediverse_title">Fédivers</string>
   <string name="about_twitter_title">Twitter</string>
@@ -143,6 +145,10 @@ jusqu’à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="notification_certificate_error_text">Vérifiez vos paramètres de serveur</string>
   <string name="notification_authentication_error_title">Échec d’authentification</string>
   <string name="notification_authentication_error_text">Échec d’authentification pour <xliff:g id="account">%s</xliff:g>. Mettre à jour les paramètres du serveur.</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">Erreur de notification</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">Impossible de créer une notification système de nouveau message. Un son de notification manquant en est probablement la cause.\n\nToucher pour ouvrir les paramètres de notification.</string>
   <string name="notification_bg_sync_ticker">Relève des courriels : <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Relève des courriels</string>
   <string name="notification_bg_send_ticker">Envoi du courriel : <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index 5d401e7085dd2c2afc6146483731146811bc4620..f78c709f96a010b8dcd6acd0a94696109f82f2ed 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -133,6 +133,8 @@
   <string name="notification_certificate_error_text">Thoir sùil air roghainnean an fhrithealaiche agad</string>
   <string name="notification_authentication_error_title">Dh’fhàillig an dearbhadh</string>
   <string name="notification_authentication_error_text">Dh’fhàillig dearbhadh a’ chunntais <xliff:g id="account">%s</xliff:g>. Ùraich roghainnean an fhrithealaiche agad.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">A’ toirt sùil airson post: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">A’ toirt sùil airson post</string>
   <string name="notification_bg_send_ticker">A’ cur a’ phuist: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
index b33e3aecf07a25083e84b8661ef97dc9534f09ca..7432041eaca1a64958df40c962acf8c70435373a 100644
--- a/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl-rES/strings.xml
@@ -89,6 +89,8 @@
   <string name="notification_action_spam">Lixo</string>
   <string name="notification_certificate_error_title">Erro de certificado para <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_certificate_error_text">Comproba a configuración do servidor</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Comprobando correo: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Comprobando correo</string>
   <string name="notification_bg_send_ticker">Enviando correo: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index 8a7a58cf0136f38d1dfae1f3155abc44d5bd8691..34b8db923d4b97b3d0eec1c2e30ad248d34d468a 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -113,6 +113,8 @@
   <string name="notification_certificate_error_text">Comprobe os axustes do servidor</string>
   <string name="notification_authentication_error_title">Fallo de autenticación</string>
   <string name="notification_authentication_error_text">Fallou a autenticación para <xliff:g id="account">%s</xliff:g>. Actualice os axustes do servidor.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Comprobando correo: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Comprobando correo</string>
   <string name="notification_bg_send_ticker">Enviando correo: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index 42e235fc8615fa3354a6f0ee5c6d37381b74d52d..4e3cb2f2ac3cb41464cc45bd57429a9ed0e1c1b6 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -123,6 +123,8 @@
   <string name="notification_certificate_error_text">provjerite postavke vašeg poslužitelja</string>
   <string name="notification_authentication_error_title">Identifikacija nije uspjela</string>
   <string name="notification_authentication_error_text">Identifikacija nije uspjela za <xliff:g id="account">%s</xliff:g>. Ažurirajte vaše postavke servera.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Provjeravam poštu: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Provjeravanje pošte</string>
   <string name="notification_bg_send_ticker">Šaljem poštu: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index f7480cfa6a96789d44cd56c4d496f70b51b4ca43..a2b6cb0ca92f580c01cccae724f0a9bbde1a43e9 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -135,7 +135,9 @@
   <string name="notification_certificate_error_title">Tanúsítványhiba: <xliff:g id="account">%s</xliff:g></string>
   <string name="notification_certificate_error_text">Ellenőrizzük a kiszolgáló beállításait.</string>
   <string name="notification_authentication_error_title">A hitelesítés sikertelen.</string>
-  <string name="notification_authentication_error_text">A hitelesítés sikertelen: <xliff:g id="account">%s</xliff:g>. Frissítsük a kiszolgáló beállításait.</string>
+  <string name="notification_authentication_error_text">A hitelesítés sikertelen: <xliff:g id="account">%s</xliff:g>. Frissítse a kiszolgálóbeállításokat.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Levelek ellenőrzése: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Levelek ellenőrzése</string>
   <string name="notification_bg_send_ticker">Levél küldése: <xliff:g id="account">%s</xliff:g></string>
@@ -788,8 +790,6 @@
   </plurals>
   <string name="remote_search_error">A távoli keresés sikertelen</string>
   <string name="account_settings_search">Keresés</string>
-  <string name="account_settings_remote_search_enabled">Kiszolgáló keresésének engedélyezése</string>
-  <string name="account_settings_remote_search_enabled_summary">Üzenetek keresése a kiszolgálón az eszközön lévők mellett</string>
   <string name="action_remote_search">Üzenetek keresése a kiszolgálón</string>
   <string name="remote_search_unavailable_no_network">Hálózati kapcsolat szükséges a kiszolgáló kereséséhez.</string>
   <string name="global_settings_background_as_unread_indicator_label">Szín megváltoztatása olvasáskor</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index 026a71aa587127de026ac77648bfa0e0744d49b4..d848046c5440d2b1cc8ca50cec9d1cdd9bb8830e 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -130,6 +130,8 @@
   <string name="notification_certificate_error_text">Periksa pengaturan server Anda</string>
   <string name="notification_authentication_error_title">Otentikasi gagal</string>
   <string name="notification_authentication_error_text">Otentikasi gagal untuk <xliff:g id="account">%s</xliff:g>. Perbarui pengaturan server Anda.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Memeriksa pesan: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Memeriksa pesan</string>
   <string name="notification_bg_send_ticker">Mengirimkan pesan: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index 7c28ac031c3a5a68bedce8185052ae82526dd318..a29cab387e2962c8b5cb3c2dc3785e6612e9bffd 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -139,6 +139,8 @@
   <string name="notification_certificate_error_text">Athugaðu stillingar póstþjónsins</string>
   <string name="notification_authentication_error_title">Auðkenning mistókst</string>
   <string name="notification_authentication_error_text">Auðkenning mistókst fyrir <xliff:g id="account">%s</xliff:g>. Uppfærðu stillingar póstþjónsins þíns.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Athuga með póst: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Athuga með póst</string>
   <string name="notification_bg_send_ticker">Sendi póst: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index 6ad3d24c36ad747c695773878380b8345bad2e41..872c250d78362809bcb6b180248f6a601133da7e 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -167,6 +167,8 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
   <string name="notification_certificate_error_text">Controlla le impostazioni del server</string>
   <string name="notification_authentication_error_title">Autenticazione non riuscita</string>
   <string name="notification_authentication_error_text">Autenticazione non riuscita per <xliff:g id="account">%s</xliff:g>. Aggiorna le impostazioni del server.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Controllo posta: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Controllo posta</string>
   <string name="notification_bg_send_ticker">Invio posta: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index 0f80fa014e61a2cbdaca84f6b3bf855073abc950..411a2cd98a48bcfd9c0a867e38a2881730966605 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -134,6 +134,8 @@
   <string name="notification_authentication_error_title">נכשל באימות</string>
   <string name="notification_authentication_error_text">האימות נכשל עבור <xliff:g id="account">%s</xliff:g>. 
 עדכן את הגדרות השרת.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">בודק דוא"ל: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">בודק דוא\"ל</string>
   <string name="notification_bg_send_ticker">שולח דוא"ל: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index 12a1f0d4206abbe5ae43b4dcabc95d5ca8ccda48..a2ff01fc771e066dffd81ffbf91d3f3b9c8648a5 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -12,6 +12,7 @@
   <string name="app_license">Apache License, Version 2.0</string>
   <string name="about_project_title">オープンソースプロジェクト</string>
   <string name="about_website_title">ウェブサイト</string>
+  <string name="user_manual_title">ユーザーマニュアル</string>
   <string name="user_forum_title">ユーザーフォーラム</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -139,6 +140,10 @@
   <string name="notification_certificate_error_text">サーバの設定を確認してください</string>
   <string name="notification_authentication_error_title">認証に失敗しました</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> の認証に失敗しました。サーバの設定を更新してください。</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">通知エラー</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">新着メッセージのためのシステム通知の作成中にエラーが発生しました。通知サウンドが不足していることが原因と思われます。\n\nタップして通知設定を開いてください。</string>
   <string name="notification_bg_sync_ticker">メール確認中: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">メール確認中</string>
   <string name="notification_bg_send_ticker">メール送信中: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index bf8d2567a94c44d71ef92703c5a3aa411fe623e1..366aa390771b5752825fda6e42593a9f9a5d9b2a 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -115,6 +115,8 @@
   <string name="notification_certificate_error_text">서버 설정을 점검하십시오.</string>
   <string name="notification_authentication_error_title">인증 실패</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> 계정 인증 오류. 서버 설정을 업데이트하세요.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">메일 체크 중: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">메일 체크 중</string>
   <string name="notification_bg_send_ticker">메일 전송 중: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 4faff67b089b2d2e48e2c8e4f3a0c422312dc366..a97b97f6a6e42ae06f9f34c9793ac048d419628f 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -141,6 +141,8 @@
   <string name="notification_certificate_error_text">Patikrinkite serverio nustatymus</string>
   <string name="notification_authentication_error_title">Autentifikavimas nepavyko</string>
   <string name="notification_authentication_error_text">Nepavyko nustatyti autentiškumo <xliff:g id="account">%s</xliff:g>. Atnaujinkite serverio nustatymus.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Tikrinamas paštas: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Tikrinamas paštas</string>
   <string name="notification_bg_send_ticker">Siunčiamas paštas: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index c665ccd93a1c04491f60f9e2eb16ea38494240ac..cc1fd35434ca3da221e229cf655a90e8e4990ef9 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -141,6 +141,8 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="notification_certificate_error_text">Pārbaudiet sava servera iestatījumus</string>
   <string name="notification_authentication_error_title">Identitātes pārbaude neizdevās</string>
   <string name="notification_authentication_error_text">Identifikācijas pārbaude kontam <xliff:g id="account">%s</xliff:g> neizdevās. Atjaunojiet servera iestatījumus!</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Pārbauda pastu: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Pārbauda pastu</string>
   <string name="notification_bg_send_ticker">Sūta pastu: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index 785d8f8c0a7e707759d00c1e28d469cf4609b857..1f4fc3664e5697f5ee552a291bea44ac47c8684e 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -140,6 +140,8 @@
   <string name="notification_certificate_error_text">നിങ്ങളുടെ സെർവർ ക്രമീകരണങ്ങൾ പരിശോധിക്കുക</string>
   <string name="notification_authentication_error_title">പ്രാമാണീകരണം പരാജയപ്പെട്ടു</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> നായുള്ള പ്രാമാണീകരണം പരാജയപ്പെട്ടു. നിങ്ങളുടെ സെർവർ ക്രമീകരണങ്ങൾ പുതുക്കുക.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">മെയിൽ പരിശോധിക്കുന്നു: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">മെയിൽ പരിശോധിക്കുന്നു</string>
   <string name="notification_bg_send_ticker">മെയിൽ അയയ്ക്കുന്നു: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index f7807b80a994c09dbce8e78b6c297943ad0768ff..38d5f6241bccae2549e383dd919f6f65e41e4020 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -130,6 +130,8 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="notification_certificate_error_text">Sjekk dine tjenerinnstillinger</string>
   <string name="notification_authentication_error_title">Autentisering feilet</string>
   <string name="notification_authentication_error_text">Autentisering feilet for <xliff:g id="account">%s</xliff:g>. Oppdater serverinnstillingene dine.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Sjekker e-post: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Sjekker e-post</string>
   <string name="notification_bg_send_ticker">Sender e-post: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index 0ac6c0593238af42c9010e224960e335e4cb1315..e723c9423e472a653cd7e4dadb452759476e74b3 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -132,6 +132,8 @@
   <string name="notification_certificate_error_text">Controleer de server instellingen</string>
   <string name="notification_authentication_error_title">Authenticatie mislukt</string>
   <string name="notification_authentication_error_text">Authenticatie mislukt voor <xliff:g id="account">%s</xliff:g>. Werk de server instellingen bij.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Controleer berichten: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Controleren berichten</string>
   <string name="notification_bg_send_ticker">Versturen van berichten: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 2951bf6d434a8cbcb22a43849e3714cabce9efce..469e4606e1c6a75c39c5934d9582a2e76facf8ad 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Licencja Apache, Wersja 2.0</string>
   <string name="about_project_title">Projekt otwartoźródłowy</string>
   <string name="about_website_title">Strona internetowa</string>
+  <string name="user_manual_title">Instrukcja obsługi</string>
+  <string name="get_help_title">Uzyskaj pomoc</string>
   <string name="user_forum_title">Forum użytkowników</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -32,11 +34,7 @@
   <string name="account_delete_dlg_instructions_fmt">The account \"<xliff:g id="account">%s</xliff:g>\" will be removed from Mail.</string>
   <!--=== General strings ==================================================================-->
   <string name="authors">Autorzy</string>
-  <string name="read_messages_label">Czytaj pocztę</string>
-  <string name="read_messages_desc">Zezwalaj tej aplikacji na czytanie Twoich wiadomości</string>
-  <string name="delete_messages_label">Usuń wiadomości</string>
-  <string name="delete_messages_desc">Zezwalaj tej aplikacji na usuwanie Twoich wiadomości.</string>
-  <string name="about_title">About Mail</string>
+  <string name="about_title">O aplikacji Mail</string>
   <string name="accounts_title">Konta</string>
   <string name="advanced">Zaawansowane</string>
   <string name="compose_title_compose">Nowa wiadomość</string>
@@ -109,7 +107,7 @@
   <string name="add_attachment_action">Dodaj załącznik</string>
   <string name="empty_trash_action">Opróżnij kosz</string>
   <string name="expunge_action">Wyczyść</string>
-  <string name="about_action">About</string>
+  <string name="about_action">O aplikacji</string>
   <string name="prefs_title">Ustawienia</string>
   <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
   <string name="general_no_subject">(Brak tematu)</string>
@@ -145,6 +143,10 @@
   <string name="notification_certificate_error_text">Sprawdź ustawienia serwera</string>
   <string name="notification_authentication_error_title">Uwierzytelnianie nie powiodło się</string>
   <string name="notification_authentication_error_text">Uwierzytelnianie dla <xliff:g id="account">%s</xliff:g> nie powiodło się. Zaktualizuj ustawienia serwera.</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">Błąd powiadomienia</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">Wystąpił błąd podczas próby utworzenia powiadomienia systemowego dla nowej wiadomości. Powodem jest najprawdopodobniej brak dźwięku powiadomienia.\n\nStuknij, aby otworzyć ustawienia powiadomień.</string>
   <string name="notification_bg_sync_ticker">Sprawdzam: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Sprawdzam</string>
   <string name="notification_bg_send_ticker">Wysyłam: <xliff:g id="account">%s</xliff:g></string>
@@ -198,7 +200,7 @@
   <string name="message_view_bcc_label">UDW:</string>
   <string name="message_view_status_attachment_not_saved">Nie można zapisać załącznika.</string>
   <string name="message_view_show_pictures_action">Wyświetl grafikę</string>
-  <string name="message_view_no_viewer">Nie moge znaleźć programu do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
+  <string name="message_view_no_viewer">Nie moge znaleźć aplikacji do wyświetlenia pliku <xliff:g id="mimetype">%s</xliff:g>.</string>
   <string name="message_view_download_remainder">Pobierz całą wiadomość</string>
   <string name="message_view_sender_label">przez %1$s</string>
   <string name="from_same_sender">Więcej od tego nadawcy</string>
@@ -207,17 +209,17 @@
   <string name="message_saved_toast">Wiadomość zapisana jako wersja robocza</string>
   <string name="global_settings_flag_label">Oznaczaj gwiazdkami</string>
   <string name="global_settings_flag_summary">Gwiazdki wskazują oznakowane wiadomości</string>
-  <string name="global_settings_preview_lines_label">Podglądaj linie</string>
-  <string name="global_settings_show_correspondent_names_label">Pokazuj nazwiska korespondentów</string>
-  <string name="global_settings_show_correspondent_names_summary">Pokazuj nazwiska korespondentów zamiast ich adresów e-mail</string>
+  <string name="global_settings_preview_lines_label">Podgląd wierszy</string>
+  <string name="global_settings_show_correspondent_names_label">Pokazuj imiona i nazwiska korespondentów</string>
+  <string name="global_settings_show_correspondent_names_summary">Pokazuj imiona i nazwiska korespondentów zamiast ich adresów e-mail</string>
   <string name="global_settings_sender_above_subject_label">Korespondent powyżej tematu</string>
-  <string name="global_settings_sender_above_subject_summary">Wyświetlaj nazwę korespondenta powyżej, zamiast poniżej tematu</string>
+  <string name="global_settings_sender_above_subject_summary">Pokazuj imiona i nazwiska korespondentów powyżej, a nie poniżej tematu</string>
   <string name="global_settings_show_contact_name_label">Pokazuj nazwę kontaktu</string>
   <string name="global_settings_show_contact_name_summary">Użyj nazw nadawców, jeżeli występują w Twojej książce kontaktowej</string>
   <string name="global_settings_registered_name_color_label">Koloruj kontakty</string>
   <string name="global_settings_registered_name_color_changed">Koloruj nazwiska na liście kontaktów</string>
   <string name="general_settings_contact_name_color_label">Kolor nazwy kontaktu</string>
-  <string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szer.</string>
+  <string name="global_settings_messageview_fixedwidth_label">Czcionka o stałej szerokości</string>
   <string name="global_settings_messageview_fixedwidth_summary">Użyj czcionki o stałej szerokości do wyświetlania wiadomości tekstowych</string>
   <string name="global_settings_messageview_autofit_width_label">Dopasuj wiadomość do rozmiaru ekranu</string>
   <string name="global_settings_messageview_autofit_width_summary">Zmniejsza wiadomości, aby mieściły się na ekranie</string>
@@ -308,7 +310,7 @@
   <string name="account_setup_expunge_policy_immediately">Od razu</string>
   <string name="account_setup_expunge_policy_on_poll">Podczas każdego pobrania</string>
   <string name="account_setup_expunge_policy_manual">Tylko ręcznie</string>
-  <string name="account_setup_incoming_autodetect_namespace_label">Wykrywaj automatycznie IMAP namespace</string>
+  <string name="account_setup_incoming_autodetect_namespace_label">Automatycznie wykrywaj przestrzeń nazw IMAP</string>
   <string name="account_setup_incoming_imap_path_prefix_label">Prefiks ścieżki IMAP</string>
   <string name="drafts_folder_label">Folder wersji roboczych</string>
   <string name="sent_folder_label">Wysłane</string>
@@ -343,7 +345,7 @@
   <string name="account_setup_options_mail_check_frequency_24hour">Co 24 godziny</string>
   <string name="idle_refresh_period_label">Odśwież połączenie IDLE</string>
   <string name="idle_refresh_period_2min">Co 2 minuty</string>
-  <string name="idle_refresh_period_3min">co 3 minuty</string>
+  <string name="idle_refresh_period_3min">Co 3 minuty</string>
   <string name="idle_refresh_period_6min">Co 6 minut</string>
   <string name="idle_refresh_period_12min">Co 12 minut</string>
   <string name="idle_refresh_period_24min">Co 24 minuty</string>
@@ -406,7 +408,7 @@
   <string name="account_settings_show_pictures_always">Od każdego</string>
   <string name="account_settings_composition">Tworzenie wiadomości</string>
   <string name="account_settings_default_quoted_text_shown_label">Cytuj oryginał</string>
-  <string name="account_settings_default_quoted_text_shown_summary">Gdy odpowiadasz tekst oryginalnej wiadomości zostanie cytowany</string>
+  <string name="account_settings_default_quoted_text_shown_summary">Gdy odpowiadasz, tekst oryginalnej wiadomości zostanie zacytowany</string>
   <string name="account_settings_reply_after_quote_label">Odpowiedź pod cytatem</string>
   <string name="account_settings_reply_after_quote_summary">Podczas odpowiadania, wiadomość oryginalna (cytowana) pojawi się nad Twoją odpowiedzią</string>
   <string name="account_settings_strip_signature_label">Wycinaj podpis z tekstu</string>
@@ -428,10 +430,10 @@
   <string name="account_settings_sync">Synchronizacja folderów</string>
   <string name="account_settings_folders">Foldery</string>
   <string name="account_settings_quote_prefix_label">Prefiks cytowania</string>
-  <string name="account_settings_crypto">Szyfrowanie pomiędzy urządzeniami końcowymi \"end-to-end\"</string>
+  <string name="account_settings_crypto">Szyfrowanie typu „end-to-end”</string>
   <string name="account_settings_crypto_app">Aktywuj wsparcie dla OpenPGP</string>
   <string name="account_settings_crypto_app_select_title">Wybierz aplikację OpenPGP</string>
-  <string name="account_settings_crypto_key">Skonfiguruj szyfrowanie pomiędzy urządzeniami końcowymi \"end-to-end\"</string>
+  <string name="account_settings_crypto_key">Skonfiguruj klucz szyfrowania typu „end-to-end”</string>
   <string name="account_settings_crypto_summary_off">Brak skonfigurowanej aplikacji OpenPGP</string>
   <string name="account_settings_crypto_summary_on">Połączono z %s</string>
   <string name="account_settings_crypto_summary_config">Konfigurowanie…</string>
@@ -599,7 +601,7 @@
   <string name="sort_by_arrival">Data otrzymania</string>
   <string name="sort_by_subject">Temat</string>
   <string name="sort_by_sender">Nadawca</string>
-  <string name="sort_by_flag">Gwiazdek</string>
+  <string name="sort_by_flag">Gwiazdka</string>
   <string name="sort_by_unread">Przeczytane/nieprzeczytane</string>
   <string name="sort_by_attach">Załączniki</string>
   <string name="account_delete_dlg_title">Usuwanie</string>
@@ -620,8 +622,8 @@
   <string name="setting_theme_global">Użyj stylu aplikacji</string>
   <string name="setting_theme_dark">Ciemna</string>
   <string name="setting_theme_light">Jasna</string>
-  <string name="setting_theme_follow_system">Użyj domyślnego systemowego</string>
-  <string name="display_preferences">Ustawienia globalne</string>
+  <string name="setting_theme_follow_system">Użyj domyślnej systemowej</string>
+  <string name="display_preferences">Wyświetlanie</string>
   <string name="global_preferences">Globalne</string>
   <string name="debug_preferences">Debugowanie</string>
   <string name="privacy_preferences">Prywatność</string>
@@ -645,7 +647,7 @@
   <string name="background_ops_auto_sync_only">Gdy \'Autosynchronizacja\' jest włączona</string>
   <string name="batch_select_all">Zaznacz wszystko</string>
   <string name="account_setup_push_limit_label">Sprawdzanie przez Push</string>
-  <string name="account_setup_push_limit_5">5 folderów</string>
+  <string name="account_setup_push_limit_5">Do 5 folderów</string>
   <string name="account_setup_push_limit_10">Do 10 folderów</string>
   <string name="account_setup_push_limit_25">Do 25 folderów</string>
   <string name="account_setup_push_limit_50">Do 50 folderów</string>
@@ -671,7 +673,7 @@
   <string name="account_settings_no_folder_selected">Żadne</string>
   <string name="account_settings_automatic_special_folder">Automatyczne (%s)</string>
   <string name="font_size_settings_title">Rozmiar czcionki</string>
-  <string name="font_size_settings_description">Ustawienia rozmiarów czcionek</string>
+  <string name="font_size_settings_description"> Ustawienia rozmiaru czcionki</string>
   <string name="font_size_account_list">Lista kont</string>
   <string name="font_size_account_name">Nazwa konta</string>
   <string name="font_size_account_description">Opis konta</string>
@@ -702,7 +704,7 @@
   <string name="font_size_medium">Średnia</string>
   <string name="font_size_large">Duża</string>
   <string name="font_size_larger">Wielka</string>
-  <string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string>
+  <string name="error_activity_not_found">Nie znaleziono odpowiedniej aplikacji.</string>
   <string name="send_failed_reason">Wysyłanie nieudane: %s</string>
   <string name="save_or_discard_draft_message_dlg_title">Zapisać wersję roboczą wiadomości?</string>
   <string name="save_or_discard_draft_message_instructions_fmt">Zapisać czy porzucić wiadomość?</string>
@@ -766,7 +768,7 @@
   <string name="settings_import_status_password_required">Hasło wymagane</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">Wymagane jest zalogowanie się</string>
-  <string name="settings_import_status_not_imported">Nie zaimportowane</string>
+  <string name="settings_import_status_not_imported">Niezaimportowane</string>
   <string name="settings_import_status_error">Import zakończony niepowodzeniem</string>
   <string name="settings_import_later_button">Później</string>
   <string name="settings_import">Import</string>
@@ -822,7 +824,7 @@
   <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">Maksymalna ilość wyników</string>
+  <string name="account_settings_remote_search_num_label">Maksymalna liczba wyników</string>
   <string name="remote_search_sending_query">Wysyłam żądanie do serwera</string>
   <plurals name="remote_search_downloading">
     <item quantity="one">Pobieram wyniki: %d</item>
@@ -889,7 +891,7 @@
   <string name="compose_error_no_key_configured">Nie skonfigurowanego klucza dla tego konta! Sprawdź ustawienia.</string>
   <string name="error_crypto_provider_incompatible">Aplikacja szyfrująca w niezgodnej wersji. Sprawdź ustawienia.</string>
   <string name="error_crypto_provider_connect">Nie można połączyć się z dostawcą kryptografii, sprawdź ustawienia lub kliknij ikonę kryptografii, aby spróbować ponownie!</string>
-  <string name="error_crypto_provider_ui_required">Inicjalizacja szyfrowania pomiędzy urządzeniami końcowymi \"end-to-end\" nie powiodła się. Sprawdź ustawienia.</string>
+  <string name="error_crypto_provider_ui_required">Inicjalizacja szyfrowania typu „end-to-end” nie powiodła się. Sprawdź ustawienia.</string>
   <string name="error_crypto_inline_attach">Tryb PGP/INLINE nie obsługuje załączników!</string>
   <string name="enable_inline_pgp">Włącz PGP/INLINE</string>
   <string name="disable_inline_pgp">Wyłącz PGP/INLINE</string>
@@ -913,34 +915,34 @@
   <string name="openpgp_dialog_sign_only_minus_attach">W przypadku niektórych klientów, podpisy mogą być wyświetlane jako załączniki \'signature.asc\' .</string>
   <string name="openpgp_dialog_sign_only_neutral_encsigned">Zaszyfrowane wiadomości są zawsze opatrzone podpisem.</string>
   <string name="crypto_msg_title_plaintext">Czysty tekst</string>
-  <string name="crypto_msg_unencrypted_sign_error">Podpis end-to-end zawiera błąd</string>
+  <string name="crypto_msg_unencrypted_sign_error">podpis „end-to-end” zawiera błąd</string>
   <string name="crypto_msg_incomplete_signed">musisz w pełni pobrać wiadomość, aby przetworzyć podpis</string>
-  <string name="crypto_msg_unsupported_signed">zawiera niewspierany podpis end-to-end</string>
+  <string name="crypto_msg_unsupported_signed">zawiera niewspierany podpis „end-to-end”</string>
   <string name="crypto_msg_unsupported_encrypted">Wiadomość jest zaszyfrowana, ale w niewspieranym formacie.</string>
   <string name="crypto_msg_cancelled">Wiadomość jest zaszyfrowana, ale deszyfrowanie zostało przerwane.</string>
-  <string name="crypto_msg_title_unencrypted_signed_e2e">Podpis End-to-End czystego tekstu</string>
+  <string name="crypto_msg_title_unencrypted_signed_e2e">„end-to-end” podpisane tekstem jawnym</string>
   <string name="crypto_msg_unencrypted_sign_verified">od zaufanego dostawcy</string>
   <string name="crypto_msg_title_unencrypted_signed">Podpisany czysty tekst</string>
-  <string name="crypto_msg_unencrypted_sign_mismatch">ale klucz end-to-end nie pasuje do nadawcy</string>
-  <string name="crypto_msg_unencrypted_sign_expired">ale klucz end-to-end wygasł</string>
-  <string name="crypto_msg_unencrypted_sign_revoked">ale klucz end-to-end jest unieważniony</string>
-  <string name="crypto_msg_unencrypted_sign_insecure">ale klucz end-to-end nie jest uważany za bezpieczny</string>
-  <string name="crypto_msg_unencrypted_sign_unknown">od nieznanego klucza end-to-end</string>
+  <string name="crypto_msg_unencrypted_sign_mismatch">ale klucz „end-to-end” nie pasuje do nadawcy</string>
+  <string name="crypto_msg_unencrypted_sign_expired">ale klucz „end-to-end” wygasł</string>
+  <string name="crypto_msg_unencrypted_sign_revoked">ale klucz „end-to-end” jest unieważniony</string>
+  <string name="crypto_msg_unencrypted_sign_insecure">ale klucz „end-to-end” nie jest uważany za bezpieczny</string>
+  <string name="crypto_msg_unencrypted_sign_unknown">od nieznanego klucza „end-to-end”</string>
   <string name="crypto_msg_title_encrypted_unknown">Zaszyfrowana</string>
   <string name="crypto_msg_encrypted_error">ale jest tu błąd deszyfrowania</string>
   <string name="crypto_msg_encrypted_incomplete">musisz w pełni pobrać wiadomość, aby odszyfrować</string>
   <string name="crypto_msg_encrypted_no_provider">ale żadna aplikacja kryptograficzna nie jest skonfigurowana</string>
   <string name="crypto_msg_title_encrypted_unsigned">Zaszyfrowana</string>
-  <string name="crypto_msg_encrypted_unsigned">ale nie end-to-end</string>
-  <string name="crypto_msg_title_encrypted_signed_e2e">Zaszyfrowana end-to-end</string>
+  <string name="crypto_msg_encrypted_unsigned">ale nie „end-to-end”</string>
+  <string name="crypto_msg_title_encrypted_signed_e2e">Zaszyfrowana „end-to-end”</string>
   <string name="crypto_msg_encrypted_sign_verified">od znanego nadawcy</string>
   <string name="crypto_msg_title_encrypted_signed">Zaszyfrowana</string>
-  <string name="crypto_msg_encrypted_sign_unknown">od nieznanego klucza end-to-end</string>
-  <string name="crypto_msg_encrypted_sign_mismatch">ale klucz end-to-end nie pasuje do nadawcy</string>
-  <string name="crypto_msg_encrypted_sign_expired">ale klucz end-to-end wygasł</string>
-  <string name="crypto_msg_encrypted_sign_revoked">ale klucz end-to-end jest unieważniony</string>
-  <string name="crypto_msg_encrypted_sign_insecure">ale klucz end-to-end nie jest uważany za bezpieczny</string>
-  <string name="crypto_msg_encrypted_sign_error">ale dane end-to-end mają błędy</string>
+  <string name="crypto_msg_encrypted_sign_unknown">od nieznanego klucza „end-to-end”</string>
+  <string name="crypto_msg_encrypted_sign_mismatch">ale klucz „end-to-end” nie pasuje do nadawcy</string>
+  <string name="crypto_msg_encrypted_sign_expired">ale klucz „end-to-end” wygasł</string>
+  <string name="crypto_msg_encrypted_sign_revoked">ale klucz „end-to-end” jest unieważniony</string>
+  <string name="crypto_msg_encrypted_sign_insecure">ale klucz „end-to-end” nie jest uważany za bezpieczny</string>
+  <string name="crypto_msg_encrypted_sign_error">ale dane „end-to-end” mają błędy</string>
   <string name="crypto_msg_encrypted_insecure">ale szyfrowanie nie jest uważane za bezpieczne</string>
   <string name="crypto_info_ok">OK</string>
   <string name="crypto_info_search_key">Klucz wyszukiwania</string>
@@ -957,7 +959,7 @@
   <string name="messageview_crypto_error_title">Błąd odszyfrowywania wiadomości e-mail.</string>
   <string name="recipient_error_non_ascii">Znaki specjalne nie są obecnie obsługiwane!</string>
   <string name="recipient_error_parse_failed">Błąd analizowania adresu!</string>
-  <string name="account_settings_crypto_hide_sign_only">Ukryj nie zaszyfrowane podpisy.</string>
+  <string name="account_settings_crypto_hide_sign_only">Ukryj niezaszyfrowane podpisy.</string>
   <string name="account_settings_crypto_hide_sign_only_on">Tylko zaszyfrowane podpisy będą widoczne.</string>
   <string name="account_settings_crypto_hide_sign_only_off">Wszystkie podpisy będą widoczne.</string>
   <string name="error_sign_only_no_encryption">Szyfrowanie nie jest dostępne w trybie sign-only!</string>
@@ -978,24 +980,24 @@
   <string name="openpgp_enabled_error_back">Cofnij</string>
   <string name="openpgp_enabled_error_disable">Wyłącz szyfrowanie</string>
   <string name="openpgp_encryption">Szyfrowanie OpenPGP</string>
-  <string name="account_settings_crypto_prefer_encrypt">Obustronny automatyczny tryb szyfrowania</string>
-  <string name="dialog_autocrypt_mutual_title">Obustronny automatyczny tryb szyfrowania</string>
+  <string name="account_settings_crypto_prefer_encrypt">Tryb wzajemny Autocrypt</string>
+  <string name="dialog_autocrypt_mutual_title">Tryb wzajemny Autocrypt</string>
   <string name="dialog_autocrypt_mutual_description_1">Wiadomości normalnie będą szyfrowane z wyboru lub kiedy odpowiadasz na szyfrowaną wiadomość.</string>
   <string name="dialog_autocrypt_mutual_description_2">Jeśli nadawca i odbiorcy włączą tryb obustronnego automatycznego szyfrowania, szyfrowanie będzie włączone domyślnie.</string>
   <string name="dialog_autocrypt_mutual_learn_more">Możesz <a href="https://k9mail.app/2018/02/26/OpenPGP-Considerations-Part-III-Autocrypt.html">kliknąć tutaj</a>, aby dowiedzieć się więcej.</string>
   <string name="general_settings_title">Ustawienia ogólne</string>
   <string name="dialog_openkeychain_info_title">Brak aplikacji dla OpenPGP</string>
   <string name="dialog_openkeychain_info_install">Instaluj</string>
-  <string name="dialog_openkeychain_info_text">Mail requires OpenKeychain for end-to-end encryption.</string>
+  <string name="dialog_openkeychain_info_text">Mail wymaga OpenKeychain do szyfrowania typu „end-to-end”.</string>
   <string name="encrypted_subject">Zaszyfrowana wiadomość</string>
   <string name="account_settings_crypto_encrypt_subject">Zaszyfruj tematy wiadomości</string>
   <string name="account_settings_crypto_encrypt_subject_subtitle">Może nie być wspierana przez niektórych odbiorców</string>
   <string name="toast_account_not_found">Błąd wewnętrzny: nieprawidłowe konto!</string>
   <string name="toast_openpgp_provider_error">Błąd połączenia z 1%s!</string>
   <string name="ac_transfer_setting_title">Wyślij wiadomość konfiguracyjną Autocrypt</string>
-  <string name="ac_transfer_setting_summary">Bezpiecznie wymieniaj z innymi urządzeniami konfigurację szyfrowania end-to-end</string>
+  <string name="ac_transfer_setting_summary">Bezpiecznie wymieniaj z innymi urządzeniami konfigurację szyfrowania typu „end-to-end”</string>
   <string name="ac_transfer_title">Wiadomość konfiguracyjna Autocrypt</string>
-  <string name="ac_transfer_intro">Wiadomość konfiguracyjna Autocrypt bezpiecznie udostępnia twoją konfigurację szyfrowania end-to-end z innymi urządzeniami.</string>
+  <string name="ac_transfer_intro">Wiadomość konfiguracyjna Autocrypt bezpiecznie udostępnia Twoją konfigurację szyfrowania typu „end-to-end” innym urządzeniom.</string>
   <string name="ac_transfer_button_send">Wyślij wiadomość konfiguracyjną</string>
   <string name="ac_transfer_will_be_sent">Wiadomość zostanie wysłana na adres:</string>
   <string name="ac_transfer_generating">Generowanie wiadomości konfiguracyjnej</string>
@@ -1020,7 +1022,7 @@ Tą wiadomość można zachować i użyć w formie kopii zapasowej twojego klucz
   <string name="push_notification_state_listening">Oczekiwanie na nowe e-maile</string>
   <string name="push_notification_state_wait_background_sync">Uśpione, dopóki synchronizacja w tle nie będzie dozwolona</string>
   <string name="push_notification_state_wait_network">Uśpione, dopóki sieć nie będzie dostępna</string>
-  <string name="push_notification_info">Dotknij, aby dowiedzieć się więcej.</string>
+  <string name="push_notification_info">Stuknij, aby dowiedzieć się więcej.</string>
   <string name="push_info_title">Informacje push</string>
   <string name="push_info_notification_explanation_text">Podczas korzystania z funkcji powiadomień push, K-9 Mail utrzymuje połączenie z serwerem pocztowym. Android wymaga wyświetlania ciągłego, gdy aplikacja jest aktywna w tle. %s</string>
   <string name="push_info_configure_notification_text">Jednak Android pozwala również ukryć powiadomienie.</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index fb76bc0e8e1feb9c8193f6eb1d41eea089f10000..bcfabe2892a6c14f7f8e09dc38d556121e135a94 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache License, Versão 2.0</string>
   <string name="about_project_title">Projeto de código aberto</string>
   <string name="about_website_title">Website</string>
+  <string name="user_manual_title">Manual do usuário</string>
+  <string name="get_help_title">Obtenha ajuda</string>
   <string name="user_forum_title">Fórum de usuários</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -143,6 +145,8 @@
   <string name="notification_certificate_error_text">Verifique suas configurações de servidor</string>
   <string name="notification_authentication_error_title">Falha na autenticação</string>
   <string name="notification_authentication_error_text">Falha na autenticação de <xliff:g id="account">%s</xliff:g>. Atualize suas configurações de servidor.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Verificando email: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Verificando email</string>
   <string name="notification_bg_send_ticker">Enviando mensagem: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index 68199d9105d3a3da19e601f136a8212d38ee36af..6b0e93aa3d8fa5914fe748776c38b1d894c3ee81 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -124,6 +124,8 @@
   <string name="notification_certificate_error_text">Verifique as configurações do servidor</string>
   <string name="notification_authentication_error_title">A autenticação falhou</string>
   <string name="notification_authentication_error_text">A autenticação falhou para <xliff:g id="account">%s</xliff:g>. Atualize as configurações do servidor.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">A verificar correio: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">A verificar correio</string>
   <string name="notification_bg_send_ticker">A enviar correio: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index 58b1927f268b7aa3e5bc27134663132f768d5f27..b221b663feec1010ef02f7c5390e3e14eb130644 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -143,6 +143,8 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
   <string name="notification_certificate_error_text">Verifică setările serverului</string>
   <string name="notification_authentication_error_title">Autentificarea a eșuat</string>
   <string name="notification_authentication_error_text">Authentificare eșuată pentru <xliff:g id="account">%s</xliff:g>. Actualizează setările serverului.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Se verifică emailul: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Se verifică emailul</string>
   <string name="notification_bg_send_ticker">Se trimite emailul: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index a10198fb087d131b751da900395f851e9cb60dd8..3654ceb179742bdc5e6c0190177dee1b111998a2 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -169,6 +169,8 @@ Mail — почтовый клиент для Android.
   <string name="notification_certificate_error_text">Проверьте настройки сервера</string>
   <string name="notification_authentication_error_title">Сбой аутентификации</string>
   <string name="notification_authentication_error_text">Сбой аутентификации для <xliff:g id="account">%s</xliff:g>. Измените настройки сервера</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Проверка <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Проверка почты</string>
   <string name="notification_bg_send_ticker">Отправка <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index 0f3b0db39df7993af9f86f0a380cf6ff6c990c87..ef4f63f78d8a848da9004767ea3a9dbffc81d561 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -135,6 +135,8 @@
   <string name="notification_certificate_error_text">Skontrolujte nastavenia servera</string>
   <string name="notification_authentication_error_title">Overenie zlyhalo</string>
   <string name="notification_authentication_error_text">Overenie pre <xliff:g id="account">%s</xliff:g> zlyhalo. Aktualizujte nastavenia servera.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Kontrolovanie pošty: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kontrolovanie pošty</string>
   <string name="notification_bg_send_ticker">Odosielanie pošty: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index 8cae24f624c6f6b3de209ecdfaba3f5ff9d29714..b70e183390218d87fa496789dc108658c6189b0a 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -146,6 +146,8 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="notification_certificate_error_text">Preverite nastavitve strežnika</string>
   <string name="notification_authentication_error_title">Overjanje je spodletelo</string>
   <string name="notification_authentication_error_text">Overjanje je spodletelo za račun <xliff:g id="account">%s</xliff:g>. Posodobiti je treba nastavitve strežnika.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Preverjanje pošte: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Preverjanje pošte</string>
   <string name="notification_bg_send_ticker">Pošiljanje pošte: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index 9a4a777b88c9ec3f9d33dc527da2b44599161d81..7316ab8711662a1e5b289ef4572ba081a9f86e5b 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache License, Version 2.0</string>
   <string name="about_project_title">Projekt Me Burim të Hapët</string>
   <string name="about_website_title">Sajt</string>
+  <string name="user_manual_title">Doracak përdoruesi</string>
+  <string name="get_help_title">Merrni ndihmë</string>
   <string name="user_forum_title">Forum përdoruesish</string>
   <string name="about_fediverse_title">Fedivers</string>
   <string name="about_twitter_title">Twitter</string>
@@ -142,6 +144,10 @@
   <string name="notification_certificate_error_text">Kontrolloni rregullimet e shërbyesit tuaj</string>
   <string name="notification_authentication_error_title">Mirëfilltësimi dështoi</string>
   <string name="notification_authentication_error_text">Mirëfilltësimi për <xliff:g id="account">%s</xliff:g> dështoi. Përditësoni rregullimet rreth shërbyesit tuaj.</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">Gabim njoftimi</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">Ndodhi një gabim teksa provohej të krijohej një njoftim sistemi për një mesazh të ri. Arsyeja ka shumë gjasa të jetë mungesa e një tingulli njoftimesh.\n\nPrekeni që të hapen rregullimet për njoftimet.</string>
   <string name="notification_bg_sync_ticker">Po merret postë: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Marrje poste</string>
   <string name="notification_bg_send_ticker">Po dërgohet postë: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index 5aab1f1669fcbbe10cc7a26686f3806aa51fa31e..0f390c0054380d7309a34f08e72db08cd4e1b375 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -134,6 +134,8 @@
   <string name="notification_certificate_error_text">Проверите поставке за сервер</string>
   <string name="notification_authentication_error_title">Аутентификација није успела</string>
   <string name="notification_authentication_error_text">Аутентификација није успела за <xliff:g id="account">%s</xliff:g>. Ажурирајте поставке сервера.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Проверавам пошту: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Проверавам пошту</string>
   <string name="notification_bg_send_ticker">Шаљем пошту: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index 3439ec8889b30a4aca183898be7e7450cd20696a..8d28f4d94a83e9c57f19137e1146ed8ac9eb27fa 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache License, Version 2.0</string>
   <string name="about_project_title">Projekt med öppen källkod</string>
   <string name="about_website_title">Webbplats</string>
+  <string name="user_manual_title">Användarmanual</string>
+  <string name="get_help_title">Få hjälp</string>
   <string name="user_forum_title">Användarforum</string>
   <string name="about_fediverse_title">Fediversum</string>
   <string name="about_twitter_title">Twitter</string>
@@ -142,6 +144,10 @@
   <string name="notification_certificate_error_text">Kontrollera dina serverinställningar</string>
   <string name="notification_authentication_error_title">Autentisering misslyckades</string>
   <string name="notification_authentication_error_text">Autentisering misslyckades för <xliff:g id="account">%s</xliff:g>. Uppdatera dina serverinställningar.</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">Aviseringsfel</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">Ett fel uppstod vid försök att skapa en systemavisering för ett nytt meddelande. Anledningen är troligen att ett aviseringsljud saknas.\n\nTryck för att öppna aviseringsinställningarna.</string>
   <string name="notification_bg_sync_ticker">Kontrollerar e-post: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Kontrollerar e-post</string>
   <string name="notification_bg_send_ticker">Skickar e-post: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index 79b76adcfa673f43bff1e21b065e786918d77bfb..239ee597629f6dd1e199e676a3efa0d7979faabb 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -139,6 +139,8 @@
   <string name="notification_certificate_error_text">Sunucu ayarlarınızı kontrol edin</string>
   <string name="notification_authentication_error_title">Kimlik Doğrulama Hatası</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> için oturum açılamadı. Sunucu ayarlarınızı güncelleyin.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Posta kontrol ediliyor: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Posta kontrol ediliyor</string>
   <string name="notification_bg_send_ticker">Posta gönderiliyor: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index d736d2e05ad54f4089522c3e506a120682c4f66e..59186a6522f4edcbe7d93b00cc214cdbcca5c6b1 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -145,6 +145,8 @@
   <string name="notification_certificate_error_text">Перевірте налаштування вашого серверу</string>
   <string name="notification_authentication_error_title">Помилка автентифікації</string>
   <string name="notification_authentication_error_text">Помилка автентифікації для <xliff:g id="account">%s</xliff:g>. Змініть налаштування сервера.</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">Перевірка пошти: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">Перевірка пошти</string>
   <string name="notification_bg_send_ticker">Надсилання пошти: <xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index 3a0492ff2ffdd540b806bf3322f98e3416ea991c..764be89ab4f10fa610c01e065188bdc44f299d59 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache 许可证，2.0 版</string>
   <string name="about_project_title">开源项目</string>
   <string name="about_website_title">网站</string>
+  <string name="user_manual_title">用户手册</string>
+  <string name="get_help_title">获取帮助</string>
   <string name="user_forum_title">用户论坛</string>
   <string name="about_fediverse_title">多样性</string>
   <string name="about_twitter_title">推特</string>
@@ -139,6 +141,10 @@
   <string name="notification_certificate_error_text">请检查您的服务器设置</string>
   <string name="notification_authentication_error_title">身份验证失败</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> 登录失败，请更新设置。</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">通知错误</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">尝试创建新消息的系统通知时出错。最有可能的原因是缺少通知声音。\n\n轻按打开通知设置。</string>
   <string name="notification_bg_sync_ticker">正在检查邮件：<xliff:g id="account">%s</xliff:g>：<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">正在检查邮件</string>
   <string name="notification_bg_send_ticker">正在发送邮件：<xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index fb4a61f252ce833d72885e98c2458f33004bee4b..c1148319992d3ce5b2cb9ffb73e99bf1475e05f3 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache 授權條款， 版本 2.0</string>
   <string name="about_project_title">開放原始碼專案</string>
   <string name="about_website_title">網站</string>
+  <string name="user_manual_title">使用者手冊</string>
+  <string name="get_help_title">取得說明</string>
   <string name="user_forum_title">使用者論壇</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -137,6 +139,8 @@
   <string name="notification_certificate_error_text">檢查你的伺服器設定</string>
   <string name="notification_authentication_error_title">身份驗證失敗</string>
   <string name="notification_authentication_error_text"><xliff:g id="account">%s</xliff:g> 登入失敗。請更新你的伺服器設定。</string>
+  <!--Title of an error notification that is displayed when creating a notification for a new message has failed-->
+  <!--Body of an error notification that is displayed when creating a notification for a new message has failed-->
   <string name="notification_bg_sync_ticker">正在檢查郵件：<xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
   <string name="notification_bg_sync_title">正在檢查郵件</string>
   <string name="notification_bg_send_ticker">正在寄送郵件：<xliff:g id="account">%s</xliff:g></string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index a5575231c2013c91a63f41a99aa3e9f9ee6ef057..d0ff72935899518194cb6040c14df4ed5a1c7e78 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -176,6 +176,11 @@
     <string name="notification_authentication_error_title">Authentication failed</string>
     <string name="notification_authentication_error_text">Authentication failed for <xliff:g id="account">%s</xliff:g>. Update your server settings.</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">Notification error</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">An error has occurred while trying to create a system notification for a new message. The reason is most likely a missing notification sound.\n\nTap to open notification settings.</string>
+
     <string name="notification_bg_sync_ticker">Checking mail: <xliff:g id="account">%s</xliff:g>:<xliff:g id="folder">%s</xliff:g></string>
     <string name="notification_bg_sync_title">Checking mail</string>
     <string name="notification_bg_send_ticker">Sending mail: <xliff:g id="account">%s</xliff:g></string>
diff --git a/fastlane/metadata/android/en-US/changelogs/32001.txt b/fastlane/metadata/android/en-US/changelogs/32001.txt
new file mode 100644
index 0000000000000000000000000000000000000000..670ef32fdf9be9c14f7f52033c4be4d1401094dc
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/32001.txt
@@ -0,0 +1,6 @@
+- Added support for using OAuth 2.0 with Office365 accounts
+- Fixed a bug that could lead to two message lists being displayed on top of each other
+- Avoid a crash when trying to create new message notifications but the notification sound couldn't be accessed
+- Fixed a bug where multi-select mode was exited early in some cases
+- Don't require re-authorization when getting an OAuth token fails due to a temporary error
+- Updated translations