diff --git a/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt b/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt
index 90eb4b6f912e3c13f37e95aa98d29d76a0f12299..4ef3af580058340c7b4aaee296cf327f5a8b8dab 100644
--- a/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt
+++ b/app/autodiscovery/api/src/main/java/com/fsck/k9/autodiscovery/api/ConnectionSettingsDiscovery.kt
@@ -4,13 +4,7 @@ import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
 
 interface ConnectionSettingsDiscovery {
-    fun discover(email: String, target: DiscoveryTarget): DiscoveryResults?
-}
-
-enum class DiscoveryTarget(val outgoing: Boolean, val incoming: Boolean) {
-    OUTGOING(true, false),
-    INCOMING(false, true),
-    INCOMING_AND_OUTGOING(true, true)
+    fun discover(email: String): DiscoveryResults?
 }
 
 data class DiscoveryResults(val incoming: List<DiscoveredServerSettings>, val outgoing: List<DiscoveredServerSettings>)
diff --git a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt b/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt
index b2dd7bd2194b92bbdb7b2886a09f373a0dbc5292..fa8aff880a8dc325f9e168e0e978a47228a460b9 100644
--- a/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt
+++ b/app/autodiscovery/providersxml/src/main/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscovery.kt
@@ -5,7 +5,6 @@ import android.net.Uri
 import com.fsck.k9.autodiscovery.api.ConnectionSettingsDiscovery
 import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
 import com.fsck.k9.autodiscovery.api.DiscoveryResults
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 import com.fsck.k9.helper.EmailHelper
 import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
@@ -19,7 +18,7 @@ class ProvidersXmlDiscovery(
     private val oAuthConfigurationProvider: OAuthConfigurationProvider
 ) : ConnectionSettingsDiscovery {
 
-    override fun discover(email: String, target: DiscoveryTarget): DiscoveryResults? {
+    override fun discover(email: String): DiscoveryResults? {
         val domain = EmailHelper.getDomainFromEmailAddress(email) ?: return null
 
         val provider = findProviderForDomain(domain) ?: return null
diff --git a/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt b/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt
index 4e7d3f329e63388c252178e3466f0f30e90619a6..f91ce3b38d48d9522dddf1dbf13477aba3556626 100644
--- a/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt
+++ b/app/autodiscovery/providersxml/src/test/java/com/fsck/k9/autodiscovery/providersxml/ProvidersXmlDiscoveryTest.kt
@@ -2,7 +2,6 @@ package com.fsck.k9.autodiscovery.providersxml
 
 import androidx.test.core.app.ApplicationProvider
 import com.fsck.k9.RobolectricTest
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
 import com.fsck.k9.oauth.OAuthConfiguration
@@ -17,7 +16,7 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
 
     @Test
     fun discover_withGmailDomain_shouldReturnCorrectSettings() {
-        val connectionSettings = providersXmlDiscovery.discover("user@gmail.com", DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val connectionSettings = providersXmlDiscovery.discover("user@gmail.com")
 
         assertThat(connectionSettings).isNotNull()
         with(connectionSettings!!.incoming.first()) {
@@ -37,7 +36,7 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
     @Test
     fun discover_withUnknownDomain_shouldReturnNull() {
         val connectionSettings = providersXmlDiscovery.discover(
-            "user@not.present.in.providers.xml.example", DiscoveryTarget.INCOMING_AND_OUTGOING
+            "user@not.present.in.providers.xml.example"
         )
 
         assertThat(connectionSettings).isNull()
diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt
index af8e2eed45631e34bde24e22d9445e81b3e38821..9dbbfdbd76d128170be4c42191d5aef3209f4485 100644
--- a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt
+++ b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscovery.kt
@@ -3,7 +3,6 @@ package com.fsck.k9.autodiscovery.srvrecords
 import com.fsck.k9.autodiscovery.api.ConnectionSettingsDiscovery
 import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
 import com.fsck.k9.autodiscovery.api.DiscoveryResults
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 import com.fsck.k9.helper.EmailHelper
 import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
@@ -12,19 +11,19 @@ class SrvServiceDiscovery(
     private val srvResolver: MiniDnsSrvResolver
 ) : ConnectionSettingsDiscovery {
 
-    override fun discover(email: String, target: DiscoveryTarget): DiscoveryResults? {
+    override fun discover(email: String): DiscoveryResults? {
         val domain = EmailHelper.getDomainFromEmailAddress(email) ?: return null
         val mailServicePriority = compareBy<MailService> { it.priority }.thenByDescending { it.security }
 
-        val outgoingSettings = if (target.outgoing)
-            listOf(SrvType.SUBMISSIONS, SrvType.SUBMISSION).flatMap { srvResolver.lookup(domain, it) }
-                .sortedWith(mailServicePriority).map { newServerSettings(it, email) }
-        else listOf()
+        val outgoingSettings = listOf(SrvType.SUBMISSIONS, SrvType.SUBMISSION)
+            .flatMap { srvResolver.lookup(domain, it) }
+            .sortedWith(mailServicePriority)
+            .map { newServerSettings(it, email) }
 
-        val incomingSettings = if (target.incoming)
-            listOf(SrvType.IMAPS, SrvType.IMAP).flatMap { srvResolver.lookup(domain, it) }
-                .sortedWith(mailServicePriority).map { newServerSettings(it, email) }
-        else listOf()
+        val incomingSettings = listOf(SrvType.IMAPS, SrvType.IMAP)
+            .flatMap { srvResolver.lookup(domain, it) }
+            .sortedWith(mailServicePriority)
+            .map { newServerSettings(it, email) }
 
         return DiscoveryResults(incoming = incomingSettings, outgoing = outgoingSettings)
     }
diff --git a/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt b/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt
index 5123822d74784d1f60a902286ffda99a37de83bc..73425a50fff5b34c52cfc8108fe33ba1a9c92159 100644
--- a/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt
+++ b/app/autodiscovery/srvrecords/src/test/java/com/fsck/k9/autodiscovery/srvrecords/SrvServiceDiscoveryTest.kt
@@ -1,15 +1,11 @@
 package com.fsck.k9.autodiscovery.srvrecords
 
-import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
 import com.fsck.k9.autodiscovery.api.DiscoveryResults
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 import com.fsck.k9.mail.ConnectionSecurity
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.verifyNoMoreInteractions
 
 class SrvServiceDiscoveryTest {
 
@@ -18,7 +14,7 @@ class SrvServiceDiscoveryTest {
         val srvResolver = newMockSrvResolver()
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val result = srvServiceDiscovery.discover("test@example.com")
 
         assertEquals(DiscoveryResults(listOf(), listOf()), result)
     }
@@ -33,7 +29,7 @@ class SrvServiceDiscoveryTest {
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val result = srvServiceDiscovery.discover("test@example.com")
 
         assertEquals(2, result!!.incoming.size)
         assertEquals(0, result.outgoing.size)
@@ -57,7 +53,7 @@ class SrvServiceDiscoveryTest {
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val result = srvServiceDiscovery.discover("test@example.com")
 
         assertEquals(0, result!!.incoming.size)
         assertEquals(2, result.outgoing.size)
@@ -133,7 +129,7 @@ class SrvServiceDiscoveryTest {
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val result = srvServiceDiscovery.discover("test@example.com")
 
         assertEquals(
             listOf(
@@ -155,54 +151,6 @@ class SrvServiceDiscoveryTest {
         )
     }
 
-    @Test
-    fun discover_whenOnlyOutgoingTrue_shouldOnlyFetchOutgoing() {
-        val srvResolver = newMockSrvResolver(
-            submissionServices = listOf(
-                newMailService(
-                    host = "smtp.example.com",
-                    port = 465,
-                    srvType = SrvType.SUBMISSIONS,
-                    security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 0
-                )
-            )
-        )
-
-        val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.OUTGOING)
-
-        verify(srvResolver).lookup("example.com", SrvType.SUBMISSIONS)
-        verify(srvResolver).lookup("example.com", SrvType.SUBMISSION)
-        verifyNoMoreInteractions(srvResolver)
-        assertEquals(1, result!!.outgoing.size)
-        assertEquals(listOf<DiscoveredServerSettings>(), result.incoming)
-    }
-
-    @Test
-    fun discover_whenOnlyIncomingTrue_shouldOnlyFetchIncoming() {
-        val srvResolver = newMockSrvResolver(
-            imapsServices = listOf(
-                newMailService(
-                    host = "imaps.example.com",
-                    port = 993,
-                    srvType = SrvType.IMAPS,
-                    security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 0
-                )
-            )
-        )
-
-        val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
-        val result = srvServiceDiscovery.discover("test@example.com", DiscoveryTarget.INCOMING)
-
-        verify(srvResolver).lookup("example.com", SrvType.IMAPS)
-        verify(srvResolver).lookup("example.com", SrvType.IMAP)
-        verifyNoMoreInteractions(srvResolver)
-        assertEquals(1, result!!.incoming.size)
-        assertEquals(listOf<DiscoveredServerSettings>(), result.outgoing)
-    }
-
     private fun newMailService(
         host: String = "example.com",
         priority: Int = 0,
diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
index 94c513d550641dd8be92df58b09d38f95a145443..c4da63191c07fd8033d18ea7749294c131f9fbbf 100644
--- a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
+++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigFetcher.kt
@@ -1,6 +1,5 @@
 package com.fsck.k9.autodiscovery.thunderbird
 
-import com.fsck.k9.helper.EmailHelper
 import java.io.InputStream
 import okhttp3.HttpUrl
 import okhttp3.OkHttpClient
@@ -8,8 +7,7 @@ import okhttp3.Request
 
 class ThunderbirdAutoconfigFetcher(private val okHttpClient: OkHttpClient) {
 
-    fun fetchAutoconfigFile(email: String): InputStream? {
-        val url = getAutodiscoveryAddress(email)
+    fun fetchAutoconfigFile(url: HttpUrl): InputStream? {
         val request = Request.Builder().url(url).build()
 
         val response = okHttpClient.newCall(request).execute()
@@ -20,20 +18,4 @@ class ThunderbirdAutoconfigFetcher(private val okHttpClient: OkHttpClient) {
             null
         }
     }
-
-    companion object {
-        // address described at:
-        // https://developer.mozilla.org/en-US/docs/Mozilla/Thunderbird/Autoconfiguration#Configuration_server_at_ISP
-        internal fun getAutodiscoveryAddress(email: String): HttpUrl {
-            val domain = EmailHelper.getDomainFromEmailAddress(email)
-            requireNotNull(domain) { "Couldn't extract domain from email address: $email" }
-
-            return HttpUrl.Builder()
-                .scheme("https")
-                .host(domain)
-                .addEncodedPathSegments(".well-known/autoconfig/mail/config-v1.1.xml")
-                .addQueryParameter("emailaddress", email)
-                .build()
-        }
-    }
 }
diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..bffb1e20f3f941de68e5cf19d7525b9a74701e4e
--- /dev/null
+++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProvider.kt
@@ -0,0 +1,47 @@
+package com.fsck.k9.autodiscovery.thunderbird
+
+import com.fsck.k9.helper.EmailHelper
+import okhttp3.HttpUrl
+import okhttp3.HttpUrl.Companion.toHttpUrl
+
+class ThunderbirdAutoconfigUrlProvider {
+    fun getAutoconfigUrls(email: String): List<HttpUrl> {
+        val domain = EmailHelper.getDomainFromEmailAddress(email)
+        requireNotNull(domain) { "Couldn't extract domain from email address: $email" }
+
+        return listOf(
+            createProviderUrl(domain, email),
+            createDomainUrl(scheme = "https", domain),
+            createDomainUrl(scheme = "http", domain),
+            createIspDbUrl(domain)
+        )
+    }
+
+    private fun createProviderUrl(domain: String?, email: String): HttpUrl {
+        // https://autoconfig.{domain}/mail/config-v1.1.xml?emailaddress={email}
+        return HttpUrl.Builder()
+            .scheme("https")
+            .host("autoconfig.$domain")
+            .addEncodedPathSegments("mail/config-v1.1.xml")
+            .addQueryParameter("emailaddress", email)
+            .build()
+    }
+
+    private fun createDomainUrl(scheme: String, domain: String): HttpUrl {
+        // https://{domain}/.well-known/autoconfig/mail/config-v1.1.xml
+        // http://{domain}/.well-known/autoconfig/mail/config-v1.1.xml
+        return HttpUrl.Builder()
+            .scheme(scheme)
+            .host(domain)
+            .addEncodedPathSegments(".well-known/autoconfig/mail/config-v1.1.xml")
+            .build()
+    }
+
+    private fun createIspDbUrl(domain: String): HttpUrl {
+        // https://autoconfig.thunderbird.net/v1.1/{domain}
+        return "https://autoconfig.thunderbird.net/v1.1/".toHttpUrl()
+            .newBuilder()
+            .addPathSegment(domain)
+            .build()
+    }
+}
diff --git a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt
index ff02028f9c2708d6cddda9c79aae070291b19c18..23d16819ad75ec5391556bc7cb0836f504e828a1 100644
--- a/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt
+++ b/app/autodiscovery/thunderbird/src/main/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdDiscovery.kt
@@ -2,19 +2,26 @@ package com.fsck.k9.autodiscovery.thunderbird
 
 import com.fsck.k9.autodiscovery.api.ConnectionSettingsDiscovery
 import com.fsck.k9.autodiscovery.api.DiscoveryResults
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 
 class ThunderbirdDiscovery(
+    private val urlProvider: ThunderbirdAutoconfigUrlProvider,
     private val fetcher: ThunderbirdAutoconfigFetcher,
     private val parser: ThunderbirdAutoconfigParser
 ) : ConnectionSettingsDiscovery {
 
-    override fun discover(email: String, target: DiscoveryTarget): DiscoveryResults? {
-        val autoconfigInputStream = fetcher.fetchAutoconfigFile(email) ?: return null
+    override fun discover(email: String): DiscoveryResults? {
+        val autoconfigUrls = urlProvider.getAutoconfigUrls(email)
 
-        return autoconfigInputStream.use {
-            parser.parseSettings(it, email)
-        }
+        return autoconfigUrls
+            .asSequence()
+            .mapNotNull { autoconfigUrl ->
+                fetcher.fetchAutoconfigFile(autoconfigUrl)?.use { inputStream ->
+                    parser.parseSettings(inputStream, email)
+                }
+            }
+            .firstOrNull { result ->
+                result.incoming.isNotEmpty() || result.outgoing.isNotEmpty()
+            }
     }
 
     override fun toString(): String = "Thunderbird autoconfig"
diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt
index 4648f675605391b09c4e6d4c8c88b631b29a2974..ca7dc0f1c2d6329e73c1758dbf18a3d98aabb08c 100644
--- a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt
+++ b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigTest.kt
@@ -169,13 +169,4 @@ class ThunderbirdAutoconfigTest {
             )
         )
     }
-
-    @Test
-    fun generatedUrls() {
-        val autoDiscoveryAddress = ThunderbirdAutoconfigFetcher.getAutodiscoveryAddress("test@metacode.biz")
-
-        assertThat(autoDiscoveryAddress.toString()).isEqualTo(
-            "https://metacode.biz/.well-known/autoconfig/mail/config-v1.1.xml?emailaddress=test%40metacode.biz"
-        )
-    }
 }
diff --git a/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..d285a3ac02f2ce94d3f2c03c9373e2d00e38d288
--- /dev/null
+++ b/app/autodiscovery/thunderbird/src/test/java/com/fsck/k9/autodiscovery/thunderbird/ThunderbirdAutoconfigUrlProviderTest.kt
@@ -0,0 +1,20 @@
+package com.fsck.k9.autodiscovery.thunderbird
+
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+
+class ThunderbirdAutoconfigUrlProviderTest {
+    private val urlProvider = ThunderbirdAutoconfigUrlProvider()
+
+    @Test
+    fun `getAutoconfigUrls with ASCII email address`() {
+        val autoconfigUrls = urlProvider.getAutoconfigUrls("test@domain.example")
+
+        assertThat(autoconfigUrls.map { it.toString() }).containsExactly(
+            "https://autoconfig.domain.example/mail/config-v1.1.xml?emailaddress=test%40domain.example",
+            "https://domain.example/.well-known/autoconfig/mail/config-v1.1.xml",
+            "http://domain.example/.well-known/autoconfig/mail/config-v1.1.xml",
+            "https://autoconfig.thunderbird.net/v1.1/domain.example"
+        )
+    }
+}
diff --git a/app/core/src/main/java/com/fsck/k9/K9.kt b/app/core/src/main/java/com/fsck/k9/K9.kt
index af9c8e7a28a35ee290f7fb29074499893a5c651e..fb5af082afc2edb03371a9483258c16dfa13c8dc 100644
--- a/app/core/src/main/java/com/fsck/k9/K9.kt
+++ b/app/core/src/main/java/com/fsck/k9/K9.kt
@@ -123,7 +123,7 @@ object K9 : EarlyInit {
     val fontSizes = FontSizes()
 
     @JvmStatic
-    var backgroundOps = BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC
+    var backgroundOps = BACKGROUND_OPS.ALWAYS
 
     @JvmStatic
     var isShowAnimations = true
@@ -266,6 +266,12 @@ object K9 : EarlyInit {
     @JvmStatic
     var pgpSignOnlyDialogCounter: Int = 0
 
+    @JvmStatic
+    var swipeRightAction: SwipeAction = SwipeAction.ToggleSelection
+
+    @JvmStatic
+    var swipeLeftAction: SwipeAction = SwipeAction.ToggleRead
+
     val isQuietTime: Boolean
         get() {
             if (!isQuietTimeEnabled) {
@@ -362,7 +368,7 @@ object K9 : EarlyInit {
         isThreadedViewEnabled = storage.getBoolean("threadedView", true)
         fontSizes.load(storage)
 
-        backgroundOps = storage.getEnum("backgroundOperations", BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC)
+        backgroundOps = storage.getEnum("backgroundOperations", BACKGROUND_OPS.ALWAYS)
 
         isColorizeMissingContactPictures = storage.getBoolean("colorizeMissingContactPictures", true)
 
@@ -382,6 +388,9 @@ object K9 : EarlyInit {
         messageViewTheme = storage.getEnum("messageViewTheme", SubTheme.USE_GLOBAL)
         messageComposeTheme = storage.getEnum("messageComposeTheme", SubTheme.USE_GLOBAL)
         isFixedMessageViewTheme = storage.getBoolean("fixedMessageViewTheme", true)
+
+        swipeRightAction = storage.getEnum("swipeRightAction", SwipeAction.ToggleSelection)
+        swipeLeftAction = storage.getEnum("swipeLeftAction", SwipeAction.ToggleRead)
     }
 
     internal fun save(editor: StorageEditor) {
@@ -447,6 +456,9 @@ object K9 : EarlyInit {
         editor.putInt("pgpInlineDialogCounter", pgpInlineDialogCounter)
         editor.putInt("pgpSignOnlyDialogCounter", pgpSignOnlyDialogCounter)
 
+        editor.putEnum("swipeRightAction", swipeRightAction)
+        editor.putEnum("swipeLeftAction", swipeLeftAction)
+
         fontSizes.save(editor)
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/Preferences.kt b/app/core/src/main/java/com/fsck/k9/Preferences.kt
index 7e66d18f85a32b87588b3f0038f855898e38fc2c..84517c4cf03f0f29b564bfb83fda1d1edf7896a6 100644
--- a/app/core/src/main/java/com/fsck/k9/Preferences.kt
+++ b/app/core/src/main/java/com/fsck/k9/Preferences.kt
@@ -110,6 +110,9 @@ class Preferences internal constructor(
             }
         }
 
+    private val completeAccounts: List<Account>
+        get() = accounts.filter { it.isFinishedSetup }
+
     override fun getAccount(accountUuid: String): Account? {
         synchronized(accountLock) {
             if (accountsMap == null) {
@@ -151,10 +154,10 @@ class Preferences internal constructor(
     @OptIn(ExperimentalCoroutinesApi::class)
     override fun getAccountsFlow(): Flow<List<Account>> {
         return callbackFlow {
-            send(accounts)
+            send(completeAccounts)
 
             val listener = AccountsChangeListener {
-                trySendBlocking(accounts)
+                trySendBlocking(completeAccounts)
             }
             addOnAccountsChangeListener(listener)
 
diff --git a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt
new file mode 100644
index 0000000000000000000000000000000000000000..8079a8766153cb12e08a15d9078771a2614ddf28
--- /dev/null
+++ b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt
@@ -0,0 +1,12 @@
+package com.fsck.k9
+
+enum class SwipeAction(val removesItem: Boolean) {
+    None(removesItem = false),
+    ToggleSelection(removesItem = false),
+    ToggleRead(removesItem = false),
+    ToggleStar(removesItem = false),
+    Archive(removesItem = true),
+    Delete(removesItem = true),
+    Spam(removesItem = true),
+    Move(removesItem = true)
+}
diff --git a/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt b/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt
index b613b650e63b4e2e91329ae67d88a9063736444b..83963f052d2456536c4b0f3c19b1a01e66e8de8b 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/DraftOperations.kt
@@ -75,8 +75,10 @@ internal class DraftOperations(
             messagingController.queuePendingCommand(account, command)
         } else {
             val fakeMessageServerId = messageStore.getMessageServerId(messageId)
-            val command = PendingAppend.create(folderId, fakeMessageServerId)
-            messagingController.queuePendingCommand(account, command)
+            if (fakeMessageServerId != null) {
+                val command = PendingAppend.create(folderId, fakeMessageServerId)
+                messagingController.queuePendingCommand(account, command)
+            }
         }
 
         messagingController.processPendingCommands(account)
diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
index 4d56037172418a8f4a09353f2f3119307f9bfcc6..5057e12d503092a1956f4cb8264b14d15cbfafa5 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
+++ b/app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -93,7 +93,6 @@ import static com.fsck.k9.K9.MAX_SEND_ATTEMPTS;
 import static com.fsck.k9.helper.ExceptionHelper.getRootCauseMessage;
 import static com.fsck.k9.helper.Preconditions.checkNotNull;
 import static com.fsck.k9.mail.Flag.X_REMOTE_COPY_STARTED;
-import static com.fsck.k9.search.LocalSearchExtensions.getAccountsFromLocalSearch;
 
 
 /**
@@ -395,27 +394,6 @@ public class MessagingController {
         }
     }
 
-    /**
-     * Find all messages in any local account which match the query 'query'
-     */
-    public List<LocalMessage> searchLocalMessages(final LocalSearch search) {
-        List<Account> searchAccounts = getAccountsFromLocalSearch(search, preferences);
-
-        List<LocalMessage> messages = new ArrayList<>();
-        for (final Account account : searchAccounts) {
-            try {
-                LocalStore localStore = localStoreProvider.getInstance(account);
-                List<LocalMessage> localMessages = localStore.searchForMessages(search);
-
-                messages.addAll(localMessages);
-            } catch (Exception e) {
-                Timber.e(e);
-            }
-        }
-
-        return messages;
-    }
-
     public Future<?> searchRemoteMessages(String acctUuid, long folderId, String query, Set<Flag> requiredFlags,
             Set<Flag> forbiddenFlags, MessagingListener listener) {
         Timber.i("searchRemoteMessages (acct = %s, folderId = %d, query = %s)", acctUuid, folderId, query);
@@ -1663,9 +1641,11 @@ public class MessagingController {
 
             if (!sentFolder.isLocalOnly()) {
                 String destinationUid = messageStore.getMessageServerId(destinationMessageId);
-                PendingCommand command = PendingAppend.create(sentFolderId, destinationUid);
-                queuePendingCommand(account, command);
-                processPendingCommands(account);
+                if (destinationUid != null) {
+                    PendingCommand command = PendingAppend.create(sentFolderId, destinationUid);
+                    queuePendingCommand(account, command);
+                    processPendingCommands(account);
+                }
             }
         }
 
@@ -1949,9 +1929,10 @@ public class MessagingController {
 
         MessageStore messageStore = messageStoreManager.getMessageStore(account);
         String messageServerId = messageStore.getMessageServerId(messageId);
-        MessageReference messageReference = new MessageReference(account.getUuid(), folderId, messageServerId);
-
-        deleteMessage(messageReference);
+        if (messageServerId != null) {
+            MessageReference messageReference = new MessageReference(account.getUuid(), folderId, messageServerId);
+            deleteMessage(messageReference);
+        }
     }
 
     public void deleteThreads(final List<MessageReference> messages) {
@@ -2707,7 +2688,6 @@ public class MessagingController {
             LocalFolder localFolder = message.getFolder();
             if (!suppressNotifications &&
                     notificationStrategy.shouldNotifyForMessage(account, localFolder, message, isOldMessage)) {
-                Timber.v("Creating notification for message %s:%s", localFolder.getName(), message.getUid());
                 // Notify with the localMessage so that we don't have to recalculate the content preview.
                 boolean silent = notificationState.wasNotified();
                 notificationController.addNewMailNotification(account, message, silent);
diff --git a/app/core/src/main/java/com/fsck/k9/helper/CursorExtensions.kt b/app/core/src/main/java/com/fsck/k9/helper/CursorExtensions.kt
index 61c60c7ba82299853f364239f771c23ab7462413..53544cdf9ea8a42a4b14b916d37ca2379e65b936 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/CursorExtensions.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/CursorExtensions.kt
@@ -35,3 +35,7 @@ fun Cursor.getIntOrThrow(columnName: String): Int {
 fun Cursor.getLongOrThrow(columnName: String): Long {
     return getLongOrNull(columnName) ?: error("Column $columnName must not be null")
 }
+
+fun Cursor.getBoolean(columnIndex: Int): Boolean {
+    return getString(columnIndex).toBoolean()
+}
diff --git a/app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java b/app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java
index ce046daa9e1e5a93f251f341b6ae99b192f9c93b..7ab0b258c9601962c3e759acceafe0dbc9fa3e15 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java
+++ b/app/core/src/main/java/com/fsck/k9/helper/DefaultTrustedSocketFactory.java
@@ -11,26 +11,23 @@ import java.util.List;
 
 import android.content.Context;
 import android.net.SSLCertificateSocketFactory;
+import android.os.Build;
 import android.text.TextUtils;
 
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.ssl.TrustManagerFactory;
 import com.fsck.k9.mail.ssl.TrustedSocketFactory;
 import javax.net.ssl.KeyManager;
+import javax.net.ssl.SNIHostName;
+import javax.net.ssl.SNIServerName;
 import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLSocket;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManager;
 import timber.log.Timber;
 
 
-/**
- * Prior to API 21 (and notably from API 10 - 2.3.4) Android weakened it's cipher list
- * by ordering them badly such that RC4-MD5 was preferred. To work around this we 
- * remove the insecure ciphers and reorder them so the latest more secure ciphers are at the top.
- *
- * On more modern versions of Android we keep the system configuration.
- */
 public class DefaultTrustedSocketFactory implements TrustedSocketFactory {
     private static final String[] ENABLED_CIPHERS;
     private static final String[] ENABLED_PROTOCOLS;
@@ -150,6 +147,11 @@ public class DefaultTrustedSocketFactory implements TrustedSocketFactory {
         if (factory instanceof android.net.SSLCertificateSocketFactory) {
             SSLCertificateSocketFactory sslCertificateSocketFactory = (SSLCertificateSocketFactory) factory;
             sslCertificateSocketFactory.setHostname(socket, hostname);
+        } else if (Build.VERSION.SDK_INT >= 24) {
+            SSLParameters sslParameters = socket.getSSLParameters();
+            List<SNIServerName> sniServerNames = Collections.singletonList(new SNIHostName(hostname));
+            sslParameters.setServerNames(sniServerNames);
+            socket.setSSLParameters(sslParameters);
         } else {
             setHostnameViaReflection(socket, hostname);
         }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java b/app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
index c3d0de6613b61d26aaf01e263ca96205f5d0dddf..a6381396728ed737977069060fad085e29050121 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/LocalMessage.java
@@ -194,10 +194,6 @@ public class LocalMessage extends MimeMessage {
         return (attachmentCount > 0);
     }
 
-    public int getAttachmentCount() {
-        return attachmentCount;
-    }
-
     @Override
     public void setFrom(Address from) {
         this.mFrom = new Address[] { from };
@@ -388,10 +384,6 @@ public class LocalMessage extends MimeMessage {
         return mFolder;
     }
 
-    public String getUri() {
-        return "k9mail://messages/" +  getAccount().getAccountNumber() + "/" + getFolder().getDatabaseId() + "/" + getUid();
-    }
-
     @Override
     public void writeTo(OutputStream out) throws IOException, MessagingException {
         if (headerNeedsUpdating) {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
index 5a748ee2728e85dfabc2d99f1fda6b004e019330..2bea1c5340779581f540848aa56542a34cd52ee3 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageListRepository.kt
@@ -5,19 +5,32 @@ import java.util.concurrent.CopyOnWriteArraySet
 class MessageListRepository(
     private val messageStoreManager: MessageStoreManager
 ) {
-    private val listeners = CopyOnWriteArraySet<Pair<String, MessageListChangedListener>>()
+    private val globalListeners = CopyOnWriteArraySet<MessageListChangedListener>()
+    private val accountListeners = CopyOnWriteArraySet<Pair<String, MessageListChangedListener>>()
+
+    fun addListener(listener: MessageListChangedListener) {
+        globalListeners.add(listener)
+    }
 
     fun addListener(accountUuid: String, listener: MessageListChangedListener) {
-        listeners.add(accountUuid to listener)
+        accountListeners.add(accountUuid to listener)
     }
 
     fun removeListener(listener: MessageListChangedListener) {
-        val entries = listeners.filter { it.second == listener }.toSet()
-        listeners.removeAll(entries)
+        globalListeners.remove(listener)
+
+        val accountEntries = accountListeners.filter { it.second == listener }.toSet()
+        if (accountEntries.isNotEmpty()) {
+            accountListeners.removeAll(accountEntries)
+        }
     }
 
     fun notifyMessageListChanged(accountUuid: String) {
-        for (listener in listeners) {
+        for (listener in globalListeners) {
+            listener.onMessageListChanged()
+        }
+
+        for (listener in accountListeners) {
             if (listener.first == accountUuid) {
                 listener.second.onMessageListChanged()
             }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
index eecbbd96454ac25f4a38f8b6dd2aa8b1911114f3..80d3dd32bc2d30096ddea89c4c4ddfd7dbee370b 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStore.kt
@@ -91,7 +91,7 @@ interface MessageStore {
     /**
      * Retrieve the server ID for a given message.
      */
-    fun getMessageServerId(messageId: Long): String
+    fun getMessageServerId(messageId: Long): String?
 
     /**
      * Retrieve the server IDs for the given messages.
diff --git a/app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java b/app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java
index eb2235cb1bf75c9b2b43c486c226ede6ab66881a..5a03104c48e77138a062821696505a1213548de2 100644
--- a/app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java
+++ b/app/core/src/main/java/com/fsck/k9/message/TextBodyBuilder.java
@@ -188,8 +188,7 @@ class TextBodyBuilder {
     private String getSignatureHtml() {
         String signature = "";
         if (!isEmpty(mSignature)) {
-            signature = "<div style='white-space: pre-wrap'>" +
-                    HtmlConverter.textToHtmlFragmentWithOriginalWhitespace(mSignature) + "</div>";
+            signature = HtmlConverter.textToHtmlFragment(mSignature);
         }
         return signature;
     }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
index fe0144108e8d4c800d930123bb743c28811318d4..6d506852ee496ff63b78c3ed04b8bb57d90d4489 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationController.kt
@@ -4,6 +4,7 @@ import com.fsck.k9.Account
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.mailstore.LocalFolder
 import com.fsck.k9.mailstore.LocalMessage
+import timber.log.Timber
 
 class NotificationController internal constructor(
     private val certificateErrorNotificationController: CertificateErrorNotificationController,
@@ -61,20 +62,33 @@ class NotificationController internal constructor(
     }
 
     fun addNewMailNotification(account: Account, message: LocalMessage, silent: Boolean) {
+        Timber.v(
+            "Creating notification for message %s:%s:%s",
+            message.account.uuid,
+            message.folder.databaseId,
+            message.uid
+        )
+
         newMailNotificationController.addNewMailNotification(account, message, silent)
     }
 
     fun removeNewMailNotification(account: Account, messageReference: MessageReference) {
+        Timber.v("Removing notification for message %s", messageReference)
+
         newMailNotificationController.removeNewMailNotifications(account, clearNewMessageState = true) {
             listOf(messageReference)
         }
     }
 
     fun clearNewMailNotifications(account: Account, selector: (List<MessageReference>) -> List<MessageReference>) {
+        Timber.v("Removing some notifications for account %s", account.uuid)
+
         newMailNotificationController.removeNewMailNotifications(account, clearNewMessageState = false, selector)
     }
 
     fun clearNewMailNotifications(account: Account, clearNewMessageState: Boolean) {
+        Timber.v("Removing all notifications for account %s", account.uuid)
+
         newMailNotificationController.clearNewMailNotifications(account, clearNewMessageState)
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
index 2458bf7800227ec7d3cd9fc887df22dce2f0eaaf..93dd1d23ca022a4e5a0b049899ab4783f23d98d7 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettingsDescriptions.java
@@ -10,15 +10,16 @@ import java.util.Set;
 import java.util.TreeMap;
 
 import android.content.Context;
-import android.graphics.Color;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.Account.SortType;
 import com.fsck.k9.DI;
 import com.fsck.k9.FontSizes;
 import com.fsck.k9.K9;
+import com.fsck.k9.K9.BACKGROUND_OPS;
 import com.fsck.k9.K9.NotificationQuickDelete;
 import com.fsck.k9.K9.SplitViewMode;
+import com.fsck.k9.SwipeAction;
 import com.fsck.k9.core.R;
 import com.fsck.k9.preferences.Settings.BooleanSetting;
 import com.fsck.k9.preferences.Settings.ColorSetting;
@@ -51,7 +52,8 @@ public class GeneralSettingsDescriptions {
                 new V(1, new BooleanSetting(false))
         ));
         s.put("backgroundOperations", Settings.versions(
-                new V(1, new EnumSetting<>(K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC))
+                new V(1, new EnumSetting<>(K9.BACKGROUND_OPS.class, K9.BACKGROUND_OPS.WHEN_CHECKED_AUTO_SYNC)),
+                new V(83, new EnumSetting<>(K9.BACKGROUND_OPS.class, BACKGROUND_OPS.ALWAYS))
         ));
         s.put("changeRegisteredNameColor", Settings.versions(
                 new V(1, new BooleanSetting(false))
@@ -275,6 +277,12 @@ public class GeneralSettingsDescriptions {
         s.put("showStarredCount", Settings.versions(
                 new V(75, new BooleanSetting(false))
         ));
+        s.put("swipeRightAction", Settings.versions(
+                new V(83, new EnumSetting<>(SwipeAction.class, SwipeAction.ToggleSelection))
+        ));
+        s.put("swipeLeftAction", Settings.versions(
+                new V(83, new EnumSetting<>(SwipeAction.class, SwipeAction.ToggleRead))
+        ));
 
         SETTINGS = Collections.unmodifiableMap(s);
 
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
index 93b5ed8699d4d550b59d908f9ab19c3ef35a27d6..adb2c53ff839f60e07c40f5ae5f63502c7340737 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/RealGeneralSettingsManager.kt
@@ -40,6 +40,9 @@ internal class RealGeneralSettingsManager(
     }
 
     override fun getSettingsFlow(): Flow<GeneralSettings> {
+        // Make sure to load settings now if they haven't been loaded already. This will also update settingsFlow.
+        getSettings()
+
         return settingsFlow.distinctUntilChanged()
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
index a82e888a7b22bf14bc31a50b184bd50efd0fdc08..a761d6fa90cb69eadd005e582b393089d1b33c9d 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
+++ b/app/core/src/main/java/com/fsck/k9/preferences/Settings.java
@@ -36,7 +36,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 82;
+    public static final int VERSION = 83;
 
     static Map<String, Object> validate(int version, Map<String, TreeMap<Integer, SettingsDescription>> settings,
             Map<String, String> importedSettings, boolean useDefaultValues) {
diff --git a/app/core/src/main/res/values/arrays_account_settings_values.xml b/app/core/src/main/res/values/arrays_account_settings_values.xml
index b43b3c62256b5bbf4ace1e9dd0c33e7deb925087..d20d463a1e0787ebaea6d654532598b90dc67514 100644
--- a/app/core/src/main/res/values/arrays_account_settings_values.xml
+++ b/app/core/src/main/res/values/arrays_account_settings_values.xml
@@ -6,6 +6,10 @@
         <item>0xFF0086FF</item>
     </integer-array>
 
+    <integer-array name="default_account_colors">
+        <item>0xFF0086FF</item>
+    </integer-array>
+
     <string-array name="check_frequency_values" translatable="false">
         <item>-1</item>
         <item>5</item>
diff --git a/app/core/src/main/res/values/arrays_general_settings_values.xml b/app/core/src/main/res/values/arrays_general_settings_values.xml
index b5b0f49f67a8e32e5e1775010113f62724f54a21..95fca883f9a8e088db0092e1c61324e4b3d0d546 100644
--- a/app/core/src/main/res/values/arrays_general_settings_values.xml
+++ b/app/core/src/main/res/values/arrays_general_settings_values.xml
@@ -210,4 +210,15 @@
         <item>spam</item>
     </string-array>
 
+    <string-array name="swipe_action_values" translatable="false">
+        <item>none</item>
+        <item>toggle_selection</item>
+        <item>toggle_read</item>
+        <item>toggle_star</item>
+        <item>archive</item>
+        <item>delete</item>
+        <item>spam</item>
+        <item>move</item>
+    </string-array>
+
 </resources>
diff --git a/app/core/src/main/res/values/material_colors.xml b/app/core/src/main/res/values/material_colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..31c59aac5bc4bbb91523431f863f3bb6020a22a3
--- /dev/null
+++ b/app/core/src/main/res/values/material_colors.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="material_red_50">#FFEBEE</color>
+    <color name="material_red_100">#FFCDD2</color>
+    <color name="material_red_200">#EF9A9A</color>
+    <color name="material_red_300">#E57373</color>
+    <color name="material_red_400">#EF5350</color>
+    <color name="material_red_500">#F44336</color>
+    <color name="material_red_600">#E53935</color>
+    <color name="material_red_700">#D32F2F</color>
+    <color name="material_red_800">#C62828</color>
+    <color name="material_red_900">#B71C1C</color>
+
+    <color name="material_deep_purple_50">#EDE7F6</color>
+    <color name="material_deep_purple_100">#D1C4E9</color>
+    <color name="material_deep_purple_200">#B39DDB</color>
+    <color name="material_deep_purple_300">#9575CD</color>
+    <color name="material_deep_purple_400">#7E57C2</color>
+    <color name="material_deep_purple_500">#673AB7</color>
+    <color name="material_deep_purple_600">#5E35B1</color>
+    <color name="material_deep_purple_700">#512DA8</color>
+    <color name="material_deep_purple_800">#4527A0</color>
+    <color name="material_deep_purple_900">#311B92</color>
+
+    <color name="material_light_blue_50">#E1F5FE</color>
+    <color name="material_light_blue_100">#B3E5FC</color>
+    <color name="material_light_blue_200">#81D4FA</color>
+    <color name="material_light_blue_300">#4FC3F7</color>
+    <color name="material_light_blue_400">#29B6F6</color>
+    <color name="material_light_blue_500">#03A9F4</color>
+    <color name="material_light_blue_600">#039BE5</color>
+    <color name="material_light_blue_700">#0288D1</color>
+    <color name="material_light_blue_800">#0277BD</color>
+    <color name="material_light_blue_900">#01579B</color>
+
+    <color name="material_green_50">#E8F5E9</color>
+    <color name="material_green_100">#C8E6C9</color>
+    <color name="material_green_200">#A5D6A7</color>
+    <color name="material_green_300">#81C784</color>
+    <color name="material_green_400">#66BB6A</color>
+    <color name="material_green_500">#4CAF50</color>
+    <color name="material_green_600">#43A047</color>
+    <color name="material_green_700">#388E3C</color>
+    <color name="material_green_800">#2E7D32</color>
+    <color name="material_green_900">#1B5E20</color>
+
+    <color name="material_yellow_50">#FFFDE7</color>
+    <color name="material_yellow_100">#FFF9C4</color>
+    <color name="material_yellow_200">#FFF59D</color>
+    <color name="material_yellow_300">#FFF176</color>
+    <color name="material_yellow_400">#FFEE58</color>
+    <color name="material_yellow_500">#FFEB3B</color>
+    <color name="material_yellow_600">#FDD835</color>
+    <color name="material_yellow_700">#FBC02D</color>
+    <color name="material_yellow_800">#F9A825</color>
+    <color name="material_yellow_900">#F57F17</color>
+
+    <color name="material_deep_orange_50">#FBE9E7</color>
+    <color name="material_deep_orange_100">#FFCCBC</color>
+    <color name="material_deep_orange_200">#FFAB91</color>
+    <color name="material_deep_orange_300">#FF8A65</color>
+    <color name="material_deep_orange_400">#FF7043</color>
+    <color name="material_deep_orange_500">#FF5722</color>
+    <color name="material_deep_orange_600">#F4511E</color>
+    <color name="material_deep_orange_700">#E64A19</color>
+    <color name="material_deep_orange_800">#D84315</color>
+    <color name="material_deep_orange_900">#BF360C</color>
+
+    <color name="material_blue_gray_50">#ECEFF1</color>
+    <color name="material_blue_gray_100">#CFD8DC</color>
+    <color name="material_blue_gray_200">#B0BEC5</color>
+    <color name="material_blue_gray_300">#90A4AE</color>
+    <color name="material_blue_gray_400">#78909C</color>
+    <color name="material_blue_gray_500">#607D8B</color>
+    <color name="material_blue_gray_600">#546E7A</color>
+    <color name="material_blue_gray_700">#455A64</color>
+    <color name="material_blue_gray_800">#37474F</color>
+    <color name="material_blue_gray_900">#263238</color>
+
+    <color name="material_pink_50">#FCE4EC</color>
+    <color name="material_pink_100">#F8BBD0</color>
+    <color name="material_pink_200">#F48FB1</color>
+    <color name="material_pink_300">#F06292</color>
+    <color name="material_pink_400">#EC407A</color>
+    <color name="material_pink_500">#E91E63</color>
+    <color name="material_pink_600">#D81B60</color>
+    <color name="material_pink_700">#C2185B</color>
+    <color name="material_pink_800">#AD1457</color>
+    <color name="material_pink_900">#880E4F</color>
+
+    <color name="material_indigo_50">#E8EAF6</color>
+    <color name="material_indigo_100">#C5CAE9</color>
+    <color name="material_indigo_200">#9FA8DA</color>
+    <color name="material_indigo_300">#7986CB</color>
+    <color name="material_indigo_400">#5C6BC0</color>
+    <color name="material_indigo_500">#3F51B5</color>
+    <color name="material_indigo_600">#3949AB</color>
+    <color name="material_indigo_700">#303F9F</color>
+    <color name="material_indigo_800">#283593</color>
+    <color name="material_indigo_900">#1A237E</color>
+
+    <color name="material_cyan_50">#E0F7FA</color>
+    <color name="material_cyan_100">#B2EBF2</color>
+    <color name="material_cyan_200">#80DEEA</color>
+    <color name="material_cyan_300">#4DD0E1</color>
+    <color name="material_cyan_400">#26C6DA</color>
+    <color name="material_cyan_500">#00BCD4</color>
+    <color name="material_cyan_600">#00ACC1</color>
+    <color name="material_cyan_700">#0097A7</color>
+    <color name="material_cyan_800">#00838F</color>
+    <color name="material_cyan_900">#006064</color>
+
+    <color name="material_light_green_50">#F1F8E9</color>
+    <color name="material_light_green_100">#DCEDC8</color>
+    <color name="material_light_green_200">#C5E1A5</color>
+    <color name="material_light_green_300">#AED581</color>
+    <color name="material_light_green_400">#9CCC65</color>
+    <color name="material_light_green_500">#8BC34A</color>
+    <color name="material_light_green_600">#7CB342</color>
+    <color name="material_light_green_700">#689F38</color>
+    <color name="material_light_green_800">#558B2F</color>
+    <color name="material_light_green_900">#33691E</color>
+
+    <color name="material_amber_50">#FFF8E1</color>
+    <color name="material_amber_100">#FFECB3</color>
+    <color name="material_amber_200">#FFE082</color>
+    <color name="material_amber_300">#FFD54F</color>
+    <color name="material_amber_400">#FFCA28</color>
+    <color name="material_amber_500">#FFC107</color>
+    <color name="material_amber_600">#FFB300</color>
+    <color name="material_amber_700">#FFA000</color>
+    <color name="material_amber_800">#FF8F00</color>
+    <color name="material_amber_900">#FF6F00</color>
+
+    <color name="material_brown_50">#EFEBE9</color>
+    <color name="material_brown_100">#D7CCC8</color>
+    <color name="material_brown_200">#BCAAA4</color>
+    <color name="material_brown_300">#A1887F</color>
+    <color name="material_brown_400">#8D6E63</color>
+    <color name="material_brown_500">#795548</color>
+    <color name="material_brown_600">#6D4C41</color>
+    <color name="material_brown_700">#5D4037</color>
+    <color name="material_brown_800">#4E342E</color>
+    <color name="material_brown_900">#3E2723</color>
+
+    <color name="material_purple_50">#F3E5F5</color>
+    <color name="material_purple_100">#E1BEE7</color>
+    <color name="material_purple_200">#CE93D8</color>
+    <color name="material_purple_300">#BA68C8</color>
+    <color name="material_purple_400">#AB47BC</color>
+    <color name="material_purple_500">#9C27B0</color>
+    <color name="material_purple_600">#8E24AA</color>
+    <color name="material_purple_700">#7B1FA2</color>
+    <color name="material_purple_800">#6A1B9A</color>
+    <color name="material_purple_900">#4A148C</color>
+
+    <color name="material_blue_50">#E3F2FD</color>
+    <color name="material_blue_100">#BBDEFB</color>
+    <color name="material_blue_200">#90CAF9</color>
+    <color name="material_blue_300">#64B5F6</color>
+    <color name="material_blue_400">#42A5F5</color>
+    <color name="material_blue_500">#2196F3</color>
+    <color name="material_blue_600">#1E88E5</color>
+    <color name="material_blue_700">#1976D2</color>
+    <color name="material_blue_800">#1565C0</color>
+    <color name="material_blue_900">#0D47A1</color>
+
+    <color name="material_teal_50">#E0F2F1</color>
+    <color name="material_teal_100">#B2DFDB</color>
+    <color name="material_teal_200">#80CBC4</color>
+    <color name="material_teal_300">#4DB6AC</color>
+    <color name="material_teal_400">#26A69A</color>
+    <color name="material_teal_500">#009688</color>
+    <color name="material_teal_600">#00897B</color>
+    <color name="material_teal_700">#00796B</color>
+    <color name="material_teal_800">#00695C</color>
+    <color name="material_teal_900">#004D40</color>
+
+    <color name="material_lime_50">#F9FBE7</color>
+    <color name="material_lime_100">#F0F4C3</color>
+    <color name="material_lime_200">#E6EE9C</color>
+    <color name="material_lime_300">#DCE775</color>
+    <color name="material_lime_400">#D4E157</color>
+    <color name="material_lime_500">#CDDC39</color>
+    <color name="material_lime_600">#C0CA33</color>
+    <color name="material_lime_700">#AFB42B</color>
+    <color name="material_lime_800">#9E9D24</color>
+    <color name="material_lime_900">#827717</color>
+
+    <color name="material_orange_50">#FFF3E0</color>
+    <color name="material_orange_100">#FFE0B2</color>
+    <color name="material_orange_200">#FFCC80</color>
+    <color name="material_orange_300">#FFB74D</color>
+    <color name="material_orange_400">#FFA726</color>
+    <color name="material_orange_500">#FF9800</color>
+    <color name="material_orange_600">#FB8C00</color>
+    <color name="material_orange_700">#F57C00</color>
+    <color name="material_orange_800">#EF6C00</color>
+    <color name="material_orange_900">#E65100</color>
+
+    <color name="material_gray_50">#FAFAFA</color>
+    <color name="material_gray_100">#F5F5F5</color>
+    <color name="material_gray_200">#EEEEEE</color>
+    <color name="material_gray_300">#E0E0E0</color>
+    <color name="material_gray_400">#BDBDBD</color>
+    <color name="material_gray_500">#9E9E9E</color>
+    <color name="material_gray_600">#757575</color>
+    <color name="material_gray_700">#616161</color>
+    <color name="material_gray_800">#424242</color>
+    <color name="material_gray_900">#212121</color>
+</resources>
diff --git a/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java b/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
index 641dbc62e0831b98a96a487dfda7355f53064459..1239d581f6ce9225d4f714270e9d1d54d18e9d3a 100644
--- a/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
+++ b/app/core/src/test/java/com/fsck/k9/controller/MessagingControllerTest.java
@@ -19,7 +19,6 @@ import com.fsck.k9.mail.AuthenticationFailedException;
 import com.fsck.k9.mail.CertificateValidationException;
 import com.fsck.k9.mail.ConnectionSecurity;
 import com.fsck.k9.mail.Flag;
-import com.fsck.k9.mail.MessageRetrievalListener;
 import com.fsck.k9.mail.MessagingException;
 import com.fsck.k9.mail.ServerSettings;
 import com.fsck.k9.mailstore.LocalFolder;
@@ -35,15 +34,12 @@ import com.fsck.k9.mailstore.SpecialLocalFoldersCreator;
 import com.fsck.k9.notification.NotificationController;
 import com.fsck.k9.notification.NotificationStrategy;
 import com.fsck.k9.preferences.Protocols;
-import com.fsck.k9.search.LocalSearch;
 import com.fsck.k9.search.SearchAccount;
 import org.jetbrains.annotations.NotNull;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Captor;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -52,7 +48,6 @@ import org.mockito.stubbing.Answer;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowLog;
 
-import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.nullable;
 import static org.mockito.ArgumentMatchers.eq;
@@ -90,8 +85,6 @@ public class MessagingControllerTest extends K9RobolectricTest {
     @Mock
     private SimpleMessagingListener listener;
     @Mock
-    private LocalSearch search;
-    @Mock
     private LocalFolder localFolder;
     @Mock
     private LocalFolder sentFolder;
@@ -101,8 +94,6 @@ public class MessagingControllerTest extends K9RobolectricTest {
     private NotificationController notificationController;
     @Mock
     private NotificationStrategy notificationStrategy;
-    @Captor
-    private ArgumentCaptor<MessageRetrievalListener<LocalMessage>> messageRetrievalListenerCaptor;
 
     private Context appContext;
     private Set<Flag> reqFlags;
@@ -178,20 +169,6 @@ public class MessagingControllerTest extends K9RobolectricTest {
         verify(backend).refreshFolderList();
     }
 
-    @Test
-    public void searchLocalMessages_shouldIgnoreExceptions()
-            throws Exception {
-        LocalMessage localMessage = mock(LocalMessage.class);
-        when(localMessage.getFolder()).thenReturn(localFolder);
-        when(search.searchAllAccounts()).thenReturn(true);
-        when(search.getAccountUuids()).thenReturn(new String[0]);
-        when(localStore.searchForMessages(search)).thenThrow(new MessagingException("Test"));
-
-        List<LocalMessage> messages = controller.searchLocalMessages(search);
-
-        assertThat(messages).isEmpty();
-    }
-
     private void setupRemoteSearch() throws Exception {
         remoteMessages = new ArrayList<>();
         Collections.addAll(remoteMessages, "oldMessageUid", "newMessageUid1", "newMessageUid2");
diff --git a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
index e29ac44ce0765d737a14002a707930657fb3c732..67eafbbef77f7a2c0d734c89ea980825ac162fc0 100644
--- a/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/TextBodyBuilderTest.kt
@@ -18,8 +18,8 @@ class TextBodyBuilderTest(val testData: TestData) {
         private const val QUOTED_HTML_TAGS_END = "</body>\n</html>"
         private const val QUOTED_HTML_TAGS_START = "<!DOCTYPE html><html><head></head><body>"
         private const val SIGNATURE_TEXT = "-- \r\n\r\nsignature\r\n  indented second line"
-        private const val SIGNATURE_TEXT_HTML = "<div style='white-space: pre-wrap'>" +
-            "<div class='k9mail-signature'>-- <br><br>signature<br>  indented second line</div></div>"
+        private const val SIGNATURE_TEXT_HTML =
+            "<div class='k9mail-signature'>-- <br><br>signature<br>\u00A0 indented second line</div>"
 
         @JvmStatic
         @Parameterized.Parameters(name = "{index}: {0}")
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
index 3bc44effdc79631440bcf5ee8ef46c879d7782fe..43a6d82738529e971a6d73ac72eafaeecc34eeee 100644
--- a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
+++ b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
@@ -13,7 +13,7 @@ internal class BodyCleaner {
 
     init {
         val allowList = Safelist.relaxed()
-            .addTags("font", "hr", "ins", "del", "center", "map", "area", "title")
+            .addTags("font", "hr", "ins", "del", "center", "map", "area", "title", "tt", "kbd", "samp", "var")
             .addAttributes("font", "color", "face", "size")
             .addAttributes("a", "name")
             .addAttributes("div", "align")
diff --git a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
index 8720a3273d5f9dad9e5a210cc6f6b2eeecc9c7eb..d60ae8b381240b6354c8ed3f3370845143c688bb 100644
--- a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
+++ b/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
@@ -445,6 +445,43 @@ class HtmlSanitizerTest {
         )
     }
 
+    @Test
+    fun `should keep 'tt' element`() {
+        assertTagsNotStripped("tt")
+    }
+
+    @Test
+    fun `should keep 'kbd' element`() {
+        assertTagsNotStripped("kbd")
+    }
+
+    @Test
+    fun `should keep 'samp' element`() {
+        assertTagsNotStripped("samp")
+    }
+
+    @Test
+    fun `should keep 'var' element`() {
+        assertTagsNotStripped("var")
+    }
+
+    private fun assertTagsNotStripped(element: String) {
+        val html = """<$element>some text</$element>"""
+
+        val result = htmlSanitizer.sanitize(html)
+
+        assertThat(result.toCompactString()).isEqualTo(
+            """
+            <html>
+            <head></head>
+            <body>
+            <$element>some text</$element>
+            </body>
+            </html>
+            """.trimIndent().trimLineBreaks()
+        )
+    }
+
     private fun Document.toCompactString(): String {
         outputSettings()
             .prettyPrint(false)
diff --git a/app/k9mail-jmap/src/main/res/values/themes.xml b/app/k9mail-jmap/src/main/res/values/themes.xml
index 8be56e875581657cfc3379c9eed99c0f948d1ae4..4122384ced4fafa99ca3ca187a5eaa2e2217caf3 100644
--- a/app/k9mail-jmap/src/main/res/values/themes.xml
+++ b/app/k9mail-jmap/src/main/res/values/themes.xml
@@ -12,9 +12,9 @@
     <style name="Theme.K9.Light.Common" parent="Theme.K9.Light.Base">
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">true</item>
-        <item name="colorPrimary">@color/md_grey_100</item>
-        <item name="colorPrimaryDark">@color/md_grey_100</item>
-        <item name="bottomBarBackground">@color/md_grey_50</item>
+        <item name="colorPrimary">@color/material_gray_100</item>
+        <item name="colorPrimaryDark">@color/material_gray_100</item>
+        <item name="bottomBarBackground">@color/material_gray_50</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
@@ -30,7 +30,7 @@
         <item name="iconActionArchive">@drawable/ic_archive</item>
         <item name="iconActionCompose">@drawable/ic_pencil</item>
         <item name="iconActionDelete">@drawable/ic_trash_can</item>
-        <item name="iconActionMove">@drawable/ic_folder</item>
+        <item name="iconActionMove">@drawable/ic_move_to_folder</item>
         <item name="iconActionCopy">@drawable/ic_content_copy</item>
         <item name="iconActionNextStatus">@drawable/ic_chevron_right</item>
         <item name="iconActionRefresh">@drawable/ic_refresh</item>
@@ -91,12 +91,33 @@
         <item name="messageListAnswered">@drawable/ic_messagelist_answered</item>
         <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>
         <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>
+
+        <item name="messageListSwipeIconTint">#ffffff</item>
+        <item name="messageListSwipeDisabledBackgroundColor">@color/material_gray_200</item>
+        <item name="messageListSwipeSelectIcon">@drawable/ic_check_circle</item>
+        <item name="messageListSwipeSelectBackgroundColor">@color/material_blue_600</item>
+        <item name="messageListSwipeMarkAsReadIcon">?attr/iconActionMarkAsRead</item>
+        <item name="messageListSwipeMarkAsUnreadIcon">?attr/iconActionMarkAsUnread</item>
+        <item name="messageListSwipeToggleReadBackgroundColor">@color/material_blue_600</item>
+        <item name="messageListSwipeAddStarIcon">?attr/iconActionFlag</item>
+        <item name="messageListSwipeRemoveStarIcon">?attr/iconActionUnflag</item>
+        <item name="messageListSwipeToggleStarBackgroundColor">@color/material_orange_600</item>
+        <item name="messageListSwipeArchiveIcon">?attr/iconActionArchive</item>
+        <item name="messageListSwipeArchiveBackgroundColor">@color/material_green_600</item>
+        <item name="messageListSwipeDeleteIcon">?attr/iconActionDelete</item>
+        <item name="messageListSwipeDeleteBackgroundColor">@color/material_red_600</item>
+        <item name="messageListSwipeSpamIcon">?attr/iconActionSpam</item>
+        <item name="messageListSwipeSpamBackgroundColor">@color/material_red_700</item>
+        <item name="messageListSwipeMoveIcon">?attr/iconActionMove</item>
+        <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_500</item>
+
         <item name="messageStar">@drawable/btn_check_star</item>
         <item name="messageStarColor">#FFC300</item>
         <item name="messageViewBackgroundColor">#ffffffff</item>
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">#e8e8e8</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
+        <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_light</item>
         <item name="contactTokenBackgroundColor">#ccc</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
         <item name="tintColorBulletPointPositive">#77aa22</item>
@@ -128,13 +149,16 @@
         <item name="behindRecyclerView">#F0F0F0</item>
     </style>
 
+    <style name="Theme.K9.Light" parent="Theme.K9.Light.Common" />
+
+    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common" />
     <style name="Theme.K9.Dark.Common" parent="Theme.K9.Dark.Base">
         <item name="android:navigationBarColor">#000000</item>
         <item name="windowActionModeOverlay">true</item>
         <item name="android:windowLightStatusBar" tools:targetApi="23">false</item>
-        <item name="colorPrimary">@color/md_grey_900</item>
-        <item name="colorPrimaryDark">@color/md_grey_900</item>
-        <item name="bottomBarBackground">@color/md_grey_900</item>
+        <item name="colorPrimary">@color/material_gray_900</item>
+        <item name="colorPrimaryDark">@color/material_gray_900</item>
+        <item name="bottomBarBackground">@color/material_gray_900</item>
 
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="iconUnifiedInbox">@drawable/ic_inbox_multiple</item>
@@ -211,6 +235,26 @@
         <item name="messageListAnswered">@drawable/ic_messagelist_answered</item>
         <item name="messageListForwarded">@drawable/ic_messagelist_forwarded</item>
         <item name="messageListAnsweredForwarded">@drawable/ic_messagelist_answered_forwarded</item>
+
+        <item name="messageListSwipeIconTint">#ffffff</item>
+        <item name="messageListSwipeDisabledBackgroundColor">@color/material_gray_900</item>
+        <item name="messageListSwipeSelectIcon">@drawable/ic_check_circle</item>
+        <item name="messageListSwipeSelectBackgroundColor">@color/material_blue_700</item>
+        <item name="messageListSwipeMarkAsReadIcon">?attr/iconActionMarkAsRead</item>
+        <item name="messageListSwipeMarkAsUnreadIcon">?attr/iconActionMarkAsUnread</item>
+        <item name="messageListSwipeToggleReadBackgroundColor">@color/material_blue_700</item>
+        <item name="messageListSwipeAddStarIcon">?attr/iconActionFlag</item>
+        <item name="messageListSwipeRemoveStarIcon">?attr/iconActionUnflag</item>
+        <item name="messageListSwipeToggleStarBackgroundColor">@color/material_orange_700</item>
+        <item name="messageListSwipeArchiveIcon">?attr/iconActionArchive</item>
+        <item name="messageListSwipeArchiveBackgroundColor">@color/material_green_700</item>
+        <item name="messageListSwipeDeleteIcon">?attr/iconActionDelete</item>
+        <item name="messageListSwipeDeleteBackgroundColor">@color/material_red_700</item>
+        <item name="messageListSwipeSpamIcon">?attr/iconActionSpam</item>
+        <item name="messageListSwipeSpamBackgroundColor">@color/material_red_800</item>
+        <item name="messageListSwipeMoveIcon">?attr/iconActionMove</item>
+        <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_600</item>
+
         <item name="messageStar">@drawable/btn_check_star</item>
         <item name="messageStarColor">#FFC300</item>
         <item name="messageViewBackgroundColor">#000000</item>
@@ -218,6 +262,7 @@
         <item name="attachmentCardBackground">#313131</item>
         <item name="contactTokenBackgroundColor">#313131</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ff606060</item>
+        <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_dark</item>
         <item name="composerBackgroundColor">@android:color/background_dark</item>
         <item name="tintColorBulletPointPositive">#77aa22</item>
         <item name="tintColorBulletPointNegative">#dd2222</item>
@@ -249,9 +294,6 @@
         <item name="behindRecyclerView">#202020</item>
     </style>
 
-    <style name="Theme.K9.Light" parent="Theme.K9.Light.Common" />
-    <style name="Theme.K9.Dark" parent="Theme.K9.Dark.Common" />
-
     <style name="Theme.K9.Dialog.Light" parent="Theme.K9.Light">
         <item name="backgroundColorChooseAccountHeader">#cccccc</item>
     </style>
diff --git a/app/k9mail/build.gradle b/app/k9mail/build.gradle
index f1bcc112c2a647dcbfef01708d0078dce314bf3b..ccc8764126e2d7128b2325f45739413b738c3d36 100644
--- a/app/k9mail/build.gradle
+++ b/app/k9mail/build.gradle
@@ -7,6 +7,7 @@ if (rootProject.testCoverage) {
 
 dependencies {
     implementation project(":app:ui:legacy")
+    implementation project(":app:ui:message-list-widget")
     implementation project(":app:core")
     implementation project(":app:storage")
     implementation project(":app:crypto-openpgp")
@@ -52,8 +53,8 @@ android {
         applicationId "foundation.e.mail"
         testApplicationId "foundation.e.mail.tests"
 
-        versionCode 33007
-        versionName '6.307'
+        versionCode 34000
+        versionName '6.400'
 
         // 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",
diff --git a/app/k9mail/src/main/AndroidManifest.xml b/app/k9mail/src/main/AndroidManifest.xml
index ccb5349bc302c3b686a21f606a3aee4184461e32..c6fccb39d3025881daa275b4cd4a69d76cb50a26 100644
--- a/app/k9mail/src/main/AndroidManifest.xml
+++ b/app/k9mail/src/main/AndroidManifest.xml
@@ -60,13 +60,6 @@
         <meta-data android:name="android.webkit.WebView.MetricsOptOut"
             android:value="true" />
 
-        <!-- activity-alias so old launcher shortcuts work -->
-        <!-- TODO: Remove after 2020-12-31 -->
-        <activity-alias
-            android:name=".activity.Accounts"
-            android:targetActivity=".activity.MessageList"
-            android:exported="true" />
-
         <activity
             android:name=".ui.onboarding.OnboardingActivity"
             android:label="@string/welcome_message_title" />
@@ -159,13 +152,6 @@
             android:label="@string/ac_transfer_title"
             />
 
-        <!-- activity-alias so old launcher shortcuts work -->
-        <!-- TODO: Remove after 2020-12-31 -->
-        <activity-alias
-            android:name=".activity.FolderList"
-            android:targetActivity=".activity.MessageList"
-            android:exported="true" />
-
         <activity
             android:name=".activity.MessageList"
             android:launchMode="singleTop"
@@ -348,11 +334,6 @@
             </intent-filter>
         </receiver>
 
-        <service
-            android:name=".widget.list.MessageListWidgetService"
-            android:enabled="true"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
         <service
             android:name=".notification.NotificationActionService"
             android:enabled="true"/>
@@ -393,11 +374,6 @@
 
         </provider>
 
-        <provider
-            android:name=".external.MessageProvider"
-            android:authorities="${applicationId}.messageprovider"
-            android:exported="false" />
-
         <provider
             android:name=".provider.DecryptedFileProvider"
             android:authorities="${applicationId}.decryptedfileprovider"
diff --git a/app/k9mail/src/main/java/com/fsck/k9/App.kt b/app/k9mail/src/main/java/com/fsck/k9/App.kt
index 0598ad958b54d05de816484745250e8d6f8c13de..907bd8a63ba551129e64c0ac110f9055f40ee171 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/App.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/App.kt
@@ -3,9 +3,9 @@ package com.fsck.k9
 import android.app.Application
 import android.content.res.Configuration
 import android.content.res.Resources
+import app.k9mail.ui.widget.list.MessageListWidgetManager
 import com.fsck.k9.activity.MessageCompose
 import com.fsck.k9.controller.MessagingController
-import com.fsck.k9.external.MessageProvider
 import com.fsck.k9.notification.NotificationChannelManager
 import com.fsck.k9.ui.base.AppLanguageManager
 import com.fsck.k9.ui.base.ThemeManager
@@ -28,6 +28,7 @@ class App : Application() {
     private val themeManager: ThemeManager by inject()
     private val appLanguageManager: AppLanguageManager by inject()
     private val notificationChannelManager: NotificationChannelManager by inject()
+    private val messageListWidgetManager: MessageListWidgetManager by inject()
     private val appCoroutineScope: CoroutineScope = GlobalScope + Dispatchers.Main
     private var appLanguageManagerInitialized = false
 
@@ -40,10 +41,10 @@ class App : Application() {
 
         K9.init(this)
         Core.init(this)
-        MessageProvider.init()
         initializeAppLanguage()
         updateNotificationChannelsOnAppLanguageChanges()
         themeManager.init()
+        messageListWidgetManager.init()
 
         messagingListenerProvider.listeners.forEach { listener ->
             messagingController.addListener(listener)
diff --git a/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt b/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
index 4f3aeb00ab8c8fab1943c03fbac51732709391ad..8967c972a600e2eeb1cd4754f885f7791c63f091 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
@@ -1,5 +1,6 @@
 package com.fsck.k9
 
+import app.k9mail.ui.widget.list.messageListWidgetModule
 import com.fsck.k9.auth.createOAuthConfigurationProvider
 import com.fsck.k9.backends.backendsModule
 import com.fsck.k9.controller.ControllerExtension
@@ -10,8 +11,7 @@ import com.fsck.k9.preferences.K9StoragePersister
 import com.fsck.k9.preferences.StoragePersister
 import com.fsck.k9.resources.resourcesModule
 import com.fsck.k9.storage.storageModule
-import com.fsck.k9.widget.list.MessageListWidgetUpdateListener
-import com.fsck.k9.widget.list.messageListWidgetModule
+import com.fsck.k9.widget.list.messageListWidgetConfigModule
 import com.fsck.k9.widget.unread.UnreadWidgetUpdateListener
 import com.fsck.k9.widget.unread.unreadWidgetModule
 import org.koin.core.qualifier.named
@@ -23,7 +23,6 @@ private val mainAppModule = module {
         MessagingListenerProvider(
             listOf(
                 get<UnreadWidgetUpdateListener>(),
-                get<MessageListWidgetUpdateListener>()
             )
         )
     }
@@ -35,6 +34,7 @@ private val mainAppModule = module {
 
 val appModules = listOf(
     mainAppModule,
+    messageListWidgetConfigModule,
     messageListWidgetModule,
     unreadWidgetModule,
     notificationModule,
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt
index 0e4e588e335a1fcda65b1ef11ceeb42b106aff68..f8bf8f7bfccb55cbfae8101fe41dad2e9a076990 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/WebDavBackendFactory.kt
@@ -8,7 +8,6 @@ import com.fsck.k9.mail.ssl.TrustManagerFactory
 import com.fsck.k9.mail.store.webdav.DraftsFolderProvider
 import com.fsck.k9.mail.store.webdav.SniHostSetter
 import com.fsck.k9.mail.store.webdav.WebDavStore
-import com.fsck.k9.mail.transport.WebDavTransport
 import com.fsck.k9.mailstore.FolderRepository
 import com.fsck.k9.mailstore.K9BackendStorageFactory
 
@@ -24,8 +23,7 @@ class WebDavBackendFactory(
         val serverSettings = account.incomingServerSettings
         val draftsFolderProvider = createDraftsFolderProvider(account)
         val webDavStore = WebDavStore(trustManagerFactory, sniHostSetter, serverSettings, draftsFolderProvider)
-        val webDavTransport = WebDavTransport(trustManagerFactory, sniHostSetter, serverSettings, draftsFolderProvider)
-        return WebDavBackend(accountName, backendStorage, webDavStore, webDavTransport)
+        return WebDavBackend(accountName, backendStorage, webDavStore)
     }
 
     private fun createDraftsFolderProvider(account: Account): DraftsFolderProvider {
diff --git a/app/k9mail/src/main/java/com/fsck/k9/external/MessageInfoHolder.java b/app/k9mail/src/main/java/com/fsck/k9/external/MessageInfoHolder.java
deleted file mode 100644
index 16f7bc573a9d0869f1306a4426c3e347ea9d2954..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/external/MessageInfoHolder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.fsck.k9.external;
-
-
-import java.util.Date;
-
-import android.content.Context;
-import android.text.SpannableStringBuilder;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.K9;
-import com.fsck.k9.helper.Contacts;
-import com.fsck.k9.helper.MessageHelper;
-import com.fsck.k9.mail.Address;
-import com.fsck.k9.mail.Flag;
-import com.fsck.k9.mail.Message.RecipientType;
-import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.ui.R;
-
-class MessageInfoHolder {
-    public Date compareDate;
-    public CharSequence sender;
-    public String senderAddress;
-    public String uid;
-    public boolean read;
-    public LocalMessage message;
-    public String uri;
-
-
-    public static MessageInfoHolder create(Context context, LocalMessage message,
-            Account account) {
-        Contacts contactHelper = K9.isShowContactName() ? Contacts.getInstance(context) : null;
-
-        MessageInfoHolder target = new MessageInfoHolder();
-
-        target.message = message;
-        target.compareDate = message.getSentDate();
-        if (target.compareDate == null) {
-            target.compareDate = message.getInternalDate();
-        }
-
-        target.read = message.isSet(Flag.SEEN);
-
-        Address[] addrs = message.getFrom();
-
-        String counterParty;
-        if (addrs.length > 0 &&  account.isAnIdentity(addrs[0])) {
-            CharSequence to = MessageHelper.toFriendly(message.getRecipients(RecipientType.TO), contactHelper);
-            counterParty = to.toString();
-            target.sender = new SpannableStringBuilder(context.getString(R.string.message_to_label)).append(to);
-        } else {
-            target.sender = MessageHelper.toFriendly(addrs, contactHelper);
-            counterParty = target.sender.toString();
-        }
-
-        if (addrs.length > 0) {
-            target.senderAddress = addrs[0].getAddress();
-        } else {
-            // a reasonable fallback "whomever we were corresponding with
-            target.senderAddress = counterParty;
-        }
-
-        target.uid = message.getUid();
-        target.uri = message.getUri();
-
-        return target;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof MessageInfoHolder)) {
-            return false;
-        }
-        MessageInfoHolder other = (MessageInfoHolder)o;
-        return message.equals(other.message);
-    }
-
-    @Override
-    public int hashCode() {
-        return uid.hashCode();
-    }
-}
diff --git a/app/k9mail/src/main/java/com/fsck/k9/external/MessageProvider.java b/app/k9mail/src/main/java/com/fsck/k9/external/MessageProvider.java
deleted file mode 100644
index 759744d9d16e4d2732e1727b54555c742049e571..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/external/MessageProvider.java
+++ /dev/null
@@ -1,1046 +0,0 @@
-package com.fsck.k9.external;
-
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import android.annotation.TargetApi;
-import android.content.ContentProvider;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.content.Context;
-import android.content.UriMatcher;
-import android.database.CharArrayBuffer;
-import android.database.ContentObserver;
-import android.database.CrossProcessCursor;
-import android.database.Cursor;
-import android.database.CursorWindow;
-import android.database.DataSetObserver;
-import android.database.MatrixCursor;
-import android.net.Uri;
-import android.os.Binder;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.BaseColumns;
-
-import com.fsck.k9.Account;
-import com.fsck.k9.BuildConfig;
-import com.fsck.k9.DI;
-import com.fsck.k9.Preferences;
-import com.fsck.k9.controller.MessageReference;
-import com.fsck.k9.controller.MessagingController;
-import com.fsck.k9.controller.SimpleMessagingListener;
-import com.fsck.k9.mail.Flag;
-import com.fsck.k9.mail.Message;
-import com.fsck.k9.mailstore.LocalMessage;
-import com.fsck.k9.search.SearchAccount;
-import timber.log.Timber;
-
-
-public class MessageProvider extends ContentProvider {
-    public static String AUTHORITY = BuildConfig.APPLICATION_ID + ".messageprovider";
-    public static Uri CONTENT_URI = Uri.parse("content://" + AUTHORITY);
-
-    private static final String[] DEFAULT_MESSAGE_PROJECTION = new String[] {
-            MessageColumns._ID,
-            MessageColumns.SEND_DATE,
-            MessageColumns.SENDER,
-            MessageColumns.SUBJECT,
-            MessageColumns.PREVIEW,
-            MessageColumns.ACCOUNT,
-            MessageColumns.URI,
-            MessageColumns.DELETE_URI,
-            MessageColumns.SENDER_ADDRESS
-    };
-    private static final String[] DEFAULT_ACCOUNT_PROJECTION = new String[] {
-            AccountColumns.ACCOUNT_NUMBER,
-            AccountColumns.ACCOUNT_NAME,
-    };
-    private static final String[] UNREAD_PROJECTION = new String[] {
-            UnreadColumns.ACCOUNT_NAME,
-            UnreadColumns.UNREAD
-    };
-
-
-    private UriMatcher uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
-    private List<QueryHandler> queryHandlers = new ArrayList<>();
-
-    /**
-     * How many simultaneous cursors we can afford to expose at once
-     */
-    Semaphore semaphore = new Semaphore(1);
-
-    ScheduledExecutorService scheduledPool = Executors.newScheduledThreadPool(1);
-
-
-    @Override
-    public boolean onCreate() {
-        registerQueryHandler(new ThrottlingQueryHandler(new AccountsQueryHandler()));
-        registerQueryHandler(new ThrottlingQueryHandler(new MessagesQueryHandler()));
-        registerQueryHandler(new ThrottlingQueryHandler(new UnreadQueryHandler()));
-
-        return true;
-    }
-
-    public static void init() {
-        Timber.v("Registering content resolver notifier");
-
-        final Context context = DI.get(Context.class);
-        MessagingController messagingController = DI.get(MessagingController.class);
-        messagingController.addListener(new SimpleMessagingListener() {
-            @Override
-            public void folderStatusChanged(Account account, long folderId) {
-                context.getContentResolver().notifyChange(CONTENT_URI, null);
-            }
-        });
-    }
-
-    @Override
-    public String getType(Uri uri) {
-        Timber.v("MessageProvider/getType: %s", uri);
-
-        return null;
-    }
-
-    @Override
-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        Timber.v("MessageProvider/query: %s", uri);
-
-        int code = uriMatcher.match(uri);
-        if (code == -1) {
-            throw new IllegalStateException("Unrecognized URI: " + uri);
-        }
-
-        Cursor cursor;
-        try {
-            QueryHandler handler = queryHandlers.get(code);
-            cursor = handler.query(uri, projection, selection, selectionArgs, sortOrder);
-        } catch (Exception e) {
-            Timber.e(e, "Unable to execute query for URI: %s", uri);
-            return null;
-        }
-
-        return cursor;
-    }
-
-    @Override
-    public int delete(Uri uri, String selection, String[] selectionArgs) {
-
-        Timber.v("MessageProvider/delete: %s", uri);
-
-        // Note: can only delete a message
-
-        List<String> segments = uri.getPathSegments();
-        int accountId = Integer.parseInt(segments.get(1));
-        long folderId = Long.parseLong(segments.get(2));
-        String msgUid = segments.get(3);
-
-        // get account
-        Account myAccount = null;
-        for (Account account : Preferences.getPreferences().getAccounts()) {
-            if (account.getAccountNumber() == accountId) {
-                myAccount = account;
-            }
-        }
-
-        if (myAccount == null) {
-            Timber.e("Could not find account with id %d", accountId);
-        }
-
-        if (myAccount != null) {
-            MessageReference messageReference = new MessageReference(myAccount.getUuid(), folderId, msgUid);
-            MessagingController controller = MessagingController.getInstance(getContext());
-            controller.deleteMessage(messageReference);
-        }
-
-        // FIXME return the actual number of deleted messages
-        return 0;
-    }
-
-    @Override
-    public Uri insert(Uri uri, ContentValues values) {
-        Timber.v("MessageProvider/insert: %s", uri);
-
-        return null;
-    }
-
-    @Override
-    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
-        Timber.v("MessageProvider/update: %s", uri);
-
-        // TBD
-
-        return 0;
-    }
-
-    /**
-     * Register a {@link QueryHandler} to handle a certain {@link Uri} for
-     * {@link #query(Uri, String[], String, String[], String)}
-     */
-    protected void registerQueryHandler(QueryHandler handler) {
-        if (queryHandlers.contains(handler)) {
-            return;
-        }
-        queryHandlers.add(handler);
-
-        int code = queryHandlers.indexOf(handler);
-        uriMatcher.addURI(AUTHORITY, handler.getPath(), code);
-    }
-
-
-    public static class ReverseDateComparator implements Comparator<MessageInfoHolder> {
-        @Override
-        public int compare(MessageInfoHolder object2, MessageInfoHolder object1) {
-            if (object1.compareDate == null) {
-                return (object2.compareDate == null ? 0 : 1);
-            } else if (object2.compareDate == null) {
-                return -1;
-            } else {
-                return object1.compareDate.compareTo(object2.compareDate);
-            }
-        }
-    }
-
-    public interface MessageColumns extends BaseColumns {
-        /**
-         * The number of milliseconds since Jan. 1, 1970, midnight GMT.
-         *
-         * <P>Type: INTEGER (long)</P>
-         */
-        String SEND_DATE = "date";
-
-        /**
-         * <P>Type: TEXT</P>
-         */
-        String SENDER = "sender";
-
-        /**
-         * <P>Type: TEXT</P>
-         */
-        String SENDER_ADDRESS = "senderAddress";
-
-        /**
-         * <P>Type: TEXT</P>
-         */
-        String SUBJECT = "subject";
-
-        /**
-         * <P>Type: TEXT</P>
-         */
-        String PREVIEW = "preview";
-
-        /**
-         * <P>Type: BOOLEAN</P>
-         */
-        String UNREAD = "unread";
-
-        /**
-         * <P>Type: TEXT</P>
-         */
-        String ACCOUNT = "account";
-
-        /**
-         * <P>Type: INTEGER</P>
-         */
-        String ACCOUNT_NUMBER = "accountNumber";
-
-        /**
-         * <P>Type: BOOLEAN</P>
-         */
-        String HAS_ATTACHMENTS = "hasAttachments";
-
-        /**
-         * <P>Type: BOOLEAN</P>
-         */
-        String HAS_STAR = "hasStar";
-
-        /**
-         * <P>Type: INTEGER</P>
-         */
-        String ACCOUNT_COLOR = "accountColor";
-
-        String URI = "uri";
-        String DELETE_URI = "delUri";
-
-        /**
-         * @deprecated the field value is misnamed/misleading - present for compatibility purpose only. To be removed.
-         */
-        @Deprecated
-        String INCREMENT = "id";
-    }
-
-    public interface AccountColumns {
-        /**
-         * <P>Type: INTEGER</P>
-         */
-        String ACCOUNT_NUMBER = "accountNumber";
-        /**
-         * <P>Type: String</P>
-         */
-        String ACCOUNT_NAME = "accountName";
-
-
-        String ACCOUNT_UUID = "accountUuid";
-        String ACCOUNT_COLOR = "accountColor";
-    }
-
-    public interface UnreadColumns {
-        /**
-         * <P>Type: String</P>
-         */
-        String ACCOUNT_NAME = "accountName";
-        /**
-         * <P>Type: INTEGER</P>
-         */
-        String UNREAD = "unread";
-    }
-
-    protected interface QueryHandler {
-        /**
-         * The path this instance is able to respond to.
-         */
-        String getPath();
-
-        Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
-                throws Exception;
-    }
-
-    /**
-     * Extracts a value from an object.
-     */
-    public interface FieldExtractor<T, K> {
-        K getField(T source);
-    }
-
-    /**
-     * Extracts the {@link LocalMessage#getDatabaseId() ID} from the given {@link MessageInfoHolder}. The underlying
-     * {@link Message} is expected to be a {@link LocalMessage}.
-     */
-    public static class IdExtractor implements FieldExtractor<MessageInfoHolder, Long> {
-        @Override
-        public Long getField(MessageInfoHolder source) {
-            return source.message.getDatabaseId();
-        }
-    }
-
-    public static class CountExtractor<T> implements FieldExtractor<T, Integer> {
-        private Integer count;
-
-        public CountExtractor(int count) {
-            this.count = count;
-        }
-
-        @Override
-        public Integer getField(T source) {
-            return count;
-        }
-    }
-
-    public static class SubjectExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            return source.message.getSubject();
-        }
-    }
-
-    public static class SendDateExtractor implements FieldExtractor<MessageInfoHolder, Long> {
-        @Override
-        public Long getField(MessageInfoHolder source) {
-            return source.message.getSentDate().getTime();
-        }
-    }
-
-    public static class PreviewExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            return source.message.getPreview();
-        }
-    }
-
-    public static class UriExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            return source.uri;
-        }
-    }
-
-    public static class DeleteUriExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            LocalMessage message = source.message;
-            int accountNumber = message.getAccount().getAccountNumber();
-            return CONTENT_URI.buildUpon()
-                    .appendPath("delete_message")
-                    .appendPath(Integer.toString(accountNumber))
-                    .appendPath(Long.toString(message.getFolder().getDatabaseId()))
-                    .appendPath(message.getUid())
-                    .build()
-                    .toString();
-        }
-    }
-
-    public static class SenderExtractor implements FieldExtractor<MessageInfoHolder, CharSequence> {
-        @Override
-        public CharSequence getField(MessageInfoHolder source) {
-            return source.sender;
-        }
-    }
-
-    public static class SenderAddressExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            return source.senderAddress;
-        }
-    }
-
-    public static class AccountExtractor implements FieldExtractor<MessageInfoHolder, String> {
-        @Override
-        public String getField(MessageInfoHolder source) {
-            return source.message.getAccount().getDisplayName();
-        }
-    }
-
-    public static class AccountColorExtractor implements FieldExtractor<MessageInfoHolder, Integer> {
-        @Override
-        public Integer getField(MessageInfoHolder source) {
-            return source.message.getAccount().getChipColor();
-        }
-    }
-
-    public static class AccountNumberExtractor implements FieldExtractor<MessageInfoHolder, Integer> {
-        @Override
-        public Integer getField(MessageInfoHolder source) {
-            return source.message.getAccount().getAccountNumber();
-        }
-    }
-
-    public static class HasAttachmentsExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
-        @Override
-        public Boolean getField(MessageInfoHolder source) {
-            return source.message.hasAttachments();
-        }
-    }
-
-    public static class HasStarExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
-        @Override
-        public Boolean getField(MessageInfoHolder source) {
-            return source.message.isSet(Flag.FLAGGED);
-        }
-    }
-
-    public static class UnreadExtractor implements FieldExtractor<MessageInfoHolder, Boolean> {
-        @Override
-        public Boolean getField(MessageInfoHolder source) {
-            return !source.read;
-        }
-    }
-
-    /**
-     * @deprecated having an incremental value has no real interest, implemented for compatibility only
-     */
-    @Deprecated
-    public static class IncrementExtractor implements FieldExtractor<MessageInfoHolder, Integer> {
-        private int count = 0;
-
-
-        @Override
-        public Integer getField(MessageInfoHolder source) {
-            return count++;
-        }
-    }
-
-    /**
-     * Retrieve messages from the integrated inbox.
-     */
-    protected class MessagesQueryHandler implements QueryHandler {
-
-        @Override
-        public String getPath() {
-            return "inbox_messages/";
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
-                throws Exception {
-            return getMessages(projection);
-        }
-
-        protected MatrixCursor getMessages(String[] projection) throws InterruptedException {
-            // new code for integrated inbox, only execute this once as it will be processed afterwards via the listener
-            SearchAccount integratedInboxAccount = SearchAccount.createUnifiedInboxAccount();
-            MessagingController msgController = MessagingController.getInstance(getContext());
-
-            List<LocalMessage> messages = msgController.searchLocalMessages(integratedInboxAccount.getRelatedSearch());
-            List<MessageInfoHolder> holders = convertToMessageInfoHolder(messages);
-
-            // TODO add sort order parameter
-            Collections.sort(holders, new ReverseDateComparator());
-
-            String[] projectionToUse;
-            if (projection == null) {
-                projectionToUse = DEFAULT_MESSAGE_PROJECTION;
-            } else {
-                projectionToUse = projection;
-            }
-
-            LinkedHashMap<String, FieldExtractor<MessageInfoHolder, ?>> extractors =
-                    resolveMessageExtractors(projectionToUse, holders.size());
-            int fieldCount = extractors.size();
-
-            String[] actualProjection = extractors.keySet().toArray(new String[fieldCount]);
-            MatrixCursor cursor = new MatrixCursor(actualProjection);
-
-            for (MessageInfoHolder holder : holders) {
-                Object[] o = new Object[fieldCount];
-
-                int i = 0;
-                for (FieldExtractor<MessageInfoHolder, ?> extractor : extractors.values()) {
-                    o[i] = extractor.getField(holder);
-                    i += 1;
-                }
-
-                cursor.addRow(o);
-            }
-
-            return cursor;
-        }
-
-        private List<MessageInfoHolder> convertToMessageInfoHolder(List<LocalMessage> messages) {
-            List<MessageInfoHolder> holders = new ArrayList<>();
-
-            Context context = getContext();
-            for (LocalMessage message : messages) {
-                Account messageAccount = message.getAccount();
-                MessageInfoHolder messageInfoHolder = MessageInfoHolder.create(context, message, messageAccount);
-
-                holders.add(messageInfoHolder);
-            }
-
-            return holders;
-        }
-
-        protected LinkedHashMap<String, FieldExtractor<MessageInfoHolder, ?>> resolveMessageExtractors(
-                String[] projection, int count) {
-            LinkedHashMap<String, FieldExtractor<MessageInfoHolder, ?>> extractors = new LinkedHashMap<>();
-
-            for (String field : projection) {
-                if (extractors.containsKey(field)) {
-                    continue;
-                }
-                if (MessageColumns._ID.equals(field)) {
-                    extractors.put(field, new IdExtractor());
-                } else if (MessageColumns._COUNT.equals(field)) {
-                    extractors.put(field, new CountExtractor<>(count));
-                } else if (MessageColumns.SUBJECT.equals(field)) {
-                    extractors.put(field, new SubjectExtractor());
-                } else if (MessageColumns.SENDER.equals(field)) {
-                    extractors.put(field, new SenderExtractor());
-                } else if (MessageColumns.SENDER_ADDRESS.equals(field)) {
-                    extractors.put(field, new SenderAddressExtractor());
-                } else if (MessageColumns.SEND_DATE.equals(field)) {
-                    extractors.put(field, new SendDateExtractor());
-                } else if (MessageColumns.PREVIEW.equals(field)) {
-                    extractors.put(field, new PreviewExtractor());
-                } else if (MessageColumns.URI.equals(field)) {
-                    extractors.put(field, new UriExtractor());
-                } else if (MessageColumns.DELETE_URI.equals(field)) {
-                    extractors.put(field, new DeleteUriExtractor());
-                } else if (MessageColumns.UNREAD.equals(field)) {
-                    extractors.put(field, new UnreadExtractor());
-                } else if (MessageColumns.ACCOUNT.equals(field)) {
-                    extractors.put(field, new AccountExtractor());
-                } else if (MessageColumns.ACCOUNT_COLOR.equals(field)) {
-                    extractors.put(field, new AccountColorExtractor());
-                } else if (MessageColumns.ACCOUNT_NUMBER.equals(field)) {
-                    extractors.put(field, new AccountNumberExtractor());
-                } else if (MessageColumns.HAS_ATTACHMENTS.equals(field)) {
-                    extractors.put(field, new HasAttachmentsExtractor());
-                } else if (MessageColumns.HAS_STAR.equals(field)) {
-                    extractors.put(field, new HasStarExtractor());
-                } else if (MessageColumns.INCREMENT.equals(field)) {
-                    extractors.put(field, new IncrementExtractor());
-                }
-            }
-            return extractors;
-        }
-    }
-
-    /**
-     * Retrieve the account list.
-     */
-    protected class AccountsQueryHandler implements QueryHandler {
-
-
-        @Override
-        public String getPath() {
-            return "accounts";
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
-                throws Exception {
-            return getAllAccounts(projection);
-        }
-
-        public Cursor getAllAccounts(String[] projection) {
-            if (projection == null) {
-                projection = DEFAULT_ACCOUNT_PROJECTION;
-            }
-
-            MatrixCursor cursor = new MatrixCursor(projection);
-
-            for (Account account : Preferences.getPreferences().getAccounts()) {
-                Object[] values = new Object[projection.length];
-
-                int fieldIndex = 0;
-                for (String field : projection) {
-                    if (AccountColumns.ACCOUNT_NUMBER.equals(field)) {
-                        values[fieldIndex] = account.getAccountNumber();
-                    } else if (AccountColumns.ACCOUNT_NAME.equals(field)) {
-                        values[fieldIndex] = account.getDisplayName();
-                    } else if (AccountColumns.ACCOUNT_UUID.equals(field)) {
-                        values[fieldIndex] = account.getUuid();
-                    } else if (AccountColumns.ACCOUNT_COLOR.equals(field)) {
-                        values[fieldIndex] = account.getChipColor();
-                    } else {
-                        values[fieldIndex] = null;
-                    }
-                    ++fieldIndex;
-                }
-
-                cursor.addRow(values);
-            }
-
-            return cursor;
-        }
-    }
-
-    /**
-     * Retrieve the unread message count for a given account specified by its {@link Account#getAccountNumber() number}.
-     */
-    protected class UnreadQueryHandler implements QueryHandler {
-
-        @Override
-        public String getPath() {
-            return "account_unread/#";
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
-                throws Exception {
-            List<String> segments = uri.getPathSegments();
-            int accountId = Integer.parseInt(segments.get(1));
-
-            /*
-             * This method below calls Account.getStats() which uses EmailProvider to do its work.
-             * For this to work we need to clear the calling identity. Otherwise accessing
-             * EmailProvider will fail because it's not exported so third-party apps can't access it
-             * directly.
-             */
-            long identityToken = Binder.clearCallingIdentity();
-            try {
-                return getAccountUnread(accountId);
-            } finally {
-                Binder.restoreCallingIdentity(identityToken);
-            }
-        }
-
-        private Cursor getAccountUnread(int accountNumber) {
-
-            MatrixCursor cursor = new MatrixCursor(UNREAD_PROJECTION);
-
-            Account myAccount;
-
-            Object[] values = new Object[2];
-
-            Context context = getContext();
-            MessagingController controller = MessagingController.getInstance(context);
-            Collection<Account> accounts = Preferences.getPreferences().getAccounts();
-
-            for (Account account : accounts) {
-                if (account.getAccountNumber() == accountNumber) {
-                    myAccount = account;
-                    values[0] = myAccount.getDisplayName();
-                    values[1] = controller.getUnreadMessageCount(account);
-                    cursor.addRow(values);
-                }
-            }
-
-            return cursor;
-        }
-    }
-
-    /**
-     * Cursor wrapper that release a semaphore on close. Close is also triggered on {@link #finalize()}.
-     */
-    protected static class MonitoredCursor implements CrossProcessCursor {
-        /**
-         * The underlying cursor implementation that handles regular requests
-         */
-        private CrossProcessCursor cursor;
-
-        /**
-         * Whether {@link #close()} was invoked
-         */
-        private AtomicBoolean closed = new AtomicBoolean(false);
-
-        private Semaphore semaphore;
-
-
-        protected MonitoredCursor(CrossProcessCursor cursor, Semaphore semaphore) {
-            this.cursor = cursor;
-            this.semaphore = semaphore;
-        }
-
-        @Override
-        public void close() {
-            if (closed.compareAndSet(false, true)) {
-                cursor.close();
-                Timber.d("Cursor closed, null'ing & releasing semaphore");
-                cursor = null;
-                semaphore.release();
-            }
-        }
-
-        @Override
-        public boolean isClosed() {
-            return closed.get() || cursor.isClosed();
-        }
-
-        @Override
-        protected void finalize() throws Throwable {
-            close();
-            super.finalize();
-        }
-
-        protected void checkClosed() throws IllegalStateException {
-            if (closed.get()) {
-                throw new IllegalStateException("Cursor was closed");
-            }
-        }
-
-        @Override
-        public void fillWindow(int pos, CursorWindow winow) {
-            checkClosed();
-            cursor.fillWindow(pos, winow);
-        }
-
-        @Override
-        public CursorWindow getWindow() {
-            checkClosed();
-            return cursor.getWindow();
-        }
-
-        @Override
-        public boolean onMove(int oldPosition, int newPosition) {
-            checkClosed();
-            return cursor.onMove(oldPosition, newPosition);
-        }
-
-        @Override
-        public void copyStringToBuffer(int columnIndex, CharArrayBuffer buffer) {
-            checkClosed();
-            cursor.copyStringToBuffer(columnIndex, buffer);
-        }
-
-        @Override
-        public void deactivate() {
-            checkClosed();
-            cursor.deactivate();
-        }
-
-        @Override
-        public byte[] getBlob(int columnIndex) {
-            checkClosed();
-            return cursor.getBlob(columnIndex);
-        }
-
-        @Override
-        public int getColumnCount() {
-            checkClosed();
-            return cursor.getColumnCount();
-        }
-
-        @Override
-        public int getColumnIndex(String columnName) {
-            checkClosed();
-            return cursor.getColumnIndex(columnName);
-        }
-
-        @Override
-        public int getColumnIndexOrThrow(String columnName) throws IllegalArgumentException {
-            checkClosed();
-            return cursor.getColumnIndexOrThrow(columnName);
-        }
-
-        @Override
-        public String getColumnName(int columnIndex) {
-            checkClosed();
-            return cursor.getColumnName(columnIndex);
-        }
-
-        @Override
-        public String[] getColumnNames() {
-            checkClosed();
-            return cursor.getColumnNames();
-        }
-
-        @Override
-        public int getCount() {
-            checkClosed();
-            return cursor.getCount();
-        }
-
-        @Override
-        public double getDouble(int columnIndex) {
-            checkClosed();
-            return cursor.getDouble(columnIndex);
-        }
-
-        @Override
-        public Bundle getExtras() {
-            checkClosed();
-            return cursor.getExtras();
-        }
-
-        @Override
-        public float getFloat(int columnIndex) {
-            checkClosed();
-            return cursor.getFloat(columnIndex);
-        }
-
-        @Override
-        public int getInt(int columnIndex) {
-            checkClosed();
-            return cursor.getInt(columnIndex);
-        }
-
-        @Override
-        public long getLong(int columnIndex) {
-            checkClosed();
-            return cursor.getLong(columnIndex);
-        }
-
-        @Override
-        public int getPosition() {
-            checkClosed();
-            return cursor.getPosition();
-        }
-
-        @Override
-        public short getShort(int columnIndex) {
-            checkClosed();
-            return cursor.getShort(columnIndex);
-        }
-
-        @Override
-        public String getString(int columnIndex) {
-            checkClosed();
-            return cursor.getString(columnIndex);
-        }
-
-        @Override
-        public boolean getWantsAllOnMoveCalls() {
-            checkClosed();
-            return cursor.getWantsAllOnMoveCalls();
-        }
-
-        @TargetApi(Build.VERSION_CODES.M)
-        @Override
-        public void setExtras(Bundle extras) {
-            cursor.setExtras(extras);
-        }
-
-        @Override
-        public boolean isAfterLast() {
-            checkClosed();
-            return cursor.isAfterLast();
-        }
-
-        @Override
-        public boolean isBeforeFirst() {
-            checkClosed();
-            return cursor.isBeforeFirst();
-        }
-
-        @Override
-        public boolean isFirst() {
-            checkClosed();
-            return cursor.isFirst();
-        }
-
-        @Override
-        public boolean isLast() {
-            checkClosed();
-            return cursor.isLast();
-        }
-
-        @Override
-        public boolean isNull(int columnIndex) {
-            checkClosed();
-            return cursor.isNull(columnIndex);
-        }
-
-        @Override
-        public boolean move(int offset) {
-            checkClosed();
-            return cursor.move(offset);
-        }
-
-        @Override
-        public boolean moveToFirst() {
-            checkClosed();
-            return cursor.moveToFirst();
-        }
-
-        @Override
-        public boolean moveToLast() {
-            checkClosed();
-            return cursor.moveToLast();
-        }
-
-        @Override
-        public boolean moveToNext() {
-            checkClosed();
-            return cursor.moveToNext();
-        }
-
-        @Override
-        public boolean moveToPosition(int position) {
-            checkClosed();
-            return cursor.moveToPosition(position);
-        }
-
-        @Override
-        public boolean moveToPrevious() {
-            checkClosed();
-            return cursor.moveToPrevious();
-        }
-
-        @Override
-        public void registerContentObserver(ContentObserver observer) {
-            checkClosed();
-            cursor.registerContentObserver(observer);
-        }
-
-        @Override
-        public void registerDataSetObserver(DataSetObserver observer) {
-            checkClosed();
-            cursor.registerDataSetObserver(observer);
-        }
-
-        @SuppressWarnings("deprecation")
-        @Override
-        public boolean requery() {
-            checkClosed();
-            return cursor.requery();
-        }
-
-        @Override
-        public Bundle respond(Bundle extras) {
-            checkClosed();
-            return cursor.respond(extras);
-        }
-
-        @Override
-        public void setNotificationUri(ContentResolver cr, Uri uri) {
-            checkClosed();
-            cursor.setNotificationUri(cr, uri);
-        }
-
-        @Override
-        public void unregisterContentObserver(ContentObserver observer) {
-            checkClosed();
-            cursor.unregisterContentObserver(observer);
-        }
-
-        @Override
-        public void unregisterDataSetObserver(DataSetObserver observer) {
-            checkClosed();
-            cursor.unregisterDataSetObserver(observer);
-        }
-
-        @Override
-        public int getType(int columnIndex) {
-            checkClosed();
-            return cursor.getType(columnIndex);
-        }
-
-        @Override
-        public Uri getNotificationUri() {
-            return null;
-        }
-    }
-
-    protected class ThrottlingQueryHandler implements QueryHandler {
-        private QueryHandler delegate;
-
-
-        public ThrottlingQueryHandler(QueryHandler delegate) {
-            this.delegate = delegate;
-        }
-
-        @Override
-        public String getPath() {
-            return delegate.getPath();
-        }
-
-        @Override
-        public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder)
-                throws Exception {
-            semaphore.acquire();
-
-            Cursor cursor = null;
-            try {
-                cursor = delegate.query(uri, projection, selection, selectionArgs, sortOrder);
-            } finally {
-                if (cursor == null) {
-                    semaphore.release();
-                }
-            }
-
-            // Android content resolvers can only process CrossProcessCursor instances
-            if (!(cursor instanceof CrossProcessCursor)) {
-                Timber.w("Unsupported cursor, returning null: %s", cursor);
-                semaphore.release();
-                return null;
-            }
-
-            MonitoredCursor wrapped = new MonitoredCursor((CrossProcessCursor) cursor, semaphore);
-
-            // Use a weak reference not to actively prevent garbage collection
-            final WeakReference<MonitoredCursor> weakReference = new WeakReference<>(wrapped);
-
-            // Make sure the cursor is closed after 30 seconds
-            scheduledPool.schedule(new Runnable() {
-
-                @Override
-                public void run() {
-                    MonitoredCursor monitored = weakReference.get();
-                    if (monitored != null && !monitored.isClosed()) {
-                        Timber.w("Forcibly closing remotely exposed cursor");
-                        try {
-                            monitored.close();
-                        } catch (Exception e) {
-                            Timber.w(e, "Exception while forcibly closing cursor");
-                        }
-                    }
-                }
-            }, 30, TimeUnit.SECONDS);
-
-            return wrapped;
-        }
-    }
-}
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt
index 05ddb774ac58b2cf6b28e80b500b7bc00d2c0a56..c7cebde8fe459dbb298222696a95f5ccf7696500 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/list/KoinModule.kt
@@ -1,7 +1,8 @@
 package com.fsck.k9.widget.list
 
+import app.k9mail.ui.widget.list.MessageListWidgetConfig
 import org.koin.dsl.module
 
-val messageListWidgetModule = module {
-    single { MessageListWidgetUpdateListener(get()) }
+val messageListWidgetConfigModule = module {
+    single<MessageListWidgetConfig> { K9MessageListWidgetConfig() }
 }
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java
deleted file mode 100644
index 5ebc4115747af3d49390dcaeeaf90bc7967f5697..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListRemoteViewFactory.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package com.fsck.k9.widget.list;
-
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Locale;
-
-import android.content.Context;
-import android.content.Intent;
-import android.database.Cursor;
-import android.graphics.Typeface;
-import android.net.Uri;
-import android.os.Binder;
-import androidx.core.content.ContextCompat;
-import android.text.SpannableString;
-import android.text.style.StyleSpan;
-import android.view.View;
-import android.widget.RemoteViews;
-import android.widget.RemoteViewsService;
-
-import com.fsck.k9.K9;
-import com.fsck.k9.R;
-import com.fsck.k9.external.MessageProvider;
-
-
-public class MessageListRemoteViewFactory implements RemoteViewsService.RemoteViewsFactory {
-    private static final String[] MAIL_LIST_PROJECTIONS = {
-            MessageProvider.MessageColumns.SENDER,
-            MessageProvider.MessageColumns.SEND_DATE,
-            MessageProvider.MessageColumns.SUBJECT,
-            MessageProvider.MessageColumns.PREVIEW,
-            MessageProvider.MessageColumns.UNREAD,
-            MessageProvider.MessageColumns.HAS_ATTACHMENTS,
-            MessageProvider.MessageColumns.URI,
-            MessageProvider.MessageColumns.ACCOUNT_COLOR,
-    };
-
-
-    private final Context context;
-    private final Calendar calendar;
-    private final ArrayList<MailItem> mailItems = new ArrayList<>(25);
-    private boolean senderAboveSubject;
-    private int readTextColor;
-    private int unreadTextColor;
-
-
-    public MessageListRemoteViewFactory(Context context) {
-        this.context = context;
-        calendar = Calendar.getInstance();
-    }
-
-    @Override
-    public void onCreate() {
-        senderAboveSubject = K9.isMessageListSenderAboveSubject();
-        readTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_read);
-        unreadTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_unread);
-    }
-
-    @Override
-    public void onDataSetChanged() {
-        long identityToken = Binder.clearCallingIdentity();
-        try {
-            loadMessageList();
-        } finally {
-            Binder.restoreCallingIdentity(identityToken);
-        }
-    }
-
-    private void loadMessageList() {
-        mailItems.clear();
-
-        Uri unifiedInboxUri = MessageProvider.CONTENT_URI.buildUpon().appendPath("inbox_messages").build();
-        Cursor cursor = context.getContentResolver().query(unifiedInboxUri, MAIL_LIST_PROJECTIONS, null, null, null);
-
-        if (cursor == null) {
-            return;
-        }
-
-        try {
-            while (cursor.moveToNext()) {
-                String sender = cursor.getString(0);
-                long date = cursor.isNull(1) ? 0L : cursor.getLong(1);
-                String subject = cursor.getString(2);
-                String preview = cursor.getString(3);
-                boolean unread = toBoolean(cursor.getString(4));
-                boolean hasAttachment = toBoolean(cursor.getString(5));
-                Uri viewUri = Uri.parse(cursor.getString(6));
-                int color = cursor.getInt(7);
-
-                mailItems.add(new MailItem(sender, date, subject, preview, unread, hasAttachment, viewUri, color));
-            }
-        } finally {
-            cursor.close();
-        }
-    }
-
-    @Override
-    public void onDestroy() {
-        // Implement interface
-    }
-
-    @Override
-    public int getCount() {
-        return mailItems.size();
-    }
-
-    @Override
-    public RemoteViews getViewAt(int position) {
-        RemoteViews remoteView = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_list_item);
-        MailItem item = mailItems.get(position);
-
-        CharSequence sender = item.unread ? bold(item.sender) : item.sender;
-        CharSequence subject = item.unread ? bold(item.subject) : item.subject;
-
-        if (senderAboveSubject) {
-            remoteView.setTextViewText(R.id.sender, sender);
-            remoteView.setTextViewText(R.id.mail_subject, subject);
-        } else {
-            remoteView.setTextViewText(R.id.sender, subject);
-            remoteView.setTextViewText(R.id.mail_subject, sender);
-        }
-        remoteView.setTextViewText(R.id.mail_date, item.getDateFormatted("%d %s"));
-        remoteView.setTextViewText(R.id.mail_preview, item.preview);
-
-        int textColor = item.getTextColor();
-        remoteView.setTextColor(R.id.sender, textColor);
-        remoteView.setTextColor(R.id.mail_subject, textColor);
-        remoteView.setTextColor(R.id.mail_date, textColor);
-        remoteView.setTextColor(R.id.mail_preview, textColor);
-
-        if (item.hasAttachment) {
-            remoteView.setInt(R.id.attachment, "setVisibility", View.VISIBLE);
-        } else {
-            remoteView.setInt(R.id.attachment, "setVisibility", View.GONE);
-        }
-
-        Intent intent = new Intent();
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.setData(item.uri);
-        remoteView.setOnClickFillInIntent(R.id.mail_list_item, intent);
-
-        remoteView.setInt(R.id.chip, "setBackgroundColor", item.color);
-
-        return remoteView;
-    }
-
-    @Override
-    public RemoteViews getLoadingView() {
-        RemoteViews loadingView = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_loading);
-        loadingView.setTextViewText(R.id.loadingText, context.getString(com.fsck.k9.ui.R.string.mail_list_widget_loading));
-        loadingView.setViewVisibility(R.id.loadingText, View.VISIBLE);
-        return loadingView;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 2;
-    }
-
-    @Override
-    public long getItemId(int position) {
-        return position;
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    private CharSequence bold(String text) {
-        SpannableString spannableString = new SpannableString(text);
-        spannableString.setSpan(new StyleSpan(Typeface.BOLD), 0, text.length(), 0);
-        return spannableString;
-    }
-
-    private boolean toBoolean(String value) {
-        return Boolean.valueOf(value);
-    }
-
-
-    private class MailItem {
-        final long date;
-        final String sender;
-        final String preview;
-        final String subject;
-        final boolean unread;
-        final boolean hasAttachment;
-        final Uri uri;
-        final int color;
-
-
-        MailItem(String sender, long date, String subject, String preview, boolean unread, boolean hasAttachment,
-                Uri viewUri, int color) {
-            this.sender = sender;
-            this.date = date;
-            this.preview = preview;
-            this.subject = subject;
-            this.unread = unread;
-            this.uri = viewUri;
-            this.hasAttachment = hasAttachment;
-            this.color = color;
-        }
-
-        int getTextColor() {
-            return unread ? unreadTextColor : readTextColor;
-        }
-
-        String getDateFormatted(String format) {
-            calendar.setTimeInMillis(date);
-
-            return String.format(format,
-                    calendar.get(Calendar.DAY_OF_MONTH),
-                    calendar.getDisplayName(Calendar.MONTH, Calendar.SHORT, Locale.getDefault()));
-        }
-    }
-}
-
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java
deleted file mode 100644
index c7a9ac00734e7ccd8a90150ae838f923f5b25c5a..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.fsck.k9.widget.list;
-
-
-import android.app.PendingIntent;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProvider;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.widget.RemoteViews;
-
-import com.fsck.k9.R;
-import com.fsck.k9.activity.MessageCompose;
-import com.fsck.k9.activity.MessageList;
-import com.fsck.k9.search.SearchAccount;
-
-import static android.app.PendingIntent.FLAG_UPDATE_CURRENT;
-import static com.fsck.k9.helper.PendingIntentCompat.FLAG_IMMUTABLE;
-import static com.fsck.k9.helper.PendingIntentCompat.FLAG_MUTABLE;
-
-
-public class MessageListWidgetProvider extends AppWidgetProvider {
-    private static final String ACTION_UPDATE_MESSAGE_LIST = "UPDATE_MESSAGE_LIST";
-
-
-    public static void triggerMessageListWidgetUpdate(Context context) {
-        Context appContext = context.getApplicationContext();
-        AppWidgetManager widgetManager = AppWidgetManager.getInstance(appContext);
-        ComponentName widget = new ComponentName(appContext, MessageListWidgetProvider.class);
-        int[] widgetIds = widgetManager.getAppWidgetIds(widget);
-
-        Intent intent = new Intent(context, MessageListWidgetProvider.class);
-        intent.setAction(ACTION_UPDATE_MESSAGE_LIST);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds);
-        context.sendBroadcast(intent);
-    }
-
-    @Override
-    public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
-        for (int appWidgetId : appWidgetIds) {
-            updateAppWidget(context, appWidgetManager, appWidgetId);
-        }
-    }
-
-    private void updateAppWidget(Context context, AppWidgetManager appWidgetManager, int appWidgetId) {
-        RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.message_list_widget_layout);
-
-        views.setTextViewText(R.id.folder, context.getString(com.fsck.k9.ui.R.string.integrated_inbox_title));
-
-        Intent intent = new Intent(context, MessageListWidgetService.class);
-        intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
-        intent.setData(Uri.parse(intent.toUri(Intent.URI_INTENT_SCHEME)));
-        views.setRemoteAdapter(R.id.listView, intent);
-
-        PendingIntent viewAction = viewActionTemplatePendingIntent(context);
-        views.setPendingIntentTemplate(R.id.listView, viewAction);
-
-        PendingIntent composeAction = composeActionPendingIntent(context);
-        views.setOnClickPendingIntent(R.id.new_message, composeAction);
-
-        PendingIntent headerClickAction = viewUnifiedInboxPendingIntent(context);
-        views.setOnClickPendingIntent(R.id.top_controls, headerClickAction);
-
-        appWidgetManager.updateAppWidget(appWidgetId, views);
-    }
-
-    @Override
-    public void onReceive(Context context, Intent intent) {
-        super.onReceive(context, intent);
-
-        String action = intent.getAction();
-        if (action.equals(ACTION_UPDATE_MESSAGE_LIST)) {
-            AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context);
-            int[] appWidgetIds = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
-            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.listView);
-        }
-    }
-
-    private PendingIntent viewActionTemplatePendingIntent(Context context) {
-        Intent intent = new Intent(context, MessageList.class);
-        intent.setAction(Intent.ACTION_VIEW);
-
-        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT | FLAG_MUTABLE);
-    }
-
-    private PendingIntent viewUnifiedInboxPendingIntent(Context context) {
-        SearchAccount unifiedInboxAccount = SearchAccount.createUnifiedInboxAccount();
-        Intent intent = MessageList.intentDisplaySearch(
-                context, unifiedInboxAccount.getRelatedSearch(), true, true, true);
-
-        return PendingIntent.getActivity(context, -1, intent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE);
-    }
-
-    private PendingIntent composeActionPendingIntent(Context context) {
-        Intent intent = new Intent(context, MessageCompose.class);
-        intent.setAction(MessageCompose.ACTION_COMPOSE);
-
-        return PendingIntent.getActivity(context, 0, intent, FLAG_UPDATE_CURRENT | FLAG_IMMUTABLE);
-    }
-}
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..805be2eb139cdd1bafb3a1791644498f744f9ffc
--- /dev/null
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
@@ -0,0 +1,9 @@
+package com.fsck.k9.widget.list
+
+import app.k9mail.ui.widget.list.MessageListWidgetConfig
+
+class MessageListWidgetProvider : app.k9mail.ui.widget.list.MessageListWidgetProvider()
+
+internal class K9MessageListWidgetConfig : MessageListWidgetConfig {
+    override val providerClass = MessageListWidgetProvider::class.java
+}
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java
deleted file mode 100644
index 980a585c620c27ff614b1aa34084bbedcbcf6bbb..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetService.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.fsck.k9.widget.list;
-
-
-import android.content.Intent;
-import android.widget.RemoteViewsService;
-
-
-public class MessageListWidgetService extends RemoteViewsService {
-    @Override
-    public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new MessageListRemoteViewFactory(getApplicationContext());
-    }
-}
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetUpdateListener.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetUpdateListener.kt
deleted file mode 100644
index 4a84ff2750db67aeadf96b3b43a0a9d6d6ded851..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/list/MessageListWidgetUpdateListener.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.fsck.k9.widget.list
-
-import android.content.Context
-import com.fsck.k9.Account
-import com.fsck.k9.controller.SimpleMessagingListener
-import com.fsck.k9.core.BuildConfig
-import com.fsck.k9.mail.Message
-import timber.log.Timber
-
-class MessageListWidgetUpdateListener(private val context: Context) : SimpleMessagingListener() {
-
-    private fun updateMailListWidget() {
-        try {
-            MessageListWidgetProvider.triggerMessageListWidgetUpdate(context)
-        } catch (e: RuntimeException) {
-            if (BuildConfig.DEBUG) {
-                throw e
-            } else {
-                Timber.e(e, "Error while updating message list widget")
-            }
-        }
-    }
-
-    override fun synchronizeMailboxRemovedMessage(account: Account, folderServerId: String, messageServerId: String) {
-        updateMailListWidget()
-    }
-
-    override fun synchronizeMailboxNewMessage(account: Account, folderServerId: String, message: Message) {
-        updateMailListWidget()
-    }
-
-    override fun folderStatusChanged(account: Account, folderId: Long) {
-        updateMailListWidget()
-    }
-}
diff --git a/app/k9mail/src/main/res/layout/message_list_widget_loading.xml b/app/k9mail/src/main/res/layout/message_list_widget_loading.xml
deleted file mode 100644
index 2df87f53401c927278deee81478daf2d0caf8f24..0000000000000000000000000000000000000000
--- a/app/k9mail/src/main/res/layout/message_list_widget_loading.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/loadingText"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:textColor="@android:color/black"
-        android:textSize="18sp" />
-
-</LinearLayout>
diff --git a/app/k9mail/src/main/res/values/themes.xml b/app/k9mail/src/main/res/values/themes.xml
index 9982756f2c75259e2f0ff5f0d0de7edda0cdf5d3..6da76fe4a3f45b312daf0d24e88068e5a36f29bb 100644
--- a/app/k9mail/src/main/res/values/themes.xml
+++ b/app/k9mail/src/main/res/values/themes.xml
@@ -121,6 +121,7 @@
         <item name="messageComposeAddContactImage">@drawable/ic_person_plus</item>
         <item name="attachmentCardBackground">@color/color_default_foreground</item>
         <item name="contactPictureFallbackDefaultBackgroundColor">#ffababab</item>
+        <item name="contactPictureFallbackBackgroundColors">@array/contact_picture_fallback_background_colors_light</item>
         <item name="contactTokenBackgroundColor">@color/color_contact_token_background</item>
         <item name="composerBackgroundColor">@android:color/background_light</item>
         <item name="tintColorBulletPointPositive">#77aa22</item>
@@ -148,6 +149,26 @@
         <item name="materialDrawerStyle">@style/Widget.MaterialDrawerStyle.K9.Light</item>
         <item name="materialDrawerHeaderStyle">@style/Widget.MaterialDrawerHeaderStyle.K9.Light</item>
         <item name="behindRecyclerView">@color/color_default_foreground</item>
+
+        <item name="messageListSwipeIconTint">#ffffff</item>
+        <item name="messageListSwipeSelectIcon">@drawable/ic_check_circle</item>
+        <item name="messageListSwipeMarkAsReadIcon">?attr/iconActionMarkAsRead</item>
+        <item name="messageListSwipeMarkAsUnreadIcon">?attr/iconActionMarkAsUnread</item>
+        <item name="messageListSwipeAddStarIcon">?attr/iconActionFlag</item>
+        <item name="messageListSwipeRemoveStarIcon">?attr/iconActionUnflag</item>
+        <item name="messageListSwipeToggleStarBackgroundColor">@color/material_orange_600</item>
+        <item name="messageListSwipeArchiveIcon">?attr/iconActionArchive</item>
+        <item name="messageListSwipeArchiveBackgroundColor">@color/material_green_600</item>
+        <item name="messageListSwipeDeleteIcon">?attr/iconActionDelete</item>
+        <item name="messageListSwipeDeleteBackgroundColor">@color/material_red_600</item>
+        <item name="messageListSwipeSpamIcon">?attr/iconActionSpam</item>
+        <item name="messageListSwipeSpamBackgroundColor">@color/material_red_700</item>
+        <item name="messageListSwipeMoveIcon">?attr/iconActionMove</item>
+        <item name="messageListSwipeMoveBackgroundColor">@color/material_purple_500</item>
+
+        <item name="messageListSwipeDisabledBackgroundColor">@color/color_default_background</item>
+        <item name="messageListSwipeSelectBackgroundColor">@color/material_blue_600</item>
+        <item name="messageListSwipeToggleReadBackgroundColor">@color/material_blue_600</item>
     </style>
 
     <style name="Theme.K9.Light" parent="Theme.MaterialComponents.NoActionBar.Bridge">
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt
index ee69f27d90a1f8010243918eec80b2f67092b99a..ca1e7dec6abd46d439b20e4d49f035f25e415afb 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStore.kt
@@ -78,7 +78,7 @@ class K9MessageStore(
         updateMessageOperations.clearNewMessageState()
     }
 
-    override fun getMessageServerId(messageId: Long): String {
+    override fun getMessageServerId(messageId: Long): String? {
         return retrieveMessageOperations.getMessageServerId(messageId)
     }
 
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt
index a57bfee54110ac3ce3dd6a422f0e05abed6102f7..c094ae3b3c258a6d04c7eca4b385ae1eb06d6bf3 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageOperations.kt
@@ -4,7 +4,6 @@ import androidx.core.database.getLongOrNull
 import com.fsck.k9.K9
 import com.fsck.k9.mail.Flag
 import com.fsck.k9.mail.Header
-import com.fsck.k9.mail.MessagingException
 import com.fsck.k9.mail.internet.MimeHeader
 import com.fsck.k9.mail.message.MessageHeaderParser
 import com.fsck.k9.mailstore.LockableDatabase
@@ -13,7 +12,7 @@ import java.util.Date
 
 internal class RetrieveMessageOperations(private val lockableDatabase: LockableDatabase) {
 
-    fun getMessageServerId(messageId: Long): String {
+    fun getMessageServerId(messageId: Long): String? {
         return lockableDatabase.execute(false) { database ->
             database.query(
                 "messages",
@@ -25,7 +24,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                 if (cursor.moveToFirst()) {
                     cursor.getString(0)
                 } else {
-                    throw MessagingException("Message [ID: $messageId] not found in database")
+                    null
                 }
             }
         }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt
index 5825dccec9db352ef7e80365ca722d77b9bc5f0b..09dccb31d7032c249727019e36f97e3db0313647 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageOperationsTest.kt
@@ -2,7 +2,6 @@ package com.fsck.k9.storage.messages
 
 import com.fsck.k9.mail.Flag
 import com.fsck.k9.mail.Header
-import com.fsck.k9.mail.MessagingException
 import com.fsck.k9.mail.crlf
 import com.fsck.k9.storage.RobolectricTest
 import com.google.common.truth.Truth.assertThat
@@ -14,9 +13,11 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
     private val lockableDatabase = createLockableDatabaseMock(sqliteDatabase)
     private val retrieveMessageOperations = RetrieveMessageOperations(lockableDatabase)
 
-    @Test(expected = MessagingException::class)
+    @Test
     fun `get message server id of non-existent message`() {
-        retrieveMessageOperations.getMessageServerId(42)
+        val messageServerId = retrieveMessageOperations.getMessageServerId(42)
+
+        assertThat(messageServerId).isNull()
     }
 
     @Test
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt
index 104c7dbb2f8edb6dfdf2d483c5ac9607634ae56f..4eef05baf5f974988c0bb1e041c7a8fb3a47c1fc 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/ThemeManager.kt
@@ -64,7 +64,7 @@ class ThemeManager(
             .onEach {
                 updateAppTheme(it)
             }
-            .launchIn(appCoroutineScope + Dispatchers.Main)
+            .launchIn(appCoroutineScope + Dispatchers.Main.immediate)
     }
 
     private fun updateAppTheme(appTheme: AppTheme) {
diff --git a/app/ui/legacy/build.gradle b/app/ui/legacy/build.gradle
index d2c66daac0163fa4a9b7472bd264889b70c2ae41..e3795d0d019063ad81bfab4026ccc6424468672d 100644
--- a/app/ui/legacy/build.gradle
+++ b/app/ui/legacy/build.gradle
@@ -22,6 +22,8 @@ dependencies {
     implementation "com.takisoft.preferencex:preferencex-datetimepicker:${versions.preferencesFix}"
     implementation "com.takisoft.preferencex:preferencex-colorpicker:${versions.preferencesFix}"
     implementation "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"
+    implementation project(':ui-utils:LinearLayoutManager')
+    implementation project(':ui-utils:ItemTouchHelper')
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:${versions.androidxLifecycle}"
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${versions.androidxLifecycle}"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:${versions.androidxLifecycle}"
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt b/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt
index 0a18249e8bdc1ada6e470dfe14ea48f5e0eee090..79f928ec3635dc1d5c0014ee9593286e1a6cd597 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/UiKoinModules.kt
@@ -4,7 +4,6 @@ import com.fsck.k9.account.accountModule
 import com.fsck.k9.activity.activityModule
 import com.fsck.k9.autodiscovery.providersxml.autodiscoveryProvidersXmlModule
 import com.fsck.k9.contacts.contactsModule
-import com.fsck.k9.fragment.fragmentModule
 import com.fsck.k9.ui.account.accountUiModule
 import com.fsck.k9.ui.base.uiBaseModule
 import com.fsck.k9.ui.changelog.changelogUiModule
@@ -28,7 +27,6 @@ val uiModules = listOf(
     messageListUiModule,
     manageFoldersUiModule,
     chooseFolderUiModule,
-    fragmentModule,
     contactsModule,
     accountModule,
     autodiscoveryProvidersXmlModule,
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
index 70a3832b5727fec066a58a55a4696367bcdedc7e..3675fbc99d8fdb18ebc7c9eec49d9220cda71e35 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountCreator.kt
@@ -7,7 +7,6 @@ import com.fsck.k9.Preferences
 import com.fsck.k9.mail.ConnectionSecurity
 import com.fsck.k9.preferences.Protocols
 import com.fsck.k9.ui.R
-import com.fsck.k9.ui.helper.MaterialColors
 
 /**
  * Deals with logic surrounding account creation.
@@ -55,12 +54,4 @@ class AccountCreator(private val preferences: Preferences, private val resources
     fun pickColor(): Int {
         return ResourcesCompat.getColor(resources, R.color.color_default_accent, null)
     }
-
-    companion object {
-        private val DEFAULT_COLORS = intArrayOf(
-            MaterialColors.BLUE_700,
-            MaterialColors.PINK_500,
-            MaterialColors.AMBER_600
-        )
-    }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt
index 483cba3dfc66750272a3b0148911f8f6f1c3f858..7d8ab451315a351492ec56376194a38ff5e39122 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/AccountRemover.kt
@@ -36,7 +36,7 @@ class AccountRemover(
 
         preferences.deleteAccount(account)
 
-        localKeyStoreManager.deleteCertificates(account)
+        removeCertificates(account)
         Core.setServicesEnabled()
 
         Timber.v("Finished removing account '%s'.", accountName)
@@ -62,4 +62,12 @@ class AccountRemover(
             Timber.e(e, "Failed to reset remote store for account %s", account)
         }
     }
+
+    private fun removeCertificates(account: Account) {
+        try {
+            localKeyStoreManager.deleteCertificates(account)
+        } catch (e: Exception) {
+            Timber.e(e, "Failed to remove certificates for account %s", account)
+        }
+    }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
index b873e5ea248c05ed2e5d6cedb9f2ff7853b11267..69b2f3d1c8ecaf58230ac6f3568b1510d2170b1a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -243,6 +243,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
     private boolean navigateUp;
 
+    private boolean sendMessageHasBeenTriggered = false;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -698,6 +700,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
         ComposeCryptoStatus cryptoStatus = recipientPresenter.getCurrentCachedCryptoStatus();
         if (cryptoStatus == null) {
+            Timber.w("Couldn't retrieve crypto status; not creating MessageBuilder!");
             return null;
         }
 
@@ -801,8 +804,13 @@ public class MessageCompose extends K9Activity implements OnClickListener,
     }
 
     public void performSendAfterChecks() {
+        if (sendMessageHasBeenTriggered) {
+            return;
+        }
+
         currentMessageBuilder = createMessageBuilder(false);
         if (currentMessageBuilder != null) {
+            sendMessageHasBeenTriggered = true;
             changesMadeSinceLastSave = false;
             setProgressBarIndeterminateVisibility(true);
             currentMessageBuilder.buildAsync(this);
@@ -1618,6 +1626,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
     @Override
     public void onMessageBuildCancel() {
+        sendMessageHasBeenTriggered = false;
         currentMessageBuilder = null;
         setProgressBarIndeterminateVisibility(false);
     }
@@ -1627,6 +1636,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
         Timber.e(me, "Error sending message");
         Toast.makeText(MessageCompose.this,
                 getString(R.string.send_failed_reason, me.getLocalizedMessage()), Toast.LENGTH_LONG).show();
+        sendMessageHasBeenTriggered = false;
         currentMessageBuilder = null;
         setProgressBarIndeterminateVisibility(false);
     }
@@ -1702,7 +1712,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
         }
 
         @Override
-        public void startIntentSenderForMessageLoaderHelper(IntentSender si, int requestCode, Intent fillIntent,
+        public boolean startIntentSenderForMessageLoaderHelper(IntentSender si, int requestCode, Intent fillIntent,
                 int flagsMask, int flagValues, int extraFlags) {
             try {
                 requestCode |= REQUEST_MASK_LOADER_HELPER;
@@ -1710,6 +1720,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             } catch (SendIntentException e) {
                 Timber.e(e, "Irrecoverable error calling PendingIntent!");
             }
+
+            return true;
         }
 
         @Override
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 83695f9addf957ba2d65828a08e719015f8e4bc2..ff34b1c63d356d98023b30fcc31c3c9ce85d7a64 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
@@ -33,7 +33,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.animation.AnimationUtils
 import android.widget.ProgressBar
-import android.widget.Toast
 import androidx.appcompat.app.ActionBar
 import androidx.appcompat.view.ActionMode
 import androidx.appcompat.widget.SearchView
@@ -57,8 +56,6 @@ import com.fsck.k9.activity.setup.AccountSetupBasics
 import com.fsck.k9.activity.setup.accountmanager.EeloAccountCreator
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.controller.MessagingController
-import com.fsck.k9.fragment.MessageListFragment
-import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener
 import com.fsck.k9.helper.Contacts
 import com.fsck.k9.helper.ParcelableUtil
 import com.fsck.k9.job.K9JobManager
@@ -79,6 +76,8 @@ import com.fsck.k9.ui.changelog.RecentChangesActivity
 import com.fsck.k9.ui.changelog.RecentChangesViewModel
 import com.fsck.k9.ui.managefolders.ManageFoldersActivity
 import com.fsck.k9.ui.messagelist.DefaultFolderProvider
+import com.fsck.k9.ui.messagelist.MessageListFragment
+import com.fsck.k9.ui.messagelist.MessageListFragment.MessageListFragmentListener
 import com.fsck.k9.ui.messageview.Direction
 import com.fsck.k9.ui.messageview.MessageViewContainerFragment
 import com.fsck.k9.ui.messageview.MessageViewContainerFragment.MessageViewContainerListener
@@ -146,7 +145,7 @@ open class MessageList :
                 ?: if (K9.isMessageViewShowNext) Direction.NEXT else Direction.PREVIOUS
         }
 
-    private var messageListActivityAppearance: MessageListActivityAppearance? = null
+    private var messageListActivityConfig: MessageListActivityConfig? = null
 
     /**
      * `true` if the message list should be displayed as flat list (i.e. no threading)
@@ -446,31 +445,31 @@ open class MessageList :
 
     private fun decodeExtrasToLaunchData(intent: Intent): LaunchData {
         val action = intent.action
-        val data = intent.data
         val queryString = intent.getStringExtra(SearchManager.QUERY)
 
-        if (action == Intent.ACTION_VIEW && data != null && data.pathSegments.size >= 3) {
-            val segmentList = data.pathSegments
-            val accountId = segmentList[0]
-            for (account in preferences.accounts) {
-                if (account.accountNumber.toString() == accountId) {
-                    val folderId = segmentList[1].toLong()
-                    val messageUid = segmentList[2]
-                    val messageReference = MessageReference(account.uuid, folderId, messageUid)
-
-                    return LaunchData(
-                        search = messageReference.toLocalSearch(),
-                        messageReference = messageReference,
-                        messageViewOnly = true
-                    )
-                }
-            }
-        } else if (action == ACTION_SHORTCUT) {
+        if (action == ACTION_SHORTCUT) {
             // Handle shortcut intents
             val specialFolder = intent.getStringExtra(EXTRA_SPECIAL_FOLDER)
-            if (SearchAccount.UNIFIED_INBOX == specialFolder) {
+            if (specialFolder == SearchAccount.UNIFIED_INBOX) {
                 return LaunchData(search = SearchAccount.createUnifiedInboxAccount().relatedSearch)
             }
+
+            val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT)
+            if (accountUuid != null) {
+                val account = preferences.getAccount(accountUuid)
+                if (account == null) {
+                    Timber.d("Account %s not found.", accountUuid)
+                    return LaunchData(createDefaultLocalSearch())
+                }
+
+                val folderId = defaultFolderProvider.getDefaultFolder(account)
+                val search = LocalSearch().apply {
+                    addAccountUuid(accountUuid)
+                    addAllowedFolder(folderId)
+                }
+
+                return LaunchData(search = search)
+            }
         } else if (action == Intent.ACTION_SEARCH && queryString != null) {
             // Query was received from Search Dialog
             val query = queryString.trim()
@@ -514,7 +513,8 @@ open class MessageList :
 
                 return LaunchData(
                     search = search,
-                    messageReference = messageReference
+                    messageReference = messageReference,
+                    messageViewOnly = intent.getBooleanExtra(EXTRA_MESSAGE_VIEW_ONLY, false)
                 )
             }
         } else if (intent.hasExtra(EXTRA_SEARCH)) {
@@ -526,24 +526,6 @@ open class MessageList :
             }
 
             return LaunchData(search = search, account = account, noThreading = noThreading)
-        } else if (intent.hasExtra("account")) {
-            val accountUuid = intent.getStringExtra("account")
-            if (accountUuid != null) {
-                // We've most likely been started by an old unread widget or accounts shortcut
-                val account = preferences.getAccount(accountUuid)
-                if (account == null) {
-                    Timber.d("Account %s not found.", accountUuid)
-                    return LaunchData(createDefaultLocalSearch())
-                }
-
-                val folderId = defaultFolderProvider.getDefaultFolder(account)
-                val search = LocalSearch().apply {
-                    addAccountUuid(accountUuid)
-                    addAllowedFolder(folderId)
-                }
-
-                return LaunchData(search = search)
-            }
         }
 
         // Default action
@@ -573,9 +555,9 @@ open class MessageList :
     public override fun onResume() {
         super.onResume()
 
-        if (messageListActivityAppearance == null) {
-            messageListActivityAppearance = MessageListActivityAppearance.create(generalSettingsManager)
-        } else if (messageListActivityAppearance != MessageListActivityAppearance.create(generalSettingsManager)) {
+        if (messageListActivityConfig == null) {
+            messageListActivityConfig = MessageListActivityConfig.create(generalSettingsManager)
+        } else if (messageListActivityConfig != MessageListActivityConfig.create(generalSettingsManager)) {
             recreateCompat()
         }
 
@@ -641,7 +623,10 @@ open class MessageList :
 
             override fun onDrawerStateChanged(newState: Int) = Unit
 
-            override fun onDrawerOpened(drawerView: View) = Unit
+            override fun onDrawerOpened(drawerView: View) {
+                collapseSearchView()
+                messageListFragment?.finishActionMode()
+            }
 
             override fun onDrawerSlide(drawerView: View, slideOffset: Float) = Unit
         }
@@ -904,15 +889,6 @@ open class MessageList :
                 }
                 return true
             }
-            'h' -> {
-                val toast = if (displayMode == DisplayMode.MESSAGE_LIST) {
-                    Toast.makeText(this, R.string.message_list_help_key, Toast.LENGTH_LONG)
-                } else {
-                    Toast.makeText(this, R.string.message_view_help_key, Toast.LENGTH_LONG)
-                }
-                toast.show()
-                return true
-            }
         }
 
         return false
@@ -946,7 +922,6 @@ open class MessageList :
                     if (drawer!!.isOpen) {
                         drawer!!.close()
                     } else {
-                        collapseSearchView()
                         drawer!!.open()
                     }
                 } else {
@@ -1099,6 +1074,8 @@ open class MessageList :
     }
 
     private fun addMessageListFragment(fragment: MessageListFragment) {
+        messageListFragment?.isActive = false
+
         supportFragmentManager.commit {
             replace(R.id.message_list_container, fragment)
 
@@ -1486,6 +1463,7 @@ open class MessageList :
 
         private const val EXTRA_ACCOUNT = "account_uuid"
         private const val EXTRA_MESSAGE_REFERENCE = "message_reference"
+        private const val EXTRA_MESSAGE_VIEW_ONLY = "message_view_only"
 
         // used for remote search
         const val EXTRA_SEARCH_ACCOUNT = "com.fsck.k9.search_account"
@@ -1575,31 +1553,47 @@ open class MessageList :
 
         @JvmStatic
         fun shortcutIntentForAccount(context: Context?, account: Account): Intent {
-            val folderId = defaultFolderProvider.getDefaultFolder(account)
+            return Intent(context, MessageList::class.java).apply {
+                action = ACTION_SHORTCUT
+                putExtra(EXTRA_ACCOUNT, account.uuid)
 
-            val search = LocalSearch().apply {
-                addAccountUuid(account.uuid)
-                addAllowedFolder(folderId)
+                addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             }
-
-            return intentDisplaySearch(context, search, noThreading = false, newTask = true, clearTop = true)
         }
 
         fun actionDisplayMessageIntent(
             context: Context,
             messageReference: MessageReference,
-            openInUnifiedInbox: Boolean = false
+            openInUnifiedInbox: Boolean = false,
+            messageViewOnly: Boolean = false
         ): Intent {
-            return Intent(context, MessageList::class.java).apply {
+            return actionDisplayMessageTemplateIntent(context, openInUnifiedInbox, messageViewOnly).apply {
                 putExtra(EXTRA_MESSAGE_REFERENCE, messageReference.toIdentityString())
+            }
+        }
 
+        fun actionDisplayMessageTemplateIntent(
+            context: Context,
+            openInUnifiedInbox: Boolean,
+            messageViewOnly: Boolean
+        ): Intent {
+            return Intent(context, MessageList::class.java).apply {
                 if (openInUnifiedInbox) {
                     val search = SearchAccount.createUnifiedInboxAccount().relatedSearch
                     putExtra(EXTRA_SEARCH, ParcelableUtil.marshall(search))
                 }
 
+                putExtra(EXTRA_MESSAGE_VIEW_ONLY, messageViewOnly)
+
                 addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
                 addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+            }
+        }
+
+        fun actionDisplayMessageTemplateFillIntent(messageReference: MessageReference): Intent {
+            return Intent().apply {
                 putExtra(EXTRA_MESSAGE_REFERENCE, messageReference.toIdentityString())
             }
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityAppearance.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
similarity index 88%
rename from app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityAppearance.kt
rename to app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
index fac66de81fa667fa3a97f3763f9f953bdc310d1d..fc2ebd1ec5f00c5a7ea705449366d4b984a0ac9a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityAppearance.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
@@ -1,11 +1,12 @@
 package com.fsck.k9.activity
 
 import com.fsck.k9.K9
+import com.fsck.k9.SwipeAction
 import com.fsck.k9.preferences.AppTheme
 import com.fsck.k9.preferences.GeneralSettingsManager
 import com.fsck.k9.preferences.SubTheme
 
-data class MessageListActivityAppearance(
+data class MessageListActivityConfig(
     val appTheme: AppTheme,
     val isShowUnifiedInbox: Boolean,
     val isShowMessageListStars: Boolean,
@@ -31,13 +32,15 @@ data class MessageListActivityAppearance(
     val fontSizeMessageViewAdditionalHeaders: Int,
     val fontSizeMessageViewSubject: Int,
     val fontSizeMessageViewDate: Int,
-    val fontSizeMessageViewContentAsPercent: Int
+    val fontSizeMessageViewContentAsPercent: Int,
+    val swipeRightAction: SwipeAction,
+    val swipeLeftAction: SwipeAction,
 ) {
 
     companion object {
-        fun create(generalSettingsManager: GeneralSettingsManager): MessageListActivityAppearance {
+        fun create(generalSettingsManager: GeneralSettingsManager): MessageListActivityConfig {
             val settings = generalSettingsManager.getSettings()
-            return MessageListActivityAppearance(
+            return MessageListActivityConfig(
                 appTheme = settings.appTheme,
                 isShowUnifiedInbox = K9.isShowUnifiedInbox,
                 isShowMessageListStars = K9.isShowMessageListStars,
@@ -63,7 +66,9 @@ data class MessageListActivityAppearance(
                 fontSizeMessageViewAdditionalHeaders = K9.fontSizes.messageViewAdditionalHeaders,
                 fontSizeMessageViewSubject = K9.fontSizes.messageViewSubject,
                 fontSizeMessageViewDate = K9.fontSizes.messageViewDate,
-                fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent
+                fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent,
+                swipeRightAction = K9.swipeRightAction,
+                swipeLeftAction = K9.swipeLeftAction,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
index a591aeed5cdd7ada6061bec5783dd65fb10d1265..2c905f0ccfb43064ab26b5bb9de627f00b3b26a6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelper.java
@@ -142,6 +142,12 @@ public class MessageLoaderHelper {
         startOrResumeLocalMessageLoader();
     }
 
+    public void resumeCryptoOperationIfNecessary() {
+        if (messageCryptoHelper != null) {
+            messageCryptoHelper.resumeCryptoOperationIfNecessary();
+        }
+    }
+
     @UiThread
     public void asyncRestartMessageCryptoProcessing() {
         cancelAndClearCryptoOperation();
@@ -351,13 +357,13 @@ public class MessageLoaderHelper {
         }
 
         @Override
-        public void startPendingIntentForCryptoHelper(IntentSender si, int requestCode, Intent fillIntent,
+        public boolean startPendingIntentForCryptoHelper(IntentSender si, int requestCode, Intent fillIntent,
                 int flagsMask, int flagValues, int extraFlags) {
             if (callback == null) {
                 throw new IllegalStateException("unexpected call when callback is already detached");
             }
 
-            callback.startIntentSenderForMessageLoaderHelper(si, requestCode, fillIntent,
+            return callback.startIntentSenderForMessageLoaderHelper(si, requestCode, fillIntent,
                     flagsMask, flagValues, extraFlags);
         }
     };
@@ -518,8 +524,8 @@ public class MessageLoaderHelper {
 
         void setLoadingProgress(int current, int max);
 
-        void startIntentSenderForMessageLoaderHelper(IntentSender si, int requestCode, Intent fillIntent, int flagsMask,
-                int flagValues, int extraFlags);
+        boolean startIntentSenderForMessageLoaderHelper(IntentSender si, int requestCode, Intent fillIntent,
+                int flagsMask, int flagValues, int extraFlags);
 
         void onDownloadErrorMessageNotFound();
         void onDownloadErrorNetworkError();
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt
index c8f33e0075ae1ce036a3c9d5a73eba0e866cd3a7..5014bc5f21686d5068fc6146b2d989da5168266e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToPresenter.kt
@@ -53,9 +53,7 @@ class ReplyToPresenter(private val view: ReplyToView) {
     }
 
     fun onNonRecipientFieldFocused() {
-        if (view.isVisible && view.getAddresses().isEmpty()) {
-            view.isVisible = false
-        }
+        view.hideIfBlank()
     }
 
     fun onSaveInstanceState(outState: Bundle) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt
index 76297080e585b7aef131c9abd7cf1e393a4285b3..e2f23bf8791664a80a518f362a0ce671c2ee6161 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ReplyToView.kt
@@ -14,7 +14,7 @@ import com.fsck.k9.view.RecipientSelectView.Recipient
 private const val VIEW_INDEX_REPLY_TO_EXPANDER_VISIBLE = 0
 private const val VIEW_INDEX_REPLY_TO_EXPANDER_HIDDEN = 1
 
-class ReplyToView(activity: MessageCompose) : View.OnClickListener {
+class ReplyToView(activity: MessageCompose) {
     private val replyToView: RecipientSelectView = activity.findViewById(R.id.reply_to)
     private val replyToWrapper: View = activity.findViewById(R.id.reply_to_wrapper)
     private val replyToDivider: View = activity.findViewById(R.id.reply_to_divider)
@@ -24,29 +24,33 @@ class ReplyToView(activity: MessageCompose) : View.OnClickListener {
     private val textWatchers = mutableSetOf<TextWatcher>()
 
     init {
-        replyToExpander.setOnClickListener(this)
-        activity.findViewById<View>(R.id.reply_to_label).setOnClickListener(this)
+        replyToExpander.setOnClickListener {
+            isVisible = true
+            replyToView.requestFocus()
+        }
+
+        activity.findViewById<View>(R.id.reply_to_label).setOnClickListener {
+            replyToView.requestFocus()
+        }
     }
 
     var isVisible: Boolean
-        get() = replyToView.isVisible
+        get() = replyToWrapper.isVisible
         set(visible) {
             replyToDivider.isVisible = visible
             replyToView.isVisible = visible
             replyToWrapper.isVisible = visible
 
             if (visible && replyToExpanderContainer.displayedChild == VIEW_INDEX_REPLY_TO_EXPANDER_VISIBLE) {
-                replyToView.requestFocus()
                 replyToExpanderContainer.displayedChild = VIEW_INDEX_REPLY_TO_EXPANDER_HIDDEN
             } else if (replyToExpanderContainer.displayedChild == VIEW_INDEX_REPLY_TO_EXPANDER_HIDDEN) {
                 replyToExpanderContainer.displayedChild = VIEW_INDEX_REPLY_TO_EXPANDER_VISIBLE
             }
         }
 
-    override fun onClick(view: View) {
-        when (view.id) {
-            R.id.reply_to_expander -> isVisible = true
-            R.id.reply_to_label -> replyToView.requestFocus()
+    fun hideIfBlank() {
+        if (isVisible && replyToView.text.isBlank()) {
+            isVisible = false
         }
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
index a39364476017ec5d98d73578691a0c6f2ca8713f..5cdcd6682497bef36a799e2f05be9606514b1f67 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.kt
@@ -23,7 +23,6 @@ import com.fsck.k9.activity.MessageList
 import com.fsck.k9.activity.setup.AccountSetupCheckSettings.CheckDirection
 import com.fsck.k9.activity.setup.accountmanager.MailAutoConfigDiscovery
 import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget
 import com.fsck.k9.autodiscovery.providersxml.ProvidersXmlDiscovery
 import com.fsck.k9.helper.SimpleTextWatcher
 import com.fsck.k9.helper.Utility.requiredFieldValid
@@ -361,7 +360,7 @@ class AccountSetupBasics : K9Activity() {
     }
 
     private fun providersXmlDiscoveryDiscover(email: String): ConnectionSettings? {
-        val discoveryResults = providersXmlDiscovery.discover(email, DiscoveryTarget.INCOMING_AND_OUTGOING)
+        val discoveryResults = providersXmlDiscovery.discover(email)
         if (discoveryResults == null || discoveryResults.incoming.isEmpty() || discoveryResults.outgoing.isEmpty()) {
             return null
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
index 56cde0a6b7acdc574c964b4782f41bfa2eaa3822..da1d29a030c86514cff293414fc1898d1f572689 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/accountmanager/EeloAccountCreator.java
@@ -37,7 +37,6 @@ import com.fsck.k9.account.AccountCreator;
 import com.fsck.k9.account.BackgroundAccountRemover;
 import com.fsck.k9.autodiscovery.api.DiscoveredServerSettings;
 import com.fsck.k9.autodiscovery.api.DiscoveryResults;
-import com.fsck.k9.autodiscovery.api.DiscoveryTarget;
 import com.fsck.k9.autodiscovery.providersxml.ProvidersXmlDiscovery;
 import com.fsck.k9.job.K9JobManager;
 import com.fsck.k9.mail.AuthType;
@@ -221,7 +220,7 @@ public class EeloAccountCreator {
 
     private static ConnectionSettings providersXmlDiscoveryDiscover(String email) {
         DiscoveryResults discoveryResults =
-                providersXmlDiscovery.discover(email, DiscoveryTarget.INCOMING_AND_OUTGOING);
+                providersXmlDiscovery.discover(email);
         if (discoveryResults == null ||
                 (discoveryResults.getIncoming().size() < 1 || discoveryResults.getOutgoing().size() < 1)) {
             return null;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt
index 35925beb1d3749c97e0daf83dd33b6008dbc8628..d1a40e77943f522e33242c1a508a1d14c75e60b8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapConfig.kt
@@ -1,26 +1,28 @@
 package com.fsck.k9.contacts
 
 import android.content.Context
-import android.util.TypedValue
 import android.view.ContextThemeWrapper
 import com.fsck.k9.K9
 import com.fsck.k9.ui.R
-import com.fsck.k9.ui.base.Theme
 import com.fsck.k9.ui.base.ThemeManager
+import com.fsck.k9.ui.getIntArray
+import com.fsck.k9.ui.resolveColorAttribute
 
 class ContactLetterBitmapConfig(context: Context, themeManager: ThemeManager) {
     val hasDefaultBackgroundColor: Boolean = !K9.isColorizeMissingContactPictures
-    val useDarkTheme = themeManager.appTheme == Theme.DARK
     val defaultBackgroundColor: Int
+    val backgroundColors: IntArray
 
     init {
-        defaultBackgroundColor = if (hasDefaultBackgroundColor) {
-            val outValue = TypedValue()
-            val themedContext = ContextThemeWrapper(context, themeManager.appThemeResourceId)
-            themedContext.theme.resolveAttribute(R.attr.contactPictureFallbackDefaultBackgroundColor, outValue, true)
-            outValue.data
+        val themedContext = ContextThemeWrapper(context, themeManager.appThemeResourceId)
+        val theme = themedContext.theme
+
+        if (hasDefaultBackgroundColor) {
+            defaultBackgroundColor = theme.resolveColorAttribute(R.attr.contactPictureFallbackDefaultBackgroundColor)
+            backgroundColors = intArrayOf()
         } else {
-            0
+            defaultBackgroundColor = 0
+            backgroundColors = theme.getIntArray(R.attr.contactPictureFallbackBackgroundColors)
         }
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt
index 1f0c4d3a6c41a3bb4807e2d7f826978124291418..935bdf01c9b491bc552a5a3312156fc43a0f81e6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactLetterBitmapCreator.kt
@@ -5,7 +5,6 @@ import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Rect
 import com.fsck.k9.mail.Address
-import com.fsck.k9.ui.helper.MaterialColors
 
 /**
  * Draw a `Bitmap` containing the "contact letter" obtained by [ContactLetterExtractor].
@@ -48,54 +47,12 @@ class ContactLetterBitmapCreator(
         }
 
         val hash = address.hashCode()
-        if (config.useDarkTheme) {
-            val colorIndex = (hash and Integer.MAX_VALUE) % BACKGROUND_COLORS_DARK.size
-            return BACKGROUND_COLORS_DARK[colorIndex]
-        } else {
-            val colorIndex = (hash and Integer.MAX_VALUE) % BACKGROUND_COLORS_LIGHT.size
-            return BACKGROUND_COLORS_LIGHT[colorIndex]
-        }
+        val backgroundColors = config.backgroundColors
+        val colorIndex = (hash and Integer.MAX_VALUE) % backgroundColors.size
+        return backgroundColors[colorIndex]
     }
 
     fun signatureOf(address: Address): String {
         return calcUnknownContactColor(address).toString()
     }
-
-    companion object {
-        private val BACKGROUND_COLORS_LIGHT = intArrayOf(
-            MaterialColors.RED_300,
-            MaterialColors.DEEP_PURPLE_300,
-            MaterialColors.LIGHT_BLUE_300,
-            MaterialColors.GREEN_300,
-            MaterialColors.DEEP_ORANGE_300,
-            MaterialColors.BLUE_GREY_300,
-            MaterialColors.PINK_300,
-            MaterialColors.INDIGO_300,
-            MaterialColors.CYAN_300,
-            MaterialColors.AMBER_400,
-            MaterialColors.BROWN_300,
-            MaterialColors.PURPLE_300,
-            MaterialColors.BLUE_300,
-            MaterialColors.TEAL_300,
-            MaterialColors.ORANGE_400
-        )
-
-        private val BACKGROUND_COLORS_DARK = intArrayOf(
-            MaterialColors.RED_600,
-            MaterialColors.DEEP_PURPLE_600,
-            MaterialColors.LIGHT_BLUE_600,
-            MaterialColors.GREEN_600,
-            MaterialColors.DEEP_ORANGE_600,
-            MaterialColors.BLUE_GREY_600,
-            MaterialColors.PINK_600,
-            MaterialColors.INDIGO_600,
-            MaterialColors.CYAN_600,
-            MaterialColors.AMBER_600,
-            MaterialColors.BROWN_600,
-            MaterialColors.PURPLE_600,
-            MaterialColors.BLUE_600,
-            MaterialColors.TEAL_600,
-            MaterialColors.ORANGE_600
-        )
-    }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/fragment/KoinModule.kt
deleted file mode 100644
index 7fe88ce2f52b2b4f8f9ea2e577de4ca666a9fe4b..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/KoinModule.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.fsck.k9.fragment
-
-import org.koin.dsl.module
-
-val fragmentModule = module {
-    single { SortTypeToastProvider() }
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt
index c569e0e2a0a467d241cee1e1d3179bf3fc5a5013..d8aa489e09ead382e9854268ef144a1082751e5f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/ThemeExtensions.kt
@@ -25,3 +25,14 @@ fun Theme.resolveDrawableAttribute(attrId: Int): Drawable {
 
     return getDrawable(typedValue.resourceId)
 }
+
+fun Theme.getIntArray(attrId: Int): IntArray {
+    val typedValue = TypedValue()
+
+    val found = resolveAttribute(attrId, typedValue, true)
+    if (!found) {
+        throw IllegalStateException("Couldn't resolve attribute ($attrId)")
+    }
+
+    return resources.getIntArray(typedValue.resourceId)
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
index ce54ed38e8be7919963dc8d04ab90e29c8b75c34..3df5d050885a547f8578bc47b5ab7e7b0bdca890 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoCallback.java
@@ -10,6 +10,6 @@ import com.fsck.k9.mailstore.MessageCryptoAnnotations;
 public interface MessageCryptoCallback {
     void onCryptoHelperProgress(int current, int max);
     void onCryptoOperationsFinished(MessageCryptoAnnotations annotations);
-    void startPendingIntentForCryptoHelper(IntentSender si, int requestCode, Intent fillIntent,
+    boolean startPendingIntentForCryptoHelper(IntentSender si, int requestCode, Intent fillIntent,
             int flagsMask, int flagValues, int extraFlags);
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
index b0b9fb039d4fbea76bdedaafda5dadcca9a34289..bcd1e5688995013672ebf4d2d37925fadcfc7f1e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
@@ -120,6 +120,12 @@ public class MessageCryptoHelper {
         nextStep();
     }
 
+    public void resumeCryptoOperationIfNecessary() {
+        if (queuedPendingIntent != null) {
+            deliverResult();
+        }
+    }
+
     private void findPartsForMultipartEncryptionPass() {
         List<Part> encryptedParts = MessageCryptoStructureDetector.findMultipartEncryptedParts(currentMessage);
         for (Part part : encryptedParts) {
@@ -765,9 +771,11 @@ public class MessageCryptoHelper {
         if (queuedResult != null) {
             callback.onCryptoOperationsFinished(queuedResult);
         } else if (queuedPendingIntent != null) {
-            callback.startPendingIntentForCryptoHelper(
+            boolean pendingIntentHandled = callback.startPendingIntentForCryptoHelper(
                     queuedPendingIntent.getIntentSender(), REQUEST_CODE_USER_INTERACTION, null, 0, 0, 0);
-            queuedPendingIntent = null;
+            if (pendingIntentHandled) {
+                queuedPendingIntent = null;
+            }
         } else {
             throw new IllegalStateException("deliverResult() called with no result!");
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/MaterialColors.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/MaterialColors.kt
deleted file mode 100644
index 9c0e2d078c08394429c824cdd50f2f460ea1c308..0000000000000000000000000000000000000000
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/MaterialColors.kt
+++ /dev/null
@@ -1,216 +0,0 @@
-package com.fsck.k9.ui.helper
-
-@Suppress("unused")
-object MaterialColors {
-    /*
-     * Heavily modified version of https://gist.github.com/kalehv/bae765c756e94455ed88
-     */
-    const val RED_50 = 0xFFFFEBEE.toInt()
-    const val RED_100 = 0xFFFFCDD2.toInt()
-    const val RED_200 = 0xFFEF9A9A.toInt()
-    const val RED_300 = 0xFFE57373.toInt()
-    const val RED_400 = 0xFFEF5350.toInt()
-    const val RED_500 = 0xFFF44336.toInt()
-    const val RED_600 = 0xFFE53935.toInt()
-    const val RED_700 = 0xFFD32F2F.toInt()
-    const val RED_800 = 0xFFC62828.toInt()
-    const val RED_900 = 0xFFB71C1C.toInt()
-
-    const val DEEP_PURPLE_50 = 0xFFEDE7F6.toInt()
-    const val DEEP_PURPLE_100 = 0xFFD1C4E9.toInt()
-    const val DEEP_PURPLE_200 = 0xFFB39DDB.toInt()
-    const val DEEP_PURPLE_300 = 0xFF9575CD.toInt()
-    const val DEEP_PURPLE_400 = 0xFF7E57C2.toInt()
-    const val DEEP_PURPLE_500 = 0xFF673AB7.toInt()
-    const val DEEP_PURPLE_600 = 0xFF5E35B1.toInt()
-    const val DEEP_PURPLE_700 = 0xFF512DA8.toInt()
-    const val DEEP_PURPLE_800 = 0xFF4527A0.toInt()
-    const val DEEP_PURPLE_900 = 0xFF311B92.toInt()
-
-    const val LIGHT_BLUE_50 = 0xFFE1F5FE.toInt()
-    const val LIGHT_BLUE_100 = 0xFFB3E5FC.toInt()
-    const val LIGHT_BLUE_200 = 0xFF81D4FA.toInt()
-    const val LIGHT_BLUE_300 = 0xFF4FC3F7.toInt()
-    const val LIGHT_BLUE_400 = 0xFF29B6F6.toInt()
-    const val LIGHT_BLUE_500 = 0xFF03A9F4.toInt()
-    const val LIGHT_BLUE_600 = 0xFF039BE5.toInt()
-    const val LIGHT_BLUE_700 = 0xFF0288D1.toInt()
-    const val LIGHT_BLUE_800 = 0xFF0277BD.toInt()
-    const val LIGHT_BLUE_900 = 0xFF01579B.toInt()
-
-    const val GREEN_50 = 0xFFE8F5E9.toInt()
-    const val GREEN_100 = 0xFFC8E6C9.toInt()
-    const val GREEN_200 = 0xFFA5D6A7.toInt()
-    const val GREEN_300 = 0xFF81C784.toInt()
-    const val GREEN_400 = 0xFF66BB6A.toInt()
-    const val GREEN_500 = 0xFF4CAF50.toInt()
-    const val GREEN_600 = 0xFF43A047.toInt()
-    const val GREEN_700 = 0xFF388E3C.toInt()
-    const val GREEN_800 = 0xFF2E7D32.toInt()
-    const val GREEN_900 = 0xFF1B5E20.toInt()
-
-    const val YELLOW_50 = 0xFFFFFDE7.toInt()
-    const val YELLOW_100 = 0xFFFFF9C4.toInt()
-    const val YELLOW_200 = 0xFFFFF59D.toInt()
-    const val YELLOW_300 = 0xFFFFF176.toInt()
-    const val YELLOW_400 = 0xFFFFEE58.toInt()
-    const val YELLOW_500 = 0xFFFFEB3B.toInt()
-    const val YELLOW_600 = 0xFFFDD835.toInt()
-    const val YELLOW_700 = 0xFFFBC02D.toInt()
-    const val YELLOW_800 = 0xFFF9A825.toInt()
-    const val YELLOW_900 = 0xFFF57F17.toInt()
-
-    const val DEEP_ORANGE_50 = 0xFFFBE9E7.toInt()
-    const val DEEP_ORANGE_100 = 0xFFFFCCBC.toInt()
-    const val DEEP_ORANGE_200 = 0xFFFFAB91.toInt()
-    const val DEEP_ORANGE_300 = 0xFFFF8A65.toInt()
-    const val DEEP_ORANGE_400 = 0xFFFF7043.toInt()
-    const val DEEP_ORANGE_500 = 0xFFFF5722.toInt()
-    const val DEEP_ORANGE_600 = 0xFFF4511E.toInt()
-    const val DEEP_ORANGE_700 = 0xFFE64A19.toInt()
-    const val DEEP_ORANGE_800 = 0xFFD84315.toInt()
-    const val DEEP_ORANGE_900 = 0xFFBF360C.toInt()
-
-    const val BLUE_GREY_50 = 0xFFECEFF1.toInt()
-    const val BLUE_GREY_100 = 0xFFCFD8DC.toInt()
-    const val BLUE_GREY_200 = 0xFFB0BEC5.toInt()
-    const val BLUE_GREY_300 = 0xFF90A4AE.toInt()
-    const val BLUE_GREY_400 = 0xFF78909C.toInt()
-    const val BLUE_GREY_500 = 0xFF607D8B.toInt()
-    const val BLUE_GREY_600 = 0xFF546E7A.toInt()
-    const val BLUE_GREY_700 = 0xFF455A64.toInt()
-    const val BLUE_GREY_800 = 0xFF37474F.toInt()
-    const val BLUE_GREY_900 = 0xFF263238.toInt()
-
-    const val PINK_50 = 0xFFFCE4EC.toInt()
-    const val PINK_100 = 0xFFF8BBD0.toInt()
-    const val PINK_200 = 0xFFF48FB1.toInt()
-    const val PINK_300 = 0xFFF06292.toInt()
-    const val PINK_400 = 0xFFEC407A.toInt()
-    const val PINK_500 = 0xFFE91E63.toInt()
-    const val PINK_600 = 0xFFD81B60.toInt()
-    const val PINK_700 = 0xFFC2185B.toInt()
-    const val PINK_800 = 0xFFAD1457.toInt()
-    const val PINK_900 = 0xFF880E4F.toInt()
-
-    const val INDIGO_50 = 0xFFE8EAF6.toInt()
-    const val INDIGO_100 = 0xFFC5CAE9.toInt()
-    const val INDIGO_200 = 0xFF9FA8DA.toInt()
-    const val INDIGO_300 = 0xFF7986CB.toInt()
-    const val INDIGO_400 = 0xFF5C6BC0.toInt()
-    const val INDIGO_500 = 0xFF3F51B5.toInt()
-    const val INDIGO_600 = 0xFF3949AB.toInt()
-    const val INDIGO_700 = 0xFF303F9F.toInt()
-    const val INDIGO_800 = 0xFF283593.toInt()
-    const val INDIGO_900 = 0xFF1A237E.toInt()
-
-    const val CYAN_50 = 0xFFE0F7FA.toInt()
-    const val CYAN_100 = 0xFFB2EBF2.toInt()
-    const val CYAN_200 = 0xFF80DEEA.toInt()
-    const val CYAN_300 = 0xFF4DD0E1.toInt()
-    const val CYAN_400 = 0xFF26C6DA.toInt()
-    const val CYAN_500 = 0xFF00BCD4.toInt()
-    const val CYAN_600 = 0xFF00ACC1.toInt()
-    const val CYAN_700 = 0xFF0097A7.toInt()
-    const val CYAN_800 = 0xFF00838F.toInt()
-    const val CYAN_900 = 0xFF006064.toInt()
-
-    const val LIGHT_GREEN_50 = 0xFFF1F8E9.toInt()
-    const val LIGHT_GREEN_100 = 0xFFDCEDC8.toInt()
-    const val LIGHT_GREEN_200 = 0xFFC5E1A5.toInt()
-    const val LIGHT_GREEN_300 = 0xFFAED581.toInt()
-    const val LIGHT_GREEN_400 = 0xFF9CCC65.toInt()
-    const val LIGHT_GREEN_500 = 0xFF8BC34A.toInt()
-    const val LIGHT_GREEN_600 = 0xFF7CB342.toInt()
-    const val LIGHT_GREEN_700 = 0xFF689F38.toInt()
-    const val LIGHT_GREEN_800 = 0xFF558B2F.toInt()
-    const val LIGHT_GREEN_900 = 0xFF33691E.toInt()
-
-    const val AMBER_50 = 0xFFFFF8E1.toInt()
-    const val AMBER_100 = 0xFFFFECB3.toInt()
-    const val AMBER_200 = 0xFFFFE082.toInt()
-    const val AMBER_300 = 0xFFFFD54F.toInt()
-    const val AMBER_400 = 0xFFFFCA28.toInt()
-    const val AMBER_500 = 0xFFFFC107.toInt()
-    const val AMBER_600 = 0xFFFFB300.toInt()
-    const val AMBER_700 = 0xFFFFA000.toInt()
-    const val AMBER_800 = 0xFFFF8F00.toInt()
-    const val AMBER_900 = 0xFFFF6F00.toInt()
-
-    const val BROWN_50 = 0xFFEFEBE9.toInt()
-    const val BROWN_100 = 0xFFD7CCC8.toInt()
-    const val BROWN_200 = 0xFFBCAAA4.toInt()
-    const val BROWN_300 = 0xFFA1887F.toInt()
-    const val BROWN_400 = 0xFF8D6E63.toInt()
-    const val BROWN_500 = 0xFF795548.toInt()
-    const val BROWN_600 = 0xFF6D4C41.toInt()
-    const val BROWN_700 = 0xFF5D4037.toInt()
-    const val BROWN_800 = 0xFF4E342E.toInt()
-    const val BROWN_900 = 0xFF3E2723.toInt()
-
-    const val PURPLE_50 = 0xFFF3E5F5.toInt()
-    const val PURPLE_100 = 0xFFE1BEE7.toInt()
-    const val PURPLE_200 = 0xFFCE93D8.toInt()
-    const val PURPLE_300 = 0xFFBA68C8.toInt()
-    const val PURPLE_400 = 0xFFAB47BC.toInt()
-    const val PURPLE_500 = 0xFF9C27B0.toInt()
-    const val PURPLE_600 = 0xFF8E24AA.toInt()
-    const val PURPLE_700 = 0xFF7B1FA2.toInt()
-    const val PURPLE_800 = 0xFF6A1B9A.toInt()
-    const val PURPLE_900 = 0xFF4A148C.toInt()
-
-    const val BLUE_50 = 0xFFE3F2FD.toInt()
-    const val BLUE_100 = 0xFFBBDEFB.toInt()
-    const val BLUE_200 = 0xFF90CAF9.toInt()
-    const val BLUE_300 = 0xFF64B5F6.toInt()
-    const val BLUE_400 = 0xFF42A5F5.toInt()
-    const val BLUE_500 = 0xFF2196F3.toInt()
-    const val BLUE_600 = 0xFF1E88E5.toInt()
-    const val BLUE_700 = 0xFF1976D2.toInt()
-    const val BLUE_800 = 0xFF1565C0.toInt()
-    const val BLUE_900 = 0xFF0D47A1.toInt()
-
-    const val TEAL_50 = 0xFFE0F2F1.toInt()
-    const val TEAL_100 = 0xFFB2DFDB.toInt()
-    const val TEAL_200 = 0xFF80CBC4.toInt()
-    const val TEAL_300 = 0xFF4DB6AC.toInt()
-    const val TEAL_400 = 0xFF26A69A.toInt()
-    const val TEAL_500 = 0xFF009688.toInt()
-    const val TEAL_600 = 0xFF00897B.toInt()
-    const val TEAL_700 = 0xFF00796B.toInt()
-    const val TEAL_800 = 0xFF00695C.toInt()
-    const val TEAL_900 = 0xFF004D40.toInt()
-
-    const val LIME_50 = 0xFFF9FBE7.toInt()
-    const val LIME_100 = 0xFFF0F4C3.toInt()
-    const val LIME_200 = 0xFFE6EE9C.toInt()
-    const val LIME_300 = 0xFFDCE775.toInt()
-    const val LIME_400 = 0xFFD4E157.toInt()
-    const val LIME_500 = 0xFFCDDC39.toInt()
-    const val LIME_600 = 0xFFC0CA33.toInt()
-    const val LIME_700 = 0xFFAFB42B.toInt()
-    const val LIME_800 = 0xFF9E9D24.toInt()
-    const val LIME_900 = 0xFF827717.toInt()
-
-    const val ORANGE_50 = 0xFFFFF3E0.toInt()
-    const val ORANGE_100 = 0xFFFFE0B2.toInt()
-    const val ORANGE_200 = 0xFFFFCC80.toInt()
-    const val ORANGE_300 = 0xFFFFB74D.toInt()
-    const val ORANGE_400 = 0xFFFFA726.toInt()
-    const val ORANGE_500 = 0xFFFF9800.toInt()
-    const val ORANGE_600 = 0xFFFB8C00.toInt()
-    const val ORANGE_700 = 0xFFF57C00.toInt()
-    const val ORANGE_800 = 0xFFEF6C00.toInt()
-    const val ORANGE_900 = 0xFFE65100.toInt()
-
-    const val GREY_50 = 0xFFFAFAFA.toInt()
-    const val GREY_100 = 0xFFF5F5F5.toInt()
-    const val GREY_200 = 0xFFEEEEEE.toInt()
-    const val GREY_300 = 0xFFE0E0E0.toInt()
-    const val GREY_400 = 0xFFBDBDBD.toInt()
-    const val GREY_500 = 0xFF9E9E9E.toInt()
-    const val GREY_600 = 0xFF757575.toInt()
-    const val GREY_700 = 0xFF616161.toInt()
-    const val GREY_800 = 0xFF424242.toInt()
-    const val GREY_900 = 0xFF212121.toInt()
-}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt
index 16be0694ae9097c10e160c5583e8c70cea9b82ea..487fcea1c558a811a2624ec127971fd8e2286f7e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/KoinModule.kt
@@ -17,4 +17,5 @@ val messageListUiModule = module {
     factory {
         MessageListLiveDataFactory(messageListLoader = get(), preferences = get(), messageListRepository = get())
     }
+    single { SortTypeToastProvider() }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
similarity index 93%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
index 1743963d93a32ea3a14bf955b42155367b8c162a..0c87cf8530c46937b81079d233a84521d0f98bda 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.fragment
+package com.fsck.k9.ui.messagelist
 
 import android.annotation.SuppressLint
 import android.content.res.Resources
@@ -29,8 +29,6 @@ import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.mail.Address
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
-import com.fsck.k9.ui.messagelist.MessageListAppearance
-import com.fsck.k9.ui.messagelist.MessageListItem
 import com.fsck.k9.ui.resolveColorAttribute
 import com.fsck.k9.ui.resolveDrawableAttribute
 import kotlin.math.max
@@ -74,16 +72,10 @@ class MessageListAdapter internal constructor(
                 selected = selected.intersect(uniqueIds)
             }
 
-            if (oldMessageList.isEmpty()) {
-                // While loading, only the footer view is showing. If we used DiffUtil, the footer view would be used as
-                // anchor element and the updated list would be scrolled all the way down.
-                notifyDataSetChanged()
-            } else {
-                val diffResult = DiffUtil.calculateDiff(
-                    MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value)
-                )
-                diffResult.dispatchUpdatesTo(this)
-            }
+            val diffResult = DiffUtil.calculateDiff(
+                MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value)
+            )
+            diffResult.dispatchUpdatesTo(this)
         }
 
     private var isInSelectionMode: Boolean = false
@@ -176,13 +168,14 @@ class MessageListAdapter internal constructor(
         }
 
     private val messageClickedListener = OnClickListener { view: View ->
-        val messageListItem = getItemFromView(view)
+        val messageListItem = getItemFromView(view) ?: return@OnClickListener
         listItemListener.onMessageClicked(messageListItem)
     }
 
     private val messageLongClickedListener = OnLongClickListener { view: View ->
-        val messageListItem = getItemFromView(view)
-        listItemListener.onToggleMessageSelection(messageListItem)
+        getItemFromView(view)?.let { messageListItem ->
+            listItemListener.onToggleMessageSelection(messageListItem)
+        }
         true
     }
 
@@ -191,13 +184,13 @@ class MessageListAdapter internal constructor(
     }
 
     private val flagClickListener = OnClickListener { view: View ->
-        val messageListItem = getItemFromView(view)
+        val messageListItem = getItemFromView(view) ?: return@OnClickListener
         listItemListener.onToggleMessageFlag(messageListItem)
     }
 
     private val contactPictureClickListener = OnClickListener { view: View ->
         val parentView = view.parent.parent as View
-        val messageListItem = getItemFromView(parentView)
+        val messageListItem = getItemFromView(parentView) ?: return@OnClickListener
         listItemListener.onToggleMessageSelection(messageListItem)
     }
 
@@ -227,8 +220,8 @@ class MessageListAdapter internal constructor(
 
     private fun getItem(position: Int): MessageListItem = messages[position]
 
-    fun getItemById(uniqueId: Long): MessageListItem {
-        return messagesMap[uniqueId]!!
+    fun getItemById(uniqueId: Long): MessageListItem? {
+        return messagesMap[uniqueId]
     }
 
     fun getItem(messageReference: MessageReference): MessageListItem? {
@@ -353,7 +346,7 @@ class MessageListAdapter internal constructor(
                 holder.flagged.isVisible = false
             }
             holder.uniqueId = uniqueId
-            setBackgroundColor(holder.itemView, isSelected, isActive)
+            setBackgroundColor(holder.mainView, isSelected, isActive)
             holder.unreadMessageIndicator.visibility = if (isRead) INVISIBLE else VISIBLE
             val beforePreviewText = if (appearance.senderAboveSubject) subject else displayName
             holder.displayName.setText(beforePreviewText, TextView.BufferType.SPANNABLE)
@@ -474,6 +467,10 @@ class MessageListAdapter internal constructor(
             item.messageUid == activeMessage.uid
     }
 
+    fun isSelected(item: MessageListItem): Boolean {
+        return item.uniqueId in selected
+    }
+
     fun toggleSelection(item: MessageListItem) {
         if (messagesMap[item.uniqueId] == null) {
             // MessageListItem is no longer in the list
@@ -487,11 +484,11 @@ class MessageListAdapter internal constructor(
         }
     }
 
-    private fun selectMessage(item: MessageListItem) {
+    fun selectMessage(item: MessageListItem) {
         selected = selected + item.uniqueId
     }
 
-    private fun deselectMessage(item: MessageListItem) {
+    fun deselectMessage(item: MessageListItem) {
         selected = selected - item.uniqueId
     }
 
@@ -533,7 +530,7 @@ class MessageListAdapter internal constructor(
             .sumOf { it.threadCount.coerceAtLeast(1) }
     }
 
-    private fun getItemFromView(view: View): MessageListItem {
+    private fun getItemFromView(view: View): MessageListItem? {
         val messageViewHolder = view.tag as MessageViewHolder
         return getItemById(messageViewHolder.uniqueId)
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
similarity index 89%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index 48ed74443a3c259ae8f2ce548f47a2bbddb02308..e3594ccda05731a8c2bca0942ae76aecb1f73aeb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -1,11 +1,11 @@
-package com.fsck.k9.fragment
+package com.fsck.k9.ui.messagelist
 
 import android.app.Activity
 import android.app.SearchManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.os.Parcelable
+import android.os.SystemClock
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuItem
@@ -16,23 +16,25 @@ import androidx.appcompat.view.ActionMode
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import app.k9mail.ui.utils.itemtouchhelper.ItemTouchHelper
+import app.k9mail.ui.utils.linearlayoutmanager.LinearLayoutManager
 import com.fsck.k9.Account
 import com.fsck.k9.Account.Expunge
 import com.fsck.k9.Account.SortType
 import com.fsck.k9.Clock
 import com.fsck.k9.K9
 import com.fsck.k9.Preferences
+import com.fsck.k9.SwipeAction
 import com.fsck.k9.activity.FolderInfoHolder
 import com.fsck.k9.activity.Search
 import com.fsck.k9.activity.misc.ContactPicture
 import com.fsck.k9.controller.MessageReference
 import com.fsck.k9.controller.MessagingController
 import com.fsck.k9.controller.SimpleMessagingListener
+import com.fsck.k9.fragment.ConfirmationDialogFragment
 import com.fsck.k9.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener
-import com.fsck.k9.fragment.MessageListFragment.MessageListFragmentListener.Companion.MAX_PROGRESS
 import com.fsck.k9.helper.Utility
 import com.fsck.k9.helper.mapToSet
 import com.fsck.k9.mail.Flag
@@ -46,12 +48,7 @@ import com.fsck.k9.ui.folders.FolderNameFormatter
 import com.fsck.k9.ui.folders.FolderNameFormatterFactory
 import com.fsck.k9.ui.folders.FoldersViewModel
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
-import com.fsck.k9.ui.messagelist.MessageListAppearance
-import com.fsck.k9.ui.messagelist.MessageListConfig
-import com.fsck.k9.ui.messagelist.MessageListInfo
-import com.fsck.k9.ui.messagelist.MessageListItem
-import com.fsck.k9.ui.messagelist.MessageListViewModel
-import com.fsck.k9.ui.messagelist.MessageSortOverride
+import com.fsck.k9.ui.messagelist.MessageListFragment.MessageListFragmentListener.Companion.MAX_PROGRESS
 import java.util.concurrent.Future
 import net.jcip.annotations.GuardedBy
 import org.koin.android.ext.android.inject
@@ -60,6 +57,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 import timber.log.Timber
 
 private const val MAXIMUM_MESSAGE_SORT_OVERRIDES = 3
+private const val MINIMUM_CLICK_INTERVAL = 200L
 
 class MessageListFragment :
     Fragment(),
@@ -81,8 +79,10 @@ class MessageListFragment :
 
     private lateinit var fragmentListener: MessageListFragmentListener
 
-    private lateinit var recyclerView: RecyclerView
-    private lateinit var swipeRefreshLayout: SwipeRefreshLayout
+    private var recyclerView: RecyclerView? = null
+    private var itemTouchHelper: ItemTouchHelper? = null
+    private var swipeRefreshLayout: SwipeRefreshLayout? = null
+
     private lateinit var adapter: MessageListAdapter
 
     private lateinit var accountUuids: Array<String>
@@ -109,6 +109,7 @@ class MessageListFragment :
     private var isThreadDisplay = false
     private var activeMessage: MessageReference? = null
     private var rememberedSelected: Set<Long>? = null
+    private var lastMessageClick = 0L
 
     lateinit var localSearch: LocalSearch
         private set
@@ -178,6 +179,8 @@ class MessageListFragment :
             }
         }
 
+        adapter = createMessageListAdapter()
+
         isInitialized = true
     }
 
@@ -195,10 +198,6 @@ class MessageListFragment :
         rememberedSelected = savedInstanceState.getLongArray(STATE_SELECTED_MESSAGES)?.toSet()
     }
 
-    fun restoreListState(savedListState: Parcelable) {
-        recyclerView.layoutManager?.onRestoreInstanceState(savedListState)
-    }
-
     private fun decodeArguments(): MessageListFragment? {
         val arguments = requireArguments()
         showingThreadedList = arguments.getBoolean(ARG_THREADED_LIST, false)
@@ -233,15 +232,36 @@ class MessageListFragment :
         return this
     }
 
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.message_list_fragment, container, false).apply {
-            initializeSwipeRefreshLayout(this)
-            initializeRecyclerView(this)
+    private fun createMessageListAdapter(): MessageListAdapter {
+        return MessageListAdapter(
+            theme = requireActivity().theme,
+            res = resources,
+            layoutInflater = layoutInflater,
+            contactsPictureLoader = ContactPicture.getContactPictureLoader(),
+            listItemListener = this,
+            appearance = messageListAppearance,
+            relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock)
+        ).apply {
+            activeMessage = this@MessageListFragment.activeMessage
         }
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.message_list_fragment, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        initializeSwipeRefreshLayout(view)
+        initializeRecyclerView(view)
+
+        // This needs to be done before loading the message list below
+        initializeSortSettings()
+
+        loadMessageList()
+    }
+
     private fun initializeSwipeRefreshLayout(view: View) {
-        swipeRefreshLayout = view.findViewById(R.id.swiperefresh)
+        val swipeRefreshLayout = view.findViewById<SwipeRefreshLayout>(R.id.swiperefresh)
 
         if (isRemoteSearchAllowed) {
             swipeRefreshLayout.setOnRefreshListener { onRemoteSearchRequested() }
@@ -251,40 +271,37 @@ class MessageListFragment :
 
         // Disable pull-to-refresh until the message list has been loaded
         swipeRefreshLayout.isEnabled = false
+
+        this.swipeRefreshLayout = swipeRefreshLayout
     }
 
     private fun initializeRecyclerView(view: View) {
-        recyclerView = view.findViewById(R.id.message_list)
+        val recyclerView = view.findViewById<RecyclerView>(R.id.message_list)
 
         recyclerView.itemAnimator = DefaultItemAnimator().apply {
             supportsChangeAnimations = false
         }
-    }
 
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
+        recyclerView.layoutManager = LinearLayoutManager(requireContext())
+        recyclerView.itemAnimator = MessageListItemAnimator()
 
-        initializeMessageList()
-
-        // This needs to be done before loading the message list below
-        initializeSortSettings()
-        loadMessageList()
-    }
-
-    private fun initializeMessageList() {
-        adapter = MessageListAdapter(
-            theme = requireActivity().theme,
-            res = resources,
-            layoutInflater = layoutInflater,
-            contactsPictureLoader = ContactPicture.getContactPictureLoader(),
-            listItemListener = this,
-            appearance = messageListAppearance,
-            relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock)
+        val itemTouchHelper = ItemTouchHelper(
+            MessageListSwipeCallback(
+                requireContext(),
+                resourceProvider = SwipeResourceProvider(requireActivity().theme),
+                swipeActionSupportProvider,
+                swipeRightAction = K9.swipeRightAction,
+                swipeLeftAction = K9.swipeLeftAction,
+                adapter,
+                swipeListener
+            )
         )
-
-        adapter.activeMessage = activeMessage
+        itemTouchHelper.attachToRecyclerView(recyclerView)
 
         recyclerView.adapter = adapter
+
+        this.recyclerView = recyclerView
+        this.itemTouchHelper = itemTouchHelper
     }
 
     private fun initializeSortSettings() {
@@ -375,7 +392,7 @@ class MessageListFragment :
 
     fun progress(progress: Boolean) {
         if (!progress) {
-            swipeRefreshLayout.isRefreshing = false
+            swipeRefreshLayout?.isRefreshing = false
         }
 
         fragmentListener.setMessageListProgressEnabled(progress)
@@ -413,9 +430,19 @@ class MessageListFragment :
     }
 
     override fun onMessageClicked(messageListItem: MessageListItem) {
+        if (!isActive) {
+            // Ignore click events that are delivered after the Fragment is no longer active. This could happen when
+            // the user taps two messages at almost the same time and the first tap opens a new MessageListFragment.
+            return
+        }
+
+        val clickTime = SystemClock.elapsedRealtime()
+        if (clickTime - lastMessageClick < MINIMUM_CLICK_INTERVAL) return
+
         if (adapter.selectedCount > 0) {
             toggleMessageSelect(messageListItem)
         } else {
+            lastMessageClick = clickTime
             if (showingThreadedList && messageListItem.threadCount > 1) {
                 fragmentListener.showThread(messageListItem.account, messageListItem.threadRoot)
             } else {
@@ -425,6 +452,10 @@ class MessageListFragment :
     }
 
     override fun onDestroyView() {
+        recyclerView = null
+        itemTouchHelper = null
+        swipeRefreshLayout = null
+
         if (isNewMessagesView && !requireActivity().isChangingConfigurations) {
             messagingController.clearNewMessages(account)
         }
@@ -504,7 +535,7 @@ class MessageListFragment :
         val queryString = localSearch.remoteSearchArguments
 
         isRemoteSearch = true
-        swipeRefreshLayout.isEnabled = false
+        swipeRefreshLayout?.isEnabled = false
 
         remoteSearchFuture = messagingController.searchRemoteMessages(
             searchAccount,
@@ -812,7 +843,24 @@ class MessageListFragment :
 
     private fun toggleMessageSelect(messageListItem: MessageListItem) {
         adapter.toggleSelection(messageListItem)
+        updateAfterSelectionChange()
+    }
 
+    private fun selectMessage(messageListItem: MessageListItem) {
+        adapter.selectMessage(messageListItem)
+        updateAfterSelectionChange()
+    }
+
+    private fun deselectMessage(messageListItem: MessageListItem) {
+        adapter.deselectMessage(messageListItem)
+        updateAfterSelectionChange()
+    }
+
+    private fun isMessageSelected(messageListItem: MessageListItem): Boolean {
+        return adapter.isSelected(messageListItem)
+    }
+
+    private fun updateAfterSelectionChange() {
         if (adapter.selectedCount == 0) {
             actionMode?.finish()
             actionMode = null
@@ -1093,8 +1141,25 @@ class MessageListFragment :
 
     override fun doNegativeClick(dialogId: Int) {
         if (dialogId == R.id.dialog_confirm_spam || dialogId == R.id.dialog_confirm_delete) {
-            // No further need for this reference
-            activeMessages = null
+            val activeMessages = this.activeMessages ?: return
+            if (activeMessages.size == 1) {
+                // List item might have been swiped and is still showing the "swipe action background"
+                resetSwipedView(activeMessages.first())
+            }
+
+            this.activeMessages = null
+        }
+    }
+
+    private fun resetSwipedView(messageReference: MessageReference) {
+        val recyclerView = this.recyclerView ?: return
+        val itemTouchHelper = this.itemTouchHelper ?: return
+
+        adapter.getItem(messageReference)?.let { messageListItem ->
+            recyclerView.findViewHolderForItemId(messageListItem.uniqueId)?.let { viewHolder ->
+                itemTouchHelper.stopSwipe(viewHolder)
+                notifyItemChanged(messageListItem)
+            }
         }
     }
 
@@ -1161,6 +1226,7 @@ class MessageListFragment :
 
     private val selectedMessageListItem: MessageListItem?
         get() {
+            val recyclerView = recyclerView ?: return null
             val focusedView = recyclerView.focusedChild ?: return null
             val viewHolder = recyclerView.findContainingViewHolder(focusedView) as? MessageViewHolder ?: return null
             return adapter.getItemById(viewHolder.uniqueId)
@@ -1273,8 +1339,10 @@ class MessageListFragment :
             return
         }
 
-        swipeRefreshLayout.isRefreshing = false
-        swipeRefreshLayout.isEnabled = isPullToRefreshAllowed
+        swipeRefreshLayout?.let { swipeRefreshLayout ->
+            swipeRefreshLayout.isRefreshing = false
+            swipeRefreshLayout.isEnabled = isPullToRefreshAllowed
+        }
 
         if (isThreadDisplay) {
             if (messageListItems.isNotEmpty()) {
@@ -1332,6 +1400,10 @@ class MessageListFragment :
         actionMode?.invalidate()
     }
 
+    fun finishActionMode() {
+        actionMode?.finish()
+    }
+
     fun remoteSearchFinished() {
         remoteSearchFuture = null
     }
@@ -1388,6 +1460,7 @@ class MessageListFragment :
     }
 
     private fun scrollToMessage(messageReference: MessageReference) {
+        val recyclerView = recyclerView ?: return
         val messageListItem = adapter.getItem(messageReference) ?: return
         val position = adapter.getPosition(messageListItem) ?: return
 
@@ -1429,6 +1502,86 @@ class MessageListFragment :
     private val isPullToRefreshAllowed: Boolean
         get() = isRemoteSearchAllowed || isCheckMailAllowed
 
+    private var itemSelectedOnSwipeStart = false
+
+    private val swipeListener = object : MessageListSwipeListener {
+        override fun onSwipeStarted(item: MessageListItem, action: SwipeAction) {
+            itemSelectedOnSwipeStart = isMessageSelected(item)
+            if (itemSelectedOnSwipeStart && action != SwipeAction.ToggleSelection) {
+                deselectMessage(item)
+            }
+        }
+
+        override fun onSwipeActionChanged(item: MessageListItem, action: SwipeAction) {
+            if (action == SwipeAction.ToggleSelection) {
+                if (itemSelectedOnSwipeStart && !isMessageSelected(item)) {
+                    selectMessage(item)
+                }
+            } else if (isMessageSelected(item)) {
+                deselectMessage(item)
+            }
+        }
+
+        override fun onSwipeAction(item: MessageListItem, action: SwipeAction) {
+            if (action.removesItem || action == SwipeAction.ToggleSelection) {
+                itemSelectedOnSwipeStart = false
+            }
+
+            when (action) {
+                SwipeAction.None -> Unit
+                SwipeAction.ToggleSelection -> {
+                    toggleMessageSelect(item)
+                }
+                SwipeAction.ToggleRead -> {
+                    setFlag(item, Flag.SEEN, !item.isRead)
+                }
+                SwipeAction.ToggleStar -> {
+                    setFlag(item, Flag.FLAGGED, !item.isStarred)
+                }
+                SwipeAction.Archive -> {
+                    onArchive(item.messageReference)
+                }
+                SwipeAction.Delete -> {
+                    onDelete(listOf(item.messageReference))
+                }
+                SwipeAction.Spam -> {
+                    onSpam(listOf(item.messageReference))
+                }
+                SwipeAction.Move -> {
+                    val messageReference = item.messageReference
+                    resetSwipedView(messageReference)
+                    onMove(messageReference)
+                }
+            }
+        }
+
+        override fun onSwipeEnded(item: MessageListItem) {
+            if (itemSelectedOnSwipeStart && !isMessageSelected(item)) {
+                selectMessage(item)
+            }
+        }
+    }
+
+    private fun notifyItemChanged(item: MessageListItem) {
+        val position = adapter.getPosition(item) ?: return
+        adapter.notifyItemChanged(position)
+    }
+
+    private val swipeActionSupportProvider = SwipeActionSupportProvider { item, action ->
+        when (action) {
+            SwipeAction.None -> false
+            SwipeAction.ToggleSelection -> true
+            SwipeAction.ToggleRead -> !isOutbox
+            SwipeAction.ToggleStar -> !isOutbox
+            SwipeAction.Archive -> {
+                !isOutbox && item.account.hasArchiveFolder() && item.folderId != item.account.archiveFolderId
+            }
+            SwipeAction.Delete -> true
+            SwipeAction.Move -> !isOutbox && messagingController.isMoveCapable(item.account)
+            SwipeAction.Spam -> !isOutbox && item.account.hasSpamFolder() && item.folderId != item.account.spamFolderId
+        }
+    }
+
     internal inner class MessageListActivityListener : SimpleMessagingListener() {
         private val lock = Any()
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListHandler.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java
similarity index 84%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListHandler.java
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java
index 72252cf15fb8cbd2886082e6b0693dd295a5b5a8..8b200c5777c2f1f4ab98fc645438f337b7117051 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListHandler.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListHandler.java
@@ -1,11 +1,10 @@
-package com.fsck.k9.fragment;
+package com.fsck.k9.ui.messagelist;
 
 
 import java.lang.ref.WeakReference;
 
 import android.app.Activity;
 import android.os.Handler;
-import android.os.Parcelable;
 
 /**
  * This class is used to run operations that modify UI elements in the UI thread.
@@ -22,7 +21,6 @@ public class MessageListHandler extends Handler {
     private static final int ACTION_PROGRESS = 3;
     private static final int ACTION_REMOTE_SEARCH_FINISHED = 4;
     private static final int ACTION_GO_BACK = 5;
-    private static final int ACTION_RESTORE_LIST_POSITION = 6;
 
     private WeakReference<MessageListFragment> mFragment;
 
@@ -68,14 +66,6 @@ public class MessageListHandler extends Handler {
         sendMessage(msg);
     }
 
-    public void restoreListPosition(Parcelable savedListState) {
-        MessageListFragment fragment = mFragment.get();
-        if (fragment != null) {
-            android.os.Message msg = android.os.Message.obtain(this, ACTION_RESTORE_LIST_POSITION, savedListState);
-            sendMessage(msg);
-        }
-    }
-
     @Override
     public void handleMessage(android.os.Message msg) {
         MessageListFragment fragment = mFragment.get();
@@ -117,11 +107,6 @@ public class MessageListHandler extends Handler {
                 fragment.goBack();
                 break;
             }
-            case ACTION_RESTORE_LIST_POSITION: {
-                Parcelable savedListState = (Parcelable) msg.obj;
-                fragment.restoreListState(savedListState);
-                break;
-            }
         }
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt
new file mode 100644
index 0000000000000000000000000000000000000000..af65ac4a793219074a8c3fb66fcac25d87d0c734
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemAnimator.kt
@@ -0,0 +1,29 @@
+package com.fsck.k9.ui.messagelist
+
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+
+class MessageListItemAnimator : DefaultItemAnimator() {
+    init {
+        supportsChangeAnimations = false
+        changeDuration = 120
+    }
+
+    override fun animateChange(
+        oldHolder: ViewHolder,
+        newHolder: ViewHolder,
+        fromX: Int,
+        fromY: Int,
+        toX: Int,
+        toY: Int
+    ): Boolean {
+        if (oldHolder == newHolder && newHolder.wasSwiped) {
+            // Don't touch views currently being swiped
+            dispatchChangeFinished(oldHolder, true)
+            dispatchChangeFinished(newHolder, false)
+            return false
+        }
+
+        return super.animateChange(oldHolder, newHolder, fromX, fromY, toX, toY)
+    }
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemDecoration.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemDecoration.kt
new file mode 100644
index 0000000000000000000000000000000000000000..68acd830bf7fc005d180fb18480b930d70c2b272
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemDecoration.kt
@@ -0,0 +1,52 @@
+package com.fsck.k9.ui.messagelist
+
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.view.View
+import androidx.core.graphics.withSave
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ItemDecoration
+import com.fsck.k9.ui.resolveDrawableAttribute
+import kotlin.math.roundToInt
+
+/**
+ * An [ItemDecoration] that uses the alpha and visibility values of a view when drawing the divider.
+ *
+ * Based on [androidx.recyclerview.widget.DividerItemDecoration].
+ */
+class MessageListItemDecoration(context: Context) : ItemDecoration() {
+    private val divider: Drawable = context.theme.resolveDrawableAttribute(android.R.attr.listDivider)
+    private val bounds = Rect()
+
+    override fun onDraw(canvas: Canvas, parent: RecyclerView, state: RecyclerView.State) {
+        if (parent.layoutManager == null) return
+
+        canvas.withSave {
+            val childCount = parent.childCount
+            for (i in 0 until childCount) {
+                val child = parent.getChildAt(i)
+                if (!child.isVisible) {
+                    continue
+                }
+
+                parent.getDecoratedBoundsWithMargins(child, bounds)
+
+                val left = 0
+                val right = parent.width
+                val bottom = bounds.bottom + child.translationY.roundToInt()
+                val top = bottom - divider.intrinsicHeight
+
+                divider.setBounds(left, top, right, bottom)
+                divider.alpha = (child.alpha * 255).toInt()
+                divider.draw(canvas)
+            }
+        }
+    }
+
+    override fun getItemOffsets(outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State) {
+        outRect.set(0, 0, 0, divider.intrinsicHeight)
+    }
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
new file mode 100644
index 0000000000000000000000000000000000000000..6077ccff1dda71426e9be460c93d750e1652bad7
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListSwipeCallback.kt
@@ -0,0 +1,254 @@
+package com.fsck.k9.ui.messagelist
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.view.LayoutInflater
+import android.view.View
+import android.view.View.MeasureSpec
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.core.graphics.withTranslation
+import androidx.recyclerview.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import app.k9mail.ui.utils.itemtouchhelper.ItemTouchHelper
+import com.fsck.k9.SwipeAction
+import com.fsck.k9.ui.R
+import kotlin.math.abs
+
+@SuppressLint("InflateParams")
+class MessageListSwipeCallback(
+    context: Context,
+    private val resourceProvider: SwipeResourceProvider,
+    private val swipeActionSupportProvider: SwipeActionSupportProvider,
+    private val swipeRightAction: SwipeAction,
+    private val swipeLeftAction: SwipeAction,
+    private val adapter: MessageListAdapter,
+    private val listener: MessageListSwipeListener
+) : ItemTouchHelper.Callback() {
+    private val swipePadding = context.resources.getDimension(R.dimen.messageListSwipeIconPadding).toInt()
+    private val swipeThreshold = context.resources.getDimension(R.dimen.messageListSwipeThreshold)
+    private val backgroundColorPaint = Paint()
+
+    private val swipeRightLayout: View
+    private val swipeLeftLayout: View
+
+    private var maxSwipeRightDistance: Int = -1
+    private var maxSwipeLeftDistance: Int = -1
+
+    init {
+        val layoutInflater = LayoutInflater.from(context)
+
+        swipeRightLayout = layoutInflater.inflate(R.layout.swipe_right_action, null, false)
+        swipeLeftLayout = layoutInflater.inflate(R.layout.swipe_left_action, null, false)
+    }
+
+    override fun getMovementFlags(recyclerView: RecyclerView, viewHolder: ViewHolder): Int {
+        if (viewHolder !is MessageViewHolder) return 0
+
+        val item = adapter.getItemById(viewHolder.uniqueId) ?: return 0
+
+        var swipeFlags = 0
+        if (swipeActionSupportProvider.isActionSupported(item, swipeRightAction)) {
+            swipeFlags = swipeFlags or ItemTouchHelper.RIGHT
+        }
+        if (swipeActionSupportProvider.isActionSupported(item, swipeLeftAction)) {
+            swipeFlags = swipeFlags or ItemTouchHelper.LEFT
+        }
+
+        return makeMovementFlags(0, swipeFlags)
+    }
+
+    override fun onMove(
+        recyclerView: RecyclerView,
+        viewHolder: ViewHolder,
+        target: ViewHolder
+    ): Boolean {
+        throw UnsupportedOperationException("not implemented")
+    }
+
+    override fun onSwipeStarted(viewHolder: ViewHolder, direction: Int) {
+        // Mark view to prevent MessageListItemAnimator from interfering with swipe animations
+        viewHolder.markAsSwiped(true)
+
+        val swipeAction = when (direction) {
+            ItemTouchHelper.RIGHT -> swipeRightAction
+            ItemTouchHelper.LEFT -> swipeLeftAction
+            else -> error("Unsupported direction: $direction")
+        }
+
+        listener.onSwipeStarted(viewHolder.messageListItem, swipeAction)
+    }
+
+    override fun onSwipeDirectionChanged(viewHolder: ViewHolder, direction: Int) {
+        val swipeAction = when (direction) {
+            ItemTouchHelper.RIGHT -> swipeRightAction
+            ItemTouchHelper.LEFT -> swipeLeftAction
+            else -> error("Unsupported direction: $direction")
+        }
+
+        listener.onSwipeActionChanged(viewHolder.messageListItem, swipeAction)
+    }
+
+    override fun onSwiped(viewHolder: ViewHolder, direction: Int) {
+        val item = viewHolder.messageListItem
+
+        when (direction) {
+            ItemTouchHelper.RIGHT -> listener.onSwipeAction(item, swipeRightAction)
+            ItemTouchHelper.LEFT -> listener.onSwipeAction(item, swipeLeftAction)
+            else -> error("Unsupported direction: $direction")
+        }
+    }
+
+    override fun onSwipeEnded(viewHolder: ViewHolder) {
+        listener.onSwipeEnded(viewHolder.messageListItem)
+    }
+
+    override fun clearView(recyclerView: RecyclerView, viewHolder: ViewHolder) {
+        super.clearView(recyclerView, viewHolder)
+        viewHolder.markAsSwiped(false)
+    }
+
+    override fun getSwipeThreshold(viewHolder: ViewHolder): Float {
+        return swipeThreshold / viewHolder.itemView.width
+    }
+
+    override fun onChildDraw(
+        canvas: Canvas,
+        recyclerView: RecyclerView,
+        viewHolder: ViewHolder,
+        dX: Float,
+        dY: Float,
+        actionState: Int,
+        isCurrentlyActive: Boolean,
+        success: Boolean
+    ) {
+        val view = viewHolder.itemView
+        val viewWidth = view.width
+        val viewHeight = view.height
+
+        if (dX != 0F) {
+            canvas.withTranslation(x = view.left.toFloat(), y = view.top.toFloat()) {
+                if (isCurrentlyActive || !success) {
+                    val holder = viewHolder as MessageViewHolder
+                    drawLayout(dX, viewWidth, viewHeight, holder)
+                } else {
+                    drawBackground(dX, viewWidth, viewHeight)
+                }
+            }
+        }
+
+        super.onChildDraw(canvas, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive, success)
+    }
+
+    private fun Canvas.drawBackground(dX: Float, width: Int, height: Int) {
+        val swipeAction = if (dX > 0) swipeRightAction else swipeLeftAction
+        val backgroundColor = resourceProvider.getBackgroundColor(swipeAction)
+
+        backgroundColorPaint.color = backgroundColor
+        drawRect(
+            0F,
+            0F,
+            width.toFloat(),
+            height.toFloat(),
+            backgroundColorPaint
+        )
+    }
+
+    private fun Canvas.drawLayout(dX: Float, width: Int, height: Int, viewHolder: MessageViewHolder) {
+        val item = adapter.getItemById(viewHolder.uniqueId) ?: return
+        val isSelected = adapter.isSelected(item)
+
+        val swipeRight = dX > 0
+        val swipeThresholdReached = abs(dX) > swipeThreshold
+
+        val swipeLayout = if (swipeRight) swipeRightLayout else swipeLeftLayout
+        val swipeAction = if (swipeRight) swipeRightAction else swipeLeftAction
+
+        val foregroundColor: Int
+        val backgroundColor: Int
+        if (swipeThresholdReached) {
+            foregroundColor = resourceProvider.iconTint
+            backgroundColor = resourceProvider.getBackgroundColor(swipeAction)
+        } else {
+            foregroundColor = resourceProvider.getBackgroundColor(swipeAction)
+            backgroundColor = resourceProvider.getBackgroundColor(SwipeAction.None)
+        }
+
+        swipeLayout.setBackgroundColor(backgroundColor)
+
+        val icon = resourceProvider.getIcon(item, swipeAction)
+        icon.setTint(foregroundColor)
+
+        val iconView = swipeLayout.findViewById<ImageView>(R.id.swipe_action_icon)
+        iconView.setImageDrawable(icon)
+
+        val textView = swipeLayout.findViewById<TextView>(R.id.swipe_action_text)
+        textView.setTextColor(foregroundColor)
+        textView.text = resourceProvider.getActionName(item, swipeAction, isSelected)
+
+        if (swipeLayout.isDirty) {
+            val widthMeasureSpec = MeasureSpec.makeMeasureSpec(width, MeasureSpec.EXACTLY)
+            val heightMeasureSpec = MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+            swipeLayout.measure(widthMeasureSpec, heightMeasureSpec)
+            swipeLayout.layout(0, 0, width, height)
+
+            if (swipeRight) {
+                maxSwipeRightDistance = textView.right + swipePadding
+            } else {
+                maxSwipeLeftDistance = swipeLayout.width - textView.left + swipePadding
+            }
+        }
+
+        swipeLayout.draw(this)
+    }
+
+    override fun getMaxSwipeDistance(recyclerView: RecyclerView, direction: Int): Int {
+        return when (direction) {
+            ItemTouchHelper.RIGHT -> if (maxSwipeRightDistance > 0) maxSwipeRightDistance else recyclerView.width
+            ItemTouchHelper.LEFT -> if (maxSwipeLeftDistance > 0) maxSwipeLeftDistance else recyclerView.width
+            else -> recyclerView.width
+        }
+    }
+
+    override fun shouldAnimateOut(direction: Int): Boolean {
+        return when (direction) {
+            ItemTouchHelper.RIGHT -> swipeRightAction.removesItem
+            ItemTouchHelper.LEFT -> swipeLeftAction.removesItem
+            else -> error("Unsupported direction")
+        }
+    }
+
+    override fun getAnimationDuration(
+        recyclerView: RecyclerView,
+        animationType: Int,
+        animateDx: Float,
+        animateDy: Float
+    ): Long {
+        val percentage = abs(animateDx) / recyclerView.width
+        return (super.getAnimationDuration(recyclerView, animationType, animateDx, animateDy) * percentage).toLong()
+    }
+
+    private val ViewHolder.messageListItem: MessageListItem
+        get() = (this as? MessageViewHolder)?.uniqueId?.let { adapter.getItemById(it) }
+            ?: error("Couldn't find MessageListItem")
+}
+
+fun interface SwipeActionSupportProvider {
+    fun isActionSupported(item: MessageListItem, action: SwipeAction): Boolean
+}
+
+interface MessageListSwipeListener {
+    fun onSwipeStarted(item: MessageListItem, action: SwipeAction)
+    fun onSwipeActionChanged(item: MessageListItem, action: SwipeAction)
+    fun onSwipeAction(item: MessageListItem, action: SwipeAction)
+    fun onSwipeEnded(item: MessageListItem)
+}
+
+private fun ViewHolder.markAsSwiped(value: Boolean) {
+    itemView.setTag(R.id.message_list_swipe_tag, if (value) true else null)
+}
+
+val ViewHolder.wasSwiped
+    get() = itemView.getTag(R.id.message_list_swipe_tag) == true
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageViewHolder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
similarity index 93%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageViewHolder.kt
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
index 471648f053724b7628dc8fdf1771c828d3bcbe65..45eda75a8ae6d6eb50d670ae860c9b412caab8c9 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageViewHolder.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListViewHolder.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.fragment
+package com.fsck.k9.ui.messagelist
 
 import android.view.View
 import android.widget.CheckBox
@@ -13,6 +13,7 @@ sealed class MessageListViewHolder(view: View) : ViewHolder(view)
 class MessageViewHolder(view: View) : MessageListViewHolder(view) {
     var uniqueId: Long = -1L
 
+    var mainView: LinearLayout = view.findViewById(R.id.main_view)
     val selected: ImageView = view.findViewById(R.id.selected)
     val subject: TextView = view.findViewById(R.id.subject)
     val displayName: TextView = view.findViewById(R.id.displayName)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MlfUtils.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java
similarity index 97%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/MlfUtils.java
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java
index eb35a43e3bf8c29d24e68bfde83a974f2cd70ba1..9c9522b42cd2c21f0c5c7a0cdd26d18812f5839e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/MlfUtils.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MlfUtils.java
@@ -1,4 +1,4 @@
-package com.fsck.k9.fragment;
+package com.fsck.k9.ui.messagelist;
 
 
 import java.util.List;
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/SortTypeToastProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt
similarity index 97%
rename from app/ui/legacy/src/main/java/com/fsck/k9/fragment/SortTypeToastProvider.kt
rename to app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt
index 998c9ed623526c8561130b4a3b082d5a40f9fb4f..b4774b2df183261175c0545714c75d24a7ba69cc 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/fragment/SortTypeToastProvider.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SortTypeToastProvider.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.fragment
+package com.fsck.k9.ui.messagelist
 
 import com.fsck.k9.Account.SortType
 import com.fsck.k9.Account.SortType.SORT_ARRIVAL
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..55b09c8168d1cf33293bd065a8fbbd61ca2efa33
--- /dev/null
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/SwipeResourceProvider.kt
@@ -0,0 +1,86 @@
+package com.fsck.k9.ui.messagelist
+
+import android.content.res.Resources.Theme
+import android.graphics.drawable.Drawable
+import androidx.annotation.AttrRes
+import com.fsck.k9.SwipeAction
+import com.fsck.k9.ui.R
+import com.fsck.k9.ui.resolveColorAttribute
+import com.fsck.k9.ui.resolveDrawableAttribute
+
+class SwipeResourceProvider(val theme: Theme) {
+    val iconTint = theme.resolveColorAttribute(R.attr.messageListSwipeIconTint)
+
+    private val selectIcon = theme.loadDrawable(R.attr.messageListSwipeSelectIcon)
+    private val markAsReadIcon = theme.loadDrawable(R.attr.messageListSwipeMarkAsReadIcon)
+    private val markAsUnreadIcon = theme.loadDrawable(R.attr.messageListSwipeMarkAsUnreadIcon)
+    private val addStarIcon = theme.loadDrawable(R.attr.messageListSwipeAddStarIcon)
+    private val removeStarIcon = theme.loadDrawable(R.attr.messageListSwipeRemoveStarIcon)
+    private val archiveIcon = theme.loadDrawable(R.attr.messageListSwipeArchiveIcon)
+    private val deleteIcon = theme.loadDrawable(R.attr.messageListSwipeDeleteIcon)
+    private val spamIcon = theme.loadDrawable(R.attr.messageListSwipeSpamIcon)
+    private val moveIcon = theme.loadDrawable(R.attr.messageListSwipeMoveIcon)
+
+    private val noActionColor = theme.resolveColorAttribute(R.attr.messageListSwipeDisabledBackgroundColor)
+    private val selectColor = theme.resolveColorAttribute(R.attr.messageListSwipeSelectBackgroundColor)
+    private val toggleReadColor = theme.resolveColorAttribute(R.attr.messageListSwipeToggleReadBackgroundColor)
+    private val toggleStarColor = theme.resolveColorAttribute(R.attr.messageListSwipeToggleStarBackgroundColor)
+    private val archiveColor = theme.resolveColorAttribute(R.attr.messageListSwipeArchiveBackgroundColor)
+    private val deleteColor = theme.resolveColorAttribute(R.attr.messageListSwipeDeleteBackgroundColor)
+    private val spamColor = theme.resolveColorAttribute(R.attr.messageListSwipeSpamBackgroundColor)
+    private val moveColor = theme.resolveColorAttribute(R.attr.messageListSwipeMoveBackgroundColor)
+
+    private val selectText = theme.resources.getString(R.string.swipe_action_select)
+    private val deselectText = theme.resources.getString(R.string.swipe_action_deselect)
+    private val markAsReadText = theme.resources.getString(R.string.swipe_action_mark_as_read)
+    private val markAsUnreadText = theme.resources.getString(R.string.swipe_action_mark_as_unread)
+    private val addStarText = theme.resources.getString(R.string.swipe_action_add_star)
+    private val removeStarText = theme.resources.getString(R.string.swipe_action_remove_star)
+    private val archiveText = theme.resources.getString(R.string.swipe_action_archive)
+    private val deleteText = theme.resources.getString(R.string.swipe_action_delete)
+    private val spamText = theme.resources.getString(R.string.swipe_action_spam)
+    private val moveText = theme.resources.getString(R.string.swipe_action_move)
+
+    fun getIcon(item: MessageListItem, action: SwipeAction): Drawable {
+        return when (action) {
+            SwipeAction.None -> error("action == SwipeAction.None")
+            SwipeAction.ToggleSelection -> selectIcon
+            SwipeAction.ToggleRead -> if (item.isRead) markAsUnreadIcon else markAsReadIcon
+            SwipeAction.ToggleStar -> if (item.isStarred) removeStarIcon else addStarIcon
+            SwipeAction.Archive -> archiveIcon
+            SwipeAction.Delete -> deleteIcon
+            SwipeAction.Spam -> spamIcon
+            SwipeAction.Move -> moveIcon
+        }
+    }
+
+    fun getBackgroundColor(action: SwipeAction): Int {
+        return when (action) {
+            SwipeAction.None -> noActionColor
+            SwipeAction.ToggleSelection -> selectColor
+            SwipeAction.ToggleRead -> toggleReadColor
+            SwipeAction.ToggleStar -> toggleStarColor
+            SwipeAction.Archive -> archiveColor
+            SwipeAction.Delete -> deleteColor
+            SwipeAction.Spam -> spamColor
+            SwipeAction.Move -> moveColor
+        }
+    }
+
+    fun getActionName(item: MessageListItem, action: SwipeAction, isSelected: Boolean): String {
+        return when (action) {
+            SwipeAction.None -> error("action == SwipeAction.None")
+            SwipeAction.ToggleSelection -> if (isSelected) deselectText else selectText
+            SwipeAction.ToggleRead -> if (item.isRead) markAsUnreadText else markAsReadText
+            SwipeAction.ToggleStar -> if (item.isStarred) removeStarText else addStarText
+            SwipeAction.Archive -> archiveText
+            SwipeAction.Delete -> deleteText
+            SwipeAction.Spam -> spamText
+            SwipeAction.Move -> moveText
+        }
+    }
+}
+
+private fun Theme.loadDrawable(@AttrRes attributeId: Int): Drawable {
+    return resolveDrawableAttribute(attributeId).mutate()
+}
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt
index 4501c25075e904c1e1ae8489407842ee93265b20..d5dd3509f801acd959124df402364cd4a9bbf8b6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewContainerFragment.kt
@@ -145,20 +145,19 @@ class MessageViewContainerFragment : Fragment() {
     }
 
     private fun setActiveMessage(position: Int) {
-        // If the position of current message changes (e.g. because messages were added or removed from the list), we
-        // keep track of the new position but otherwise ignore the event.
-        val newMessageReference = adapter.getMessageReference(position)
+        val newMessageReference = adapter.getMessageReference(position) ?: return
         if (newMessageReference == activeMessageReference) {
+            // If the position of current message changes (e.g. because messages were added or removed from the list),
+            // we keep track of the new position but otherwise ignore the event.
             currentPosition = position
             return
         }
 
         rememberNavigationDirection(position)
 
-        messageReference = adapter.getMessageReference(position)
-
-        activeMessageReference = messageReference
-        fragmentListener.setActiveMessage(messageReference)
+        messageReference = newMessageReference
+        activeMessageReference = newMessageReference
+        fragmentListener.setActiveMessage(newMessageReference)
     }
 
     private fun rememberNavigationDirection(newPosition: Int) {
@@ -172,9 +171,7 @@ class MessageViewContainerFragment : Fragment() {
         val newPosition = viewPager.currentItem - 1
         return if (newPosition >= 0) {
             setActiveMessage(newPosition)
-
-            val smoothScroll = true
-            viewPager.setCurrentItem(newPosition, smoothScroll)
+            viewPager.setCurrentItem(newPosition, /* smoothScroll = */ false)
             true
         } else {
             false
@@ -185,9 +182,7 @@ class MessageViewContainerFragment : Fragment() {
         val newPosition = viewPager.currentItem + 1
         return if (newPosition < adapter.itemCount) {
             setActiveMessage(newPosition)
-
-            val smoothScroll = true
-            viewPager.setCurrentItem(newPosition, smoothScroll)
+            viewPager.setCurrentItem(newPosition, /* smoothScroll = */ false)
             true
         } else {
             false
@@ -265,10 +260,8 @@ class MessageViewContainerFragment : Fragment() {
             return MessageViewFragment.newInstance(messageReference)
         }
 
-        fun getMessageReference(position: Int): MessageReference {
-            check(position in messageList.indices)
-
-            return messageList[position].messageReference
+        fun getMessageReference(position: Int): MessageReference? {
+            return messageList.getOrNull(position)?.messageReference
         }
 
         fun getPosition(messageReference: MessageReference): Int {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
index a7de139a0cc746eb57896b9e03682aabfed6a095..e2d39f56598cb443d40448a64e4ec5a632d9ba1b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
@@ -91,6 +91,9 @@ class MessageViewFragment :
     private var isDeleteMenuItemDisabled: Boolean = false
     private var wasMessageMarkedAsOpened: Boolean = false
 
+    private var isActive: Boolean = false
+        private set
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
@@ -104,6 +107,12 @@ class MessageViewFragment :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        // Hide the toolbar menu when first creating this fragment. The menu will be set to visible once this fragment
+        // becomes the active page of the view pager in MessageViewContainerFragment.
+        if (savedInstanceState == null) {
+            setMenuVisibility(false)
+        }
+
         setHasOptionsMenu(true)
 
         messageReference = MessageReference.parse(arguments?.getString(ARG_REFERENCE))
@@ -175,11 +184,15 @@ class MessageViewFragment :
     }
 
     override fun setMenuVisibility(menuVisible: Boolean) {
+        isActive = menuVisible
+
         super.setMenuVisibility(menuVisible)
 
-        // When the menu is hidden, the message associated with this fragment is no longer active. If the user returns
-        // to it, we want to mark the message as opened again.
-        if (!menuVisible) {
+        if (menuVisible) {
+            messageLoaderHelper.resumeCryptoOperationIfNecessary()
+        } else {
+            // When the menu is hidden, the message associated with this fragment is no longer active. If the user returns
+            // to it, we want to mark the message as opened again.
             wasMessageMarkedAsOpened = false
         }
     }
@@ -201,6 +214,8 @@ class MessageViewFragment :
     }
 
     override fun onPrepareOptionsMenu(menu: Menu) {
+        if (!isActive) return
+
         menu.findItem(R.id.delete).apply {
             isVisible = K9.isMessageViewDeleteActionVisible
             isEnabled = !isDeleteMenuItemDisabled
@@ -887,7 +902,9 @@ class MessageViewFragment :
             flagsMask: Int,
             flagValues: Int,
             extraFlags: Int
-        ) {
+        ): Boolean {
+            if (!isActive) return false
+
             showProgressThreshold = null
             try {
                 val maskedRequestCode = requestCode or REQUEST_MASK_LOADER_HELPER
@@ -897,6 +914,8 @@ class MessageViewFragment :
             } catch (e: SendIntentException) {
                 Timber.e(e, "Irrecoverable error calling PendingIntent!")
             }
+
+            return true
         }
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
index bb9f6f48ddae8ec7923dfc4dfc2221a60c96c87a..2fd149e9adbb751802ab9fdaae21a23e7026a95e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsListFragment.kt
@@ -77,11 +77,10 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
 
     private fun populateSettingsList() {
         viewModel.accounts.observeNotNull(this) { accounts ->
-            val accountsFinishedSetup = accounts.filter { it.isFinishedSetup }
-            if (accountsFinishedSetup.isEmpty()) {
+            if (accounts.isEmpty()) {
                 launchOnboarding()
             } else {
-                populateSettingsList(accountsFinishedSetup)
+                populateSettingsList(accounts)
             }
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
index fe0b5a2062194603562ee497352a194199f855d8..64b53ad4b547ee5d343afdc46333fb5bde960164 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsDataStore.kt
@@ -2,6 +2,7 @@ package com.fsck.k9.ui.settings.general
 
 import androidx.preference.PreferenceDataStore
 import com.fsck.k9.K9
+import com.fsck.k9.SwipeAction
 import com.fsck.k9.job.K9JobManager
 import com.fsck.k9.preferences.AppTheme
 import com.fsck.k9.preferences.GeneralSettingsManager
@@ -127,6 +128,8 @@ class GeneralSettingsDataStore(
             "message_view_date_font" -> K9.fontSizes.messageViewDate.toString()
             "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders.toString()
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput.toString()
+            "swipe_action_right" -> swipeActionToString(K9.swipeRightAction)
+            "swipe_action_left" -> swipeActionToString(K9.swipeLeftAction)
             else -> defValue
         }
     }
@@ -166,6 +169,8 @@ class GeneralSettingsDataStore(
             "message_view_date_font" -> K9.fontSizes.messageViewDate = value.toInt()
             "message_view_additional_headers_font" -> K9.fontSizes.messageViewAdditionalHeaders = value.toInt()
             "message_compose_input_font" -> K9.fontSizes.messageComposeInput = value.toInt()
+            "swipe_action_right" -> K9.swipeRightAction = stringToSwipeAction(value)
+            "swipe_action_left" -> K9.swipeLeftAction = stringToSwipeAction(value)
             else -> return
         }
 
@@ -282,4 +287,27 @@ class GeneralSettingsDataStore(
             jobManager.scheduleAllMailJobs()
         }
     }
+
+    private fun swipeActionToString(action: SwipeAction) = when (action) {
+        SwipeAction.None -> "none"
+        SwipeAction.ToggleSelection -> "toggle_selection"
+        SwipeAction.ToggleRead -> "toggle_read"
+        SwipeAction.ToggleStar -> "toggle_star"
+        SwipeAction.Archive -> "archive"
+        SwipeAction.Delete -> "delete"
+        SwipeAction.Spam -> "spam"
+        SwipeAction.Move -> "move"
+    }
+
+    private fun stringToSwipeAction(action: String) = when (action) {
+        "none" -> SwipeAction.None
+        "toggle_selection" -> SwipeAction.ToggleSelection
+        "toggle_read" -> SwipeAction.ToggleRead
+        "toggle_star" -> SwipeAction.ToggleStar
+        "archive" -> SwipeAction.Archive
+        "delete" -> SwipeAction.Delete
+        "spam" -> SwipeAction.Spam
+        "move" -> SwipeAction.Move
+        else -> throw AssertionError()
+    }
 }
diff --git a/app/ui/legacy/src/main/res/drawable/ic_move_to_folder.xml b/app/ui/legacy/src/main/res/drawable/ic_move_to_folder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9b88184787c735c7c66651584de57a9e9595a23b
--- /dev/null
+++ b/app/ui/legacy/src/main/res/drawable/ic_move_to_folder.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20,6h-8l-2,-2L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,8c0,-1.1 -0.9,-2 -2,-2zM14,18v-3h-4v-4h4L14,8l5,5 -5,5z" />
+</vector>
diff --git a/app/ui/legacy/src/main/res/layout/message_list_fragment.xml b/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
index e5d9f7e7392fe62851058c7a56e3737353551d17..2d2534edb7b7766462359ff49785c6eafa157324 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_fragment.xml
@@ -6,7 +6,7 @@
     android:id="@+id/swiperefresh"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="com.fsck.k9.fragment.MessageListFragment">
+    tools:context=".messagelist.MessageListFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/message_list"
@@ -18,7 +18,6 @@
         android:scrollbarStyle="insideOverlay"
         android:fadingEdge="none"
         app:fastScrollEnabled="false"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         tools:listitem="@layout/message_list_item"/>
 
 </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
diff --git a/app/ui/legacy/src/main/res/layout/message_list_item.xml b/app/ui/legacy/src/main/res/layout/message_list_item.xml
index 464615f9d2a5635e0cc38686142e30879d0c0aa4..5f666364b2f9dfb6e1144d64cdea8d365f6b398c 100644
--- a/app/ui/legacy/src/main/res/layout/message_list_item.xml
+++ b/app/ui/legacy/src/main/res/layout/message_list_item.xml
@@ -5,217 +5,227 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
+    android:background="@color/color_default_background"
     android:orientation="vertical"
     tools:layout_height="?android:attr/listPreferredItemHeight">
 
     <LinearLayout
+        android:id="@+id/main_view"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <View
-            android:id="@+id/unread_message_indicator"
-            android:layout_width="10dp"
-            android:layout_height="10dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="15dp"
-            android:background="@drawable/ic_unread_message"
-            android:visibility="invisible" />
-
-        <RelativeLayout
-            android:id="@+id/list_item_inner"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="13dp"
-            android:layout_marginTop="7dp"
-            android:layout_marginEnd="4dp"
-            android:layout_marginBottom="7dp"
-            android:clickable="false"
-            android:focusable="false"
-            android:focusableInTouchMode="false">
-
-            <LinearLayout
-                android:id="@+id/subject_wrapper"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_toStartOf="@+id/date">
-
-                <CheckBox
-                    android:id="@+id/star"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="9dp"
-                    android:button="@drawable/ic_star"
-                    android:enabled="false"
-                    android:focusable="false"
-                    android:gravity="center_vertical"
-                    android:visibility="visible"
-                    tools:text="&#x200B;" />
-
-                <ImageView
-                    android:id="@+id/account_color_chip"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_marginEnd="4dp"
-                    android:contentDescription="@null"
-                    android:visibility="gone"
-                    app:srcCompat="@drawable/ic_account_color"
-                    tools:tint="@color/color_default_accent" />
-
-                <TextView
-                    android:id="@+id/subject"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.K9.MediumSmall"
-                    android:textColor="@color/color_default_primary_text"
-                    tools:text="Subject" />
-            </LinearLayout>
+            android:orientation="horizontal">
 
+            <View
+                android:id="@+id/unread_message_indicator"
+                android:layout_width="10dp"
+                android:layout_height="10dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="15dp"
+                android:background="@drawable/ic_unread_message"
+                android:visibility="invisible" />
 
             <RelativeLayout
+                android:id="@+id/list_item_inner"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/subject_wrapper"
-                android:layout_alignParentStart="true"
-                android:layout_toStartOf="@id/extra_info_holder">
-
-                <ImageView
-                    android:id="@+id/status"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_alignParentStart="true"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginTop="9dp"
-                    android:layout_marginEnd="8dp"
-                    android:contentDescription="@null"
-                    app:srcCompat="?attr/messageListAnswered"
-                    tools:src="@drawable/ic_messagelist_answered" />
+                android:layout_gravity="center_vertical"
+                android:layout_marginStart="13dp"
+                android:layout_marginTop="7dp"
+                android:layout_marginEnd="4dp"
+                android:layout_marginBottom="7dp"
+                android:clickable="false"
+                android:focusable="false"
+                android:focusableInTouchMode="false">
 
-                <TextView
-                    android:id="@+id/displayName"
+                <LinearLayout
+                    android:id="@+id/subject_wrapper"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignWithParentIfMissing="false"
+                    android:layout_alignParentStart="true"
                     android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_toEndOf="@id/status"
-                    android:bufferType="spannable"
-                    android:ellipsize="end"
-                    android:gravity="top"
-                    android:longClickable="false"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextAppearance.K9.Small"
-                    android:textColor="@color/color_default_secondary_text"
-                    tools:text="Message preview" />
-
-                <TextView
-                    android:id="@+id/preview"
+                    android:layout_toStartOf="@+id/date">
+
+                    <CheckBox
+                        android:id="@+id/star"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_marginTop="4dp"
+                        android:layout_marginEnd="9dp"
+                        android:button="@drawable/ic_star"
+                        android:enabled="false"
+                        android:focusable="false"
+                        android:gravity="center_vertical"
+                        android:visibility="visible"
+                        tools:text="&#x200B;" />
+
+                    <ImageView
+                        android:id="@+id/account_color_chip"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_vertical"
+                        android:layout_marginEnd="4dp"
+                        android:contentDescription="@null"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_account_color"
+                        tools:tint="@color/color_default_accent" />
+
+                    <TextView
+                        android:id="@+id/subject"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0.7"
+                        android:ellipsize="end"
+                        android:singleLine="true"
+                        android:textAppearance="@style/TextAppearance.K9.MediumSmall"
+                        android:textColor="@color/color_default_primary_text"
+                        tools:text="Subject" />
+                </LinearLayout>
+
+
+                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_alignWithParentIfMissing="false"
-                    android:layout_below="@+id/displayName"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignParentBottom="false"
-                    android:layout_toEndOf="@id/status"
-                    android:bufferType="spannable"
-                    android:ellipsize="end"
-                    android:gravity="top"
-                    android:longClickable="false"
-                    android:singleLine="false"
-                    android:textAppearance="@style/TextAppearance.K9.Small"
-                    android:textColor="?messageListPreviewTextColor"
-                    tools:text="Message preview" />
-            </RelativeLayout>
-
-
-            <RelativeLayout
-                android:id="@+id/extra_info_holder"
-                android:layout_width="56dp"
-                android:layout_height="38dp"
-                android:layout_below="@id/date"
-                android:layout_alignParentEnd="true">
+                    android:layout_below="@+id/subject_wrapper"
+                    android:layout_alignParentStart="true"
+                    android:layout_toStartOf="@id/extra_info_holder">
+
+                    <ImageView
+                        android:id="@+id/status"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_alignParentStart="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginTop="9dp"
+                        android:layout_marginEnd="8dp"
+                        android:contentDescription="@null"
+                        app:srcCompat="?attr/messageListAnswered"
+                        tools:src="@drawable/ic_messagelist_answered" />
+
+                    <TextView
+                        android:id="@+id/displayName"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignWithParentIfMissing="false"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_toEndOf="@id/status"
+                        android:bufferType="spannable"
+                        android:ellipsize="end"
+                        android:gravity="top"
+                        android:longClickable="false"
+                        android:singleLine="true"
+                        android:textAppearance="@style/TextAppearance.K9.Small"
+                        android:textColor="@color/color_default_secondary_text"
+                        tools:text="Message preview" />
+
+                    <TextView
+                        android:id="@+id/preview"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_alignWithParentIfMissing="false"
+                        android:layout_below="@+id/displayName"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentBottom="false"
+                        android:layout_toEndOf="@id/status"
+                        android:bufferType="spannable"
+                        android:ellipsize="end"
+                        android:gravity="top"
+                        android:longClickable="false"
+                        android:singleLine="false"
+                        android:textAppearance="@style/TextAppearance.K9.Small"
+                        android:textColor="?messageListPreviewTextColor"
+                        tools:text="Message preview" />
+                </RelativeLayout>
+
+
+                <RelativeLayout
+                    android:id="@+id/extra_info_holder"
+                    android:layout_width="56dp"
+                    android:layout_height="38dp"
+                    android:layout_below="@id/date"
+                    android:layout_alignParentEnd="true">
+
+                    <TextView
+                        android:id="@+id/thread_count"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginTop="14dp"
+                        android:layout_marginEnd="7dp"
+                        android:background="?attr/messageListThreadCountBackground"
+                        android:focusable="false"
+                        android:padding="4dp"
+                        android:textAlignment="center"
+                        android:textColor="?attr/messageListThreadCountForegroundColor"
+                        android:textSize="12sp"
+                        android:textStyle="bold"
+                        tools:text="3" />
+
+                    <ImageView
+                        android:id="@+id/attachment"
+                        android:layout_width="16dp"
+                        android:layout_height="16dp"
+                        android:layout_alignWithParentIfMissing="true"
+                        android:layout_alignParentTop="true"
+                        android:layout_marginTop="18dp"
+                        android:layout_marginEnd="8dp"
+                        android:layout_toStartOf="@+id/thread_count"
+                        android:contentDescription="@null"
+                        app:srcCompat="?attr/messageListAttachment" />
+
+                    <ImageView
+                        android:id="@+id/selected"
+                        android:layout_width="32dp"
+                        android:layout_height="32dp"
+                        android:layout_alignParentTop="true"
+                        android:layout_alignParentEnd="true"
+                        android:layout_marginEnd="12dp"
+                        android:contentDescription="@null"
+                        android:visibility="gone"
+                        app:srcCompat="@drawable/ic_check_circle_large" />
+                </RelativeLayout>
 
                 <TextView
-                    android:id="@+id/thread_count"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:id="@+id/date"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignWithParentIfMissing="true"
                     android:layout_alignParentTop="true"
-                    android:layout_alignParentEnd="true"
-                    android:layout_marginTop="14dp"
-                    android:layout_marginEnd="7dp"
-                    android:background="?attr/messageListThreadCountBackground"
-                    android:focusable="false"
-                    android:padding="4dp"
-                    android:textAlignment="center"
-                    android:textColor="?attr/messageListThreadCountForegroundColor"
+                    android:layout_centerVertical="true"
+                    android:layout_toStartOf="@id/right_chevron"
+                    android:singleLine="true"
+                    android:textColor="@color/color_default_ternary_text"
                     android:textSize="12sp"
-                    android:textStyle="bold"
-                    tools:text="3" />
+                    tools:text="Oct 27" />
 
                 <ImageView
-                    android:id="@+id/attachment"
+                    android:id="@+id/right_chevron"
                     android:layout_width="16dp"
                     android:layout_height="16dp"
                     android:layout_alignWithParentIfMissing="true"
                     android:layout_alignParentTop="true"
-                    android:layout_marginTop="18dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_toStartOf="@+id/thread_count"
-                    android:contentDescription="@null"
-                    app:srcCompat="?attr/messageListAttachment" />
-
-                <ImageView
-                    android:id="@+id/selected"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:layout_alignParentTop="true"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginEnd="12dp"
+                    android:layout_centerVertical="true"
+                    android:layout_marginEnd="4dp"
                     android:contentDescription="@null"
-                    android:visibility="gone"
-                    app:srcCompat="@drawable/ic_check_circle_large" />
+                    android:src="@drawable/ic_chevron_right_small" />
             </RelativeLayout>
 
-            <TextView
-                android:id="@+id/date"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignWithParentIfMissing="true"
-                android:layout_alignParentTop="true"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@id/right_chevron"
-                android:singleLine="true"
-                android:textColor="@color/color_default_ternary_text"
-                android:textSize="12sp"
-                tools:text="Oct 27" />
-
-            <ImageView
-                android:id="@+id/right_chevron"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_alignWithParentIfMissing="true"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:layout_marginEnd="4dp"
-                android:contentDescription="@null"
-                android:src="@drawable/ic_chevron_right_small" />
-        </RelativeLayout>
+        </LinearLayout>
+
+        <View
+            android:id="@+id/end_divider"
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:layout_marginTop="7dp"
+            android:background="@color/color_default_divider" />
 
     </LinearLayout>
-    <View
-        android:id="@+id/end_divider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="7dp"
-        android:background="@color/color_default_divider" />
 </LinearLayout>
diff --git a/app/ui/legacy/src/main/res/layout/swipe_left_action.xml b/app/ui/legacy/src/main/res/layout/swipe_left_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..93400abc45cbf5a8761d5c373418ad855b186ba2
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/swipe_left_action.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    tools:background="?attr/messageListSwipeSelectBackgroundColor"
+    tools:ignore="RtlHardcoded"
+    tools:layout_height="?android:listPreferredItemHeight">
+
+    <ImageView
+        android:id="@+id/swipe_action_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="@dimen/messageListSwipeIconPadding"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="?attr/messageListSwipeMarkAsReadIcon"
+        tools:tint="?attr/messageListSwipeIconTint" />
+
+    <TextView
+        android:id="@+id/swipe_action_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="@dimen/messageListSwipeTextPadding"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:gravity="right"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textColor="?attr/messageListSwipeIconTint"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toLeftOf="@+id/swipe_action_icon"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/swipe_action_mark_as_read" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/ui/legacy/src/main/res/layout/swipe_right_action.xml b/app/ui/legacy/src/main/res/layout/swipe_right_action.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d9ce8383adcef95a4a38e8b0d655efaba8f5de5f
--- /dev/null
+++ b/app/ui/legacy/src/main/res/layout/swipe_right_action.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    tools:background="?attr/messageListSwipeSelectBackgroundColor"
+    tools:ignore="RtlHardcoded"
+    tools:layout_height="?android:listPreferredItemHeight">
+
+    <ImageView
+        android:id="@+id/swipe_action_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/messageListSwipeIconPadding"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="16dp"
+        android:contentDescription="@null"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="?attr/messageListSwipeSelectIcon"
+        tools:tint="?attr/messageListSwipeIconTint" />
+
+    <TextView
+        android:id="@+id/swipe_action_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/messageListSwipeTextPadding"
+        android:layout_marginTop="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_marginBottom="16dp"
+        android:ellipsize="end"
+        android:gravity="left"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textColor="?attr/messageListSwipeIconTint"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintLeft_toRightOf="@+id/swipe_action_icon"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@string/swipe_action_select" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
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 218de4d030f431add5caeded0511279e76a1d4f3..9b57d8cd30b69fca979fbeeb072492ff5adc6d2f 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,51 @@
      Locale-specific versions are kept in res/raw-<locale qualifier>/changelog.xml.
 -->
 <changelog>
+    <release version="6.400" versioncode="34000" date="2022-11-28">
+        <change>Added swipe actions to the message list screen</change>
+        <change>Added support for swiping between messages</change>
+        <change>Added a monochromatic app icon for Android 13</change>
+        <change>Fixed "K-9 Accounts" shortcuts (please remove existing shortcuts and add them again)</change>
+        <change>Fixed error reporting for (old) send failures</change>
+        <change>A lot of other bug fixes; see changes for versions 6.3xx</change>
+        <change>Added Western Frisian translation and updated others</change>
+    </release>
+    <release version="6.312" versioncode="33012" date="2022-11-15">
+        <change>Tweaked swipe actions in the message list screen</change>
+        <change>Fixed a bug where canceling account setup was showing a new account in the side drawer</change>
+        <change>Updated translations</change>
+    </release>
+    <release version="6.311" versioncode="33011" date="2022-11-01">
+        <change>Don't unexpectedly show and focus the "reply to" field when composing a message</change>
+        <change>Fixed a bug where sometimes toolbar buttons in the message view would affect another message than the one currently being displayed</change>
+        <change>Changed the way the app switches to the next/previous message to avoid a bug that could lead to the toolbar disappearing</change>
+        <change>Fall back to using IPv4 if connecting to a POP3 server using IPv6 fails</change>
+        <change>SMTP: Stop treating all TLS errors as certificate error</change>
+        <change>Added more (local) logging when creating and removing notifications</change>
+        <change>Fixed a couple of rare crashes</change>
+    </release>
+    <release version="6.310" versioncode="33010" date="2022-10-24">
+        <change>Fixed "K-9 Accounts" shortcuts (you probably have to remove existing shortcuts and add them again)</change>
+        <change>Fixed a couple of bugs and display issues in the message list widget</change>
+        <change>Fixed bug that could lead to a crypto provider popup showing before swiping to the next/previous message was completed</change>
+        <change>Some other minor bug fixes</change>
+        <change>Updated translations</change>
+    </release>
+    <release version="6.309" versioncode="33009" date="2022-10-12">
+        <change>Automatically scroll to the top after using pull to refresh, so new messages are visible</change>
+        <change>Fixed a bug that prevented the app from establishing a connection to the outgoing server under certain circumstances</change>
+        <change>Fixed a bug that could lead to messages being sent twice when the send button was double clicked</change>
+        <change>Changed the structure of HTML signatures in outgoing messages to increase compatibility</change>
+        <change>More bug fixes and internal changes</change>
+        <change>Updated translations</change>
+    </release>
+    <release version="6.308" versioncode="33008" date="2022-10-06">
+        <change>Added swipe actions to the message list screen</change>
+        <change>Changed the minimum size of the message list widget to 2x2 cells</change>
+        <change>Fixed a bug where the app would start using the light theme before switching to the dark theme resulting in a brief flash of white</change>
+        <change>More minor bug fixes and improvements</change>
+        <change>Updated translations</change>
+    </release>
     <release version="6.307" versioncode="33007" date="2022-09-26">
         <change>Fixed the message list background color in the dark theme</change>
         <change>Fixed a small display issue where "Load up to X more" could have been displayed when it shouldn't have been</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 7048a855b1a532eceef4bd2af85c03840630e07b..b85851f3c4385c42cea68655ecd085583b6de264 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -210,6 +210,22 @@
   <string name="global_settings_confirm_menu_discard">إلغاء الرسالة</string>
   <string name="global_settings_confirm_menu_mark_all_read">جعل كل الرسائل مقروءة</string>
   <string name="global_settings_confirm_action_delete_notif">احذف (من الإشعارات)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">بدون</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">أرشيف</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">احذف</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">بريد مُزعج</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">حَرِّكْ</string>
   <string name="global_settings_privacy_hide_useragent">إخفاء عميل البريد</string>
   <string name="global_settings_privacy_hide_useragent_detail">احذف مُعرف بريد كية-9 من ترويسات الرسالة</string>
   <string name="global_settings_privacy_hide_timezone">احذف التوقيت</string>
@@ -718,7 +734,10 @@
   <string name="unsigned_text_divider_label">نص غير مُوَقَّع</string>
   <string name="crypto_no_provider_title">هذه الرسالة مُعماة</string>
   <string name="mail_list_widget_text">قائمة رسائل K-9</string>
-  <string name="mail_list_widget_loading">يُحمل الرسائل…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">يُحمل…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">يُحمل…</string>
   <string name="openpgp_enabled_error_title">التعمية غير ممكنة</string>
   <string name="enable_encryption">تنشيط التعمية</string>
   <string name="disable_encryption">تعطيل التعمية</string>
@@ -736,4 +755,22 @@
   <string name="switch_off">مُوقّف</string>
   <!--permissions-->
   <string name="push_info_learn_more_text">لمعرفة المزيد</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">حدد</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">إلغ التحديد</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">علامة غير مقروء</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">أضف نجمة</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">احذف النجمة</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">أرشيف</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">احذف</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">بريد مُزعج</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 9aaa9d41442b0e6d3950ad3bb22a50f20f6812db..b51d637d994e4a62771b67fabcdfc43f628acecf 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -220,6 +220,22 @@
   <string name="global_settings_confirm_menu_discard">Скасаваць ліст</string>
   <string name="global_settings_confirm_menu_mark_all_read">Пазначыць усе лісты прачытанымі</string>
   <string name="global_settings_confirm_action_delete_notif">Выдаліць (у апавяшчэнні)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Няма</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Архіў</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Выдаліць</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Перамясціць</string>
   <string name="global_settings_privacy_hide_useragent">Схаваць паштовы кліент</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Схаваць часавы пояс</string>
@@ -556,8 +572,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Нераспазнаны сертыфікат</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Ухваліць</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Адхіліць</string>
-  <string name="message_view_help_key">Del (ці D) - Выдаліць\nR - Адказаць\nA - Адказаць усім\nC - Стварыць\nF - Пераслаць\nM - Перамясціць\nV - Адправіць у архіў\nY - Скапіяваць\nZ - Пазначыць (не)прачытаным\nG - Адзначыць\nO - Тып сартавання\nI - Парадак сартавання\nQ - Вярнуцца да каталогаў\nS - Абраць / Адкінуць выбар\nJ альбо P - Папярэдні ліст\nK альбо N - Наступны ліст</string>
-  <string name="message_list_help_key">Del (ці D) - Выдаліць\nC - Стварыць\nF - Пераслаць\nM - Перамясціць\nV - Адправіць у архіў\nY - Скапіяваць\nZ - Пазначыць (не)прачытаным\nG - Адзначыць\nO - Тып сартавання\nI - Парадак сартавання\nQ - Вярнуцца да каталогаў\nS - Абраць / Адкінуць выбар</string>
   <string name="folder_list_filter_hint">Пошук каталога</string>
   <string name="folder_list_display_mode_label">Паказваць каталогі…</string>
   <string name="folder_list_display_mode_all">Усе каталогі</string>
@@ -906,8 +920,12 @@
   <string name="crypto_no_provider_title">Ліст зашыфраваны</string>
   <string name="crypto_no_provider_message">Ліст зашыфраваны OpenPGP\nКаб прачытаць, неабходна ўсталяваць і наладзіць праграму OpenPGP.</string>
   <string name="crypto_no_provider_button">Перайсці ў налады</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Лісты Mail</string>
   <string name="mail_list_widget_loading">Загрузка лістоў…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Загрузка…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Загрузка…</string>
   <string name="openpgp_enabled_error_title">Зашыфраваць немагчыма</string>
   <string name="openpgp_enabled_error_msg">Некаторыя з гэтых адрасатаў не падтрымліваюць такую функцыю!</string>
   <string name="enable_encryption">Уключыць шыфраванне</string>
@@ -958,4 +976,22 @@
   <string name="permission_contacts_rationale_title">Дазволіць доступ да кантактаў</string>
   <string name="permission_contacts_rationale_message">Для вываду прапаноў імёнаў і фота праграме неабходна мець доступ да кантактаў.</string>
   <string name="generic_loading_error">Падчас загрузкі даных адбылася памылка</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Абраць</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Зняць выбар</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Пазначыць як нечытанае</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Адзначыць</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Выдаліць адзнаку</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Архіў</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Выдаліць</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 768846e2e8323ed1849b829ac82fcd618e20c622..0a66adae86da59c1925eabca5bb420d56dc01303 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -225,6 +225,22 @@
   <string name="global_settings_confirm_menu_discard">Изтрийте съобщението</string>
   <string name="global_settings_confirm_menu_mark_all_read">Отбелязване на всички съобщения като прочетени</string>
   <string name="global_settings_confirm_action_delete_notif">Изтрийте (от лентата с известия)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Никой</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Архивирайте</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Изтрий</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Премести</string>
   <string name="global_settings_privacy_hide_useragent">Скриване на имейл програмата</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Скриване на времевата зона</string>
@@ -552,8 +568,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Неразпознат сертификат</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Приеми ключа</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Отхвърли ключа</string>
-  <string name="message_view_help_key">Del (or D) - Изтриване\nR - Отговор\nA - Отговор на всички\nC - Създаване\nF - Препращане\nM - Премесване\nV - Архивиране\nY - Копиране\nZ - Отбелязване като (не)прочетно\nG - Звезда\nO - Сортиране\nI - Приоритет на сортиране\nQ - Обратно към папките\nS - Отбелязване/премахване на отбелязване\nJ или P - Предно съобщение\nK или N - Следващо съобщение</string>
-  <string name="message_list_help_key">Del (or D) - Изтриване\nC - Създаване\nM - Премесване\nV - Архивиране\nC - Копиране\nZ - Отбелязване като (не)прочетно\nG - Звезда\nO - Сортиране\nI - Приоритет на сортиране\nQ - Обратно към папките\nS - Отбелязване/премахване на отбелязване</string>
   <string name="folder_list_filter_hint">Името на папката съдържа</string>
   <string name="folder_list_display_mode_label">Покажи папките…</string>
   <string name="folder_list_display_mode_all">Всички папки</string>
@@ -892,8 +906,12 @@
   <string name="crypto_no_provider_title">Имейлът е криптиран</string>
   <string name="crypto_no_provider_message">Този имейл е криптиран използвайки OpenPGP.\nЗа да го прочетете, трябва да инсталирате и настроите OpenPGP приложението.</string>
   <string name="crypto_no_provider_button">Към настройки</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail списък със собщения</string>
   <string name="mail_list_widget_loading">Зареждане на съобщения…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Зареждане…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Зареждане…</string>
   <string name="openpgp_enabled_error_title">Криптирането е невъзможно</string>
   <string name="openpgp_enabled_error_msg">Някои от избраните получатели не поддържат тази функция!</string>
   <string name="enable_encryption">Включване на криптирането</string>
@@ -955,4 +973,22 @@
   <string name="push_info_configure_notification_action">Конфигурирайте известия</string>
   <string name="push_info_disable_push_text">Ако нямате нужда от мигновени известия, трябва да деактивирате Push и да използвате Polling. Polling проверява за нови писма на регулярни интервали и не се нуждае от известия.</string>
   <string name="push_info_disable_push_action">Изключи Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Избери</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Отмени Избор</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Маркирай като непрочетено</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Добави звезда</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Премахни звезда</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Архивирайте</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Изтрий</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 02d40db15a0225db958978b15dabe7535283c3d6..cbfeb2ca5ac6b690d2a2ef95eed85a0b8edfb5ad 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -207,6 +207,22 @@
   <string name="global_settings_confirm_menu_discard">Dilezel ar gemennadenn</string>
   <string name="global_settings_confirm_menu_mark_all_read">Merkañ an holl gemennadennoù evel lennet</string>
   <string name="global_settings_confirm_action_delete_notif">Dilemel (er rebuziñ)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Netra</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Dielloù</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Dilemel</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Lastez</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Dilec’hiañ</string>
   <string name="global_settings_privacy_hide_useragent">Kuzhat an arval postel</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Kuzhat ar gwerzhid-eur</string>
@@ -534,8 +550,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Testeni dianav</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Asantiñ an alc’hwez</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Nac’h an alc’hwez</string>
-  <string name="message_view_help_key">Del (pe D) - Dilemel\nR - Respont\nA - Respont d’an holl\nC - Skridaozañ\nF - Treuzkas\nM - Dilec’hiañ\nV - Diellaouiñ\nY - Eilañ\nZ - Merkañ evel (An)lennet\nG - Steredenniñ\nO - Doare urzhiañ\nI - Tu an urzh\nQ - Distreiñ d’an teuliadoù\nS - (Di)ziuzañ\nJ or P - Kemennadenn gent\nK pe N - Kemennadenn da heul</string>
-  <string name="message_list_help_key">Del (pe D) - Dilemel\nC - Skridaozañ\nM - Dilec’hiañ\nV - Diellaouiñ\nY - Eilañ\nZ - Merkañ evel (An)Lennet\nG - Steredenniñ\nO - Doare urzhiañ\nI - Tu an urzhiañ\nQ - Distreiñ d’an teuliadoù\nS - (Di)ziuzañ</string>
   <string name="folder_list_filter_hint">Anv an teuliad a endalc’h</string>
   <string name="folder_list_display_mode_label">Diskouez an teuliadoù</string>
   <string name="folder_list_display_mode_all">An holl deuliadoù</string>
@@ -856,6 +870,10 @@
   <string name="crypto_no_provider_button">Mont d\'an arventennoù</string>
   <string name="mail_list_widget_text">Roll kemennadennoù Mail</string>
   <string name="mail_list_widget_loading">O kargañ kemennadennoù...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">O kargañ…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">O kargañ…</string>
   <string name="openpgp_enabled_error_title">N’eo ket posupl enrinegañ</string>
   <string name="openpgp_enabled_error_msg">Ul lodenn eus an degemererien ne skoront ket ar c’heweriuster-mañ!</string>
   <string name="enable_encryption">Gweredekaat an enrinegañ</string>
@@ -903,4 +921,22 @@ Gallout a rit mirout ar gemennadenn-mañ hag implij anezhi evel un enrolladenn e
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Aotren da haeziñ an darempredoù</string>
   <string name="permission_contacts_rationale_message">Evit bezañ gouest da ginnig darempredoù hag evit skrammañ anvioù ha skeudennoù an darempredoù en deus ezhomm an arload da haeziñ ho tarempredoù.</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Diuzañ</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Diziuzañ</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Merkañ evel anlennet</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Ouzhpennañ ur steredenn</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Dilemel ar steredenn</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Dielloù</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Dilemel</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Lastez</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 40444f4b469b6c2b5e87966b82b022720a51ad5a..b143b446020c34560a7afe685e6d0f595f5da1da 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -192,7 +192,7 @@
   <string name="message_compose_show_quoted_text_action">Inclou el missatge citat</string>
   <string name="message_compose_description_delete_quoted_text">Elimina el text citat</string>
   <string name="message_compose_description_edit_quoted_text">Edita el text citat</string>
-  <string name="remove_attachment_action">Suprimeix l\'adjunt</string>
+  <string name="remove_attachment_action">Elimina l\'adjunt</string>
   <string name="message_view_from_format">De: <xliff:g id="name">%1$s</xliff:g> &lt;<xliff:g id="email">%2$s</xliff:g>&gt;</string>
   <string name="message_to_label">A:</string>
   <string name="message_view_cc_label">A/c:</string>
@@ -235,6 +235,28 @@
   <string name="global_settings_confirm_menu_discard">Descarta el missatge</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marca tots els missatges com a llegits</string>
   <string name="global_settings_confirm_action_delete_notif">Elimina (des de notificacions)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Accions lliscants</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Llisca a la dreta</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Llisca a l\'esquerra</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Cap</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Commuta la selecció</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Marca-ho com a llegit / no llegit</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Elimina / afegeix un estel</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arxiva</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Elimina</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Correu brossa</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mou</string>
   <string name="global_settings_privacy_hide_useragent">Amaga el client de correu</string>
   <string name="global_settings_privacy_hide_useragent_detail">Suprimeix el nom Mail User-Agent de les capçaleres del missatge</string>
   <string name="global_settings_privacy_hide_timezone">Amaga el fus horari</string>
@@ -399,6 +421,9 @@
   <string name="account_settings_mark_message_as_read_on_view_summary">Marca el missatge com a llegit després d\'haver-lo obert.</string>
   <string name="account_settings_mark_message_as_read_on_delete_label">Marca com a llegit quan se suprimeixi</string>
   <string name="account_settings_mark_message_as_read_on_delete_summary">Marca un missatge com a llegit quan se suprimeix.</string>
+  <string name="account_settings_notification_channels_label">Categories de notificacions</string>
+  <string name="account_settings_open_notification_settings_messages_summary">Configureu les notificacions per als missatges nous</string>
+  <string name="account_settings_open_notification_settings_miscellaneous_summary">Configureu les notificacions per als errors i l\'estat</string>
   <string name="account_settings_show_pictures_label">Sempre mostra les imatges</string>
   <string name="account_settings_show_pictures_never">No</string>
   <string name="account_settings_show_pictures_only_from_contacts">Dels contactes</string>
@@ -605,8 +630,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificat no reconegut</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepta la clau</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rebutja la clau</string>
-  <string name="message_view_help_key">Del (o D) - Elimina\nR - Respon\nA - Respon a tothom\nC - Escriu\nF - Reenvia\nM - Mou\nV - Arxiva\nY - Copia\nZ - Marca com a (no) llegit\nG - Estel\nO - Per tipus\nI - Per ordre\nQ - Torna a les carpetes\nS - Selecciona  / desmarca\nJ o P - Missatge anterior n\K o N - Missatge següent</string>
-  <string name="message_list_help_key">Del (o D) - Elimina\nC - Escriu\nM - Mou\nV - Arxiva\nY - Copia\nZ - Marca com a (no) llegit\nG - Estel\nO - Tipus de classificació\nI - Ordre de classificació\nQ - Torna a les carpetes\nS - Selecciona  / desmarca</string>
   <string name="folder_list_filter_hint">El nom de carpeta conté</string>
   <string name="folder_list_display_mode_label">Carpetes...</string>
   <string name="folder_list_display_mode_all">Mostra totes les carpetes</string>
@@ -654,6 +677,7 @@
   <string name="account_setup_push_limit_1000">1000 carpetes</string>
   <string name="animations_title">Animació</string>
   <string name="animations_summary">Utilitza efectes visuals cridaners</string>
+  <string name="volume_navigation_title">Navegació amb la tecla de volum a la vista de missatges</string>
   <string name="show_unified_inbox_title">Mostra la safata d\'entrada unificada</string>
   <string name="integrated_inbox_title">Bústia unificada</string>
   <string name="integrated_inbox_detail">Tots els missatges en carpetes unificades</string>
@@ -705,7 +729,7 @@
   <string name="confirm_discard_draft_message_title">Descarto el missatge?</string>
   <string name="confirm_discard_draft_message">Segur que voleu descartar aquest missatge?</string>
   <string name="dialog_confirm_clear_local_folder_title">Voleu netejar els missatges locals?</string>
-  <string name="dialog_confirm_clear_local_folder_message">Això suprimirà tots els missatges locals de la carpeta. No se suprimirà cap missatge del servidor.</string>
+  <string name="dialog_confirm_clear_local_folder_message">Això eliminarà tots els missatges locals de la carpeta. No s\'eliminarà cap missatge del servidor.</string>
   <string name="dialog_confirm_clear_local_folder_action">Neteja els missatges</string>
   <string name="dialog_confirm_delete_title">Confirmeu l\'eliminació</string>
   <string name="dialog_confirm_delete_message">Voleu eliminar aquest missatge?</string>
@@ -951,6 +975,10 @@
   <string name="crypto_no_provider_button">Ves a la configuració</string>
   <string name="mail_list_widget_text">Llista de missatges del K-9</string>
   <string name="mail_list_widget_loading">Carregant missatges...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">S\'està carregant…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">S\'està carregant…</string>
   <string name="openpgp_enabled_error_title">Encriptació no possible</string>
   <string name="openpgp_enabled_error_msg">Alguns dels destinataris seleccionats no admeten aquesta característica!</string>
   <string name="enable_encryption">Habilita l\'encriptació</string>
@@ -1012,4 +1040,24 @@ Podeu guardar aquest missatge i usar-lo com a còpia de seguretat per a la vostr
   <string name="push_info_configure_notification_action">Configureu la notificació</string>
   <string name="push_info_disable_push_text">Si no necessiteu notificacions instantànies sobre missatges nous, haureu de desactivar Tramesa i utilitzar Sondeig. El sondeig comprova si hi ha correus nous a intervals regulars i no necessita la notificació.</string>
   <string name="push_info_disable_push_action">Desactiva la Tramesa</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Selecciona</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Desselecciona</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Marca com a llegit</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marca com a no llegit</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Afegeix un estel</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Elimina l\'estel</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arxiva</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Elimina</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Correu brossa</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Mou…</string>
 </resources>
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 4381f4ddf44cd625eb0ea88fd1e75c5c5140022b..90e1b132ff2bccecb6b589fd70a2cfd6cd7d8f57 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -240,6 +240,22 @@
   <string name="global_settings_confirm_menu_discard">Zahodit zprávu</string>
   <string name="global_settings_confirm_menu_mark_all_read">Označit všechny zprávy jako přečtené</string>
   <string name="global_settings_confirm_action_delete_notif">Smazat (z oznámení)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Žádné</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archivovat</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Smazat</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Nevyžádaná</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Přesunout</string>
   <string name="global_settings_privacy_hide_useragent">Skrýt e-mailového klienta</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Skrýt časovou zónu</string>
@@ -613,8 +629,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nerozpoznaný certifikát</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Přijmout klíč</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odmítnout klíč</string>
-  <string name="message_view_help_key">Delete (nebo D) – Smazat\nR – Odpovědět\nA – Odpovědět všem\nC – Vytvořit\nF – Přeposlat\nM – Přesunout\nV - Archivovat\nY – Kopírovat\nZ – Označit (Ne)přečtené\nG – Hvězdička\nO – Uspořádat podle typu\nI – Uspořádat podle pořadí\nQ – Zpět ke složkám\nS – Označit/odznačit\nJ nebo P – Předešlá zpráva\nK nebo N – Další zpráva</string>
-  <string name="message_list_help_key">Delete (nebo D) – Smazat\nC – Vytvořit\nM – Přesunout\nV – Archivovat\nY – Zkopírovat\nZ – Označit jako (ne)přečtené\nG – Označit hvězdičkou\nO – Typ řazení\nI – Pořadí řazení\nQ – Návrat na složky\nS – Označit / zrušit označení</string>
   <string name="folder_list_filter_hint">Název složky obsahuje</string>
   <string name="folder_list_display_mode_label">Zobrazit složky…</string>
   <string name="folder_list_display_mode_all">Všechny složky</string>
@@ -968,8 +982,12 @@
   <string name="crypto_no_provider_title">Tento e-mail je šifrovaný</string>
   <string name="crypto_no_provider_message">Tento email byl zašifrovaný pomocí OpenPGP.\nAbyste si ho mohl/a přečíst, potřebujete si nainstalovat a nakonfigurovat kompatibilní OpenPGP aplikaci.</string>
   <string name="crypto_no_provider_button">Přejít do nastavení</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Seznam zpráv Mail</string>
   <string name="mail_list_widget_loading">Načítání zpráv…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Načítání…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Načítání…</string>
   <string name="openpgp_enabled_error_title">Šifrování není možné</string>
   <string name="openpgp_enabled_error_msg">Někteří ze zvolených příjemců nepodporují tuto funkci!</string>
   <string name="enable_encryption">Zapnout šifrování</string>
@@ -1030,4 +1048,22 @@ Tuto zprávu si můžete ponechat a použít jí jako zálohu svého tajného kl
   <string name="push_info_configure_notification_action">Nastavit upozorňování</string>
   <string name="push_info_disable_push_text">Pokud nepotřebujete okamžitá upozornění na nové zprávy, měli byste Push vypnout a použít pravidelné dotazování se. To kontroluje nové e-maily v pravidelném intervalu a nepotřebuje upozornění.</string>
   <string name="push_info_disable_push_action">Vypnout Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Vybrat</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Zrušit výběr</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Označit jako nepřečtené</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Přidat \u2605</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Odebrat \u2606</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archivovat</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Smazat</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Nevyžádaná</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 cd062d9f37f4984a81f9f7bd7b79ef841801e680..5afd2e360095f175266aed744ed8d1780e8aaab0 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -12,7 +12,10 @@
   <string name="app_license">Trwydded Apache, Fersiwn 2.0</string>
   <string name="about_project_title">Prosiect Cod Agored</string>
   <string name="about_website_title">Gwefan</string>
+  <string name="user_manual_title">Llawlyfr defnyddiwr</string>
+  <string name="get_help_title">Cael cymorth</string>
   <string name="user_forum_title">Fforwm defnyddiwyr</string>
+  <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Llyfrgelloedd</string>
   <string name="license">Trwydded</string>
@@ -46,7 +49,7 @@
   <string name="choose_account_title">Dewis cyfrif</string>
   <string name="choose_folder_title">Dewis ffolder</string>
   <string name="choose_folder_move_title">Symud i...</string>
-  <string name="choose_folder_copy_title">Copïo i...</string>
+  <string name="choose_folder_copy_title">Copïo i…</string>
   <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> wedi\'i dewis</string>
   <string name="next_action">Nesaf</string>
   <string name="previous_action">Blaenorol</string>
@@ -146,7 +149,9 @@
   <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-->
+  <string name="notification_notify_error_title">Gwall hysbysiad</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">Bu gwall wrth geisio creu hysbysiad system am neges newydd. Mae\'n debyg mai\'r rheswm yw bod sain hysbysiad ar goll.\n\nTapia i agor gosodiadau hysbysiadau.</string>
   <string name="notification_bg_sync_ticker">Yn gwirio am negeseuon: <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
@@ -171,7 +176,7 @@
   <string name="debug_enable_sensitive_logging_summary">Gall dangos cyfrineiriau mewn logiau.</string>
   <string name="debug_export_logs_title">Allforio logiau</string>
   <string name="debug_export_logs_success">Allforiwyd yn llwyddiannus. Gall logiau gynnwys gwybodaeth sensitif. Byddwch yn ofalus gyda phwy rydych yn eu rhannu.</string>
-  <string name="debug_export_logs_failure">Methwyd yr allforio.</string>
+  <string name="debug_export_logs_failure">Methodd yr allforio.</string>
   <string name="message_list_load_more_messages_action">Llwytho rhagor o negeseuon</string>
   <string name="message_to_fmt">At:<xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_subject_hint">Pwnc</string>
@@ -235,6 +240,22 @@
   <string name="global_settings_confirm_menu_discard">Dileu neges</string>
   <string name="global_settings_confirm_menu_mark_all_read">Nodi pob neges fel ei wedi ei darllen</string>
   <string name="global_settings_confirm_action_delete_notif">Dileu (o hysbysiad)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Dim</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archif</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Dileu</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Sbam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Symud</string>
   <string name="global_settings_privacy_hide_useragent">Cuddio cleient e-bost</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Cuddio cylchfa amser</string>
@@ -372,6 +393,7 @@
   <string name="account_setup_failed_dlg_server_message_fmt">Methwyd cysylltu gyda\'r gweinydd.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_oauth_flow_canceled">Diddymwyd awdurdodi</string>
   <string name="account_setup_failed_dlg_oauth_flow_failed">Methodd awdurdodi gyda\'r gwall hwn: <xliff:g id="error">%s</xliff:g></string>
+  <string name="account_setup_failed_dlg_oauth_not_supported">Ni chefnogir OAuth 2.0 ar hyn o bryd gyda\'r darparydd hwn.</string>
   <string name="account_setup_failed_dlg_browser_not_found">Methodd yr ap hwn ddod o hyd i borwr i\'w ddefnyddio i roi mynediad at dy gyfrif.</string>
   <string name="account_setup_failed_dlg_edit_details_action">Golygu manylion</string>
   <string name="account_setup_failed_dlg_continue_action">Parhau</string>
@@ -513,6 +535,7 @@
   <string name="folder_settings_folder_push_mode_normal">Dim Rhenc</string>
   <string name="folder_settings_folder_push_mode_first_class">Rhenc 1af</string>
   <string name="folder_settings_folder_push_mode_second_class">2ail renc</string>
+  <string name="folder_settings_folder_push_mode_inherited">Fel rhenc gwirio</string>
   <string name="folder_settings_folder_notify_mode_label">Rhenc hysbysiadau\'r ffolder</string>
   <string name="folder_settings_folder_notify_mode_normal">Dim rhenc</string>
   <string name="folder_settings_folder_notify_mode_first_class">Rhenc 1af</string>
@@ -606,8 +629,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Tystysgrif Ddiarth</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Derbyn Allwedd</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Gwrthod Allwedd</string>
-  <string name="message_view_help_key">Del (neu D) - Dileu\nR - Ateb\nA - Ateb i bawb\nC - Cyfansoddi\nF - Anfon ymlaen\nM - Symud\nV - Archifo\nY - Copïo\nZ - Nodi heb/wedi ei darllen\nG - Serennu\nO - Math o drefn\nI - Trefn sortio\nQ - Nôl i\'r ffolderi\nS - Dewis/dad-ddewis\nJ neu P - Neges flaenorol\nK neu N - Neges nesaf</string>
-  <string name="message_list_help_key">Del (neu D) - Dileu\nC - Cyfansoddi\nM - Symud\nV - Archive\nY - Copy\nZ -Nodi wedi/heb ei darllen\nG - Serennu\nO - Math o drefn\nI - Trefn\nQ - Nôl i\'r ffolderi\nS - Dewis/dad-ddewis</string>
   <string name="folder_list_filter_hint">Enw ffolder yn cynnwys</string>
   <string name="folder_list_display_mode_label">Dangos ffolderi…</string>
   <string name="folder_list_display_mode_all">Pob ffolder</string>
@@ -655,7 +676,9 @@
   <string name="account_setup_push_limit_1000">1000 o ffolderi</string>
   <string name="animations_title">Animeiddiad</string>
   <string name="animations_summary">Defnyddio effeithiau gweledol dros ben llestri</string>
+  <string name="volume_navigation_title">Llywio gyda botymau sain ym modd golwg neges</string>
   <string name="show_unified_inbox_title">Dangos mewnflwch unedig</string>
+  <string name="show_starred_count_title">Dangos cyfrif serennog</string>
   <string name="integrated_inbox_title">Mewnflwch Unedig</string>
   <string name="integrated_inbox_detail">Holl negeseuon pob cyfrif mewn un ffolder unedig</string>
   <string name="folder_settings_include_in_integrated_inbox_label">Uno</string>
@@ -738,7 +761,7 @@
   <string name="messagelist_sent_cc_me_sigil">›</string>
   <string name="settings_list_backup_category">Copi wrth gefn</string>
   <string name="settings_list_miscellaneous_category">Amrywiol</string>
-  <string name="settings_export_title">Archwilio gosodiadau</string>
+  <string name="settings_export_title">Allforio gosodiadau</string>
   <string name="settings_export_button">Allforio</string>
   <string name="settings_export_share_button">Rhannu</string>
   <string name="settings_export_progress_text">Yn allforio gosodiadau…</string>
@@ -960,8 +983,12 @@
   <string name="crypto_no_provider_title">Mae\'r neges e-bost hon wedi ei amgryptio.</string>
   <string name="crypto_no_provider_message">Mae\'r neges e-bost hon wedi ei amgryptio gydag OpenPGP.\nI\'w darllen, rhaid gosod a ffurfweddu ap OpenPGP sy\'n cydweddu.</string>
   <string name="crypto_no_provider_button">Mynd i Osodiadau</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Rhestr Negeseuon Mail</string>
   <string name="mail_list_widget_loading">Yn llwytho negeseuon…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Yn llwytho…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Yn llwytho…</string>
   <string name="openpgp_enabled_error_title">Dyw amgryptiad ddim ar gael.</string>
   <string name="openpgp_enabled_error_msg">Dyw rhai o\'r derbynnwyr ddim yn cefnogi\'r nodwedd hon.</string>
   <string name="enable_encryption">Galluogi amgryptio</string>
@@ -1011,10 +1038,34 @@ Mae\'n bosib i ti gadw\'r neges hon a\'i ddefnyddio wrth gefn fel dy allwedd gyf
   <string name="permission_contacts_rationale_title">Caniatáu mynediad at gysylltiadau</string>
   <string name="permission_contacts_rationale_message">Er mwyn medru awgrymu cysylltiadau a dangos lluniau ac enwau cysylltiadau, mae ar yr ap angen mynediad at dy gysylltiadau.</string>
   <string name="generic_loading_error">Bu gwall wrth lwytho\'r data</string>
+  <string name="push_notification_state_initializing">Yn ymgychwyn…</string>
   <string name="push_notification_state_listening">Yn aros am negeseuon e-bost newydd</string>
+  <string name="push_notification_state_wait_background_sync">Yn cysgu nes bod cysoni yn y cefndir wedi\'i ganiatáu</string>
   <string name="push_notification_state_wait_network">Yn cysgu nes bod rhwydwaith ar gael</string>
   <string name="push_notification_info">Tapiwch i ddysgu rhagor.</string>
+  <string name="push_info_title">Gwybodaeth gwthio</string>
+  <string name="push_info_notification_explanation_text">Pan yn defnyddio Gwthio, mae K-9 Mail yn cadw cysylltiad â\'r gweinydd ebost. Mae ar Android angen dangos hysbysiad parhaus tra bod yr ap yn weithredol yn y cefndir. %s</string>
   <string name="push_info_configure_notification_text">Fodd bynnag, mae Android hefyd yn eich galluogi i guddio\'r hysbysiad.</string>
   <string name="push_info_learn_more_text">Dysgu rhagor</string>
   <string name="push_info_configure_notification_action">Ffurfweddu hysbysiad</string>
+  <string name="push_info_disable_push_text">Os nad wyt angen hysbysiadau ar unwaith am negeseuon newydd, analluoga Gwthio a defnyddio Gwirio. Mae Gwirio yn edrych am negeseuon newydd ar gyfnodau rheolaidd heb fod angen yr hysbysiad parhaus.</string>
+  <string name="push_info_disable_push_action">Analluogi Gwthio</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Dewis</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Dad-ddewis</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Nodi heb ei darllen</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Ychwanegu seren</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Tynnu seren</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archif</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Dileu</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Sbam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 8fc95e1ef30237dd04da9a4a1234ce0967210dc1..c3c95faffd45b8b8e78cdb78e61f4a56723930a5 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -229,6 +229,22 @@
   <string name="global_settings_confirm_menu_discard">Kassér meddelelse</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marker alle meddelelser som læst</string>
   <string name="global_settings_confirm_action_delete_notif">Slet (fra beskedbjælke)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Ingen</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arkivere</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Slet</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Flyt</string>
   <string name="global_settings_privacy_hide_useragent">Skjul mail klient</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Skjul tidszone</string>
@@ -581,8 +597,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Ukendt certificat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptér nøgle</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Afvis nøgle</string>
-  <string name="message_view_help_key">Del (or D) - Slet\nR - Svar\nA - Svar alle\nC - Skriv besked\nF - Videresend\nM - Flyt\nV - Arkiver\nY - Kopier\nZ - Marker (U)læst\nG - Stjernemarker\nO - Sorteringstype\nI - Sortering\nQ - Tilbage til Mapper\nS - Marker/afmarker\nJ or P - Forrige meddelelse\nK or N - Næste Meddelelse</string>
-  <string name="message_list_help_key">Del (or D) - Slet\nC - Skriv besked\nM - Flyt\nV - Arkiver\nY - Kopier\nZ - Marker (U)læst\nG - Stjernemarker\nO - Sorteringstype\nI - Sorteringsorden\nQ - Tilbage til mapper\nS - Marker/afmaker</string>
   <string name="folder_list_filter_hint">Mappenavn indeholder</string>
   <string name="folder_list_display_mode_label">Mapper</string>
   <string name="folder_list_display_mode_all">Vis alle mapper</string>
@@ -921,8 +935,12 @@
   <string name="crypto_no_provider_title">Denne email er krypteret</string>
   <string name="crypto_no_provider_message">Denne email er krypteret med OpenPGP.\nFor at læse den skal du installere en kompatibel OpenPGP applikation.</string>
   <string name="crypto_no_provider_button">Gå til opsætning</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail Meddelelsesliste</string>
   <string name="mail_list_widget_loading">Indlæser meddelelser…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Indlæser…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Indlæser…</string>
   <string name="openpgp_enabled_error_title">Kryptering var ikke mulig</string>
   <string name="openpgp_enabled_error_msg">Nogle af de valgte modtagere understøtter ikke denne funktion!</string>
   <string name="enable_encryption">Aktivér kryptering</string>
@@ -984,4 +1002,22 @@ Beskeden kan beholdes og bruges som sikkerhedskopi til den hemmelige nøgle. Hvi
   <string name="push_info_configure_notification_action">Indstille påmindelse</string>
   <string name="push_info_disable_push_text">Hvis der ikke er brug for hurtig påmindelse om nye beskeder, skal skub handling deaktiveres og test bruges. Test kontrollerer regelmæssigt efter ny post og har ikke brug for påmindelsen.</string>
   <string name="push_info_disable_push_action">Deaktivere skub handling </string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Vælg</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Fravælg</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marker som ulæst</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Tilføj stjernemarkering</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Fjern stjernemarkering</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arkivere</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Slet</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 e805537d547ac4c654be5bb87faee10c48ceaaec..302e68d674272402e1dd07102cace46a53d058fd 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -629,8 +629,6 @@ Bitte senden Sie Fehlerberichte, Ideen für neue Funktionen und stellen Sie Frag
     <string name="account_setup_failed_dlg_invalid_certificate_title">Ungültiges Zertifikat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Zertifikat akzeptieren</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Zertifikat ablehnen</string>
-    <string name="message_view_help_key">Entf (oder D) - Löschen\nR - Antworten\nA - Allen Antworten\nC - Verfassen\nF - Weiterleiten\nM - Verschieben\nV - Archivieren\nY - Kopieren\nZ - Als (un)gelesen markieren\nG - Wichtig\nO - Sortiertyp\nI - Sortierreihenfolge\nQ - Zurück zu den Ordnern\nS - Auswählen/Abwählen\nJ oder P - Vorherige Nachricht\nK oder N - Nächste Nachricht</string>
-    <string name="message_list_help_key">Entf (oder D) - Löschen\nC - Verfassen\nM - Verschieben\nV - Archivieren\nY - Kopieren\nZ - Als (un)gelesen markieren\nG - Wichtig\nO - Sortiertyp\nI - Sortierreihenfolge\nQ - Zurück zu den Ordnern\nS - Auswählen/Abwählen</string>
     <string name="folder_list_filter_hint">Ordnername enthält</string>
     <string name="folder_list_display_mode_label">Ordner anzeigen …</string>
     <string name="folder_list_display_mode_all">Alle Ordner anzeigen</string>
@@ -1071,4 +1069,4 @@ Sie können diese Nachricht aufheben und sie als Backup für Ihren geheimen Schl
     <string name="openpgp_dialog_create_key_pair">SCHLÜSSELPAAR ERZEUGEN</string>
     <string name="openpgp_dialog_cancel">ABBRECHEN</string>
     <string name="openpgp_dialog_proceed">WEITER</string>
-</resources>
\ No newline at end of file
+</resources>
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 c630a892c50a443331245164fcb8ad3df26d269b..c5eb03d9727929058f547781035ca5633b690eec 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -237,6 +237,22 @@
   <string name="global_settings_confirm_menu_discard">Απόρριψη μηνύματος</string>
   <string name="global_settings_confirm_menu_mark_all_read">Μαρκάρισμα όλων των μηνυμάτων ως αναγνωσμένων</string>
   <string name="global_settings_confirm_action_delete_notif">Διαγραφή (από ειδοποίηση)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Κανένας</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Αρχειοθέτηση</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Διαγραφή</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Ανεπιθύμητα</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Μετακίνηση</string>
   <string name="global_settings_privacy_hide_useragent">Απόκρυψη προγράμματος-πελάτη αλληλογραφίας</string>
   <string name="global_settings_privacy_hide_useragent_detail">Αφαίρεση του Πράκτορα-χρήστη Mail από την επικεφαλίδα του μηνύματος</string>
   <string name="global_settings_privacy_hide_timezone">Απόκρυψη ζώνης ώρας</string>
@@ -375,6 +391,7 @@
   <string name="account_setup_failed_dlg_oauth_flow_canceled">Η εξακρίβωση ακυρώθηκε</string>
   <string name="account_setup_failed_dlg_oauth_flow_failed">Η εξακρίβωση απέτυχε με το εξής σφάλμα: <xliff:g id="error">%s</xliff:g></string>
   <string name="account_setup_failed_dlg_oauth_not_supported">Το πρωτόκολο OAuth 2.0 αυτή τη στιγμή δεν υποστηρίζεται από τον συγκεκριμένο πάροχο.</string>
+  <string name="account_setup_failed_dlg_browser_not_found">Η εφαρμογή δεν βρήκε περιηγητή ιστού για να παράσχει πρόσβαση στον λογαριασμό σας.</string>
   <string name="account_setup_failed_dlg_edit_details_action">Διόρθωση λεπτομερειών</string>
   <string name="account_setup_failed_dlg_continue_action">Συνέχεια</string>
   <string name="account_settings_push_advanced_title">Προχωρημένα</string>
@@ -536,7 +553,10 @@
   <string name="account_settings_vibrate_pattern_4">Μοτίβο 4</string>
   <string name="account_settings_vibrate_pattern_5">Μοτίβο 5</string>
   <string name="account_settings_vibrate_times">Επανάληψη δόνησης</string>
+  <string name="account_settings_vibrate_summary_disabled">Απενεργοποιήθηκε</string>
   <string name="account_settings_ringtone">Κουδούνισμα με νέο μήνυμα</string>
+  <string name="account_settings_notification_light_label">Φωτεινή ειδοποίηση</string>
+  <string name="account_settings_notification_light_disabled">Απενεργοποιήθηκε</string>
   <string name="account_settings_notification_light_account_color">Χρώμα λογαριασμού</string>
   <string name="account_settings_notification_light_default_color">Προεπιλεγμένο χρώμα συστήματος</string>
   <string name="account_settings_notification_light_white">Λευκό</string>
@@ -544,6 +564,8 @@
   <string name="account_settings_notification_light_green">Πράσινο</string>
   <string name="account_settings_notification_light_blue">Μπλε</string>
   <string name="account_settings_notification_light_yellow">Κίτρινο</string>
+  <string name="account_settings_notification_light_cyan">Μωβ</string>
+  <string name="account_settings_notification_light_magenta">Ματζέντα</string>
   <string name="account_settings_composition_title">Επιλογές σύνθεσης μηνύματος</string>
   <string name="account_settings_composition_label">Εξ ορισμού σύνθεση</string>
   <string name="account_settings_composition_summary">Ορισμός εξ ορισμού Αποστολέα, Ιδιωτικής κοινοποίησης και υπογραφής</string>
@@ -601,8 +623,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Άγνωστο πιστοποιητικό</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Αποδοχή κλειδιού</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Απόρριψη κλειδιού</string>
-  <string name="message_view_help_key">Del (or D) - Διαγραφή\nR - Απάντηση\nA - Απάντηση Όλων\nC - Σύνθεση\nF - Προώθηση\nM - Μετακίνηση\nV - Αρχειοθέτηση\nY - Αντιγραφή\nZ - Σημείωση ως (μη) αναγνωσμένο\nG - Αστέρι\nO - Ταξινόμηση κατά τύπο\nI - Ταξινόμηση κατά σειρά\nQ - Επιστροφή στους Φακέλους\nS - Επιλογή/αποεπιλογή\nJ or P - Προηγούμενο Μήνυμα\nK or N - Επόμενο Μήνυμα</string>
-  <string name="message_list_help_key">Del (or D) - Διαγραφή\nC - Σύνθεση\nM - Μετακίνηση\nV - Αρχειοθέτηση\nY - Αντιγραφή\nZ - Σημείωση ως (μη) αναγνωσμένο\nG - Αστέρι\nO - Ταξινόμηση κατά τύπο\nI - Ταξινόμηση κατά σειρά\nQ - Επιστροφή στους Φακέλους\nS - Επιλογή/αποεπιλογή</string>
   <string name="folder_list_filter_hint">Το όνομα του φακέλου περιέχει</string>
   <string name="folder_list_display_mode_label">Φάκελοι</string>
   <string name="folder_list_display_mode_all">Προβολή όλων</string>
@@ -650,6 +670,7 @@
   <string name="account_setup_push_limit_1000">1000 φάκελοι</string>
   <string name="animations_title">Κινούμενα σχέδια</string>
   <string name="animations_summary">Χρήση οπτικών εφέ gaudy</string>
+  <string name="volume_navigation_title">Πλοήγηση με τα πλήκτρα ήχου όταν προβάλεται μήνυμα</string>
   <string name="show_unified_inbox_title">Εμφάνιση Ενιαία Εισερχόμενα</string>
   <string name="integrated_inbox_title">Ενιαία Εισερχόμενα</string>
   <string name="integrated_inbox_detail">Όλα τα μηνύματα στους ενοποιημένους φακέλους</string>
@@ -742,7 +763,9 @@
   <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
   <string name="settings_import_password_required">Παρακαλώ εισάγετε συνθηματικά</string>
   <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_required">Παρακαλώ συνδεθείτε</string>
   <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_and_password_required">Παρακαλώ συνδεθείτε και εισάγετε κωδικό</string>
   <string name="settings_import_failure">Αποτυχία εισαγωγής ρυθμίσεων</string>
   <string name="settings_import_read_failure">Αποτυχία ανάγνωσης αρχείου ρυθμίσεων</string>
   <string name="settings_import_partial_failure">Αποτυχία εισαγωγής ορισμένων ρυθμίσεων</string>
@@ -945,6 +968,10 @@
   <string name="crypto_no_provider_button">Μετάβαση στις Ρυθμίσεις</string>
   <string name="mail_list_widget_text">Λίστα Μηνυμάτων του Mail</string>
   <string name="mail_list_widget_loading">Φόρτωση μηνυμάτων...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Φόρτωση…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Φόρτωση…</string>
   <string name="openpgp_enabled_error_title">Δεν είναι δυνατή η κρυπτογράφηση</string>
   <string name="openpgp_enabled_error_msg">Ορισμένοι από τους επιλεγμένους παραλήπτες δεν υποστηρίζουν αυτήν τη δυνατότητα!</string>
   <string name="enable_encryption">Ενεργοποίηση Κρυπτογράφησης</string>
@@ -1006,4 +1033,22 @@
   <string name="push_info_configure_notification_action">Προσαρμογή ειδοποίησης</string>
   <string name="push_info_disable_push_text">Αν δεν χρειάζεστε άμεση ειδοποίηση για νέα μηνύματα, απενεργοποιήστε το σπρώξιμο και χρησιμοποιήστε ενημέρωση (Polling). Η ενημέρωση ελέγχει για νέα μηνύματα ανά τακτά χρονικά διαστήματα και δεν χρειάζεται την ειδοποίηση.</string>
   <string name="push_info_disable_push_action">Απενεργοποίηση σπρωξίματος</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Επιλογή</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Απο-επιλογή</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Σήμανση ως μη αναγνωσμένο</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Προσθήκη αστεριού</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Αφαίρεση αστεριού</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Αρχειοθέτηση</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Διαγραφή</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Ανεπιθύμητα</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 4e77e4be5af60c28c5e249c7ba18f262c21e60d8..abef9ef170eac0ebaa15e578341917f11333b5eb 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
@@ -17,6 +17,17 @@
   <!--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>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <!--Name of the swipe action to delete a message-->
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <!--Name of the swipe action to move a message to another folder-->
   <!--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-->
@@ -35,5 +46,17 @@
   <!--=== Client certificates specific ==================================================================-->
   <!--Note: This references message_view_download_remainder-->
   <string name="error_crypto_provider_ui_required">Failed to initialise end-to-end encryption, please check your settings</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 b657f41332e19b96099f553bca224ddc26b8a47f..51693bd50a2e8a26890d38f6ab6679d46e1b81a2 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -224,6 +224,22 @@
   <string name="global_settings_confirm_menu_discard">Ignori mesaĝon</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marki ĉiujn kiel legitajn</string>
   <string name="global_settings_confirm_action_delete_notif">Forigi (el sciigo)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nenia</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arĥivo</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Forigi</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Trudmesaĝo</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Movi</string>
   <string name="global_settings_privacy_hide_useragent">Kaŝi retpoŝtilan nomon</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Kaŝi horzonon</string>
@@ -570,8 +586,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nekonata atestilo</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Akcepti ŝlosilon</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rifuzi ŝlosilon</string>
-  <string name="message_view_help_key">Del (aŭ D) - forigi\nR - respondi\nA - respondi al ĉiuj\nC - krei\nF - plusendi\nM - movi\nV - arĥivigi\nY - kopii\nZ - marki kiel (ne)legitan\nG - steletigi\nO - ordiga tipo\nI - ordigo\nQ - reveni al mesaĝujoj\nS - (mal)elekti\nJ aŭ P -antaŭa mesaĝo\nK aŭ N - sekva mesaĝo</string>
-  <string name="message_list_help_key">Del (aŭ D) - forigi\nC - krei\nM - movi\nV - arĥivigi\nY - kopii\nZ - marki kiel (ne)legitan\nG - steletigi\nO - ordiga tipo\nI - ordigo\nQ - reveni al mesaĝujoj\nS - (mal)elekti</string>
   <string name="folder_list_filter_hint">Nomo de mesaĝujo enhavas</string>
   <string name="folder_list_display_mode_label">Montri mesaĝujojn…</string>
   <string name="folder_list_display_mode_all">Ĉiuj mesaĝujoj</string>
@@ -912,8 +926,12 @@
   <string name="crypto_no_provider_title">Tiu ĉi retletero estas ĉifrita</string>
   <string name="crypto_no_provider_message">Tiu ĉi retletero estas ĉifrita per OpenPGP.\nPor legi ĝin, vi devas instali kaj agordi kongruan OpenPGP-aplikaĵon.</string>
   <string name="crypto_no_provider_button">Iri al agordoj</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail mesaĝlisto</string>
   <string name="mail_list_widget_loading">Ŝargado de mesaĝoj…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Ŝargado…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Ŝargado…</string>
   <string name="openpgp_enabled_error_title">Ĉifrado ne eblas</string>
   <string name="openpgp_enabled_error_msg">Kelkaj da elektitaj ricevontoj ne subtenas tiun ĉi agordon!</string>
   <string name="enable_encryption">Aktivigi ĉifradon</string>
@@ -975,4 +993,22 @@ Vi povas konservi tiun ĉi mesaĝon kaj uzi ĝin kiel sekurkopion de via privata
   <string name="push_info_configure_notification_action">Agordi sciigon</string>
   <string name="push_info_disable_push_text">Se vi ne bezonas tujajn sciigojn pri novaj mesaĝoj, malaktivigu puŝ-sciigojn kaj uzu periodajn petojn «pooling». Periodaj petoj «pooling» kontrolas pri novaj retleteroj en ripetiĝanta tempintervalo kaj ne postulas vidigi la puŝ-sciigon,</string>
   <string name="push_info_disable_push_action">Malaktivigi puŝ-sciigojn</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Elekti</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Malelekti</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marki kiel nelegitan</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Steletigi</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Malsteletigi</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arĥivo</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Forigi</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Trudmesaĝo</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 a36fd29266b78b0e51bb111d5679d9ef4baf6980..512efc80ae5829b9db77f13f257a55025c8107bb 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -231,6 +231,28 @@
   <string name="global_settings_confirm_menu_discard">Descartar mensaje</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marcar todos los mensajes como leídos</string>
   <string name="global_settings_confirm_action_delete_notif">Borrar (de notificaciones)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Acciones al deslizar el dedo</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Al deslizar a la derecha</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Al deslizar a la izquierda</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Ninguno</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">De/seleccionar</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Marcar como leído/sin leer</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Marcar como destacado o no</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archivo</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Borrar</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mover</string>
   <string name="global_settings_privacy_hide_useragent">Ocultar cliente de correo</string>
   <string name="global_settings_privacy_hide_useragent_detail">Eliminar el Agente de Usuario Mail de las cabeceras del mensaje</string>
   <string name="global_settings_privacy_hide_timezone">Ocultar zona horaria</string>
@@ -600,8 +622,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado desconocido</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar clave</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rechazar clave</string>
-  <string name="message_view_help_key">Del (o D) - Borrar\nR - Responder\nA - Responder a todos\nC - Redactar\nF - Reenviar\nM - Mover\nV - Archivar\nY - Copiar\nZ - Marcar como (no) leído\nG - Estrella\nO - Tipo de ordenación\nI - Orden de ordenación\nQ - Volver a las carpetas\nS - Des/marcar\nJ o P - Mensaje anterior\nK o N - Siguiente mensaje</string>
-  <string name="message_list_help_key">Del (o D) - Borrar\nC - Redactar\nM - Mover\nV - Archivar\nY - Copiar\nZ - Marcar como (no) leído\nG - Estrella\nO - Tipo de ordenación\nI - Orden de ordenación\nQ - Volver a las carpetas\nS - Des/marcar</string>
   <string name="folder_list_filter_hint">El nombre de la carpeta contiene</string>
   <string name="folder_list_display_mode_label">Mostrar carpetas…</string>
   <string name="folder_list_display_mode_all">Ver todas las carpetas</string>
@@ -953,6 +973,10 @@
   <string name="mail_list_widget_loading">Cargando mensajes…</string>
   <string name="openpgp_enabled_error_title">Imposible el cifrado</string>
   <string name="openpgp_enabled_error_msg">¡Algunos remitentes marcados no soportan esta característica!</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Cargando…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Cargando…</string>
   <string name="enable_encryption">Activar cifrado</string>
   <string name="disable_encryption">Desactivar cifrado</string>
   <string name="openpgp_description_text1">El cifrado de los mensajes asegura que puedan ser leídos por el destinatario y por nadie más.</string>
@@ -1011,4 +1035,24 @@ Puede mantener este mensaje y usarlo como copia de seguridad de su clave secreta
   <string name="push_info_configure_notification_action">Configurar la apariencia de la notificación</string>
   <string name="push_info_disable_push_text">En caso de no necesitar notificaciones instantáneas de mensajes nuevos puedes desactivar las comprobaciones rápidas («push», o IDLE) y seguir utilizando comprobaciones normales («poll»); esta opción clásica pregunta al servidor de vez en cuando, conectándose de forma esporádica a intervalos regulares y no necesita mantener una conexión permanente ni mantener un servicio y notificación constante en segundo plano. Gastando menos batería.</string>
   <string name="push_info_disable_push_action">Desactivar sincronización rápida («push»)</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Seleccionar</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Deseleccionar</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Marcar como leído</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marcar como no leído</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Destacar el mensaje</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">No marcar como destacado</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archivo</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Borrar</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Mover…</string>
 </resources>
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 719a11c94a15ac16ee02ebe230204552695e14db..44967a593aca77628a9f331b09cb74d8b75735f3 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -227,6 +227,24 @@
   <string name="global_settings_confirm_menu_discard">Loobu kirjast</string>
   <string name="global_settings_confirm_menu_mark_all_read">Märgi kõik sõnumid loetuks</string>
   <string name="global_settings_confirm_action_delete_notif">Kustuta (teadetest)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Mitte ükski</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Märgi loetuks/mitteloetuks</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Lisa või eemalda tärn</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arhiveeri</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Kustuta</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Rämps</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Teisalda</string>
   <string name="global_settings_privacy_hide_useragent">Peida meiliklient</string>
   <string name="global_settings_privacy_hide_useragent_detail">Eemalda Mail User-Agent meili päistest</string>
   <string name="global_settings_privacy_hide_timezone">Peida ajavöönd</string>
@@ -596,7 +614,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Tunnustamata sertifikaat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aktsepteeri võti</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Keeldu võtmest</string>
-  <string name="message_view_help_key">Del (või D) - Kustuta\nR - Vasta\nA - Vasta kõigile\nC - Koosta\nF - Saada edasi\nM - Teisalda\nV - Arhiveeri\nY - Kopeeri\nZ - Märgi (mitte)loetuks\nG - Tärn\nO - Sortimise tüüp\nI - Sorteerimise järjekord\nQ - Tagasi kaustadesse\nS - Vali/Tühista valik\nJ or P - Eelmine sõnum\nK or N - Järgmine sõnum</string>
   <string name="folder_list_filter_hint">Kausta nimi sisaldab</string>
   <string name="folder_list_display_mode_label">Näita kaustu…</string>
   <string name="folder_list_display_mode_all">Kõik kaustad</string>
@@ -936,8 +953,12 @@
   <string name="crypto_no_provider_title">See e-kiri on krüpteeritud</string>
   <string name="crypto_no_provider_message">Selle kirja krüptimisel on kasutusel OpenPGP.\nKirjalugemsieks palun paigalda ja seadista sobilik OpenPGP rakendus.</string>
   <string name="crypto_no_provider_button">Ava sätted</string>
-  <string name="mail_list_widget_text">K-9 sõnumite nimekiri</string>
+  <string name="mail_list_widget_text">Mail sõnumite nimekiri</string>
   <string name="mail_list_widget_loading">Sõnumite laadimine&#8230;</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Laadib…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Laadib…</string>
   <string name="openpgp_enabled_error_title">Krüpteerimine poe võimalik</string>
   <string name="openpgp_enabled_error_msg">Mõned kirja saajad ei saa seda funktsionaalsust kasutada!</string>
   <string name="enable_encryption">Võimalda krüpteerimine</string>
@@ -999,4 +1020,22 @@ Palun jäta see kiri alles ning kasuta seda muu hulgas oma krüptovõtme varunda
   <string name="push_info_configure_notification_action">Seadista teavitusi</string>
   <string name="push_info_disable_push_text">Kui sul pole vaja ülikiiret infot saabunud kirjade kohta, siis lülita tõuketeenused välja ning lase K-9 Mail\'il kasutada tavapärast uute kirjade kontrollimist. Sellisel juhul vaatab K-9 Mail seadistatud ajavahemiku järel serverist uusi kirju ja mainitud püsiteavitust pole vaja.</string>
   <string name="push_info_disable_push_action">Ära kasuta tõuketeenuseid</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Vali</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Tühista valik</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Märgi mitteloetuks</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Lisa tärn</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Eemalda tärn</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arhiveeri</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Kustuta</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Rämps</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 e9c4f8248bf9cc8d2a9ce27afcde4944a9544bfd..563c0a88fc5e4ee333b788c160c598e3697f6616 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -235,6 +235,28 @@
   <string name="global_settings_confirm_menu_discard">Baztertu mezua</string>
   <string name="global_settings_confirm_menu_mark_all_read">Markatu mezu guztiak irakurritako gisa</string>
   <string name="global_settings_confirm_action_delete_notif">Ezabatu (jakinarazpenetatik)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Hatza pasatzearen ekintzak </string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Pasatu hatza eskubirantz</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Pasatu hatza ezkerrerantz</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Bat ere ez</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Alderantzizkatu hautaketa</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Markatu irakurrita/irakurri gabe</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Jarri/kendu izarra</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Artxibatu</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Ezabatu</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Zabor-posta</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mugitu</string>
   <string name="global_settings_privacy_hide_useragent">Ezkutatu posta bezeroa</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Ezkutatu ordu-zona</string>
@@ -608,8 +630,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Ziurtagiri ezezaguna</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Onartu gakoa</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Baztertu gakoa</string>
-  <string name="message_view_help_key">Del (edo D) - Ezabatu\nR - Erantzun\nA - Erantzun denei\nC - Idatzi\nF - Birbidali\nM - Mugitu\nV - Artxibatu\nY - Kopiatu\nZ - Markatu irakurri (gabe) gisa\nG - Izarra\nO - Ordenatze mota\nI - Ordenatzeko irizpidea\nQ - Itzuli Karpetetara\nS - Hautatu/desautatu\nJ or P - Aurreko Mezua\nK or N - Hurrengo Mezua</string>
-  <string name="message_list_help_key">Del (edo D) - Ezabatu\nC - Idatzi\nM - Mugitu\nV - Artxibatu\nY - Kopiatu\nZ - Markatu irakurri (gabe) gisa\nG - Izarra\nO - Ordenatze mota\nI - Ordenatzeko irizpidea\nQ - Itzuli Karpetetara\nS - Hautatu/desautatu</string>
   <string name="folder_list_filter_hint">Karpetaren izenak dauka</string>
   <string name="folder_list_display_mode_label">Erakutsi karpetak…</string>
   <string name="folder_list_display_mode_all">Karpeta guztiak</string>
@@ -657,6 +677,7 @@
   <string name="account_setup_push_limit_1000">1000 karpeta</string>
   <string name="animations_title">Animazioak</string>
   <string name="animations_summary">Erabili bistaratze efektu nabarmenak</string>
+  <string name="volume_navigation_title">Nabigatu bolumenaren botoiekin mezuak ikusterakoan</string>
   <string name="show_unified_inbox_title">Erakutsi Sarrera Ontzi Bateratua</string>
   <string name="show_starred_count_title">Erakutsi kontu izardunak</string>
   <string name="integrated_inbox_title">Sarrerako ontzi bateratua</string>
@@ -953,8 +974,12 @@
   <string name="crypto_no_provider_title">Posta hau zifratuta dago</string>
   <string name="crypto_no_provider_message">Posta hau OpenPGPrekin zifratua izan da.\nIrakurtzeko, OpenPGPrekin bateragarria den aplikazio bat instalatu eta konfiguratu behar duzu.</string>
   <string name="crypto_no_provider_button">Joan ezarpenetara</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail Mezuen Zerrenda</string>
   <string name="mail_list_widget_loading">Mezuak kargatzen…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Kargatzen…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Kargatzen…</string>
   <string name="openpgp_enabled_error_title">Zifratzea ez da posible</string>
   <string name="openpgp_enabled_error_msg">Hautatutako hartzaile batzuek ez dute eginbide hau onartzen!</string>
   <string name="enable_encryption">Gaitu zifratzea</string>
@@ -1015,4 +1040,22 @@ Mezu hau gorde dezakezu eta zure gako sekretuaren babes-kopia gisa erabili. Hau
   <string name="push_info_configure_notification_action">Konfiguratu jakinarazpena</string>
   <string name="push_info_disable_push_text">Mezu berriei buruzko berehalako jakinarazpenik behar ez baduzu, Push desgaitu eta Bozketa erabili. Inkestak posta berriak egiaztatzen ditu aldizka eta ez du jakinarazpenik behar.</string>
   <string name="push_info_disable_push_action">Desgaitu \"Push\"a</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Hautatu</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Desautatu</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Markatu irakurri gabeko gisa</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Gehitu izarra</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Kendu izarra</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Artxibatu</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Ezabatu</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Zabor-posta</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 773b457c5c8f89fa62c84ab1f9ce09119d2b039e..cbb8088954c6b8844777b56dfcad877efcaa598c 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -227,6 +227,22 @@
   <string name="global_settings_confirm_menu_discard">دورانداختن پیام</string>
   <string name="global_settings_confirm_menu_mark_all_read">همهٔ پیام‌ها خوانده شد</string>
   <string name="global_settings_confirm_action_delete_notif">حذف (از اعلان)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">هیچ‌کدام</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">بایگانی</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">حذف</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">هرزنامه</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">انتقال</string>
   <string name="global_settings_privacy_hide_useragent">کارخواه رایانامه را مخفی کن</string>
   <string name="global_settings_privacy_hide_useragent_detail">شناسهٔ K-9 User-Agent را از سرایند رایانامه‌ها بردار</string>
   <string name="global_settings_privacy_hide_timezone">منطقهٔ زمانی را مخفی کن</string>
@@ -597,8 +613,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">گواهی ناشناس</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">پذیرش کلید</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">ردکردن کلید</string>
-  <string name="message_view_help_key">Del (یا D) - حذف\nR - پاسخ\nA - پاسخ به همه\nC - نوشتن\nF - هدایت\nM - انتقال\nV - بایگانی\nY - کپی\nZ - نشان بزن که (نـ)خواندم\nG - ستاره\nO - نوع ترتیب\nI - ترتیب\nQ - بازگشت به پوشه‌ها\nS - انتخاب (نـ)کردن\nJ یا P - پیام قبلی\nK یا N - پیام بعدی</string>
-  <string name="message_list_help_key">Del (یا D) - حذف\nC - نوشتن\nM - انتقال\nV - بایگانی\nY - کپی\nZ - نشان بزن که (نـ)خواندم\nG - ستاره\nO - نوع ترتیب\nI - ترتیب\nQ - بازگشت به پوشه‌ها\nS - انتخاب (نـ)کردن</string>
   <string name="folder_list_filter_hint">بخشی از نام پوشه</string>
   <string name="folder_list_display_mode_label">نمایش کدام پوشه‌ها…</string>
   <string name="folder_list_display_mode_all">همهٔ پوشه‌ها</string>
@@ -945,6 +959,10 @@
   <string name="crypto_no_provider_button">برو به تنظیمات</string>
   <string name="mail_list_widget_text">لیست پیام K-9</string>
   <string name="mail_list_widget_loading">بارگیری پیام‌ها...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">بارگیری…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">بارگیری…</string>
   <string name="openpgp_enabled_error_title">رمزنگاری ممکن نیست</string>
   <string name="openpgp_enabled_error_msg">بعضی از گیرندگان انتخابی از این ویژگی پشتیبانی نمی‌کنند!</string>
   <string name="enable_encryption">فعال‌سازی رمزنگاری</string>
@@ -1006,4 +1024,21 @@
   <string name="push_info_configure_notification_action">پیکربندی اعلان</string>
   <string name="push_info_disable_push_text">اگر برای پیام‌های جدید نیاز به اعلان آنی ندارید، بهتر است پیشرانی را غیرفعال کنید و سرکشی را به کار ببرید. روش سرکشی در فواصل زمانی منظم آمدن نامه‌های جدید را بررسی می‌کند و به آن اعلان نیاز ندارد.</string>
   <string name="push_info_disable_push_action">غیرفعال‌سازی پیشرانی</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">بی‌انتخاب</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">خوانده نشد</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">افزودن ستاره</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">حذف ستاره</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">بایگانی</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">حذف</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">هرزنامه</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 e063c2c63bcbb55fff5b60d06e47a3f73d1e80cc..01240ce3ca9ed474de67ba9fd9c0eb262514a59a 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -1,33 +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">Mail-tilit</string>
-  <string name="unread_widget_label">Mail-lukematon</string>
-  <!--Used in the about dialog-->
-  <string name="app_authors">The Mail Dog Walkers</string>
-  <string name="source_code">Lähdekoodi</string>
-  <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>
-  <string name="about_libraries">Kirjastot</string>
-  <string name="license">Lisenssi</string>
-  <string name="changelog_title">Muutosloki</string>
-  <string name="changelog_loading_error">Muutoslokia ei voitu ladata.</string>
-  <string name="changelog_version_title">Versio %s</string>
-  <string name="changelog_recent_changes_title">Mitä uutta</string>
-  <string name="changelog_show_recent_changes">Näytä viimeisimmät muutokset kun sovellus päivitettiin</string>
-  <string name="changelog_snackbar_text">Selvitä mitä uutta tämä julkaisu sisältää</string>
-  <!--Welcome message-->
-  <string name="welcome_message_title">Tervetuloa Mail Mailiin</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">Mail-tilit</string>
+    <string name="unread_widget_label">Mail-lukematon</string>
+    <!--Used in the about dialog-->
+    <string name="app_authors">The Mail Dog Walkers</string>
+    <string name="source_code">Lähdekoodi</string>
+    <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>
+    <string name="about_libraries">Kirjastot</string>
+    <string name="license">Lisenssi</string>
+    <string name="changelog_title">Muutosloki</string>
+    <string name="changelog_loading_error">Muutoslokia ei voitu ladata.</string>
+    <string name="changelog_version_title">Versio %s</string>
+    <string name="changelog_recent_changes_title">Mitä uutta</string>
+    <string name="changelog_show_recent_changes">Näytä viimeisimmät muutokset kun sovellus päivitettiin</string>
+    <string name="changelog_snackbar_text">Selvitä mitä uutta tämä julkaisu sisältää</string>
+    <!--Welcome message-->
+    <string name="welcome_message_title">Tervetuloa Mail Mailiin</string>
+    <string name="accounts_welcome"><![CDATA[
 <p>
 Mail on monipuolinen ilmainen sähköpostisovellus Androidille.
 </p><p>
@@ -56,967 +56,990 @@ Ilmoita virheistä, ota osaa sovelluskehitykseen ja esitä kysymyksiä osoittees
 <a href="https://github.com/k9mail/k-9/">https://github.com/k9mail/k-9/</a>.
 </p>
     ]]></string>
-  <!--Default signature-->
-  <string name="default_signature">-- \nLähetetty Android-laitteestani Mail Maililla. Pahoittelut vähäsanaisuudestani.</string>
-  <!--General strings that include the app name-->
-  <string name="account_delete_dlg_instructions_fmt">Tili \"<xliff:g id="account">%s</xliff:g>\" poistetaan Mailista.</string>
-  <!--=== General strings ==================================================================-->
-  <string name="authors">Tekijät</string>
-  <string name="about_title">Tietoja Mailista</string>
-  <string name="accounts_title">Tilit</string>
-  <string name="advanced">Lisäasetukset</string>
-  <string name="compose_title_compose">Kirjoita</string>
-  <string name="compose_title_reply">Vastaa</string>
-  <string name="compose_title_reply_all">Vastaa kaikille</string>
-  <string name="compose_title_forward">Välitä</string>
-  <string name="compose_title_forward_as_attachment">Välitä liitteenä</string>
-  <string name="choose_account_title">Valitse tili</string>
-  <string name="choose_folder_title">Valitse kansio</string>
-  <string name="choose_folder_move_title">Siirrä…</string>
-  <string name="choose_folder_copy_title">Kopioi…</string>
-  <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> valittu</string>
-  <string name="next_action">Seuraava</string>
-  <string name="previous_action">Edellinen</string>
-  <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
-  <string name="okay_action">OK</string>
-  <string name="cancel_action">Peruuta</string>
-  <string name="send_action">Lähetä</string>
-  <string name="empty_subject">Aihe on tyhjä, napsauta uudelleen lähettääksesi silti</string>
-  <string name="reply_action">Vastaa</string>
-  <string name="reply_all_action">Vastaa kaikille</string>
-  <string name="delete_action">Poista</string>
-  <string name="archive_action">Arkistoi</string>
-  <string name="spam_action">Roskaposti</string>
-  <string name="forward_action">Välitä</string>
-  <string name="forward_as_attachment_action">Välitä liitteenä</string>
-  <string name="edit_as_new_message_action">Muokkaa uutena viestinä</string>
-  <string name="move_action">Siirrä</string>
-  <string name="move_to_drafts_action">Siirrä luonnoksiin</string>
-  <string name="single_message_options_action">Lähetä…</string>
-  <string name="refile_action">Siirrä kansioon…</string>
-  <string name="done_action">Valmis</string>
-  <string name="discard_action">Hylkää</string>
-  <string name="save_draft_action">Tallenna luonnoksena</string>
-  <string name="check_mail_action">Tarkista sähköposti</string>
-  <string name="send_messages_action">Lähetä viestit</string>
-  <string name="refresh_folders_action">Päivitä kansiot</string>
-  <string name="filter_folders_action">Etsi kansio</string>
-  <string name="add_account_action">Lisää tili</string>
-  <string name="compose_action">Kirjoita</string>
-  <string name="search_action">Etsi</string>
-  <string name="search_everywhere_action">Etsi kaikkialta</string>
-  <string name="search_results">Hakutulokset</string>
-  <string name="new_messages_title">Uudet viestit</string>
-  <string name="preferences_action">Asetukset</string>
-  <string name="folders_action">Hallitse kansioita</string>
-  <string name="account_settings_action">Tilin asetukset</string>
-  <string name="remove_account_action">Poista tili</string>
-  <string name="mark_as_read_action">Merkitse luetuksi</string>
-  <string name="send_alternate_action">Jaa</string>
-  <string name="send_alternate_chooser_title">Valitse lähettäjä</string>
-  <string name="flag_action">Lisää tähti</string>
-  <string name="unflag_action">Poista tähti</string>
-  <string name="copy_action">Kopioi</string>
-  <string name="unsubscribe_action">Lopeta tilaus</string>
-  <string name="show_headers_action">Näytä otsikot</string>
-  <plurals name="copy_address_to_clipboard">
-    <item quantity="one">Osoite kopioitu leikepöydälle</item>
-    <item quantity="other">Osoitteet kopioitu leikepöydälle</item>
-  </plurals>
-  <string name="copy_subject_to_clipboard">Aiheen teksti kopioitu leikepöydälle</string>
-  <string name="message_view_theme_action_dark">Vaihda tummaan teemaan</string>
-  <string name="message_view_theme_action_light">Vaihda vaaleaan teemaan</string>
-  <string name="mark_as_unread_action">Merkitse lukemattomaksi</string>
-  <string name="read_receipt">Lukukuittaus</string>
-  <string name="read_receipt_enabled">Lukukuittaus pyydetään</string>
-  <string name="read_receipt_disabled">Lukukuittausta ei pyydetä</string>
-  <string name="add_attachment_action">Lisää liite</string>
-  <string name="empty_trash_action">Tyhjennä roskakori</string>
-  <string name="expunge_action">Poista pysyvästi</string>
-  <string name="about_action">Tietoja</string>
-  <string name="prefs_title">Asetukset</string>
-  <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
-  <string name="general_no_subject">(Ei aihetta)</string>
-  <string name="general_no_sender">Ei lähettäjää</string>
-  <string name="status_loading_more">Ladataan viestejä\u2026</string>
-  <string name="status_network_error">Yhteysvirhe</string>
-  <string name="status_invalid_id_error">Viestiä ei löytynyt</string>
-  <string name="status_loading_error">Viestin lataamisvirhe</string>
-  <string name="load_more_messages_fmt">Lataa <xliff:g id="messages_to_load">%d</xliff:g> lisää</string>
-  <string name="size_format_gigabytes">%.1f Gt</string>
-  <string name="size_format_megabytes">%.1f Mt</string>
-  <string name="size_format_kilobytes">%.1f kt</string>
-  <string name="size_format_bytes">%d t</string>
-  <string name="notification_new_title">Uusi sähköpostiviesti</string>
-  <plurals name="notification_new_messages_title">
-    <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> uusi viesti</item>
-    <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> uutta viestiä</item>
-  </plurals>
-  <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%1$d</xliff:g> lukematonta (<xliff:g id="account">%2$s</xliff:g>)</string>
-  <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%1$d</xliff:g> lisää tilillä <xliff:g id="account">%2$s</xliff:g></string>
-  <string name="notification_action_reply">Vastaa</string>
-  <string name="notification_action_mark_as_read">Merkitse luetuksi</string>
-  <string name="notification_action_mark_all_as_read">Merkitse kaikki luetuiksi</string>
-  <string name="notification_action_delete">Poista</string>
-  <string name="notification_action_delete_all">Poista kaikki</string>
-  <string name="notification_action_archive">Arkistoi</string>
-  <string name="notification_action_archive_all">Arkistoi kaikki</string>
-  <string name="notification_action_spam">Roskaposti</string>
-  <string name="notification_certificate_error_public">Varmennevirhe</string>
-  <string name="notification_certificate_error_title">Varmennevirhe tilissä <xliff:g id="account">%s</xliff:g></string>
-  <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">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
-  <string name="notification_bg_send_title">Lähetetään viestejä</string>
-  <string name="notification_bg_title_separator">:</string>
-  <string name="notification_channel_push_title">Synkronoi (Push)</string>
-  <string name="notification_channel_push_description">Näytetään kun odotetaan uusia viestejä</string>
-  <string name="notification_channel_messages_title">Viestit</string>
-  <string name="notification_channel_messages_description">Viesteihin liittyvät ilmoitukset</string>
-  <string name="notification_channel_miscellaneous_title">Muut</string>
-  <string name="notification_channel_miscellaneous_description">Virheet ja muut sekalaiset ilmoitukset</string>
-  <string name="special_mailbox_name_inbox">Saapuneet</string>
-  <string name="special_mailbox_name_outbox">Lähtevät</string>
-  <string name="special_mailbox_name_drafts">Luonnokset</string>
-  <string name="special_mailbox_name_trash">Roskakori</string>
-  <string name="special_mailbox_name_sent">Lähetetyt</string>
-  <string name="send_failure_subject">Joidenkin viestien lähettäminen epäonnistui</string>
-  <string name="version">Versio</string>
-  <string name="debug_enable_debug_logging_title">Käytä virheenkorjaustietojen lokiinkirjausta</string>
-  <string name="debug_enable_debug_logging_summary">Kirjoita lokiin laajempi kuvaus ongelmista</string>
-  <string name="debug_enable_sensitive_logging_title">Kirjaa lokiin arkaluontoisia tietoja</string>
-  <string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string>
-  <string name="debug_export_logs_title">Vie lokit</string>
-  <string name="debug_export_logs_success">Vienti onnistui. Lokit saattavat sisältää arkaluonteista tietoa. Pidä ne tallessa ja ole varovainen sen suhteen, kenelle ne lähetät.</string>
-  <string name="debug_export_logs_failure">Vienti epäonnistui.</string>
-  <string name="message_list_load_more_messages_action">Lataa lisää viestejä</string>
-  <string name="message_to_fmt">Vastaanottaja: <xliff:g id="counterParty"> %s </xliff:g></string>
-  <string name="message_compose_subject_hint">Aihe</string>
-  <string name="message_compose_content_hint">Viesti</string>
-  <string name="message_compose_signature_hint">Allekirjoitus</string>
-  <string name="message_compose_quote_header_separator">-------- Alkuperäinen viesti --------</string>
-  <string name="message_compose_quote_header_subject">Aihe:</string>
-  <string name="message_compose_quote_header_send_date">Lähetetty:</string>
-  <string name="message_compose_quote_header_from">Lähettäjä:</string>
-  <string name="message_compose_quote_header_to">Vastaanottaja:</string>
-  <string name="message_compose_quote_header_cc">Kopio:</string>
-  <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> kirjoitti:</string>
-  <string name="message_compose_reply_header_fmt_with_date"><xliff:g id="sent_date">%1$s</xliff:g> <xliff:g id="sender">%2$s</xliff:g> kirjoitti:</string>
-  <string name="message_compose_error_no_recipients">Valitse vähintään yksi vastaanottaja.</string>
-  <string name="compose_error_incomplete_recipient">Vastaanottajakenttä sisältää virheellistä syötettä!</string>
-  <string name="error_contact_address_not_found">Tämän henkilön sähköpostiosoitetta ei löytynyt.</string>
-  <string name="message_compose_attachments_skipped_toast">Joitakin liitteitä ei voida lähettää edelleen, koska niitä ei ole ladattu.</string>
-  <string name="message_compose_attachments_forward_toast">Viestiä ei voida välittää, koska joitain liitteitä ei ole ladattu.</string>
-  <string name="message_compose_show_quoted_text_action">Sisällytä lainattu viesti</string>
-  <string name="message_compose_description_delete_quoted_text">Poista lainattu teksti</string>
-  <string name="message_compose_description_edit_quoted_text">Muokkaa lainattua tekstiä</string>
-  <string name="remove_attachment_action">Poista liite</string>
-  <string name="message_view_from_format">Lähettäjä: <xliff:g id="name">%1$s</xliff:g> &lt;<xliff:g id="email">%2$s</xliff:g>&gt;</string>
-  <string name="message_to_label">Vast.ottaja:</string>
-  <string name="message_view_cc_label">Kopio:</string>
-  <string name="message_view_bcc_label">Piilokopio:</string>
-  <string name="message_view_status_attachment_not_saved">Liitteen tallentaminen epäonnistui.</string>
-  <string name="message_view_show_pictures_action">Näytä kuvat</string>
-  <string name="message_view_no_viewer">Tiedostotyypille <xliff:g id="mimetype">%s</xliff:g> ei löydy katseluohjelmaa.</string>
-  <string name="message_view_download_remainder">Lataa koko viesti</string>
-  <string name="message_view_sender_label">%1$s kautta</string>
-  <string name="from_same_sender">Lisää samalta lähettäjältä</string>
-  <string name="search_from_format">Lähettäjä <xliff:g id="sender">%s</xliff:g></string>
-  <string name="message_discarded_toast">Viesti peruutettu</string>
-  <string name="message_saved_toast">Viesti tallennettu luonnoksena</string>
-  <string name="global_settings_flag_label">Näytä tähdet</string>
-  <string name="global_settings_flag_summary">Tähdet ilmaisevat merkityt viestit</string>
-  <string name="global_settings_preview_lines_label">Rivien esikatselu</string>
-  <string name="global_settings_show_correspondent_names_label">Näytä yhteyshenkilöiden nimet</string>
-  <string name="global_settings_show_correspondent_names_summary">Näytä yhteyshenkilöiden nimet sähköpostiosoitteen sijaan</string>
-  <string name="global_settings_sender_above_subject_label">Yhteyshenkilö aiheen yläpuolella</string>
-  <string name="global_settings_sender_above_subject_summary">Näytä yhteyshenkilöiden nimet aiherivin yläpuolella</string>
-  <string name="global_settings_show_contact_name_label">Näytä yhteystietojen nimet</string>
-  <string name="global_settings_show_contact_name_summary">Käytä vastaanottajien nimiä osoitekirjasta, kun käytettävissä</string>
-  <string name="global_settings_registered_name_color_label">Väritä yhteystiedot</string>
-  <string name="global_settings_registered_name_color_changed">Väritä nimet yhteystiedoissa</string>
-  <string name="general_settings_contact_name_color_label">Yhteystiedon nimen väri</string>
-  <string name="global_settings_messageview_fixedwidth_label">Kiinteä kirjasinleveys</string>
-  <string name="global_settings_messageview_fixedwidth_summary">Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille</string>
-  <string name="global_settings_messageview_autofit_width_label">Sovita viestit automaattisesti</string>
-  <string name="global_settings_messageview_autofit_width_summary">Kutista viestit sopimaan näytölle</string>
-  <string name="global_settings_messageview_return_to_list_label">Palaa poiston jälkeen listanäkymään</string>
-  <string name="global_settings_messageview_return_to_list_summary">Palaa viestilistaan viestin poiston jälkeen</string>
-  <string name="global_settings_messageview_show_next_label">Näytä poiston jälkeen seuraava viesti</string>
-  <string name="global_settings_messageview_show_next_summary">Näytä viestin poiston jälkeen oletusarvoisesti seuraava viesti</string>
-  <string name="global_settings_confirm_actions_title">Vahvista toiminnot</string>
-  <string name="global_settings_confirm_actions_summary">Näytä valintaikkuna valitun toiminnon suorittamisesta</string>
-  <string name="global_settings_confirm_action_delete">Poista</string>
-  <string name="global_settings_confirm_action_delete_starred">Poista tähdellä merkityt (viestinäkymässä)</string>
-  <string name="global_settings_confirm_action_spam">Roskaposti</string>
-  <string name="global_settings_confirm_menu_discard">Hylkää viesti</string>
-  <string name="global_settings_confirm_menu_mark_all_read">Merkitse kaikki viestit luetuiksi</string>
-  <string name="global_settings_confirm_action_delete_notif">Poista (ilmoituksessa)</string>
-  <string name="global_settings_privacy_hide_useragent">Piilota sähköpostisovellus</string>
-  <string name="global_settings_privacy_hide_useragent_detail">Poista Mail-tunnistetiedot viestin otsaketiedoista</string>
-  <string name="global_settings_privacy_hide_timezone">Piilota aikavyöhyke</string>
-  <string name="global_settings_privacy_hide_timezone_detail">Käytä UTC-aikaa paikallisen aikavyöhykkeen sijaan sähköpostin otsakkeissa</string>
-  <string name="global_settings_notification_quick_delete_title">Näytä Poista-painike</string>
-  <string name="global_settings_notification_quick_delete_never">Ei koskaan</string>
-  <string name="global_settings_notification_quick_delete_when_single_msg">Yksittäisen viestin ilmoituksessa</string>
-  <string name="global_settings_notification_quick_delete_always">Aina</string>
-  <string name="global_settings_lock_screen_notification_visibility_title">Lukitusnäytön ilmoitukset</string>
-  <string name="global_settings_lock_screen_notification_visibility_nothing">Ei lukitusnäytön ilmoituksia</string>
-  <string name="global_settings_lock_screen_notification_visibility_app_name">Sovelluksen nimi</string>
-  <string name="global_settings_lock_screen_notification_visibility_message_count">Uusien viestien määrä</string>
-  <string name="global_settings_lock_screen_notification_visibility_senders">Viestien määrä ja lähettäjät</string>
-  <string name="global_settings_lock_screen_notification_visibility_everything">Sama kuin näytön ollessa lukittuna</string>
-  <string name="quiet_time">Hiljainen aika</string>
-  <string name="quiet_time_description">Poista käytöstä soittoäänen pirinä, pärinä ja vilkkuminen yöllä</string>
-  <string name="quiet_time_notification">Poista ilmoitukset käytöstä</string>
-  <string name="quiet_time_notification_description">Poista ilmoitukset kokonaan käytöstä hiljaisena aikana</string>
-  <string name="quiet_time_starts">Hiljainen aika alkaa</string>
-  <string name="quiet_time_ends">Hiljainen aika päättyy</string>
-  <string name="account_setup_basics_title">Lisää uusi tili</string>
-  <string name="account_setup_basics_email_hint">Sähköpostiosoite</string>
-  <string name="account_setup_basics_password_hint">Salasana</string>
-  <string name="account_setup_oauth_description">Jotta voit käyttää tätä tiliä K-9 Mailin kanssa, sinun tulee kirjautua sisään ja antaa sovellukselle oikeus päästä sähköposteihisi.</string>
-  <!--Displayed below the 'account_setup_oauth_description' text-->
-  <string name="account_setup_oauth_sign_in">Kirjaudu sisään</string>
-  <!--Displayed below the 'account_setup_oauth_description' text-->
-  <string name="account_setup_oauth_sign_in_with_google">Kirjaudu sisään Googlella</string>
-  <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
-  <string name="account_setup_basics_show_password_need_lock">Jotta näet salasanasi tässä, ota käyttöön laitteen näytön lukitus.</string>
-  <string name="account_setup_basics_show_password_biometrics_title">Vahvista henkilöllisyytesi</string>
-  <string name="account_setup_basics_show_password_biometrics_subtitle">Avaa lukitus nähdäksesi salasanasi</string>
-  <string name="account_setup_basics_manual_setup_action">Määritä asetukset käsin</string>
-  <string name="account_setup_check_settings_title"/>
-  <string name="account_setup_check_settings_retr_info_msg">Haetaan tilin tietoja\u2026</string>
-  <string name="account_setup_check_settings_check_incoming_msg">Tarkistetaan saapuvan postin palvelimen asetuksia\u2026</string>
-  <string name="account_setup_check_settings_check_outgoing_msg">Tarkistetaan lähtevän postin palvelimen asetuksia\u2026</string>
-  <string name="account_setup_check_settings_authenticate">Varmistetaan\u2026</string>
-  <string name="account_setup_check_settings_fetch">Haetaan tilin asetuksia\u2026</string>
-  <string name="account_setup_check_settings_canceling_msg">Peruutetaan\u2026</string>
-  <string name="account_setup_names_title">Melkein valmista!</string>
-  <string name="account_setup_names_account_name_label">Anna tilin nimi (ei pakollinen):</string>
-  <string name="account_setup_names_user_name_label">Anna nimesi (näkyy lähtevissä viesteissä):</string>
-  <string name="account_setup_account_type_title">Tilin tyyppi</string>
-  <string name="account_setup_account_type_instructions">Mikä tämän tilin tyyppi on?</string>
-  <string name="account_setup_account_type_pop_action">POP3</string>
-  <string name="account_setup_account_type_imap_action">IMAP</string>
-  <string name="account_setup_auth_type_normal_password">Tavallinen salasana</string>
-  <string name="account_setup_auth_type_insecure_password">Salasana, välitetään turvattomasti</string>
-  <string name="account_setup_auth_type_encrypted_password">Salattu salasana</string>
-  <string name="account_setup_auth_type_tls_client_certificate">Asiakasvarmenne</string>
-  <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
-  <string name="account_setup_incoming_title">Saapuvan postin palvelimen asetukset</string>
-  <string name="account_setup_incoming_username_label">Käyttäjätunnus</string>
-  <string name="account_setup_incoming_password_label">Salasana</string>
-  <string name="account_setup_incoming_client_certificate_label">Asiakasvarmenne</string>
-  <string name="account_setup_incoming_pop_server_label">POP3-palvelin</string>
-  <string name="account_setup_incoming_imap_server_label">IMAP-palvelin</string>
-  <string name="account_setup_incoming_webdav_server_label">Exchange-palvelin</string>
-  <string name="account_setup_incoming_port_label">Portti</string>
-  <string name="account_setup_incoming_security_label">Suojauksen tyyppi</string>
-  <string name="account_setup_incoming_auth_type_label">Todennuksen tyyppi</string>
-  <string name="account_setup_incoming_security_none_label">Ei mitään</string>
-  <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
-  <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
-  <string name="account_setup_incoming_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei ole kelvollinen asetuksen \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" kanssa</string>
-  <string name="account_setup_incoming_delete_policy_label">Kun viesti poistetaan</string>
-  <string name="account_setup_incoming_delete_policy_never_label">Älä poista palvelimelta</string>
-  <string name="account_setup_incoming_delete_policy_delete_label">Poista palvelimelta</string>
-  <string name="account_setup_incoming_delete_policy_markread_label">Merkitse luetuksi palvelimella</string>
-  <string name="account_setup_incoming_use_compression">Käytä pakkausta</string>
-  <string name="account_setup_expunge_policy_label">Poista viestit</string>
-  <string name="account_setup_expunge_policy_immediately">Heti</string>
-  <string name="account_setup_expunge_policy_on_poll">Tarkistettaessa</string>
-  <string name="account_setup_expunge_policy_manual">Vain manuaalisesti</string>
-  <string name="account_setup_incoming_autodetect_namespace_label">Tunnista IMAP-nimiavaruus automaattisesti</string>
-  <string name="account_setup_incoming_imap_path_prefix_label">IMAP-polun etuliite</string>
-  <string name="drafts_folder_label">Luonnokset-kansio</string>
-  <string name="sent_folder_label">Lähetetyt-kansio</string>
-  <string name="trash_folder_label">Roskakori-kansio</string>
-  <string name="archive_folder_label">Arkisto-kansio</string>
-  <string name="spam_folder_label">Roskapostikansio</string>
-  <string name="account_setup_incoming_subscribed_folders_only_label">Näytä vain tilatut kansiot</string>
-  <string name="account_setup_auto_expand_folder">Avaa kansio automaattisesti</string>
-  <string name="account_setup_incoming_webdav_path_prefix_label">OWA-polku</string>
-  <string name="account_setup_incoming_webdav_auth_path_label">Autentikointipolku</string>
-  <string name="account_setup_incoming_webdav_mailbox_path_label">Postilaatikon polku</string>
-  <string name="account_setup_outgoing_title">Lähtevän postin palvelimen asetukset</string>
-  <string name="account_setup_outgoing_smtp_server_label">SMTP-palvelin</string>
-  <string name="account_setup_outgoing_port_label">Portti</string>
-  <string name="account_setup_outgoing_security_label">Suojaus</string>
-  <string name="account_setup_outgoing_require_login_label">Edellytä kirjautumista.</string>
-  <string name="account_setup_outgoing_username_label">Käyttäjätunnus</string>
-  <string name="account_setup_outgoing_password_label">Salasana</string>
-  <string name="account_setup_outgoing_authentication_label">Todennustapa</string>
-  <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei ole kelvollinen asetuksen \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" kanssa</string>
-  <string name="account_setup_bad_uri">Virheellinen asetus: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Tilin asetukset</string>
-  <string name="account_setup_options_mail_check_frequency_label">Viestien tarkistus</string>
-  <string name="account_setup_options_mail_check_frequency_never">Ei koskaan</string>
-  <string name="account_setup_options_mail_check_frequency_15min">Joka 15 minuutti</string>
-  <string name="account_setup_options_mail_check_frequency_30min">Joka 30 minuutti</string>
-  <string name="account_setup_options_mail_check_frequency_1hour">Joka tunti</string>
-  <string name="account_setup_options_mail_check_frequency_2hour">Joka 2 tunti</string>
-  <string name="account_setup_options_mail_check_frequency_3hour">Joka 3 tunti</string>
-  <string name="account_setup_options_mail_check_frequency_6hour">Joka 6 tunti</string>
-  <string name="account_setup_options_mail_check_frequency_12hour">Joka 12 tunti</string>
-  <string name="account_setup_options_mail_check_frequency_24hour">Joka 24 tunti</string>
-  <string name="idle_refresh_period_label">Päivitä IDLE-yhteys</string>
-  <string name="idle_refresh_period_2min">Joka 2 minuutti</string>
-  <string name="idle_refresh_period_3min">Joka 3 minuutti</string>
-  <string name="idle_refresh_period_6min">Joka 6 minuutti</string>
-  <string name="idle_refresh_period_12min">Joka 12 minuutti</string>
-  <string name="idle_refresh_period_24min">Joka 24 minuutti</string>
-  <string name="idle_refresh_period_36min">Joka 36 minuutti</string>
-  <string name="idle_refresh_period_48min">Joka 48 minuutti</string>
-  <string name="idle_refresh_period_60min">Joka 60 minuutti</string>
-  <string name="account_setup_options_notify_label">Ilmoitus postin saapumisesta</string>
-  <string name="account_setup_options_mail_display_count_label">Näytettävien viestien lukumäärä</string>
-  <string name="account_setup_options_mail_display_count_10">10 kansiota</string>
-  <string name="account_setup_options_mail_display_count_25">25 kansiota</string>
-  <string name="account_setup_options_mail_display_count_50">50 kansiota</string>
-  <string name="account_setup_options_mail_display_count_100">100 viestiä</string>
-  <string name="account_setup_options_mail_display_count_250">250 viestiä</string>
-  <string name="account_setup_options_mail_display_count_500">500 viestiä</string>
-  <string name="account_setup_options_mail_display_count_1000">1000 viestiä</string>
-  <string name="account_setup_options_mail_display_count_2500">2500 viestiä</string>
-  <string name="account_setup_options_mail_display_count_5000">5000 viestiä</string>
-  <string name="account_setup_options_mail_display_count_10000">10000 viestiä</string>
-  <string name="account_setup_options_mail_display_count_all">Kaikki viestit</string>
-  <string name="move_copy_cannot_copy_unsynced_message">Viestiä ei voi kopioida tai siirtää, koska sitä ei ole synkronoitu palvelimelle</string>
-  <string name="account_setup_failed_dlg_title">Asennus ei onnistunut</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Käyttäjätunnus tai salasana väärin.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_certificate_message_fmt">Palvelin esitti virheellisen SSL-varmenteen. Joskus tämä johtuu palvelimen vääristä asetuksista. Toisinaan syynä on se, että joku koettaa hyökätä sinua tai sähköpostipalvelinta vastaan. Jos et ole varma mistä on kyse, napsauta Hylkää ja ole yhteydessä sähköpostipalvelinta hallinoivaan tahoon.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_server_message_fmt">Yhteys palvelimeen ei onnistu.\n(<xliff:g id="error">%s</xliff:g>)</string>
-  <string name="account_setup_failed_dlg_oauth_flow_canceled">Valtuutus peruttu</string>
-  <string name="account_setup_failed_dlg_oauth_flow_failed">Valtuutus epäonnistui, virhe: <xliff:g id="error">%s</xliff:g></string>
-  <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 ei ole tällä hetkellä tuettu tämän palvelutarjoajan kohdalla.</string>
-  <string name="account_setup_failed_dlg_browser_not_found">Sovellus ei löytänyt selainta käytettäväksi pääsyn antamiseksi tälle tilille.</string>
-  <string name="account_setup_failed_dlg_edit_details_action">Muokkaa tietoja</string>
-  <string name="account_setup_failed_dlg_continue_action">Jatka</string>
-  <string name="account_settings_push_advanced_title">Lisäasetukset</string>
-  <string name="account_settings_title_fmt">Yleiset</string>
-  <string name="account_settings_notify_label">Saapuneiden viestien ilmoitukset</string>
-  <string name="account_settings_folder_notify_new_mail_mode_label">Ilmoitukset kansioista</string>
-  <string name="account_settings_folder_notify_new_mail_mode_all">Kaikki</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_class">Vain 1. luokan kansiot</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
-  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_folder_notify_new_mail_mode_none">Ei mitään</string>
-  <string name="account_settings_notify_sync_label">Synkronointi-ilmoitukset</string>
-  <string name="account_settings_email_label">Sähköpostiosoite</string>
-  <string name="account_settings_notify_summary">Näytä tilapalkissa ilmoitus uusista viesteistä</string>
-  <string name="account_settings_notify_sync_summary">Näytä tilapalkissa ilmoitus viestien tarkistamisesta</string>
-  <string name="account_settings_notify_self_label">Ilmoita lähetetyistä viesteistä</string>
-  <string name="account_settings_notify_self_summary">Näytä ilmoitus lähettämistäni viesteistä</string>
-  <string name="account_notify_contacts_mail_only_label">Vain yhteystiedot</string>
-  <string name="account_notify_contacts_mail_only_summary">Näytä ilmoitukset vain niistä viesteistä, jotka tulevat tunnetuilta yhteystiedoilta</string>
-  <string name="account_settings_ignore_chat_messages_label">Älä huomioi keskusteluviestejä</string>
-  <string name="account_settings_ignore_chat_messages_summary">Älä näytä ilmoituksia viesteistä, jotka kuuluvat sähköpostikeskusteluun</string>
-  <string name="account_settings_mark_message_as_read_on_view_label">Merkitse viesti luetuksi avattaessa</string>
-  <string name="account_settings_mark_message_as_read_on_view_summary">Merkitse viesti luetuksi, kun se avataan katseltavaksi</string>
-  <string name="account_settings_mark_message_as_read_on_delete_label">Merkitse luetuksi poistettaessa</string>
-  <string name="account_settings_mark_message_as_read_on_delete_summary">Merkitse viesti luetuksi, kun se poistetaan</string>
-  <string name="account_settings_notification_channels_label">Ilmoitusten luokat</string>
-  <string name="account_settings_open_notification_settings_messages_summary">Määritä uusien viestien ilmoitukset</string>
-  <string name="account_settings_open_notification_settings_miscellaneous_summary">Määritä virhe- ja tilailmoitukset</string>
-  <string name="account_settings_show_pictures_label">Näytä aina kuvat</string>
-  <string name="account_settings_show_pictures_never">Ei koskaan</string>
-  <string name="account_settings_show_pictures_only_from_contacts">Vain yhteystiedoissa olevilta lähettäjiltä</string>
-  <string name="account_settings_show_pictures_always">Keneltä tahansa</string>
-  <string name="account_settings_composition">Viestien lähettäminen</string>
-  <string name="account_settings_default_quoted_text_shown_label">Lainaa alkuperäistä viestiä vastattaessa  </string>
-  <string name="account_settings_default_quoted_text_shown_summary">Alkuperäinen viesti on vastauksessa viesteihin vastattaessa.</string>
-  <string name="account_settings_reply_after_quote_label">Vastaa lainauksen jälkeen</string>
-  <string name="account_settings_reply_after_quote_summary">Kun viestiin vastataan, alkuperäinen viesti on vastauksesi yläpuolella.</string>
-  <string name="account_settings_strip_signature_label">Poista allekirjoitus lainatusta vastauksesta</string>
-  <string name="account_settings_strip_signature_summary">Lainatun tekstin allekirjoitus poistetaan viesteihin vastattaessa</string>
-  <string name="account_settings_message_format_label">Viestin muoto</string>
-  <string name="account_settings_message_format_text">Pelkkä teksti (kuvat ja muotoilu poistetaan)</string>
-  <string name="account_settings_message_format_html">HTML (kuvat ja muotoilu säilytetään)</string>
-  <string name="account_settings_message_format_auto">Automaattinen (pelkkä teksti, ellei vastata HTML-viestiin)</string>
-  <string name="account_settings_always_show_cc_bcc_label">Näytä aina Kopio/Piilokopio</string>
-  <string name="account_settings_message_read_receipt_label">Vastaanottokuittaus</string>
-  <string name="account_settings_message_read_receipt_summary">Pyydä aina vastaanottokuittaus</string>
-  <string name="account_settings_quote_style_label">Lainauksen tyyli vastattaessa</string>
-  <string name="account_settings_quote_style_prefix">Etuliite (kuten Gmail, Pine)</string>
-  <string name="account_settings_quote_style_header">Otsikko (kuten Outlook, Yahoo!, Hotmail)</string>
-  <string name="account_settings_upload_sent_messages_label">Lähetä lähetetyt viestit</string>
-  <string name="account_settings_upload_sent_messages_summary">Lähetä viestit Lähetetyt-kansioon lähettämisen jälkeen</string>
-  <string name="account_settings_general_title">Yleiset asetukset</string>
-  <string name="account_settings_reading_mail">Viestien lukeminen</string>
-  <string name="account_settings_sync">Viestien hakeminen</string>
-  <string name="account_settings_folders">Kansiot</string>
-  <string name="account_settings_quote_prefix_label">Lainauksen etuliite</string>
-  <string name="account_settings_crypto">Päästä päähän -salaus</string>
-  <string name="account_settings_crypto_app">Ota käyttöön OpenPGP-tuki</string>
-  <string name="account_settings_crypto_app_select_title">Valitse OpenPGP-sovellus</string>
-  <string name="account_settings_crypto_key">Määritä päästä päähän -avain</string>
-  <string name="account_settings_crypto_summary_off">OpenPGP-sovellusta ei ole määritetty</string>
-  <string name="account_settings_crypto_summary_on">Yhdistetty kohteeseen %s</string>
-  <string name="account_settings_crypto_summary_config">Tehdään asetuksia…</string>
-  <string name="account_settings_crypto_encrypt_all_drafts">Talleta kaikki luonnokset salattuina</string>
-  <string name="account_settings_crypto_encrypt_all_drafts_on">Kaikki luonnokset talletetaan salattuina</string>
-  <string name="account_settings_crypto_encrypt_all_drafts_off">Salaa luonnokset vain jos salaus on käytössä</string>
-  <string name="account_settings_mail_check_frequency_label">Kansioiden tarkistus</string>
-  <string name="account_settings_color_label">Tilin väri</string>
-  <string name="account_settings_color_summary">Valitse väri tilin kansio- ja tililistaan</string>
-  <string name="account_settings_mail_display_count_label">Paikallisen kansion koko</string>
-  <string name="account_settings_autodownload_message_size_label">Hae viestit, joiden koko on enintään</string>
-  <string name="account_settings_autodownload_message_size_1">1 KiB</string>
-  <string name="account_settings_autodownload_message_size_2">2 KiB</string>
-  <string name="account_settings_autodownload_message_size_4">4 KiB</string>
-  <string name="account_settings_autodownload_message_size_8">8 KiB</string>
-  <string name="account_settings_autodownload_message_size_16">16 KiB</string>
-  <string name="account_settings_autodownload_message_size_32">32 KiB</string>
-  <string name="account_settings_autodownload_message_size_64">64 KiB</string>
-  <string name="account_settings_autodownload_message_size_128">128 KiB</string>
-  <string name="account_settings_autodownload_message_size_256">256 KiB</string>
-  <string name="account_settings_autodownload_message_size_512">512 KiB</string>
-  <string name="account_settings_autodownload_message_size_1024">1 MiB</string>
-  <string name="account_settings_autodownload_message_size_2048">2 MiB</string>
-  <string name="account_settings_autodownload_message_size_5120">5 MiB</string>
-  <string name="account_settings_autodownload_message_size_10240">10 MiB</string>
-  <string name="account_settings_autodownload_message_size_any">mikä tahansa (ei rajoitusta)</string>
-  <string name="account_settings_message_age_label">Synkronoi viestit ajalta</string>
-  <string name="account_settings_message_age_any">milloin vain (ei rajoitusta)</string>
-  <string name="account_settings_message_age_0">tänään</string>
-  <string name="account_settings_message_age_1">viimeiset 2 päivää</string>
-  <string name="account_settings_message_age_2">viimeiset 3 päivää</string>
-  <string name="account_settings_message_age_7">viime viikko</string>
-  <string name="account_settings_message_age_14">viimeiset 2 viikkoa</string>
-  <string name="account_settings_message_age_21">viimeiset 3 viikkoa</string>
-  <string name="account_settings_message_age_1_month">viime kuun</string>
-  <string name="account_settings_message_age_2_months">viimeiset 2 kuukautta</string>
-  <string name="account_settings_message_age_3_months">viimeiset 3 kuukautta</string>
-  <string name="account_settings_message_age_6_months">viimeiset 6 kuukautta</string>
-  <string name="account_settings_message_age_1_year">viime vuosi</string>
-  <string name="account_settings_folder_display_mode_label">Näytä kansiot</string>
-  <string name="account_settings_folder_display_mode_all">Kaikki</string>
-  <string name="account_settings_folder_display_mode_first_class">Vain 1. luokan kansiot</string>
-  <string name="account_settings_folder_display_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
-  <string name="account_settings_folder_display_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_folder_sync_mode_label">Tarkistettavat kansiot</string>
-  <string name="account_settings_folder_sync_mode_all">Kaikki</string>
-  <string name="account_settings_folder_sync_mode_first_class">Vain 1. luokan kansiot</string>
-  <string name="account_settings_folder_sync_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
-  <string name="account_settings_folder_sync_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_folder_sync_mode_none">Ei mitään</string>
-  <string name="account_settings_folder_push_mode_label">Push-kysely</string>
-  <string name="account_settings_folder_push_mode_all">Kaikki</string>
-  <string name="account_settings_folder_push_mode_first_class">Vain 1. luokan kansiot</string>
-  <string name="account_settings_folder_push_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
-  <string name="account_settings_folder_push_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_folder_push_mode_none">Ei mitään</string>
-  <string name="account_settings_folder_target_mode_label">Siirrä/kopioi kohdekansiot</string>
-  <string name="account_settings_folder_target_mode_all">Kaikki</string>
-  <string name="account_settings_folder_target_mode_first_class">Vain 1. luokan kansiot</string>
-  <string name="account_settings_folder_target_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
-  <string name="account_settings_folder_target_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_sync_remote_deletetions_label">Synkronoi etäpoistot</string>
-  <string name="account_settings_sync_remote_deletetions_summary">Poista viestit, kun ne poistetaan palvelimelta</string>
-  <string name="account_settings_openpgp_missing">OpenPGP-sovellus puuttuu - poistettiinko se?</string>
-  <string name="folder_settings_title">Kansioiden asetukset</string>
-  <string name="folder_settings_in_top_group_label">Näytä yläryhmässä</string>
-  <string name="folder_settings_in_top_group_summary">Näytä yläosassa lähellä kansiolistaa</string>
-  <string name="folder_settings_folder_display_mode_label">Näytettävän kansion luokka</string>
-  <string name="folder_settings_folder_display_mode_normal">Ei luokkaa</string>
-  <string name="folder_settings_folder_display_mode_first_class">1. luokka</string>
-  <string name="folder_settings_folder_display_mode_second_class">2. luokka</string>
-  <string name="folder_settings_folder_sync_mode_label">Poll-luokka</string>
-  <string name="folder_settings_folder_sync_mode_normal">Ei mitään</string>
-  <string name="folder_settings_folder_sync_mode_first_class">1. luokka</string>
-  <string name="folder_settings_folder_sync_mode_second_class">2. luokka</string>
-  <string name="folder_settings_folder_sync_mode_inherited">Sama kuin näytettävällä kansiolla</string>
-  <string name="folder_settings_folder_push_mode_label">Push-luokka</string>
-  <string name="folder_settings_folder_push_mode_normal">Ei luokkaa</string>
-  <string name="folder_settings_folder_push_mode_first_class">1. luokka</string>
-  <string name="folder_settings_folder_push_mode_second_class">2. luokka</string>
-  <string name="folder_settings_folder_push_mode_inherited">Sama kuin poll-luokka</string>
-  <string name="folder_settings_folder_notify_mode_label">Kansion ilmoitusluokka</string>
-  <string name="folder_settings_folder_notify_mode_normal">Ei luokkaa</string>
-  <string name="folder_settings_folder_notify_mode_first_class">1. luokka</string>
-  <string name="folder_settings_folder_notify_mode_second_class">2. luokka</string>
-  <string name="folder_settings_folder_notify_mode_inherited">Sama kuin push-luokka</string>
-  <string name="folder_settings_clear_local_folder_action">Poista paikalliset viestit</string>
-  <string name="account_settings_incoming_label">Saapuvan postin palvelin</string>
-  <string name="account_settings_incoming_summary">Määritä saapuvan postin palvelin</string>
-  <string name="account_settings_outgoing_label">Lähtevän postin palvelin</string>
-  <string name="account_settings_outgoing_summary">Määritä lähtevän postin palvelin (SMTP)</string>
-  <string name="account_settings_description_label">Tilin nimi</string>
-  <string name="account_settings_name_label">Nimesi</string>
-  <string name="notifications_title">Ilmoitukset</string>
-  <string name="account_settings_vibration">Värinä</string>
-  <string name="account_settings_vibrate_enable">Värinä</string>
-  <string name="account_settings_vibrate_pattern_label">Värinän malli</string>
-  <string name="account_settings_vibrate_pattern_default">Oletus</string>
-  <string name="account_settings_vibrate_pattern_1">Malli 1</string>
-  <string name="account_settings_vibrate_pattern_2">Malli 2</string>
-  <string name="account_settings_vibrate_pattern_3">Malli 3</string>
-  <string name="account_settings_vibrate_pattern_4">Malli 4</string>
-  <string name="account_settings_vibrate_pattern_5">Malli 5</string>
-  <string name="account_settings_vibrate_times">Värinöiden lukumäärä</string>
-  <string name="account_settings_vibrate_summary_disabled">Ei käytössä</string>
-  <string name="account_settings_ringtone">Uuden viestin ilmoitusääni</string>
-  <string name="account_settings_notification_light_label">Ilmoituksen valo</string>
-  <string name="account_settings_notification_light_disabled">Ei käytössä</string>
-  <string name="account_settings_notification_light_account_color">Tilin väri</string>
-  <string name="account_settings_notification_light_default_color">Järjestelmän oletusväri</string>
-  <string name="account_settings_notification_light_white">Valkoinen</string>
-  <string name="account_settings_notification_light_red">Punainen</string>
-  <string name="account_settings_notification_light_green">Vihreä</string>
-  <string name="account_settings_notification_light_blue">Sininen</string>
-  <string name="account_settings_notification_light_yellow">Keltainen</string>
-  <string name="account_settings_notification_light_cyan">Syaani</string>
-  <string name="account_settings_notification_light_magenta">Magenta</string>
-  <string name="account_settings_composition_title">Viestin kirjoituksen asetukset</string>
-  <string name="account_settings_composition_label">Kirjoituksen oletusasetukset</string>
-  <string name="account_settings_composition_summary">Aseta oletusarvot: lähettäjä, piilokopio ja allekirjoitus</string>
-  <string name="account_settings_identities_label">Identiteettien hallinta</string>
-  <string name="account_settings_identities_summary">Määritä vaihtoehtoiset lähettäjän osoitteet ja allekirjoitukset</string>
-  <string name="manage_identities_title">Identiteettien hallinta</string>
-  <string name="manage_identities_context_menu_title">Identiteetin hallinta</string>
-  <string name="edit_identity_title">Muokkaa identiteettiä</string>
-  <string name="edit_identity_save">Tallenna</string>
-  <string name="new_identity_action">Uusi identiteetti</string>
-  <string name="account_settings_always_bcc_label">Piilokopio kaikista viesteistä osoitteeseen</string>
-  <string name="manage_identities_edit_action">Muokkaa</string>
-  <string name="manage_identities_move_up_action">Siirrä ylös</string>
-  <string name="manage_identities_move_down_action">Siirrä alas</string>
-  <string name="manage_identities_move_top_action">Siirrä ylimmäiseksi / aseta oletukseksi</string>
-  <string name="manage_identities_remove_action">Poista</string>
-  <string name="edit_identity_description_label">Identiteetin kuvaus</string>
-  <string name="edit_identity_description_hint">(Valinnainen)</string>
-  <string name="edit_identity_name_label">Nimesi</string>
-  <string name="edit_identity_name_hint">(Valinnainen)</string>
-  <string name="edit_identity_email_label">Sähköpostiosoite</string>
-  <string name="edit_identity_email_hint">(Pakollinen)</string>
-  <string name="edit_identity_reply_to_label">Vastausosoite</string>
-  <string name="edit_identity_reply_to_hint">(Valinnainen)</string>
-  <string name="edit_identity_signature_label">Allekirjoitus</string>
-  <string name="edit_identity_signature_hint">(Valinnainen)</string>
-  <string name="account_settings_signature_use_label">Käytä allekirjoitusta</string>
-  <string name="account_settings_signature_label">Allekirjoitus</string>
-  <string name="default_identity_description">Oletusidentiteetti</string>
-  <string name="choose_identity_title">Valitse identiteetti</string>
-  <string name="send_as">Lähetä nimellä</string>
-  <string name="no_removable_identity">Et voi poistaa ainoaa identiteettiäsi</string>
-  <string name="identity_has_no_email">Identiteettiä ei voi käyttää ilman sähköpostiosoitetta</string>
-  <string name="sort_earliest_first">Vanhemmat viestit ensin</string>
-  <string name="sort_latest_first">Uusimmat viestit ensin</string>
-  <string name="sort_subject_alpha">Aiheen mukaan aakkosjärjestyksessä</string>
-  <string name="sort_subject_re_alpha">Aiheen mukaan käänteisessä aakkosjärjestyksessä</string>
-  <string name="sort_sender_alpha">Lähettäjän mukaan aakkosjärjestyksessä</string>
-  <string name="sort_sender_re_alpha">Lähettäjän mukaan käänteisessä aakkosjärjestyksessä</string>
-  <string name="sort_flagged_first">Tähdellä merkityt ensin</string>
-  <string name="sort_flagged_last">Merkitsemättömät ensin</string>
-  <string name="sort_unread_first">Lukemattomat ensin</string>
-  <string name="sort_unread_last">Luetut ensin</string>
-  <string name="sort_attach_first">Liitteelliset viestit ensin</string>
-  <string name="sort_unattached_first">Liitteettömät viestit ensin</string>
-  <string name="sort_by">Lajittele…</string>
-  <string name="sort_by_date">Päivämäärän mukaan</string>
-  <string name="sort_by_arrival">Saapumisajan mukaan</string>
-  <string name="sort_by_subject">Aiheen mukaan</string>
-  <string name="sort_by_sender">Lähettäjän mukaan</string>
-  <string name="sort_by_flag">Tähden mukaan</string>
-  <string name="sort_by_unread">Luettujen/lukemattomien mukaan</string>
-  <string name="sort_by_attach">Liitteiden mukaan</string>
-  <string name="account_delete_dlg_title">Poista tili</string>
-  <string name="account_setup_failed_dlg_invalid_certificate_title">Tunnistamaton varmenne</string>
-  <string name="account_setup_failed_dlg_invalid_certificate_accept">Hyväksy-avain</string>
-  <string name="account_setup_failed_dlg_invalid_certificate_reject">Hylkää-avain</string>
-  <string name="message_view_help_key">Del (tai D) - Poista\nR - Vastaa\nA - Vastaa Kaikille\nC - Uusi viesti\nF - Välitä\nM - Siirrä\nV - Arkistoi\nY - Kopioi\nZ - Merkitse Lukemattomaksi(luetuksi)\nG - Merkitse tähdellä\nO - Lajittelun tyyppi\nI - Lajittelun järjestys\nQ - Palaa kansioihin\nS - Valitse/Poista valinta\nJ tai P - Edellinen viesti\nK or N - Seuraava viesti</string>
-  <string name="message_list_help_key">Del (tai D) - Poista\nC - Uusi viesti\nM - Siirrä\nV - Arkistoi\nY - Kopioi\nZ - Merkitse (Lukemattomaksi)luetuksi\nG - Merkitse tähdellä\nO - Lajittelun tyyppi\nI - Lajittelun järjestys\nQ - Palaa kansioihin\nS - Valitse / poista valinta</string>
-  <string name="folder_list_filter_hint">Kansion nimi sisältää</string>
-  <string name="folder_list_display_mode_label">Kansiot</string>
-  <string name="folder_list_display_mode_all">Näytä kaikki</string>
-  <string name="folder_list_display_mode_first_class">Näytä vain 1. luokan kansiot</string>
-  <string name="folder_list_display_mode_first_and_second_class">Näytä 1. ja 2. luokan kansiot</string>
-  <string name="folder_list_display_mode_not_second_class">Näytä kaikki paitsi 2. luokan kansiot</string>
-  <string name="account_settings_signature__location_label">Allekirjoituksen sijainti</string>
-  <string name="account_settings_signature__location_before_quoted_text">Ennen lainattua viestiä</string>
-  <string name="account_settings_signature__location_after_quoted_text">Lainatun viestin jälkeen</string>
-  <string name="setting_theme_global">Käytä sovellusteemaa</string>
-  <string name="setting_theme_dark">Tumma</string>
-  <string name="setting_theme_light">Vaalea</string>
-  <string name="setting_theme_follow_system">Käytä järjestelmän oletusta</string>
-  <string name="display_preferences">Näyttö</string>
-  <string name="global_preferences">Yleiset</string>
-  <string name="debug_preferences">Virheenkorjaus</string>
-  <string name="privacy_preferences">Tietosuoja</string>
-  <string name="network_preferences">Verkko</string>
-  <string name="interaction_preferences">Toimintoasetukset</string>
-  <string name="accountlist_preferences">Tililista</string>
-  <string name="messagelist_preferences">Viestilistat</string>
-  <string name="messageview_preferences">Viestit</string>
-  <string name="settings_theme_label">Teema</string>
-  <string name="settings_message_theme_label">Viestinäkymän teema</string>
-  <string name="settings_compose_theme_label">Viestimuokkaimen teema</string>
-  <string name="settings_language_label">Kieli</string>
-  <string name="preference_search_no_results">Asetuksia ei löytynyt</string>
-  <string name="settings_message_theme_selection_label">Kiinteä viestiteema</string>
-  <string name="settings_message_theme_selection_summary_off">Valitse viestinäkymän teema viestiä luettaessa</string>
-  <string name="settings_message_theme_selection_summary_on">Käytä kiinteää viestinäkymän teemaa</string>
-  <string name="setting_language_system">Järjestelmän oletus</string>
-  <string name="background_ops_label">Synkronointi taustalla</string>
-  <string name="background_ops_never">Ei koskaan</string>
-  <string name="background_ops_always">Aina</string>
-  <string name="background_ops_auto_sync_only">Kun Automaattinen synkronointi on valittu</string>
-  <string name="batch_select_all">Valitse kaikki</string>
-  <string name="account_setup_push_limit_label">Push-tilassa tarkistettavien kansioiden enimmäismäärä</string>
-  <string name="account_setup_push_limit_5">5 kansiota</string>
-  <string name="account_setup_push_limit_10">10 kansiota</string>
-  <string name="account_setup_push_limit_25">25 kansiota</string>
-  <string name="account_setup_push_limit_50">50 kansiota</string>
-  <string name="account_setup_push_limit_100">100 kansiota</string>
-  <string name="account_setup_push_limit_250">250 kansiota</string>
-  <string name="account_setup_push_limit_500">500 kansiota</string>
-  <string name="account_setup_push_limit_1000">1000 kansiota</string>
-  <string name="animations_title">Animaatio</string>
-  <string name="animations_summary">Käytä koreita visuaalisia tehosteita</string>
-  <string name="volume_navigation_title">Liikkuminen äänipainikkeilla viestinäkymässä</string>
-  <string name="show_unified_inbox_title">Näytä \"Yhdistetty saapuneet\"</string>
-  <string name="show_starred_count_title">Näytä tähdellä merkittyjen viestien määrä</string>
-  <string name="integrated_inbox_title">Yhdistetty saapuneet</string>
-  <string name="integrated_inbox_detail">Kaikki viestit Yhdistetty saapuneet -kansiossa</string>
-  <string name="folder_settings_include_in_integrated_inbox_label">Yhdistä</string>
-  <string name="folder_settings_include_in_integrated_inbox_summary">Kaikki viestit näytetään Yhdistetty saapuneet -kansiossa</string>
-  <string name="account_settings_searchable_label">Etsi kansioista</string>
-  <string name="account_settings_searchable_all">Kaikki</string>
-  <string name="account_settings_searchable_displayable">Näytettävissä olevat</string>
-  <string name="account_settings_searchable_none">Ei mitään</string>
-  <string name="account_settings_no_folder_selected">Ei mitään</string>
-  <string name="account_settings_automatic_special_folder">Automaattinen (%s)</string>
-  <string name="font_size_settings_title">Kirjasinkoko</string>
-  <string name="font_size_settings_description">Määritä kirjasimen koko</string>
-  <string name="font_size_account_list">Tililista</string>
-  <string name="font_size_account_name">Tilin nimi</string>
-  <string name="font_size_account_description">Tilin kuvaus</string>
-  <string name="font_size_folder_list">Kansiolistat</string>
-  <string name="font_size_folder_name">Kansion nimi</string>
-  <string name="font_size_folder_status">Kansion tila</string>
-  <string name="font_size_message_list">Viestilistat</string>
-  <string name="font_size_message_list_subject">Viestin aihe</string>
-  <string name="font_size_message_list_sender">Lähettäjä</string>
-  <string name="font_size_message_list_date">Päiväys</string>
-  <string name="font_size_message_list_preview">Esikatselu</string>
-  <string name="font_size_message_view">Viestinäkymä</string>
-  <string name="font_size_message_view_sender">Lähettäjä</string>
-  <string name="font_size_message_view_to">Vastaanottaja</string>
-  <string name="font_size_message_view_cc">Kopio</string>
-  <string name="font_size_message_view_bcc">Piilokopio</string>
-  <string name="font_size_message_view_additional_headers">Tarkemmat otsikkotiedot</string>
-  <string name="font_size_message_view_subject">Viestin aihe</string>
-  <string name="font_size_message_view_date">Aika ja päivämäärä</string>
-  <string name="font_size_message_view_content">Viestin sisältö</string>
-  <string name="font_size_message_compose">Viestin kirjoitus</string>
-  <string name="font_size_message_compose_input">Tekstinsyöttökentät</string>
-  <string name="font_size_default">Oletus</string>
-  <string name="font_size_tiniest">Pienin</string>
-  <string name="font_size_tiny">Erittäin pieni</string>
-  <string name="font_size_smaller">Pienempi</string>
-  <string name="font_size_small">Pieni</string>
-  <string name="font_size_medium">Keskikoko</string>
-  <string name="font_size_large">Suuri</string>
-  <string name="font_size_larger">Suurin</string>
-  <string name="error_activity_not_found">Toiminnolle ei löytynyt sopivaa ohjelmaa.</string>
-  <string name="send_failed_reason">Lähetys epäonnistui: %s</string>
-  <string name="save_or_discard_draft_message_dlg_title">Tallennetaanko luonnos?</string>
-  <string name="save_or_discard_draft_message_instructions_fmt">Tallennetaanko vai hylätäänkö tämä viesti?</string>
-  <string name="save_or_discard_draft_message_changes">Tallennetaanko vai hylätäänkö muutokset?</string>
-  <string name="confirm_discard_draft_message_title">Hylkää viesti?</string>
-  <string name="confirm_discard_draft_message">Haluatko varmasti hylätä tämän viestin?</string>
-  <string name="dialog_confirm_clear_local_folder_title">Poistetaanko paikalliset viestit?</string>
-  <string name="dialog_confirm_clear_local_folder_message">Tämä poistaa kaikki paikalliset viestit kansiosta. Viestejä ei poisteta palvelimelta.</string>
-  <string name="dialog_confirm_clear_local_folder_action">Poista viestit</string>
-  <string name="dialog_confirm_delete_title">Vahvista poisto</string>
-  <string name="dialog_confirm_delete_message">Haluatko poistaa tämän viestin?</string>
-  <plurals name="dialog_confirm_delete_messages">
-    <item quantity="one">Haluatko varmasti poistaa tämän viestin?</item>
-    <item quantity="other">Haluatko varmasti poistaa <xliff:g id="message_count">%1$d</xliff:g> viestiä?</item>
-  </plurals>
-  <string name="dialog_confirm_delete_confirm_button">Kyllä</string>
-  <string name="dialog_confirm_delete_cancel_button">Ei</string>
-  <string name="dialog_confirm_mark_all_as_read_title">Vahvista kaikki luetuiksi</string>
-  <string name="dialog_confirm_mark_all_as_read_message">Haluatko merkitä kaikki viestit luetuiksi?</string>
-  <string name="dialog_confirm_empty_trash_title">Vahvista roskakorin tyhjentäminen</string>
-  <string name="dialog_confirm_empty_trash_message">Haluatko tyhjentää roskakorikansion?</string>
-  <string name="dialog_confirm_mark_all_as_read_confirm_button">Kyllä</string>
-  <string name="dialog_confirm_mark_all_as_read_cancel_button">Ei</string>
-  <string name="dialog_confirm_spam_title">Vahvista roskapostikansioon siirtäminen</string>
-  <plurals name="dialog_confirm_spam_message">
-    <item quantity="one">Haluatko todella siirtää tämän viestin roskapostikansioon?</item>
-    <item quantity="other">Haluatko todella siirtää <xliff:g id="message_count">%1$d</xliff:g> viestiä roskapostikansioon?</item>
-  </plurals>
-  <string name="dialog_confirm_spam_confirm_button">Kyllä</string>
-  <string name="dialog_confirm_spam_cancel_button">Ei</string>
-  <string name="dialog_attachment_progress_title">Ladataan liitettä</string>
-  <string name="messagelist_sent_to_me_sigil">»</string>
-  <string name="messagelist_sent_cc_me_sigil">›</string>
-  <string name="settings_list_backup_category">Varmuuskopio</string>
-  <string name="settings_list_miscellaneous_category">Muut</string>
-  <string name="settings_export_title">Vie asetukset</string>
-  <string name="settings_export_button">Vie</string>
-  <string name="settings_export_share_button">Jaa</string>
-  <string name="settings_export_progress_text">Viedään asetuksia…</string>
-  <string name="settings_export_success_generic">Asetukset vietiin onnistuneesti</string>
-  <string name="settings_export_failure">Asetusten vienti epäonnistui</string>
-  <string name="settings_import_title">Tuo asetukset</string>
-  <string name="settings_import_pick_document_button">Valitse tiedosto</string>
-  <string name="settings_import_button">Tuo</string>
-  <string name="settings_import_success_generic">Asetusten tuonti onnistui</string>
-  <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
-  <string name="settings_import_password_required">Anna salasanat</string>
-  <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
-  <string name="settings_import_authorization_required">Kirjaudu sisään</string>
-  <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
-  <string name="settings_import_authorization_and_password_required">Kirjaudu sisään ja anna salasanat</string>
-  <string name="settings_import_failure">Asetusten tuonti epäonnistui</string>
-  <string name="settings_import_read_failure">Asetustiedoston lukeminen epäonnistui</string>
-  <string name="settings_import_partial_failure">Joidenkin asetusten tuonti epäonnistui</string>
-  <string name="settings_import_status_success">Tuonti onnistui</string>
-  <string name="settings_import_status_password_required">Salasana vaaditaan</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">Sisäänkirjautuminen vaaditaan</string>
-  <string name="settings_import_status_not_imported">Ei tuotu</string>
-  <string name="settings_import_status_error">Tuontivirhe</string>
-  <string name="settings_import_later_button">Myöhemmin</string>
-  <string name="settings_import">Tuo asetukset</string>
-  <string name="settings_importing">Tuodaan asetuksia…</string>
-  <plurals name="settings_import_password_prompt">
-    <item quantity="one">Jotta voit käyttää tiliä \"<xliff:g id="account">%s</xliff:g>\", sinun on annettava palvelimen salasana.</item>
-    <item quantity="other">Jotta voit käyttää tiliä \"<xliff:g id="account">%s</xliff:g>\", sinun on annettava palvelimien salasanat.</item>
-  </plurals>
-  <string name="settings_import_incoming_server_password_hint">Saapuvan postin palvelimen salasana</string>
-  <string name="settings_import_outgoing_server_password_hint">Lähtevän postin palvelimen salasana</string>
-  <string name="settings_import_use_same_password_for_outgoing_server">Käytä samaa salasanaa lähtevälle palvelimelle</string>
-  <string name="server_name_format">Palvelimen nimi: <xliff:g id="hostname">%s</xliff:g></string>
-  <string name="unread_widget_select_account">Näytä tilin lukemattomien viestien määrä…</string>
-  <string name="unread_widget_account_title">Tili</string>
-  <string name="unread_widget_account_summary">Tili, jonka osalta näytetään lukemattomien viestien määrä</string>
-  <string name="unread_widget_unified_inbox_account_summary">Yhdistetty saapuneet</string>
-  <string name="unread_widget_folder_enabled_title">Kansion määrä</string>
-  <string name="unread_widget_folder_enabled_summary">Näytä lukemattomien määrä vain yksittäisen kansion osalta</string>
-  <string name="unread_widget_folder_title">Kansio</string>
-  <string name="unread_widget_folder_summary">Kansio, jonka osalta näytetään lukemattomien viestien määrä</string>
-  <string name="unread_widget_action_done">Valmis</string>
-  <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> - <xliff:g id="folder_name">%2$s</xliff:g></string>
-  <string name="unread_widget_account_not_selected">Tiliä ei ole valittu</string>
-  <string name="unread_widget_folder_not_selected">Kansiota ei ole valittu</string>
-  <string name="webview_empty_message">Ei tekstiä</string>
-  <string name="webview_contextmenu_link_view_action">Avaa katseltavaksi</string>
-  <string name="webview_contextmenu_link_share_action">Jaa linkki</string>
-  <string name="webview_contextmenu_link_copy_action">Kopioi linkki leikepöydälle</string>
-  <string name="webview_contextmenu_link_clipboard_label">Linkki</string>
-  <string name="webview_contextmenu_link_text_copy_action">Kopioi linkin teksti leikepöydälle</string>
-  <string name="webview_contextmenu_link_text_clipboard_label">Linkin teksti</string>
-  <string name="webview_contextmenu_image_title">Kuva</string>
-  <string name="webview_contextmenu_image_view_action">Näytä kuva</string>
-  <string name="webview_contextmenu_image_save_action">Tallenna kuva</string>
-  <string name="webview_contextmenu_image_download_action">Lataa kuva</string>
-  <string name="webview_contextmenu_image_copy_action">Kopioi kuvan osoite leikepöydälle</string>
-  <string name="webview_contextmenu_image_clipboard_label">Kuvan osoite</string>
-  <string name="webview_contextmenu_phone_call_action">Soita numeroon</string>
-  <string name="webview_contextmenu_phone_save_action">Tallenna yhteystietoihin</string>
-  <string name="webview_contextmenu_phone_copy_action">Kopioi puhelinnumero leikepöydälle</string>
-  <string name="webview_contextmenu_phone_clipboard_label">Puhelinnumero</string>
-  <string name="webview_contextmenu_email_send_action">Lähetä sähköpostia</string>
-  <string name="webview_contextmenu_email_save_action">Tallenna yhteystietoihin</string>
-  <string name="webview_contextmenu_email_copy_action">Kopioi sähköpostiosoite leikepöydälle</string>
-  <string name="webview_contextmenu_email_clipboard_label">Sähköpostiosoite</string>
-  <string name="account_settings_remote_search_num_results_entries_all">Kaikki</string>
-  <string name="account_settings_remote_search_num_results_entries_10">10</string>
-  <string name="account_settings_remote_search_num_results_entries_25">25</string>
-  <string name="account_settings_remote_search_num_results_entries_50">50</string>
-  <string name="account_settings_remote_search_num_results_entries_100">100</string>
-  <string name="account_settings_remote_search_num_results_entries_250">250</string>
-  <string name="account_settings_remote_search_num_results_entries_500">500</string>
-  <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
-  <string name="account_settings_remote_search_num_label">Etähaun tulosten rajoitus</string>
-  <string name="remote_search_sending_query">Lähetetään pyyntöä palvelimelle</string>
-  <plurals name="remote_search_downloading">
-    <item quantity="one">Noudetaan %d tulos</item>
-    <item quantity="other">Noudetaan %d tulosta</item>
-  </plurals>
-  <plurals name="remote_search_downloading_limited">
-    <item quantity="one">Noudetaan %1$d / %2$d tulos</item>
-    <item quantity="other">Noudetaan %1$d / %2$d tulosta</item>
-  </plurals>
-  <string name="remote_search_error">Etähaku epäonnistui</string>
-  <string name="account_settings_search">Hae</string>
-  <string name="action_remote_search">Etsi viestejä palvelimelta</string>
-  <string name="remote_search_unavailable_no_network">Etähaku ei ole käytettävissä ilman verkkoyhteyttä.</string>
-  <string name="global_settings_background_as_unread_indicator_label">Vaihda väriä kun luettu</string>
-  <string name="global_settings_background_as_unread_indicator_summary">Eri tausta osoittaa viestin olevan luettu</string>
-  <string name="global_settings_threaded_view_label">Ketjunäkymä</string>
-  <string name="global_settings_threaded_view_summary">Kutista samaan ketjuun kuuluvat viestit</string>
-  <string name="upgrade_databases_title">Päivitetään tietokantoja</string>
-  <string name="upgrade_databases_unspecified">Päivitetään tietokantoja…</string>
-  <string name="upgrade_database_format">Päivitetään tilin \"<xliff:g id="account">%s</xliff:g>\" tietokantaa</string>
-  <string name="global_settings_splitview_mode_label">Näytä jaettu näyttö</string>
-  <string name="global_settings_splitview_always">Aina</string>
-  <string name="global_settings_splitview_never">Ei koskaan</string>
-  <string name="global_settings_splitview_when_in_landscape">Kun laite on vaaka-asennossa</string>
-  <string name="message_view_empty">Valitse viesti vasemmalta</string>
-  <string name="global_settings_show_contact_picture_label">Näytä yhteystietojen kuvat</string>
-  <string name="global_settings_show_contact_picture_summary">Näytä yhteystietojen kuvat viestilistassa</string>
-  <string name="mark_all_as_read">Merkitse kaikki luetuiksi</string>
-  <string name="global_settings_colorize_missing_contact_pictures_label">Väritä yhteystietojen kuvat</string>
-  <string name="global_settings_colorize_missing_contact_pictures_summary">Väritä yhteystietojen puuttuvat kuvat</string>
-  <string name="global_settings_messageview_visible_refile_actions_title">Näytettävät viestitoiminnot</string>
-  <string name="global_settings_messageview_visible_refile_actions_summary">Näytä valitut toiminnot viestin Näytä-valikossa</string>
-  <string name="loading_attachment">Ladataan liitettä…</string>
-  <string name="fetching_attachment_dialog_title_send">Lähetetään viestiä</string>
-  <string name="fetching_attachment_dialog_title_save">Tallennetaan luonnosta</string>
-  <string name="fetching_attachment_dialog_message">Noudetaan liitettä…</string>
-  <string name="auth_external_error">Autentikointi ei onnistu.  Palvelin ei ilmoita SASL EXTERNAL -kelpoisuudesta.  Tämä saattaa johtua vanhentuneesta asiakasvarmenteesta, tuntemattomasta varmentajasta tai jostakin muusta asetusongelmasta.</string>
-  <!--=== Client certificates specific ==================================================================-->
-  <string name="account_setup_basics_client_certificate">Käytä asiakasvarmennetta</string>
-  <string name="client_certificate_spinner_empty">Ei asiakasvarmennetta</string>
-  <string name="client_certificate_spinner_delete">Poista asiakasvarmenteen valinta</string>
-  <string name="client_certificate_retrieval_failure">Asiakasvarmenteen noutaminen epäonnistui aliakselle \"<xliff:g id="alias">%s</xliff:g>\"</string>
-  <string name="client_certificate_advanced_options">Lisäasetukset</string>
-  <string name="client_certificate_expired">Asiakasvarmenne \"<xliff:g id="certificate_alias">%1$s</xliff:g>\" on vanhentunut tai ei ole vielä voimassa (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
-  <!--Note: This references message_view_download_remainder-->
-  <string name="preview_encrypted">*Salattu*</string>
-  <string name="add_from_contacts">Lisää yhteystiedoista</string>
-  <string name="recipient_cc">Kopio</string>
-  <string name="recipient_bcc">Piilokopio</string>
-  <string name="recipient_to">Vastaanottaja</string>
-  <string name="recipient_from">Lähettäjä</string>
-  <string name="reply_to_label">Vastausosoite</string>
-  <string name="unknown_recipient">&lt;Tuntematon vastaanottaja&gt;</string>
-  <string name="unknown_sender">&lt;Tuntematon lähettäjä&gt;</string>
-  <string name="address_type_home">Koti</string>
-  <string name="address_type_work">Työ</string>
-  <string name="address_type_other">Muu</string>
-  <string name="address_type_mobile">Mobiili</string>
-  <string name="compose_error_no_draft_folder">Tälle tilille ei ole määritelty luonnoskansiota!</string>
-  <string name="compose_error_no_key_configured">Tälle tilille ei ole määritetty avainta! Tarkista asetukset.</string>
-  <string name="error_crypto_provider_incompatible">Salauksen tarjoaja käyttää yhteensopimatonta versiota. Tarkista asetuksesi!</string>
-  <string name="error_crypto_provider_connect">Yhteyttä salaussovellukseen ei voitu muodostaa: tarkista asetukset tai yritä napsauttaa salauskuvaketta uudestaan!</string>
-  <string name="error_crypto_provider_ui_required">Päästä päähän -salauksen alustaminen epäonnistui, tarkista asetukset</string>
-  <string name="error_crypto_inline_attach">PGP/INLINE-tila ei tue liitteitä!</string>
-  <string name="enable_inline_pgp">Käytä PGP/INLINE-tilaa</string>
-  <string name="disable_inline_pgp">Poista PGP/INLINE käytöstä</string>
-  <string name="enable_sign_only">Käytä PGP:n pelkkää allekirjoitusta</string>
-  <string name="disable_sign_only">Poista käytöstä PGP:n pelkkä allekirjoitus</string>
-  <string name="openpgp_inline_title">PGP/INLINE-tila</string>
-  <string name="openpgp_inline_text">Viesti lähetetään PGP/INLINE-muodossa.\nTätä tulisi käyttää vain yhteensopivuutta varten:</string>
-  <string name="openpgp_inline_plus_compat">Jotkin sovellukset tukevat vain tätä muotoa</string>
-  <string name="openpgp_inline_minus_transit">Allekirjoitukset saattavat rikkontua siirron aikana</string>
-  <string name="openpgp_inline_minus_attach">Liitteet eivät ole tuettuja</string>
-  <string name="openpgp_inline_ok">Selvä!</string>
-  <string name="openpgp_inline_disable">Poista käytöstä</string>
-  <string name="openpgp_inline_keep_enabled">Pidä käytössä</string>
-  <string name="openpgp_sign_only_ok">Selvä!</string>
-  <string name="openpgp_sign_only_disable">Poista käytöstä</string>
-  <string name="openpgp_sign_only_keep_enabled">Pidä käytössä</string>
-  <string name="openpgp_dialog_sign_only_title">PGP:n pelkkä allekirjoitustila</string>
-  <string name="openpgp_dialog_sign_only_text">Tässä tilassa PGP-avaintasi käytetään salakirjoitetun allekirjoituksen luomiseen, mutta sähköpostiviestiä ei salata.</string>
-  <string name="openpgp_dialog_sign_only_plus_verified">Tämä ei salaa sähköpostiviestiä, mutta vahvistaa sen olevan lähetetty käyttäen sinun avainta.</string>
-  <string name="openpgp_dialog_sign_only_minus_break">Allekirjoitukset saattavat rikkoontua postituslistoille lähettäessä.</string>
-  <string name="openpgp_dialog_sign_only_minus_attach">Allekirjoitukset saatetaan näyttää \"signature.asc\"-liitteinä joissain sovelluksissa.</string>
-  <string name="openpgp_dialog_sign_only_neutral_encsigned">Salatut viestit sisältävät aina allekirjoituksen.</string>
-  <string name="crypto_msg_title_plaintext">Raakateksti</string>
-  <string name="crypto_msg_unencrypted_sign_error">päästä päähän -allekirjoitus sisälsi virheen</string>
-  <string name="crypto_msg_incomplete_signed">viesti täytyy ladata kokonaan, jotta allekirjoitus voidaan käsitellä</string>
-  <string name="crypto_msg_unsupported_signed">sisältää ei-tuetun päästä päähän -allekirjoituksen</string>
-  <string name="crypto_msg_unsupported_encrypted">Viesti on salattu, mutta sen muoto ei ole tuettu.</string>
-  <string name="crypto_msg_cancelled">Viesti on salattu, mutta viestin salauksen purkaminen peruttiin.</string>
-  <string name="crypto_msg_title_unencrypted_signed_e2e">Päästä päähän -allekirjoitettu raakateksti</string>
-  <string name="crypto_msg_unencrypted_sign_verified">vahvistetulta allekirjoittajalta</string>
-  <string name="crypto_msg_title_unencrypted_signed">Allekirjoitettu raakateksti</string>
-  <string name="crypto_msg_unencrypted_sign_mismatch">mutta päästä päähän -avain ei vastannut lähettäjää</string>
-  <string name="crypto_msg_unencrypted_sign_expired">mutta päästä päähän -avain on vanhentunut</string>
-  <string name="crypto_msg_unencrypted_sign_revoked">mutta päästä päähän -avain on kumottu</string>
-  <string name="crypto_msg_unencrypted_sign_insecure">mutta päästä päähän -avainta ei mielletä turvalliseksi</string>
-  <string name="crypto_msg_unencrypted_sign_unknown">tuntemattomalta päästä päähän -avaimelta</string>
-  <string name="crypto_msg_title_encrypted_unknown">Salattu</string>
-  <string name="crypto_msg_encrypted_error">mutta salausta purkaessa tapahtui virhe</string>
-  <string name="crypto_msg_encrypted_incomplete">täytyy ladata viesti kokonaan salauksen purkamista varten</string>
-  <string name="crypto_msg_encrypted_no_provider">mutta salaussovellusta ei ole määritetty</string>
-  <string name="crypto_msg_title_encrypted_unsigned">Salattu</string>
-  <string name="crypto_msg_encrypted_unsigned">mutta ei päästä päähän</string>
-  <string name="crypto_msg_title_encrypted_signed_e2e">Päästä päähän salattu</string>
-  <string name="crypto_msg_encrypted_sign_verified">vahvistetulta lähettäjältä</string>
-  <string name="crypto_msg_title_encrypted_signed">Salattu</string>
-  <string name="crypto_msg_encrypted_sign_unknown">tuntemattomalta päästä päähän -avaimelta</string>
-  <string name="crypto_msg_encrypted_sign_mismatch">mutta päästä päähän -avain ei vastannut lähettäjää</string>
-  <string name="crypto_msg_encrypted_sign_expired">mutta päästä päähän -avain on vanhentunut</string>
-  <string name="crypto_msg_encrypted_sign_revoked">mutta päästä päähän -avain on kumottu</string>
-  <string name="crypto_msg_encrypted_sign_insecure">mutta päästä päähän -avainta ei mielletä turvalliseksi</string>
-  <string name="crypto_msg_encrypted_sign_error">mutta päästä päähän -tiedot sisältävät virheitä</string>
-  <string name="crypto_msg_encrypted_insecure">mutta salausta ei mielletä turvalliseksi</string>
-  <string name="crypto_info_ok">OK</string>
-  <string name="crypto_info_search_key">Etsi avainta</string>
-  <string name="crypto_info_view_signer">Näytä allekirjoittaja</string>
-  <string name="crypto_info_view_sender">Näytä lähettäjä</string>
-  <string name="crypto_info_view_security_warning">Yksityiskohdat</string>
-  <string name="locked_attach_unlock">Avaa lukitus</string>
-  <string name="locked_attach_unencrypted">Tätä osaa ei salattu, joten se saattaa olla epäluotettava.</string>
-  <string name="locked_attach_title">Suojaamaton liite</string>
-  <string name="message_progress_text">Ladataan…</string>
-  <string name="messageview_decrypt_cancelled">Salauksen purkaminen peruttiin.</string>
-  <string name="messageview_decrypt_retry">Yritä uudelleen</string>
-  <string name="messageview_decrypt_incomplete">Salattu viesti tulee ladata, jotta sen salaus voidaan avata.</string>
-  <string name="messageview_crypto_error_title">Virhe sähköpostin salausta avatessa</string>
-  <string name="recipient_error_non_ascii">Erikoismerkit eivät ole tällä hetkellä tuettuja!</string>
-  <string name="recipient_error_parse_failed">Virhe osoitetta jäsennettäessä!</string>
-  <string name="account_settings_crypto_hide_sign_only">Piilota salaamattomat allekirjoitukset</string>
-  <string name="account_settings_crypto_hide_sign_only_on">Vain salatut allekirjoitukset näytetään</string>
-  <string name="account_settings_crypto_hide_sign_only_off">Kaikki allekirjoitukset näytetään</string>
-  <string name="error_sign_only_no_encryption">Salaus ei ole käytettävissä pelkässä allekirjoitustilassa!</string>
-  <string name="unsigned_text_divider_label">Allekirjoittamaton teksti</string>
-  <string name="crypto_no_provider_title">Tämä sähköpostiviesti on salattu</string>
-  <string name="crypto_no_provider_message">Tämä viesti on salattu OpenPGP:llä.\nLukeaksesi viestin sinun tulee asentaa ja määrittää yhteensopiva OpenPGP-sovellus.</string>
-  <string name="crypto_no_provider_button">Siirry asetuksiin</string>
-  <string name="mail_list_widget_text">K-9-viestiluettelo</string>
-  <string name="mail_list_widget_loading">Ladataan viestejä…</string>
-  <string name="openpgp_enabled_error_title">Salaus ei ole mahdollista</string>
-  <string name="openpgp_enabled_error_msg">Jotkut valitut vastaanottajat eivät tue tätä ominaisuutta!</string>
-  <string name="enable_encryption">Käytä salausta</string>
-  <string name="disable_encryption">Poista salaus käytöstä</string>
-  <string name="openpgp_description_text1">Viestin salaus takaa, ettei niitä voi lukea kukaan muu kuin vastaanottaja.</string>
-  <string name="openpgp_description_text3">Salaus ilmestyy näkyviin vain jos kaikki vastaanottajat tukevat sitä, ja kyseiset tahot ovat lähettäneet sinulle sähköpostia aiemmin.</string>
-  <string name="openpgp_description_text2">Ota salaus käyttöön tai poista käytöstä napauttamalla tätä kuvaketta.</string>
-  <string name="openpgp_enabled_error_gotit">Selvä</string>
-  <string name="openpgp_enabled_error_back">Takaisin</string>
-  <string name="openpgp_enabled_error_disable">Poista salaus käytöstä</string>
-  <string name="openpgp_encryption">OpenPGP-salaus</string>
-  <string name="account_settings_crypto_prefer_encrypt">Automattisen salauksen kahdenkeskeinen tila</string>
-  <string name="dialog_autocrypt_mutual_title">Automattisen salauksen kahdenkeskeinen tila</string>
-  <string name="dialog_autocrypt_mutual_description_1">Viestit salataan normaalisti valinnan mukaan, tai kun vastataan salattuun viestiin.</string>
-  <string name="dialog_autocrypt_mutual_description_2">Jos sekä lähettäjä että vastaanottaja ottavat käyttöön kahdenkeskeisen tilan, salaus otetaan käyttöön oletusarvoisesti.</string>
-  <string name="dialog_autocrypt_mutual_learn_more">Voit <a href="https://k9mail.app/2018/02/26/OpenPGP-Considerations-Part-III-Autocrypt.html">napauttaa tästä</a> saadaksesi lisätietoja.</string>
-  <string name="general_settings_title">Yleiset asetukset</string>
-  <string name="dialog_openkeychain_info_title">OpenPGP-sovellusta ei ole asennettu</string>
-  <string name="dialog_openkeychain_info_install">Asenna</string>
-  <string name="dialog_openkeychain_info_text">K-9 Mail vaatii OpenKeychainin päästä päähän -salausta varten.</string>
-  <string name="encrypted_subject">Salattu viesti</string>
-  <string name="account_settings_crypto_encrypt_subject">Salaa viestien aiheet</string>
-  <string name="account_settings_crypto_encrypt_subject_subtitle">Ei välttämättä tuettu kaikkien vastaanottajien osalta</string>
-  <string name="toast_account_not_found">Sisäinen virhe: virheellinen tili!</string>
-  <string name="toast_openpgp_provider_error">Virhe yhdistäessä kohteeseen %s!</string>
-  <string name="ac_transfer_setting_title">Lähetä Autocrypt-asetusviesti</string>
-  <string name="ac_transfer_setting_summary">Jaa päästä päähän -salauksen asetukset turvallisesti muiden laitteiden kanssa</string>
-  <string name="ac_transfer_title">Autocrypt-asetusviesti</string>
-  <string name="ac_transfer_intro">Autocrypt-asetusviesti jakaa päästä päähän -salauksen asetukset turvallisesti muiden laitteidesi kanssa.</string>
-  <string name="ac_transfer_button_send">Lähetä asetusviesti</string>
-  <string name="ac_transfer_will_be_sent">Viesti lähetetään osoitteeseesi:</string>
-  <string name="ac_transfer_generating">Luodaan asetusviestiä…</string>
-  <string name="ac_transfer_sending_to">Lähetetään viesti:</string>
-  <string name="ac_transfer_finish">Viimeistelläksesi avaa viesti toisella laitteellasi ja kirjoita asetuskoodi.</string>
-  <string name="ac_transfer_show_code">Näytä asetuskoodi</string>
-  <string name="ac_transfer_msg_subject">Autocrypt-asetusviesti</string>
-  <string name="ac_transfer_msg_body">Tämä viesti sisältää kaikki tiedot Autocryptin asetusten sekä salausavaimesi siirtämiseksi turvallisesti alkuperäisestä laitteestasi.
+    <!--Default signature-->
+    <string name="default_signature">-- \nLähetetty Android-laitteestani Mail Maililla. Pahoittelut vähäsanaisuudestani.</string>
+    <!--General strings that include the app name-->
+    <string name="account_delete_dlg_instructions_fmt">Tili \"<xliff:g id="account">%s</xliff:g>\" poistetaan Mailista.</string>
+    <!--=== General strings ==================================================================-->
+    <string name="authors">Tekijät</string>
+    <string name="about_title">Tietoja Mailista</string>
+    <string name="accounts_title">Tilit</string>
+    <string name="advanced">Lisäasetukset</string>
+    <string name="compose_title_compose">Kirjoita</string>
+    <string name="compose_title_reply">Vastaa</string>
+    <string name="compose_title_reply_all">Vastaa kaikille</string>
+    <string name="compose_title_forward">Välitä</string>
+    <string name="compose_title_forward_as_attachment">Välitä liitteenä</string>
+    <string name="choose_account_title">Valitse tili</string>
+    <string name="choose_folder_title">Valitse kansio</string>
+    <string name="choose_folder_move_title">Siirrä…</string>
+    <string name="choose_folder_copy_title">Kopioi…</string>
+    <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> valittu</string>
+    <string name="next_action">Seuraava</string>
+    <string name="previous_action">Edellinen</string>
+    <!--Used to confirm acceptance of dialog boxes, warnings, errors, etc.-->
+    <string name="okay_action">OK</string>
+    <string name="cancel_action">Peruuta</string>
+    <string name="send_action">Lähetä</string>
+    <string name="empty_subject">Aihe on tyhjä, napsauta uudelleen lähettääksesi silti</string>
+    <string name="reply_action">Vastaa</string>
+    <string name="reply_all_action">Vastaa kaikille</string>
+    <string name="delete_action">Poista</string>
+    <string name="archive_action">Arkistoi</string>
+    <string name="spam_action">Roskaposti</string>
+    <string name="forward_action">Välitä</string>
+    <string name="forward_as_attachment_action">Välitä liitteenä</string>
+    <string name="edit_as_new_message_action">Muokkaa uutena viestinä</string>
+    <string name="move_action">Siirrä</string>
+    <string name="move_to_drafts_action">Siirrä luonnoksiin</string>
+    <string name="single_message_options_action">Lähetä…</string>
+    <string name="refile_action">Siirrä kansioon…</string>
+    <string name="done_action">Valmis</string>
+    <string name="discard_action">Hylkää</string>
+    <string name="save_draft_action">Tallenna luonnoksena</string>
+    <string name="check_mail_action">Tarkista sähköposti</string>
+    <string name="send_messages_action">Lähetä viestit</string>
+    <string name="refresh_folders_action">Päivitä kansiot</string>
+    <string name="filter_folders_action">Etsi kansio</string>
+    <string name="add_account_action">Lisää tili</string>
+    <string name="compose_action">Kirjoita</string>
+    <string name="search_action">Etsi</string>
+    <string name="search_everywhere_action">Etsi kaikkialta</string>
+    <string name="search_results">Hakutulokset</string>
+    <string name="new_messages_title">Uudet viestit</string>
+    <string name="preferences_action">Asetukset</string>
+    <string name="folders_action">Hallitse kansioita</string>
+    <string name="account_settings_action">Tilin asetukset</string>
+    <string name="remove_account_action">Poista tili</string>
+    <string name="mark_as_read_action">Merkitse luetuksi</string>
+    <string name="send_alternate_action">Jaa</string>
+    <string name="send_alternate_chooser_title">Valitse lähettäjä</string>
+    <string name="flag_action">Lisää tähti</string>
+    <string name="unflag_action">Poista tähti</string>
+    <string name="copy_action">Kopioi</string>
+    <string name="unsubscribe_action">Lopeta tilaus</string>
+    <string name="show_headers_action">Näytä otsikot</string>
+    <plurals name="copy_address_to_clipboard">
+        <item quantity="one">Osoite kopioitu leikepöydälle</item>
+        <item quantity="other">Osoitteet kopioitu leikepöydälle</item>
+    </plurals>
+    <string name="copy_subject_to_clipboard">Aiheen teksti kopioitu leikepöydälle</string>
+    <string name="message_view_theme_action_dark">Vaihda tummaan teemaan</string>
+    <string name="message_view_theme_action_light">Vaihda vaaleaan teemaan</string>
+    <string name="mark_as_unread_action">Merkitse lukemattomaksi</string>
+    <string name="read_receipt">Lukukuittaus</string>
+    <string name="read_receipt_enabled">Lukukuittaus pyydetään</string>
+    <string name="read_receipt_disabled">Lukukuittausta ei pyydetä</string>
+    <string name="add_attachment_action">Lisää liite</string>
+    <string name="empty_trash_action">Tyhjennä roskakori</string>
+    <string name="expunge_action">Poista pysyvästi</string>
+    <string name="about_action">Tietoja</string>
+    <string name="prefs_title">Asetukset</string>
+    <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
+    <string name="general_no_subject">(Ei aihetta)</string>
+    <string name="general_no_sender">Ei lähettäjää</string>
+    <string name="status_loading_more">Ladataan viestejä\u2026</string>
+    <string name="status_network_error">Yhteysvirhe</string>
+    <string name="status_invalid_id_error">Viestiä ei löytynyt</string>
+    <string name="status_loading_error">Viestin lataamisvirhe</string>
+    <string name="load_more_messages_fmt">Lataa <xliff:g id="messages_to_load">%d</xliff:g> lisää</string>
+    <string name="size_format_gigabytes">%.1f Gt</string>
+    <string name="size_format_megabytes">%.1f Mt</string>
+    <string name="size_format_kilobytes">%.1f kt</string>
+    <string name="size_format_bytes">%d t</string>
+    <string name="notification_new_title">Uusi sähköpostiviesti</string>
+    <plurals name="notification_new_messages_title">
+        <item quantity="one"><xliff:g id="new_message_count">%d</xliff:g> uusi viesti</item>
+        <item quantity="other"><xliff:g id="new_message_count">%d</xliff:g> uutta viestiä</item>
+    </plurals>
+    <string name="notification_new_one_account_fmt"><xliff:g id="unread_message_count">%1$d</xliff:g> lukematonta (<xliff:g id="account">%2$s</xliff:g>)</string>
+    <string name="notification_additional_messages">+ <xliff:g id="additional_messages">%1$d</xliff:g> lisää tilillä <xliff:g id="account">%2$s</xliff:g></string>
+    <string name="notification_action_reply">Vastaa</string>
+    <string name="notification_action_mark_as_read">Merkitse luetuksi</string>
+    <string name="notification_action_mark_all_as_read">Merkitse kaikki luetuiksi</string>
+    <string name="notification_action_delete">Poista</string>
+    <string name="notification_action_delete_all">Poista kaikki</string>
+    <string name="notification_action_archive">Arkistoi</string>
+    <string name="notification_action_archive_all">Arkistoi kaikki</string>
+    <string name="notification_action_spam">Roskaposti</string>
+    <string name="notification_certificate_error_public">Varmennevirhe</string>
+    <string name="notification_certificate_error_title">Varmennevirhe tilissä <xliff:g id="account">%s</xliff:g></string>
+    <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">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
+    <string name="notification_bg_send_title">Lähetetään viestejä</string>
+    <string name="notification_bg_title_separator">:</string>
+    <string name="notification_channel_push_title">Synkronoi (Push)</string>
+    <string name="notification_channel_push_description">Näytetään kun odotetaan uusia viestejä</string>
+    <string name="notification_channel_messages_title">Viestit</string>
+    <string name="notification_channel_messages_description">Viesteihin liittyvät ilmoitukset</string>
+    <string name="notification_channel_miscellaneous_title">Muut</string>
+    <string name="notification_channel_miscellaneous_description">Virheet ja muut sekalaiset ilmoitukset</string>
+    <string name="special_mailbox_name_inbox">Saapuneet</string>
+    <string name="special_mailbox_name_outbox">Lähtevät</string>
+    <string name="special_mailbox_name_drafts">Luonnokset</string>
+    <string name="special_mailbox_name_trash">Roskakori</string>
+    <string name="special_mailbox_name_sent">Lähetetyt</string>
+    <string name="send_failure_subject">Joidenkin viestien lähettäminen epäonnistui</string>
+    <string name="version">Versio</string>
+    <string name="debug_enable_debug_logging_title">Käytä virheenkorjaustietojen lokiinkirjausta</string>
+    <string name="debug_enable_debug_logging_summary">Kirjoita lokiin laajempi kuvaus ongelmista</string>
+    <string name="debug_enable_sensitive_logging_title">Kirjaa lokiin arkaluontoisia tietoja</string>
+    <string name="debug_enable_sensitive_logging_summary">Salasanat saattavat näkyä lokeissa.</string>
+    <string name="debug_export_logs_title">Vie lokit</string>
+    <string name="debug_export_logs_success">Vienti onnistui. Lokit saattavat sisältää arkaluonteista tietoa. Pidä ne tallessa ja ole varovainen sen suhteen, kenelle ne lähetät.</string>
+    <string name="debug_export_logs_failure">Vienti epäonnistui.</string>
+    <string name="message_list_load_more_messages_action">Lataa lisää viestejä</string>
+    <string name="message_to_fmt">Vastaanottaja: <xliff:g id="counterParty"> %s </xliff:g></string>
+    <string name="message_compose_subject_hint">Aihe</string>
+    <string name="message_compose_content_hint">Viesti</string>
+    <string name="message_compose_signature_hint">Allekirjoitus</string>
+    <string name="message_compose_quote_header_separator">-------- Alkuperäinen viesti --------</string>
+    <string name="message_compose_quote_header_subject">Aihe:</string>
+    <string name="message_compose_quote_header_send_date">Lähetetty:</string>
+    <string name="message_compose_quote_header_from">Lähettäjä:</string>
+    <string name="message_compose_quote_header_to">Vastaanottaja:</string>
+    <string name="message_compose_quote_header_cc">Kopio:</string>
+    <string name="message_compose_reply_header_fmt"><xliff:g id="sender">%s</xliff:g> kirjoitti:</string>
+    <string name="message_compose_reply_header_fmt_with_date"><xliff:g id="sent_date">%1$s</xliff:g> <xliff:g id="sender">%2$s</xliff:g> kirjoitti:</string>
+    <string name="message_compose_error_no_recipients">Valitse vähintään yksi vastaanottaja.</string>
+    <string name="compose_error_incomplete_recipient">Vastaanottajakenttä sisältää virheellistä syötettä!</string>
+    <string name="error_contact_address_not_found">Tämän henkilön sähköpostiosoitetta ei löytynyt.</string>
+    <string name="message_compose_attachments_skipped_toast">Joitakin liitteitä ei voida lähettää edelleen, koska niitä ei ole ladattu.</string>
+    <string name="message_compose_attachments_forward_toast">Viestiä ei voida välittää, koska joitain liitteitä ei ole ladattu.</string>
+    <string name="message_compose_show_quoted_text_action">Sisällytä lainattu viesti</string>
+    <string name="message_compose_description_delete_quoted_text">Poista lainattu teksti</string>
+    <string name="message_compose_description_edit_quoted_text">Muokkaa lainattua tekstiä</string>
+    <string name="remove_attachment_action">Poista liite</string>
+    <string name="message_view_from_format">Lähettäjä: <xliff:g id="name">%1$s</xliff:g> &lt;<xliff:g id="email">%2$s</xliff:g>&gt;</string>
+    <string name="message_to_label">Vast.ottaja:</string>
+    <string name="message_view_cc_label">Kopio:</string>
+    <string name="message_view_bcc_label">Piilokopio:</string>
+    <string name="message_view_status_attachment_not_saved">Liitteen tallentaminen epäonnistui.</string>
+    <string name="message_view_show_pictures_action">Näytä kuvat</string>
+    <string name="message_view_no_viewer">Tiedostotyypille <xliff:g id="mimetype">%s</xliff:g> ei löydy katseluohjelmaa.</string>
+    <string name="message_view_download_remainder">Lataa koko viesti</string>
+    <string name="message_view_sender_label">%1$s kautta</string>
+    <string name="from_same_sender">Lisää samalta lähettäjältä</string>
+    <string name="search_from_format">Lähettäjä <xliff:g id="sender">%s</xliff:g></string>
+    <string name="message_discarded_toast">Viesti peruutettu</string>
+    <string name="message_saved_toast">Viesti tallennettu luonnoksena</string>
+    <string name="global_settings_flag_label">Näytä tähdet</string>
+    <string name="global_settings_flag_summary">Tähdet ilmaisevat merkityt viestit</string>
+    <string name="global_settings_preview_lines_label">Rivien esikatselu</string>
+    <string name="global_settings_show_correspondent_names_label">Näytä yhteyshenkilöiden nimet</string>
+    <string name="global_settings_show_correspondent_names_summary">Näytä yhteyshenkilöiden nimet sähköpostiosoitteen sijaan</string>
+    <string name="global_settings_sender_above_subject_label">Yhteyshenkilö aiheen yläpuolella</string>
+    <string name="global_settings_sender_above_subject_summary">Näytä yhteyshenkilöiden nimet aiherivin yläpuolella</string>
+    <string name="global_settings_show_contact_name_label">Näytä yhteystietojen nimet</string>
+    <string name="global_settings_show_contact_name_summary">Käytä vastaanottajien nimiä osoitekirjasta, kun käytettävissä</string>
+    <string name="global_settings_registered_name_color_label">Väritä yhteystiedot</string>
+    <string name="global_settings_registered_name_color_changed">Väritä nimet yhteystiedoissa</string>
+    <string name="general_settings_contact_name_color_label">Yhteystiedon nimen väri</string>
+    <string name="global_settings_messageview_fixedwidth_label">Kiinteä kirjasinleveys</string>
+    <string name="global_settings_messageview_fixedwidth_summary">Käytä kiinteää kirjasinleveyttä muotoilemattomille viesteille</string>
+    <string name="global_settings_messageview_autofit_width_label">Sovita viestit automaattisesti</string>
+    <string name="global_settings_messageview_autofit_width_summary">Kutista viestit sopimaan näytölle</string>
+    <string name="global_settings_messageview_return_to_list_label">Palaa poiston jälkeen listanäkymään</string>
+    <string name="global_settings_messageview_return_to_list_summary">Palaa viestilistaan viestin poiston jälkeen</string>
+    <string name="global_settings_messageview_show_next_label">Näytä poiston jälkeen seuraava viesti</string>
+    <string name="global_settings_messageview_show_next_summary">Näytä viestin poiston jälkeen oletusarvoisesti seuraava viesti</string>
+    <string name="global_settings_confirm_actions_title">Vahvista toiminnot</string>
+    <string name="global_settings_confirm_actions_summary">Näytä valintaikkuna valitun toiminnon suorittamisesta</string>
+    <string name="global_settings_confirm_action_delete">Poista</string>
+    <string name="global_settings_confirm_action_delete_starred">Poista tähdellä merkityt (viestinäkymässä)</string>
+    <string name="global_settings_confirm_action_spam">Roskaposti</string>
+    <string name="global_settings_confirm_menu_discard">Hylkää viesti</string>
+    <string name="global_settings_confirm_menu_mark_all_read">Merkitse kaikki viestit luetuiksi</string>
+    <string name="global_settings_confirm_action_delete_notif">Poista (ilmoituksessa)</string>
+    <!--Title of the screen to configure swipe actions-->
+    <string name="general_settings_swipe_actions_title">Vetotoiminnot</string>
+    <!--Name of the setting to configure the right swipe action-->
+    <string name="general_settings_right_swipe_title">Veto oikealle</string>
+    <!--Name of the setting to configure the left swipe action-->
+    <string name="general_settings_left_swipe_title">Veto vasemmalle</string>
+    <!--The list item users select to not use a swipe action for a particular direction-->
+    <string name="general_settings_swipe_action_none">Ei mitään</string>
+    <!--Name of the swipe action to select/deselect a message-->
+    <string name="general_settings_swipe_action_toggle_selection">Valitse viesti tai poista valinta viestin kohdalta</string>
+    <!--Name of the swipe action to mark as message as read/unread-->
+    <string name="general_settings_swipe_action_toggle_read">Merkitse luetuksi/lukemattomaksi</string>
+    <!--Name of the swipe action to add/remove a star-->
+    <string name="general_settings_swipe_action_toggle_star">Lisää tai poista tähti</string>
+    <!--Name of the swipe action to archive a message-->
+    <string name="general_settings_swipe_action_archive">Arkistoi</string>
+    <!--Name of the swipe action to delete a message-->
+    <string name="general_settings_swipe_action_delete">Poista</string>
+    <!--Name of the swipe action to move a message to the spam folder-->
+    <string name="general_settings_swipe_action_spam">Roskaposti</string>
+    <!--Name of the swipe action to move a message to another folder-->
+    <string name="general_settings_swipe_action_move">Siirrä</string>
+    <string name="global_settings_privacy_hide_useragent">Piilota sähköpostisovellus</string>
+    <string name="global_settings_privacy_hide_useragent_detail">Poista Mail-tunnistetiedot viestin otsaketiedoista</string>
+    <string name="global_settings_privacy_hide_timezone">Piilota aikavyöhyke</string>
+    <string name="global_settings_privacy_hide_timezone_detail">Käytä UTC-aikaa paikallisen aikavyöhykkeen sijaan sähköpostin otsakkeissa</string>
+    <string name="global_settings_notification_quick_delete_title">Näytä Poista-painike</string>
+    <string name="global_settings_notification_quick_delete_never">Ei koskaan</string>
+    <string name="global_settings_notification_quick_delete_when_single_msg">Yksittäisen viestin ilmoituksessa</string>
+    <string name="global_settings_notification_quick_delete_always">Aina</string>
+    <string name="global_settings_lock_screen_notification_visibility_title">Lukitusnäytön ilmoitukset</string>
+    <string name="global_settings_lock_screen_notification_visibility_nothing">Ei lukitusnäytön ilmoituksia</string>
+    <string name="global_settings_lock_screen_notification_visibility_app_name">Sovelluksen nimi</string>
+    <string name="global_settings_lock_screen_notification_visibility_message_count">Uusien viestien määrä</string>
+    <string name="global_settings_lock_screen_notification_visibility_senders">Viestien määrä ja lähettäjät</string>
+    <string name="global_settings_lock_screen_notification_visibility_everything">Sama kuin näytön ollessa lukittuna</string>
+    <string name="quiet_time">Hiljainen aika</string>
+    <string name="quiet_time_description">Poista käytöstä soittoäänen pirinä, pärinä ja vilkkuminen yöllä</string>
+    <string name="quiet_time_notification">Poista ilmoitukset käytöstä</string>
+    <string name="quiet_time_notification_description">Poista ilmoitukset kokonaan käytöstä hiljaisena aikana</string>
+    <string name="quiet_time_starts">Hiljainen aika alkaa</string>
+    <string name="quiet_time_ends">Hiljainen aika päättyy</string>
+    <string name="account_setup_basics_title">Lisää uusi tili</string>
+    <string name="account_setup_basics_email_hint">Sähköpostiosoite</string>
+    <string name="account_setup_basics_password_hint">Salasana</string>
+    <string name="account_setup_oauth_description">Jotta voit käyttää tätä tiliä K-9 Mailin kanssa, sinun tulee kirjautua sisään ja antaa sovellukselle oikeus päästä sähköposteihisi.</string>
+    <!--Displayed below the 'account_setup_oauth_description' text-->
+    <string name="account_setup_oauth_sign_in">Kirjaudu sisään</string>
+    <!--Displayed below the 'account_setup_oauth_description' text-->
+    <string name="account_setup_oauth_sign_in_with_google">Kirjaudu sisään Googlella</string>
+    <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
+    <string name="account_setup_basics_show_password_need_lock">Jotta näet salasanasi tässä, ota käyttöön laitteen näytön lukitus.</string>
+    <string name="account_setup_basics_show_password_biometrics_title">Vahvista henkilöllisyytesi</string>
+    <string name="account_setup_basics_show_password_biometrics_subtitle">Avaa lukitus nähdäksesi salasanasi</string>
+    <string name="account_setup_basics_manual_setup_action">Määritä asetukset käsin</string>
+    <string name="account_setup_check_settings_title" />
+    <string name="account_setup_check_settings_retr_info_msg">Haetaan tilin tietoja\u2026</string>
+    <string name="account_setup_check_settings_check_incoming_msg">Tarkistetaan saapuvan postin palvelimen asetuksia\u2026</string>
+    <string name="account_setup_check_settings_check_outgoing_msg">Tarkistetaan lähtevän postin palvelimen asetuksia\u2026</string>
+    <string name="account_setup_check_settings_authenticate">Varmistetaan\u2026</string>
+    <string name="account_setup_check_settings_fetch">Haetaan tilin asetuksia\u2026</string>
+    <string name="account_setup_check_settings_canceling_msg">Peruutetaan\u2026</string>
+    <string name="account_setup_names_title">Melkein valmista!</string>
+    <string name="account_setup_names_account_name_label">Anna tilin nimi (ei pakollinen):</string>
+    <string name="account_setup_names_user_name_label">Anna nimesi (näkyy lähtevissä viesteissä):</string>
+    <string name="account_setup_account_type_title">Tilin tyyppi</string>
+    <string name="account_setup_account_type_instructions">Mikä tämän tilin tyyppi on?</string>
+    <string name="account_setup_account_type_pop_action">POP3</string>
+    <string name="account_setup_account_type_imap_action">IMAP</string>
+    <string name="account_setup_auth_type_normal_password">Tavallinen salasana</string>
+    <string name="account_setup_auth_type_insecure_password">Salasana, välitetään turvattomasti</string>
+    <string name="account_setup_auth_type_encrypted_password">Salattu salasana</string>
+    <string name="account_setup_auth_type_tls_client_certificate">Asiakasvarmenne</string>
+    <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
+    <string name="account_setup_incoming_title">Saapuvan postin palvelimen asetukset</string>
+    <string name="account_setup_incoming_username_label">Käyttäjätunnus</string>
+    <string name="account_setup_incoming_password_label">Salasana</string>
+    <string name="account_setup_incoming_client_certificate_label">Asiakasvarmenne</string>
+    <string name="account_setup_incoming_pop_server_label">POP3-palvelin</string>
+    <string name="account_setup_incoming_imap_server_label">IMAP-palvelin</string>
+    <string name="account_setup_incoming_webdav_server_label">Exchange-palvelin</string>
+    <string name="account_setup_incoming_port_label">Portti</string>
+    <string name="account_setup_incoming_security_label">Suojauksen tyyppi</string>
+    <string name="account_setup_incoming_auth_type_label">Todennuksen tyyppi</string>
+    <string name="account_setup_incoming_security_none_label">Ei mitään</string>
+    <string name="account_setup_incoming_security_ssl_label">SSL/TLS</string>
+    <string name="account_setup_incoming_security_tls_label">STARTTLS</string>
+    <string name="account_setup_incoming_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei ole kelvollinen asetuksen \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" kanssa</string>
+    <string name="account_setup_incoming_delete_policy_label">Kun viesti poistetaan</string>
+    <string name="account_setup_incoming_delete_policy_never_label">Älä poista palvelimelta</string>
+    <string name="account_setup_incoming_delete_policy_delete_label">Poista palvelimelta</string>
+    <string name="account_setup_incoming_delete_policy_markread_label">Merkitse luetuksi palvelimella</string>
+    <string name="account_setup_incoming_use_compression">Käytä pakkausta</string>
+    <string name="account_setup_expunge_policy_label">Poista viestit</string>
+    <string name="account_setup_expunge_policy_immediately">Heti</string>
+    <string name="account_setup_expunge_policy_on_poll">Tarkistettaessa</string>
+    <string name="account_setup_expunge_policy_manual">Vain manuaalisesti</string>
+    <string name="account_setup_incoming_autodetect_namespace_label">Tunnista IMAP-nimiavaruus automaattisesti</string>
+    <string name="account_setup_incoming_imap_path_prefix_label">IMAP-polun etuliite</string>
+    <string name="drafts_folder_label">Luonnokset-kansio</string>
+    <string name="sent_folder_label">Lähetetyt-kansio</string>
+    <string name="trash_folder_label">Roskakori-kansio</string>
+    <string name="archive_folder_label">Arkisto-kansio</string>
+    <string name="spam_folder_label">Roskapostikansio</string>
+    <string name="account_setup_incoming_subscribed_folders_only_label">Näytä vain tilatut kansiot</string>
+    <string name="account_setup_auto_expand_folder">Avaa kansio automaattisesti</string>
+    <string name="account_setup_incoming_webdav_path_prefix_label">OWA-polku</string>
+    <string name="account_setup_incoming_webdav_auth_path_label">Autentikointipolku</string>
+    <string name="account_setup_incoming_webdav_mailbox_path_label">Postilaatikon polku</string>
+    <string name="account_setup_outgoing_title">Lähtevän postin palvelimen asetukset</string>
+    <string name="account_setup_outgoing_smtp_server_label">SMTP-palvelin</string>
+    <string name="account_setup_outgoing_port_label">Portti</string>
+    <string name="account_setup_outgoing_security_label">Suojaus</string>
+    <string name="account_setup_outgoing_require_login_label">Edellytä kirjautumista.</string>
+    <string name="account_setup_outgoing_username_label">Käyttäjätunnus</string>
+    <string name="account_setup_outgoing_password_label">Salasana</string>
+    <string name="account_setup_outgoing_authentication_label">Todennustapa</string>
+    <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" ei ole kelvollinen asetuksen \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\" kanssa</string>
+    <string name="account_setup_bad_uri">Virheellinen asetus: <xliff:g id="err_mess">%s</xliff:g></string>
+    <string name="account_setup_options_title">Tilin asetukset</string>
+    <string name="account_setup_options_mail_check_frequency_label">Viestien tarkistus</string>
+    <string name="account_setup_options_mail_check_frequency_never">Ei koskaan</string>
+    <string name="account_setup_options_mail_check_frequency_15min">Joka 15 minuutti</string>
+    <string name="account_setup_options_mail_check_frequency_30min">Joka 30 minuutti</string>
+    <string name="account_setup_options_mail_check_frequency_1hour">Joka tunti</string>
+    <string name="account_setup_options_mail_check_frequency_2hour">Joka 2 tunti</string>
+    <string name="account_setup_options_mail_check_frequency_3hour">Joka 3 tunti</string>
+    <string name="account_setup_options_mail_check_frequency_6hour">Joka 6 tunti</string>
+    <string name="account_setup_options_mail_check_frequency_12hour">Joka 12 tunti</string>
+    <string name="account_setup_options_mail_check_frequency_24hour">Joka 24 tunti</string>
+    <string name="idle_refresh_period_label">Päivitä IDLE-yhteys</string>
+    <string name="idle_refresh_period_2min">Joka 2 minuutti</string>
+    <string name="idle_refresh_period_3min">Joka 3 minuutti</string>
+    <string name="idle_refresh_period_6min">Joka 6 minuutti</string>
+    <string name="idle_refresh_period_12min">Joka 12 minuutti</string>
+    <string name="idle_refresh_period_24min">Joka 24 minuutti</string>
+    <string name="idle_refresh_period_36min">Joka 36 minuutti</string>
+    <string name="idle_refresh_period_48min">Joka 48 minuutti</string>
+    <string name="idle_refresh_period_60min">Joka 60 minuutti</string>
+    <string name="account_setup_options_notify_label">Ilmoitus postin saapumisesta</string>
+    <string name="account_setup_options_mail_display_count_label">Näytettävien viestien lukumäärä</string>
+    <string name="account_setup_options_mail_display_count_10">10 kansiota</string>
+    <string name="account_setup_options_mail_display_count_25">25 kansiota</string>
+    <string name="account_setup_options_mail_display_count_50">50 kansiota</string>
+    <string name="account_setup_options_mail_display_count_100">100 viestiä</string>
+    <string name="account_setup_options_mail_display_count_250">250 viestiä</string>
+    <string name="account_setup_options_mail_display_count_500">500 viestiä</string>
+    <string name="account_setup_options_mail_display_count_1000">1000 viestiä</string>
+    <string name="account_setup_options_mail_display_count_2500">2500 viestiä</string>
+    <string name="account_setup_options_mail_display_count_5000">5000 viestiä</string>
+    <string name="account_setup_options_mail_display_count_10000">10000 viestiä</string>
+    <string name="account_setup_options_mail_display_count_all">Kaikki viestit</string>
+    <string name="move_copy_cannot_copy_unsynced_message">Viestiä ei voi kopioida tai siirtää, koska sitä ei ole synkronoitu palvelimelle</string>
+    <string name="account_setup_failed_dlg_title">Asennus ei onnistunut</string>
+    <string name="account_setup_failed_dlg_auth_message_fmt">Käyttäjätunnus tai salasana väärin.\n(<xliff:g id="error">%s</xliff:g>)</string>
+    <string name="account_setup_failed_dlg_certificate_message_fmt">Palvelin esitti virheellisen SSL-varmenteen. Joskus tämä johtuu palvelimen vääristä asetuksista. Toisinaan syynä on se, että joku koettaa hyökätä sinua tai sähköpostipalvelinta vastaan. Jos et ole varma mistä on kyse, napsauta Hylkää ja ole yhteydessä sähköpostipalvelinta hallinoivaan tahoon.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
+    <string name="account_setup_failed_dlg_server_message_fmt">Yhteys palvelimeen ei onnistu.\n(<xliff:g id="error">%s</xliff:g>)</string>
+    <string name="account_setup_failed_dlg_oauth_flow_canceled">Valtuutus peruttu</string>
+    <string name="account_setup_failed_dlg_oauth_flow_failed">Valtuutus epäonnistui, virhe: <xliff:g id="error">%s</xliff:g></string>
+    <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 ei ole tällä hetkellä tuettu tämän palvelutarjoajan kohdalla.</string>
+    <string name="account_setup_failed_dlg_browser_not_found">Sovellus ei löytänyt selainta käytettäväksi pääsyn antamiseksi tälle tilille.</string>
+    <string name="account_setup_failed_dlg_edit_details_action">Muokkaa tietoja</string>
+    <string name="account_setup_failed_dlg_continue_action">Jatka</string>
+    <string name="account_settings_push_advanced_title">Lisäasetukset</string>
+    <string name="account_settings_title_fmt">Yleiset</string>
+    <string name="account_settings_notify_label">Saapuneiden viestien ilmoitukset</string>
+    <string name="account_settings_folder_notify_new_mail_mode_label">Ilmoitukset kansioista</string>
+    <string name="account_settings_folder_notify_new_mail_mode_all">Kaikki</string>
+    <string name="account_settings_folder_notify_new_mail_mode_first_class">Vain 1. luokan kansiot</string>
+    <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
+    <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_folder_notify_new_mail_mode_none">Ei mitään</string>
+    <string name="account_settings_notify_sync_label">Synkronointi-ilmoitukset</string>
+    <string name="account_settings_email_label">Sähköpostiosoite</string>
+    <string name="account_settings_notify_summary">Näytä tilapalkissa ilmoitus uusista viesteistä</string>
+    <string name="account_settings_notify_sync_summary">Näytä tilapalkissa ilmoitus viestien tarkistamisesta</string>
+    <string name="account_settings_notify_self_label">Ilmoita lähetetyistä viesteistä</string>
+    <string name="account_settings_notify_self_summary">Näytä ilmoitus lähettämistäni viesteistä</string>
+    <string name="account_notify_contacts_mail_only_label">Vain yhteystiedot</string>
+    <string name="account_notify_contacts_mail_only_summary">Näytä ilmoitukset vain niistä viesteistä, jotka tulevat tunnetuilta yhteystiedoilta</string>
+    <string name="account_settings_ignore_chat_messages_label">Älä huomioi keskusteluviestejä</string>
+    <string name="account_settings_ignore_chat_messages_summary">Älä näytä ilmoituksia viesteistä, jotka kuuluvat sähköpostikeskusteluun</string>
+    <string name="account_settings_mark_message_as_read_on_view_label">Merkitse viesti luetuksi avattaessa</string>
+    <string name="account_settings_mark_message_as_read_on_view_summary">Merkitse viesti luetuksi, kun se avataan katseltavaksi</string>
+    <string name="account_settings_mark_message_as_read_on_delete_label">Merkitse luetuksi poistettaessa</string>
+    <string name="account_settings_mark_message_as_read_on_delete_summary">Merkitse viesti luetuksi, kun se poistetaan</string>
+    <string name="account_settings_notification_channels_label">Ilmoitusten luokat</string>
+    <string name="account_settings_open_notification_settings_messages_summary">Määritä uusien viestien ilmoitukset</string>
+    <string name="account_settings_open_notification_settings_miscellaneous_summary">Määritä virhe- ja tilailmoitukset</string>
+    <string name="account_settings_show_pictures_label">Näytä aina kuvat</string>
+    <string name="account_settings_show_pictures_never">Ei koskaan</string>
+    <string name="account_settings_show_pictures_only_from_contacts">Vain yhteystiedoissa olevilta lähettäjiltä</string>
+    <string name="account_settings_show_pictures_always">Keneltä tahansa</string>
+    <string name="account_settings_composition">Viestien lähettäminen</string>
+    <string name="account_settings_default_quoted_text_shown_label">Lainaa alkuperäistä viestiä vastattaessa  </string>
+    <string name="account_settings_default_quoted_text_shown_summary">Alkuperäinen viesti on vastauksessa viesteihin vastattaessa.</string>
+    <string name="account_settings_reply_after_quote_label">Vastaa lainauksen jälkeen</string>
+    <string name="account_settings_reply_after_quote_summary">Kun viestiin vastataan, alkuperäinen viesti on vastauksesi yläpuolella.</string>
+    <string name="account_settings_strip_signature_label">Poista allekirjoitus lainatusta vastauksesta</string>
+    <string name="account_settings_strip_signature_summary">Lainatun tekstin allekirjoitus poistetaan viesteihin vastattaessa</string>
+    <string name="account_settings_message_format_label">Viestin muoto</string>
+    <string name="account_settings_message_format_text">Pelkkä teksti (kuvat ja muotoilu poistetaan)</string>
+    <string name="account_settings_message_format_html">HTML (kuvat ja muotoilu säilytetään)</string>
+    <string name="account_settings_message_format_auto">Automaattinen (pelkkä teksti, ellei vastata HTML-viestiin)</string>
+    <string name="account_settings_always_show_cc_bcc_label">Näytä aina Kopio/Piilokopio</string>
+    <string name="account_settings_message_read_receipt_label">Vastaanottokuittaus</string>
+    <string name="account_settings_message_read_receipt_summary">Pyydä aina vastaanottokuittaus</string>
+    <string name="account_settings_quote_style_label">Lainauksen tyyli vastattaessa</string>
+    <string name="account_settings_quote_style_prefix">Etuliite (kuten Gmail, Pine)</string>
+    <string name="account_settings_quote_style_header">Otsikko (kuten Outlook, Yahoo!, Hotmail)</string>
+    <string name="account_settings_upload_sent_messages_label">Lähetä lähetetyt viestit</string>
+    <string name="account_settings_upload_sent_messages_summary">Lähetä viestit Lähetetyt-kansioon lähettämisen jälkeen</string>
+    <string name="account_settings_general_title">Yleiset asetukset</string>
+    <string name="account_settings_reading_mail">Viestien lukeminen</string>
+    <string name="account_settings_sync">Viestien hakeminen</string>
+    <string name="account_settings_folders">Kansiot</string>
+    <string name="account_settings_quote_prefix_label">Lainauksen etuliite</string>
+    <string name="account_settings_crypto">Päästä päähän -salaus</string>
+    <string name="account_settings_crypto_app">Ota käyttöön OpenPGP-tuki</string>
+    <string name="account_settings_crypto_app_select_title">Valitse OpenPGP-sovellus</string>
+    <string name="account_settings_crypto_key">Määritä päästä päähän -avain</string>
+    <string name="account_settings_crypto_summary_off">OpenPGP-sovellusta ei ole määritetty</string>
+    <string name="account_settings_crypto_summary_on">Yhdistetty kohteeseen %s</string>
+    <string name="account_settings_crypto_summary_config">Tehdään asetuksia…</string>
+    <string name="account_settings_crypto_encrypt_all_drafts">Talleta kaikki luonnokset salattuina</string>
+    <string name="account_settings_crypto_encrypt_all_drafts_on">Kaikki luonnokset talletetaan salattuina</string>
+    <string name="account_settings_crypto_encrypt_all_drafts_off">Salaa luonnokset vain jos salaus on käytössä</string>
+    <string name="account_settings_mail_check_frequency_label">Kansioiden tarkistus</string>
+    <string name="account_settings_color_label">Tilin väri</string>
+    <string name="account_settings_color_summary">Valitse väri tilin kansio- ja tililistaan</string>
+    <string name="account_settings_mail_display_count_label">Paikallisen kansion koko</string>
+    <string name="account_settings_autodownload_message_size_label">Hae viestit, joiden koko on enintään</string>
+    <string name="account_settings_autodownload_message_size_1">1 KiB</string>
+    <string name="account_settings_autodownload_message_size_2">2 KiB</string>
+    <string name="account_settings_autodownload_message_size_4">4 KiB</string>
+    <string name="account_settings_autodownload_message_size_8">8 KiB</string>
+    <string name="account_settings_autodownload_message_size_16">16 KiB</string>
+    <string name="account_settings_autodownload_message_size_32">32 KiB</string>
+    <string name="account_settings_autodownload_message_size_64">64 KiB</string>
+    <string name="account_settings_autodownload_message_size_128">128 KiB</string>
+    <string name="account_settings_autodownload_message_size_256">256 KiB</string>
+    <string name="account_settings_autodownload_message_size_512">512 KiB</string>
+    <string name="account_settings_autodownload_message_size_1024">1 MiB</string>
+    <string name="account_settings_autodownload_message_size_2048">2 MiB</string>
+    <string name="account_settings_autodownload_message_size_5120">5 MiB</string>
+    <string name="account_settings_autodownload_message_size_10240">10 MiB</string>
+    <string name="account_settings_autodownload_message_size_any">mikä tahansa (ei rajoitusta)</string>
+    <string name="account_settings_message_age_label">Synkronoi viestit ajalta</string>
+    <string name="account_settings_message_age_any">milloin vain (ei rajoitusta)</string>
+    <string name="account_settings_message_age_0">tänään</string>
+    <string name="account_settings_message_age_1">viimeiset 2 päivää</string>
+    <string name="account_settings_message_age_2">viimeiset 3 päivää</string>
+    <string name="account_settings_message_age_7">viime viikko</string>
+    <string name="account_settings_message_age_14">viimeiset 2 viikkoa</string>
+    <string name="account_settings_message_age_21">viimeiset 3 viikkoa</string>
+    <string name="account_settings_message_age_1_month">viime kuun</string>
+    <string name="account_settings_message_age_2_months">viimeiset 2 kuukautta</string>
+    <string name="account_settings_message_age_3_months">viimeiset 3 kuukautta</string>
+    <string name="account_settings_message_age_6_months">viimeiset 6 kuukautta</string>
+    <string name="account_settings_message_age_1_year">viime vuosi</string>
+    <string name="account_settings_folder_display_mode_label">Näytä kansiot</string>
+    <string name="account_settings_folder_display_mode_all">Kaikki</string>
+    <string name="account_settings_folder_display_mode_first_class">Vain 1. luokan kansiot</string>
+    <string name="account_settings_folder_display_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
+    <string name="account_settings_folder_display_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_folder_sync_mode_label">Tarkistettavat kansiot</string>
+    <string name="account_settings_folder_sync_mode_all">Kaikki</string>
+    <string name="account_settings_folder_sync_mode_first_class">Vain 1. luokan kansiot</string>
+    <string name="account_settings_folder_sync_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
+    <string name="account_settings_folder_sync_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_folder_sync_mode_none">Ei mitään</string>
+    <string name="account_settings_folder_push_mode_label">Push-kysely</string>
+    <string name="account_settings_folder_push_mode_all">Kaikki</string>
+    <string name="account_settings_folder_push_mode_first_class">Vain 1. luokan kansiot</string>
+    <string name="account_settings_folder_push_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
+    <string name="account_settings_folder_push_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_folder_push_mode_none">Ei mitään</string>
+    <string name="account_settings_folder_target_mode_label">Siirrä/kopioi kohdekansiot</string>
+    <string name="account_settings_folder_target_mode_all">Kaikki</string>
+    <string name="account_settings_folder_target_mode_first_class">Vain 1. luokan kansiot</string>
+    <string name="account_settings_folder_target_mode_first_and_second_class">1. ja 2. luokan kansiot</string>
+    <string name="account_settings_folder_target_mode_not_second_class">Kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_sync_remote_deletetions_label">Synkronoi etäpoistot</string>
+    <string name="account_settings_sync_remote_deletetions_summary">Poista viestit, kun ne poistetaan palvelimelta</string>
+    <string name="account_settings_openpgp_missing">OpenPGP-sovellus puuttuu - poistettiinko se?</string>
+    <string name="folder_settings_title">Kansioiden asetukset</string>
+    <string name="folder_settings_in_top_group_label">Näytä yläryhmässä</string>
+    <string name="folder_settings_in_top_group_summary">Näytä yläosassa lähellä kansiolistaa</string>
+    <string name="folder_settings_folder_display_mode_label">Näytettävän kansion luokka</string>
+    <string name="folder_settings_folder_display_mode_normal">Ei luokkaa</string>
+    <string name="folder_settings_folder_display_mode_first_class">1. luokka</string>
+    <string name="folder_settings_folder_display_mode_second_class">2. luokka</string>
+    <string name="folder_settings_folder_sync_mode_label">Poll-luokka</string>
+    <string name="folder_settings_folder_sync_mode_normal">Ei mitään</string>
+    <string name="folder_settings_folder_sync_mode_first_class">1. luokka</string>
+    <string name="folder_settings_folder_sync_mode_second_class">2. luokka</string>
+    <string name="folder_settings_folder_sync_mode_inherited">Sama kuin näytettävällä kansiolla</string>
+    <string name="folder_settings_folder_push_mode_label">Push-luokka</string>
+    <string name="folder_settings_folder_push_mode_normal">Ei luokkaa</string>
+    <string name="folder_settings_folder_push_mode_first_class">1. luokka</string>
+    <string name="folder_settings_folder_push_mode_second_class">2. luokka</string>
+    <string name="folder_settings_folder_push_mode_inherited">Sama kuin poll-luokka</string>
+    <string name="folder_settings_folder_notify_mode_label">Kansion ilmoitusluokka</string>
+    <string name="folder_settings_folder_notify_mode_normal">Ei luokkaa</string>
+    <string name="folder_settings_folder_notify_mode_first_class">1. luokka</string>
+    <string name="folder_settings_folder_notify_mode_second_class">2. luokka</string>
+    <string name="folder_settings_folder_notify_mode_inherited">Sama kuin push-luokka</string>
+    <string name="folder_settings_clear_local_folder_action">Poista paikalliset viestit</string>
+    <string name="account_settings_incoming_label">Saapuvan postin palvelin</string>
+    <string name="account_settings_incoming_summary">Määritä saapuvan postin palvelin</string>
+    <string name="account_settings_outgoing_label">Lähtevän postin palvelin</string>
+    <string name="account_settings_outgoing_summary">Määritä lähtevän postin palvelin (SMTP)</string>
+    <string name="account_settings_description_label">Tilin nimi</string>
+    <string name="account_settings_name_label">Nimesi</string>
+    <string name="notifications_title">Ilmoitukset</string>
+    <string name="account_settings_vibration">Värinä</string>
+    <string name="account_settings_vibrate_enable">Värinä</string>
+    <string name="account_settings_vibrate_pattern_label">Värinän malli</string>
+    <string name="account_settings_vibrate_pattern_default">Oletus</string>
+    <string name="account_settings_vibrate_pattern_1">Malli 1</string>
+    <string name="account_settings_vibrate_pattern_2">Malli 2</string>
+    <string name="account_settings_vibrate_pattern_3">Malli 3</string>
+    <string name="account_settings_vibrate_pattern_4">Malli 4</string>
+    <string name="account_settings_vibrate_pattern_5">Malli 5</string>
+    <string name="account_settings_vibrate_times">Värinöiden lukumäärä</string>
+    <string name="account_settings_vibrate_summary_disabled">Ei käytössä</string>
+    <string name="account_settings_ringtone">Uuden viestin ilmoitusääni</string>
+    <string name="account_settings_notification_light_label">Ilmoituksen valo</string>
+    <string name="account_settings_notification_light_disabled">Ei käytössä</string>
+    <string name="account_settings_notification_light_account_color">Tilin väri</string>
+    <string name="account_settings_notification_light_default_color">Järjestelmän oletusväri</string>
+    <string name="account_settings_notification_light_white">Valkoinen</string>
+    <string name="account_settings_notification_light_red">Punainen</string>
+    <string name="account_settings_notification_light_green">Vihreä</string>
+    <string name="account_settings_notification_light_blue">Sininen</string>
+    <string name="account_settings_notification_light_yellow">Keltainen</string>
+    <string name="account_settings_notification_light_cyan">Syaani</string>
+    <string name="account_settings_notification_light_magenta">Magenta</string>
+    <string name="account_settings_composition_title">Viestin kirjoituksen asetukset</string>
+    <string name="account_settings_composition_label">Kirjoituksen oletusasetukset</string>
+    <string name="account_settings_composition_summary">Aseta oletusarvot: lähettäjä, piilokopio ja allekirjoitus</string>
+    <string name="account_settings_identities_label">Identiteettien hallinta</string>
+    <string name="account_settings_identities_summary">Määritä vaihtoehtoiset lähettäjän osoitteet ja allekirjoitukset</string>
+    <string name="manage_identities_title">Identiteettien hallinta</string>
+    <string name="manage_identities_context_menu_title">Identiteetin hallinta</string>
+    <string name="edit_identity_title">Muokkaa identiteettiä</string>
+    <string name="edit_identity_save">Tallenna</string>
+    <string name="new_identity_action">Uusi identiteetti</string>
+    <string name="account_settings_always_bcc_label">Piilokopio kaikista viesteistä osoitteeseen</string>
+    <string name="manage_identities_edit_action">Muokkaa</string>
+    <string name="manage_identities_move_up_action">Siirrä ylös</string>
+    <string name="manage_identities_move_down_action">Siirrä alas</string>
+    <string name="manage_identities_move_top_action">Siirrä ylimmäiseksi / aseta oletukseksi</string>
+    <string name="manage_identities_remove_action">Poista</string>
+    <string name="edit_identity_description_label">Identiteetin kuvaus</string>
+    <string name="edit_identity_description_hint">(Valinnainen)</string>
+    <string name="edit_identity_name_label">Nimesi</string>
+    <string name="edit_identity_name_hint">(Valinnainen)</string>
+    <string name="edit_identity_email_label">Sähköpostiosoite</string>
+    <string name="edit_identity_email_hint">(Pakollinen)</string>
+    <string name="edit_identity_reply_to_label">Vastausosoite</string>
+    <string name="edit_identity_reply_to_hint">(Valinnainen)</string>
+    <string name="edit_identity_signature_label">Allekirjoitus</string>
+    <string name="edit_identity_signature_hint">(Valinnainen)</string>
+    <string name="account_settings_signature_use_label">Käytä allekirjoitusta</string>
+    <string name="account_settings_signature_label">Allekirjoitus</string>
+    <string name="default_identity_description">Oletusidentiteetti</string>
+    <string name="choose_identity_title">Valitse identiteetti</string>
+    <string name="send_as">Lähetä nimellä</string>
+    <string name="no_removable_identity">Et voi poistaa ainoaa identiteettiäsi</string>
+    <string name="identity_has_no_email">Identiteettiä ei voi käyttää ilman sähköpostiosoitetta</string>
+    <string name="sort_earliest_first">Vanhemmat viestit ensin</string>
+    <string name="sort_latest_first">Uusimmat viestit ensin</string>
+    <string name="sort_subject_alpha">Aiheen mukaan aakkosjärjestyksessä</string>
+    <string name="sort_subject_re_alpha">Aiheen mukaan käänteisessä aakkosjärjestyksessä</string>
+    <string name="sort_sender_alpha">Lähettäjän mukaan aakkosjärjestyksessä</string>
+    <string name="sort_sender_re_alpha">Lähettäjän mukaan käänteisessä aakkosjärjestyksessä</string>
+    <string name="sort_flagged_first">Tähdellä merkityt ensin</string>
+    <string name="sort_flagged_last">Merkitsemättömät ensin</string>
+    <string name="sort_unread_first">Lukemattomat ensin</string>
+    <string name="sort_unread_last">Luetut ensin</string>
+    <string name="sort_attach_first">Liitteelliset viestit ensin</string>
+    <string name="sort_unattached_first">Liitteettömät viestit ensin</string>
+    <string name="sort_by">Lajittele…</string>
+    <string name="sort_by_date">Päivämäärän mukaan</string>
+    <string name="sort_by_arrival">Saapumisajan mukaan</string>
+    <string name="sort_by_subject">Aiheen mukaan</string>
+    <string name="sort_by_sender">Lähettäjän mukaan</string>
+    <string name="sort_by_flag">Tähden mukaan</string>
+    <string name="sort_by_unread">Luettujen/lukemattomien mukaan</string>
+    <string name="sort_by_attach">Liitteiden mukaan</string>
+    <string name="account_delete_dlg_title">Poista tili</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_title">Tunnistamaton varmenne</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_accept">Hyväksy-avain</string>
+    <string name="account_setup_failed_dlg_invalid_certificate_reject">Hylkää-avain</string>
+    <string name="folder_list_filter_hint">Kansion nimi sisältää</string>
+    <string name="folder_list_display_mode_label">Kansiot</string>
+    <string name="folder_list_display_mode_all">Näytä kaikki</string>
+    <string name="folder_list_display_mode_first_class">Näytä vain 1. luokan kansiot</string>
+    <string name="folder_list_display_mode_first_and_second_class">Näytä 1. ja 2. luokan kansiot</string>
+    <string name="folder_list_display_mode_not_second_class">Näytä kaikki paitsi 2. luokan kansiot</string>
+    <string name="account_settings_signature__location_label">Allekirjoituksen sijainti</string>
+    <string name="account_settings_signature__location_before_quoted_text">Ennen lainattua viestiä</string>
+    <string name="account_settings_signature__location_after_quoted_text">Lainatun viestin jälkeen</string>
+    <string name="setting_theme_global">Käytä sovellusteemaa</string>
+    <string name="setting_theme_dark">Tumma</string>
+    <string name="setting_theme_light">Vaalea</string>
+    <string name="setting_theme_follow_system">Käytä järjestelmän oletusta</string>
+    <string name="display_preferences">Näyttö</string>
+    <string name="global_preferences">Yleiset</string>
+    <string name="debug_preferences">Virheenkorjaus</string>
+    <string name="privacy_preferences">Tietosuoja</string>
+    <string name="network_preferences">Verkko</string>
+    <string name="interaction_preferences">Toimintoasetukset</string>
+    <string name="accountlist_preferences">Tililista</string>
+    <string name="messagelist_preferences">Viestilistat</string>
+    <string name="messageview_preferences">Viestit</string>
+    <string name="settings_theme_label">Teema</string>
+    <string name="settings_message_theme_label">Viestinäkymän teema</string>
+    <string name="settings_compose_theme_label">Viestimuokkaimen teema</string>
+    <string name="settings_language_label">Kieli</string>
+    <string name="preference_search_no_results">Asetuksia ei löytynyt</string>
+    <string name="settings_message_theme_selection_label">Kiinteä viestiteema</string>
+    <string name="settings_message_theme_selection_summary_off">Valitse viestinäkymän teema viestiä luettaessa</string>
+    <string name="settings_message_theme_selection_summary_on">Käytä kiinteää viestinäkymän teemaa</string>
+    <string name="setting_language_system">Järjestelmän oletus</string>
+    <string name="background_ops_label">Synkronointi taustalla</string>
+    <string name="background_ops_never">Ei koskaan</string>
+    <string name="background_ops_always">Aina</string>
+    <string name="background_ops_auto_sync_only">Kun Automaattinen synkronointi on valittu</string>
+    <string name="batch_select_all">Valitse kaikki</string>
+    <string name="account_setup_push_limit_label">Push-tilassa tarkistettavien kansioiden enimmäismäärä</string>
+    <string name="account_setup_push_limit_5">5 kansiota</string>
+    <string name="account_setup_push_limit_10">10 kansiota</string>
+    <string name="account_setup_push_limit_25">25 kansiota</string>
+    <string name="account_setup_push_limit_50">50 kansiota</string>
+    <string name="account_setup_push_limit_100">100 kansiota</string>
+    <string name="account_setup_push_limit_250">250 kansiota</string>
+    <string name="account_setup_push_limit_500">500 kansiota</string>
+    <string name="account_setup_push_limit_1000">1000 kansiota</string>
+    <string name="animations_title">Animaatio</string>
+    <string name="animations_summary">Käytä koreita visuaalisia tehosteita</string>
+    <string name="volume_navigation_title">Liikkuminen äänipainikkeilla viestinäkymässä</string>
+    <string name="show_unified_inbox_title">Näytä \"Yhdistetty saapuneet\"</string>
+    <string name="show_starred_count_title">Näytä tähdellä merkittyjen viestien määrä</string>
+    <string name="integrated_inbox_title">Yhdistetty saapuneet</string>
+    <string name="integrated_inbox_detail">Kaikki viestit Yhdistetty saapuneet -kansiossa</string>
+    <string name="folder_settings_include_in_integrated_inbox_label">Yhdistä</string>
+    <string name="folder_settings_include_in_integrated_inbox_summary">Kaikki viestit näytetään Yhdistetty saapuneet -kansiossa</string>
+    <string name="account_settings_searchable_label">Etsi kansioista</string>
+    <string name="account_settings_searchable_all">Kaikki</string>
+    <string name="account_settings_searchable_displayable">Näytettävissä olevat</string>
+    <string name="account_settings_searchable_none">Ei mitään</string>
+    <string name="account_settings_no_folder_selected">Ei mitään</string>
+    <string name="account_settings_automatic_special_folder">Automaattinen (%s)</string>
+    <string name="font_size_settings_title">Kirjasinkoko</string>
+    <string name="font_size_settings_description">Määritä kirjasimen koko</string>
+    <string name="font_size_account_list">Tililista</string>
+    <string name="font_size_account_name">Tilin nimi</string>
+    <string name="font_size_account_description">Tilin kuvaus</string>
+    <string name="font_size_folder_list">Kansiolistat</string>
+    <string name="font_size_folder_name">Kansion nimi</string>
+    <string name="font_size_folder_status">Kansion tila</string>
+    <string name="font_size_message_list">Viestilistat</string>
+    <string name="font_size_message_list_subject">Viestin aihe</string>
+    <string name="font_size_message_list_sender">Lähettäjä</string>
+    <string name="font_size_message_list_date">Päiväys</string>
+    <string name="font_size_message_list_preview">Esikatselu</string>
+    <string name="font_size_message_view">Viestinäkymä</string>
+    <string name="font_size_message_view_sender">Lähettäjä</string>
+    <string name="font_size_message_view_to">Vastaanottaja</string>
+    <string name="font_size_message_view_cc">Kopio</string>
+    <string name="font_size_message_view_bcc">Piilokopio</string>
+    <string name="font_size_message_view_additional_headers">Tarkemmat otsikkotiedot</string>
+    <string name="font_size_message_view_subject">Viestin aihe</string>
+    <string name="font_size_message_view_date">Aika ja päivämäärä</string>
+    <string name="font_size_message_view_content">Viestin sisältö</string>
+    <string name="font_size_message_compose">Viestin kirjoitus</string>
+    <string name="font_size_message_compose_input">Tekstinsyöttökentät</string>
+    <string name="font_size_default">Oletus</string>
+    <string name="font_size_tiniest">Pienin</string>
+    <string name="font_size_tiny">Erittäin pieni</string>
+    <string name="font_size_smaller">Pienempi</string>
+    <string name="font_size_small">Pieni</string>
+    <string name="font_size_medium">Keskikoko</string>
+    <string name="font_size_large">Suuri</string>
+    <string name="font_size_larger">Suurin</string>
+    <string name="error_activity_not_found">Toiminnolle ei löytynyt sopivaa ohjelmaa.</string>
+    <string name="send_failed_reason">Lähetys epäonnistui: %s</string>
+    <string name="save_or_discard_draft_message_dlg_title">Tallennetaanko luonnos?</string>
+    <string name="save_or_discard_draft_message_instructions_fmt">Tallennetaanko vai hylätäänkö tämä viesti?</string>
+    <string name="save_or_discard_draft_message_changes">Tallennetaanko vai hylätäänkö muutokset?</string>
+    <string name="confirm_discard_draft_message_title">Hylkää viesti?</string>
+    <string name="confirm_discard_draft_message">Haluatko varmasti hylätä tämän viestin?</string>
+    <string name="dialog_confirm_clear_local_folder_title">Poistetaanko paikalliset viestit?</string>
+    <string name="dialog_confirm_clear_local_folder_message">Tämä poistaa kaikki paikalliset viestit kansiosta. Viestejä ei poisteta palvelimelta.</string>
+    <string name="dialog_confirm_clear_local_folder_action">Poista viestit</string>
+    <string name="dialog_confirm_delete_title">Vahvista poisto</string>
+    <string name="dialog_confirm_delete_message">Haluatko poistaa tämän viestin?</string>
+    <plurals name="dialog_confirm_delete_messages">
+        <item quantity="one">Haluatko varmasti poistaa tämän viestin?</item>
+        <item quantity="other">Haluatko varmasti poistaa <xliff:g id="message_count">%1$d</xliff:g> viestiä?</item>
+    </plurals>
+    <string name="dialog_confirm_delete_confirm_button">Kyllä</string>
+    <string name="dialog_confirm_delete_cancel_button">Ei</string>
+    <string name="dialog_confirm_mark_all_as_read_title">Vahvista kaikki luetuiksi</string>
+    <string name="dialog_confirm_mark_all_as_read_message">Haluatko merkitä kaikki viestit luetuiksi?</string>
+    <string name="dialog_confirm_empty_trash_title">Vahvista roskakorin tyhjentäminen</string>
+    <string name="dialog_confirm_empty_trash_message">Haluatko tyhjentää roskakorikansion?</string>
+    <string name="dialog_confirm_mark_all_as_read_confirm_button">Kyllä</string>
+    <string name="dialog_confirm_mark_all_as_read_cancel_button">Ei</string>
+    <string name="dialog_confirm_spam_title">Vahvista roskapostikansioon siirtäminen</string>
+    <plurals name="dialog_confirm_spam_message">
+        <item quantity="one">Haluatko todella siirtää tämän viestin roskapostikansioon?</item>
+        <item quantity="other">Haluatko todella siirtää <xliff:g id="message_count">%1$d</xliff:g> viestiä roskapostikansioon?</item>
+    </plurals>
+    <string name="dialog_confirm_spam_confirm_button">Kyllä</string>
+    <string name="dialog_confirm_spam_cancel_button">Ei</string>
+    <string name="dialog_attachment_progress_title">Ladataan liitettä</string>
+    <string name="messagelist_sent_to_me_sigil">»</string>
+    <string name="messagelist_sent_cc_me_sigil">›</string>
+    <string name="settings_list_backup_category">Varmuuskopio</string>
+    <string name="settings_list_miscellaneous_category">Muut</string>
+    <string name="settings_export_title">Vie asetukset</string>
+    <string name="settings_export_button">Vie</string>
+    <string name="settings_export_share_button">Jaa</string>
+    <string name="settings_export_progress_text">Viedään asetuksia…</string>
+    <string name="settings_export_success_generic">Asetukset vietiin onnistuneesti</string>
+    <string name="settings_export_failure">Asetusten vienti epäonnistui</string>
+    <string name="settings_import_title">Tuo asetukset</string>
+    <string name="settings_import_pick_document_button">Valitse tiedosto</string>
+    <string name="settings_import_button">Tuo</string>
+    <string name="settings_import_success_generic">Asetusten tuonti onnistui</string>
+    <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
+    <string name="settings_import_password_required">Anna salasanat</string>
+    <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+    <string name="settings_import_authorization_required">Kirjaudu sisään</string>
+    <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+    <string name="settings_import_authorization_and_password_required">Kirjaudu sisään ja anna salasanat</string>
+    <string name="settings_import_failure">Asetusten tuonti epäonnistui</string>
+    <string name="settings_import_read_failure">Asetustiedoston lukeminen epäonnistui</string>
+    <string name="settings_import_partial_failure">Joidenkin asetusten tuonti epäonnistui</string>
+    <string name="settings_import_status_success">Tuonti onnistui</string>
+    <string name="settings_import_status_password_required">Salasana vaaditaan</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">Sisäänkirjautuminen vaaditaan</string>
+    <string name="settings_import_status_not_imported">Ei tuotu</string>
+    <string name="settings_import_status_error">Tuontivirhe</string>
+    <string name="settings_import_later_button">Myöhemmin</string>
+    <string name="settings_import">Tuo asetukset</string>
+    <string name="settings_importing">Tuodaan asetuksia…</string>
+    <plurals name="settings_import_password_prompt">
+        <item quantity="one">Jotta voit käyttää tiliä \"<xliff:g id="account">%s</xliff:g>\", sinun on annettava palvelimen salasana.</item>
+        <item quantity="other">Jotta voit käyttää tiliä \"<xliff:g id="account">%s</xliff:g>\", sinun on annettava palvelimien salasanat.</item>
+    </plurals>
+    <string name="settings_import_incoming_server_password_hint">Saapuvan postin palvelimen salasana</string>
+    <string name="settings_import_outgoing_server_password_hint">Lähtevän postin palvelimen salasana</string>
+    <string name="settings_import_use_same_password_for_outgoing_server">Käytä samaa salasanaa lähtevälle palvelimelle</string>
+    <string name="server_name_format">Palvelimen nimi: <xliff:g id="hostname">%s</xliff:g></string>
+    <string name="unread_widget_select_account">Näytä tilin lukemattomien viestien määrä…</string>
+    <string name="unread_widget_account_title">Tili</string>
+    <string name="unread_widget_account_summary">Tili, jonka osalta näytetään lukemattomien viestien määrä</string>
+    <string name="unread_widget_unified_inbox_account_summary">Yhdistetty saapuneet</string>
+    <string name="unread_widget_folder_enabled_title">Kansion määrä</string>
+    <string name="unread_widget_folder_enabled_summary">Näytä lukemattomien määrä vain yksittäisen kansion osalta</string>
+    <string name="unread_widget_folder_title">Kansio</string>
+    <string name="unread_widget_folder_summary">Kansio, jonka osalta näytetään lukemattomien viestien määrä</string>
+    <string name="unread_widget_action_done">Valmis</string>
+    <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> - <xliff:g id="folder_name">%2$s</xliff:g></string>
+    <string name="unread_widget_account_not_selected">Tiliä ei ole valittu</string>
+    <string name="unread_widget_folder_not_selected">Kansiota ei ole valittu</string>
+    <string name="webview_empty_message">Ei tekstiä</string>
+    <string name="webview_contextmenu_link_view_action">Avaa katseltavaksi</string>
+    <string name="webview_contextmenu_link_share_action">Jaa linkki</string>
+    <string name="webview_contextmenu_link_copy_action">Kopioi linkki leikepöydälle</string>
+    <string name="webview_contextmenu_link_clipboard_label">Linkki</string>
+    <string name="webview_contextmenu_link_text_copy_action">Kopioi linkin teksti leikepöydälle</string>
+    <string name="webview_contextmenu_link_text_clipboard_label">Linkin teksti</string>
+    <string name="webview_contextmenu_image_title">Kuva</string>
+    <string name="webview_contextmenu_image_view_action">Näytä kuva</string>
+    <string name="webview_contextmenu_image_save_action">Tallenna kuva</string>
+    <string name="webview_contextmenu_image_download_action">Lataa kuva</string>
+    <string name="webview_contextmenu_image_copy_action">Kopioi kuvan osoite leikepöydälle</string>
+    <string name="webview_contextmenu_image_clipboard_label">Kuvan osoite</string>
+    <string name="webview_contextmenu_phone_call_action">Soita numeroon</string>
+    <string name="webview_contextmenu_phone_save_action">Tallenna yhteystietoihin</string>
+    <string name="webview_contextmenu_phone_copy_action">Kopioi puhelinnumero leikepöydälle</string>
+    <string name="webview_contextmenu_phone_clipboard_label">Puhelinnumero</string>
+    <string name="webview_contextmenu_email_send_action">Lähetä sähköpostia</string>
+    <string name="webview_contextmenu_email_save_action">Tallenna yhteystietoihin</string>
+    <string name="webview_contextmenu_email_copy_action">Kopioi sähköpostiosoite leikepöydälle</string>
+    <string name="webview_contextmenu_email_clipboard_label">Sähköpostiosoite</string>
+    <string name="account_settings_remote_search_num_results_entries_all">Kaikki</string>
+    <string name="account_settings_remote_search_num_results_entries_10">10</string>
+    <string name="account_settings_remote_search_num_results_entries_25">25</string>
+    <string name="account_settings_remote_search_num_results_entries_50">50</string>
+    <string name="account_settings_remote_search_num_results_entries_100">100</string>
+    <string name="account_settings_remote_search_num_results_entries_250">250</string>
+    <string name="account_settings_remote_search_num_results_entries_500">500</string>
+    <string name="account_settings_remote_search_num_results_entries_1000">1000</string>
+    <string name="account_settings_remote_search_num_label">Etähaun tulosten rajoitus</string>
+    <string name="remote_search_sending_query">Lähetetään pyyntöä palvelimelle</string>
+    <plurals name="remote_search_downloading">
+        <item quantity="one">Noudetaan %d tulos</item>
+        <item quantity="other">Noudetaan %d tulosta</item>
+    </plurals>
+    <plurals name="remote_search_downloading_limited">
+        <item quantity="one">Noudetaan %1$d / %2$d tulos</item>
+        <item quantity="other">Noudetaan %1$d / %2$d tulosta</item>
+    </plurals>
+    <string name="remote_search_error">Etähaku epäonnistui</string>
+    <string name="account_settings_search">Hae</string>
+    <string name="action_remote_search">Etsi viestejä palvelimelta</string>
+    <string name="remote_search_unavailable_no_network">Etähaku ei ole käytettävissä ilman verkkoyhteyttä.</string>
+    <string name="global_settings_background_as_unread_indicator_label">Vaihda väriä kun luettu</string>
+    <string name="global_settings_background_as_unread_indicator_summary">Eri tausta osoittaa viestin olevan luettu</string>
+    <string name="global_settings_threaded_view_label">Ketjunäkymä</string>
+    <string name="global_settings_threaded_view_summary">Kutista samaan ketjuun kuuluvat viestit</string>
+    <string name="upgrade_databases_title">Päivitetään tietokantoja</string>
+    <string name="upgrade_databases_unspecified">Päivitetään tietokantoja…</string>
+    <string name="upgrade_database_format">Päivitetään tilin \"<xliff:g id="account">%s</xliff:g>\" tietokantaa</string>
+    <string name="global_settings_splitview_mode_label">Näytä jaettu näyttö</string>
+    <string name="global_settings_splitview_always">Aina</string>
+    <string name="global_settings_splitview_never">Ei koskaan</string>
+    <string name="global_settings_splitview_when_in_landscape">Kun laite on vaaka-asennossa</string>
+    <string name="message_view_empty">Valitse viesti vasemmalta</string>
+    <string name="global_settings_show_contact_picture_label">Näytä yhteystietojen kuvat</string>
+    <string name="global_settings_show_contact_picture_summary">Näytä yhteystietojen kuvat viestilistassa</string>
+    <string name="mark_all_as_read">Merkitse kaikki luetuiksi</string>
+    <string name="global_settings_colorize_missing_contact_pictures_label">Väritä yhteystietojen kuvat</string>
+    <string name="global_settings_colorize_missing_contact_pictures_summary">Väritä yhteystietojen puuttuvat kuvat</string>
+    <string name="global_settings_messageview_visible_refile_actions_title">Näytettävät viestitoiminnot</string>
+    <string name="global_settings_messageview_visible_refile_actions_summary">Näytä valitut toiminnot viestin Näytä-valikossa</string>
+    <string name="loading_attachment">Ladataan liitettä…</string>
+    <string name="fetching_attachment_dialog_title_send">Lähetetään viestiä</string>
+    <string name="fetching_attachment_dialog_title_save">Tallennetaan luonnosta</string>
+    <string name="fetching_attachment_dialog_message">Noudetaan liitettä…</string>
+    <string name="auth_external_error">Autentikointi ei onnistu.  Palvelin ei ilmoita SASL EXTERNAL -kelpoisuudesta.  Tämä saattaa johtua vanhentuneesta asiakasvarmenteesta, tuntemattomasta varmentajasta tai jostakin muusta asetusongelmasta.</string>
+    <!--=== Client certificates specific ==================================================================-->
+    <string name="account_setup_basics_client_certificate">Käytä asiakasvarmennetta</string>
+    <string name="client_certificate_spinner_empty">Ei asiakasvarmennetta</string>
+    <string name="client_certificate_spinner_delete">Poista asiakasvarmenteen valinta</string>
+    <string name="client_certificate_retrieval_failure">Asiakasvarmenteen noutaminen epäonnistui aliakselle \"<xliff:g id="alias">%s</xliff:g>\"</string>
+    <string name="client_certificate_advanced_options">Lisäasetukset</string>
+    <string name="client_certificate_expired">Asiakasvarmenne \"<xliff:g id="certificate_alias">%1$s</xliff:g>\" on vanhentunut tai ei ole vielä voimassa (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
+    <!--Note: This references message_view_download_remainder-->
+    <string name="preview_encrypted">*Salattu*</string>
+    <string name="add_from_contacts">Lisää yhteystiedoista</string>
+    <string name="recipient_cc">Kopio</string>
+    <string name="recipient_bcc">Piilokopio</string>
+    <string name="recipient_to">Vastaanottaja</string>
+    <string name="recipient_from">Lähettäjä</string>
+    <string name="reply_to_label">Vastausosoite</string>
+    <string name="unknown_recipient">&lt;Tuntematon vastaanottaja&gt;</string>
+    <string name="unknown_sender">&lt;Tuntematon lähettäjä&gt;</string>
+    <string name="address_type_home">Koti</string>
+    <string name="address_type_work">Työ</string>
+    <string name="address_type_other">Muu</string>
+    <string name="address_type_mobile">Mobiili</string>
+    <string name="compose_error_no_draft_folder">Tälle tilille ei ole määritelty luonnoskansiota!</string>
+    <string name="compose_error_no_key_configured">Tälle tilille ei ole määritetty avainta! Tarkista asetukset.</string>
+    <string name="error_crypto_provider_incompatible">Salauksen tarjoaja käyttää yhteensopimatonta versiota. Tarkista asetuksesi!</string>
+    <string name="error_crypto_provider_connect">Yhteyttä salaussovellukseen ei voitu muodostaa: tarkista asetukset tai yritä napsauttaa salauskuvaketta uudestaan!</string>
+    <string name="error_crypto_provider_ui_required">Päästä päähän -salauksen alustaminen epäonnistui, tarkista asetukset</string>
+    <string name="error_crypto_inline_attach">PGP/INLINE-tila ei tue liitteitä!</string>
+    <string name="enable_inline_pgp">Käytä PGP/INLINE-tilaa</string>
+    <string name="disable_inline_pgp">Poista PGP/INLINE käytöstä</string>
+    <string name="enable_sign_only">Käytä PGP:n pelkkää allekirjoitusta</string>
+    <string name="disable_sign_only">Poista käytöstä PGP:n pelkkä allekirjoitus</string>
+    <string name="openpgp_inline_title">PGP/INLINE-tila</string>
+    <string name="openpgp_inline_text">Viesti lähetetään PGP/INLINE-muodossa.\nTätä tulisi käyttää vain yhteensopivuutta varten:</string>
+    <string name="openpgp_inline_plus_compat">Jotkin sovellukset tukevat vain tätä muotoa</string>
+    <string name="openpgp_inline_minus_transit">Allekirjoitukset saattavat rikkontua siirron aikana</string>
+    <string name="openpgp_inline_minus_attach">Liitteet eivät ole tuettuja</string>
+    <string name="openpgp_inline_ok">Selvä!</string>
+    <string name="openpgp_inline_disable">Poista käytöstä</string>
+    <string name="openpgp_inline_keep_enabled">Pidä käytössä</string>
+    <string name="openpgp_sign_only_ok">Selvä!</string>
+    <string name="openpgp_sign_only_disable">Poista käytöstä</string>
+    <string name="openpgp_sign_only_keep_enabled">Pidä käytössä</string>
+    <string name="openpgp_dialog_sign_only_title">PGP:n pelkkä allekirjoitustila</string>
+    <string name="openpgp_dialog_sign_only_text">Tässä tilassa PGP-avaintasi käytetään salakirjoitetun allekirjoituksen luomiseen, mutta sähköpostiviestiä ei salata.</string>
+    <string name="openpgp_dialog_sign_only_plus_verified">Tämä ei salaa sähköpostiviestiä, mutta vahvistaa sen olevan lähetetty käyttäen sinun avainta.</string>
+    <string name="openpgp_dialog_sign_only_minus_break">Allekirjoitukset saattavat rikkoontua postituslistoille lähettäessä.</string>
+    <string name="openpgp_dialog_sign_only_minus_attach">Allekirjoitukset saatetaan näyttää \"signature.asc\"-liitteinä joissain sovelluksissa.</string>
+    <string name="openpgp_dialog_sign_only_neutral_encsigned">Salatut viestit sisältävät aina allekirjoituksen.</string>
+    <string name="crypto_msg_title_plaintext">Raakateksti</string>
+    <string name="crypto_msg_unencrypted_sign_error">päästä päähän -allekirjoitus sisälsi virheen</string>
+    <string name="crypto_msg_incomplete_signed">viesti täytyy ladata kokonaan, jotta allekirjoitus voidaan käsitellä</string>
+    <string name="crypto_msg_unsupported_signed">sisältää ei-tuetun päästä päähän -allekirjoituksen</string>
+    <string name="crypto_msg_unsupported_encrypted">Viesti on salattu, mutta sen muoto ei ole tuettu.</string>
+    <string name="crypto_msg_cancelled">Viesti on salattu, mutta viestin salauksen purkaminen peruttiin.</string>
+    <string name="crypto_msg_title_unencrypted_signed_e2e">Päästä päähän -allekirjoitettu raakateksti</string>
+    <string name="crypto_msg_unencrypted_sign_verified">vahvistetulta allekirjoittajalta</string>
+    <string name="crypto_msg_title_unencrypted_signed">Allekirjoitettu raakateksti</string>
+    <string name="crypto_msg_unencrypted_sign_mismatch">mutta päästä päähän -avain ei vastannut lähettäjää</string>
+    <string name="crypto_msg_unencrypted_sign_expired">mutta päästä päähän -avain on vanhentunut</string>
+    <string name="crypto_msg_unencrypted_sign_revoked">mutta päästä päähän -avain on kumottu</string>
+    <string name="crypto_msg_unencrypted_sign_insecure">mutta päästä päähän -avainta ei mielletä turvalliseksi</string>
+    <string name="crypto_msg_unencrypted_sign_unknown">tuntemattomalta päästä päähän -avaimelta</string>
+    <string name="crypto_msg_title_encrypted_unknown">Salattu</string>
+    <string name="crypto_msg_encrypted_error">mutta salausta purkaessa tapahtui virhe</string>
+    <string name="crypto_msg_encrypted_incomplete">täytyy ladata viesti kokonaan salauksen purkamista varten</string>
+    <string name="crypto_msg_encrypted_no_provider">mutta salaussovellusta ei ole määritetty</string>
+    <string name="crypto_msg_title_encrypted_unsigned">Salattu</string>
+    <string name="crypto_msg_encrypted_unsigned">mutta ei päästä päähän</string>
+    <string name="crypto_msg_title_encrypted_signed_e2e">Päästä päähän salattu</string>
+    <string name="crypto_msg_encrypted_sign_verified">vahvistetulta lähettäjältä</string>
+    <string name="crypto_msg_title_encrypted_signed">Salattu</string>
+    <string name="crypto_msg_encrypted_sign_unknown">tuntemattomalta päästä päähän -avaimelta</string>
+    <string name="crypto_msg_encrypted_sign_mismatch">mutta päästä päähän -avain ei vastannut lähettäjää</string>
+    <string name="crypto_msg_encrypted_sign_expired">mutta päästä päähän -avain on vanhentunut</string>
+    <string name="crypto_msg_encrypted_sign_revoked">mutta päästä päähän -avain on kumottu</string>
+    <string name="crypto_msg_encrypted_sign_insecure">mutta päästä päähän -avainta ei mielletä turvalliseksi</string>
+    <string name="crypto_msg_encrypted_sign_error">mutta päästä päähän -tiedot sisältävät virheitä</string>
+    <string name="crypto_msg_encrypted_insecure">mutta salausta ei mielletä turvalliseksi</string>
+    <string name="crypto_info_ok">OK</string>
+    <string name="crypto_info_search_key">Etsi avainta</string>
+    <string name="crypto_info_view_signer">Näytä allekirjoittaja</string>
+    <string name="crypto_info_view_sender">Näytä lähettäjä</string>
+    <string name="crypto_info_view_security_warning">Yksityiskohdat</string>
+    <string name="locked_attach_unlock">Avaa lukitus</string>
+    <string name="locked_attach_unencrypted">Tätä osaa ei salattu, joten se saattaa olla epäluotettava.</string>
+    <string name="locked_attach_title">Suojaamaton liite</string>
+    <string name="message_progress_text">Ladataan…</string>
+    <string name="messageview_decrypt_cancelled">Salauksen purkaminen peruttiin.</string>
+    <string name="messageview_decrypt_retry">Yritä uudelleen</string>
+    <string name="messageview_decrypt_incomplete">Salattu viesti tulee ladata, jotta sen salaus voidaan avata.</string>
+    <string name="messageview_crypto_error_title">Virhe sähköpostin salausta avatessa</string>
+    <string name="recipient_error_non_ascii">Erikoismerkit eivät ole tällä hetkellä tuettuja!</string>
+    <string name="recipient_error_parse_failed">Virhe osoitetta jäsennettäessä!</string>
+    <string name="account_settings_crypto_hide_sign_only">Piilota salaamattomat allekirjoitukset</string>
+    <string name="account_settings_crypto_hide_sign_only_on">Vain salatut allekirjoitukset näytetään</string>
+    <string name="account_settings_crypto_hide_sign_only_off">Kaikki allekirjoitukset näytetään</string>
+    <string name="error_sign_only_no_encryption">Salaus ei ole käytettävissä pelkässä allekirjoitustilassa!</string>
+    <string name="unsigned_text_divider_label">Allekirjoittamaton teksti</string>
+    <string name="crypto_no_provider_title">Tämä sähköpostiviesti on salattu</string>
+    <string name="crypto_no_provider_message">Tämä viesti on salattu OpenPGP:llä.\nLukeaksesi viestin sinun tulee asentaa ja määrittää yhteensopiva OpenPGP-sovellus.</string>
+    <string name="crypto_no_provider_button">Siirry asetuksiin</string>
+    <string name="mail_list_widget_text">K-9-viestiluettelo</string>
+    <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+    <string name="message_list_widget_initializing">Ladataan…</string>
+    <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+    <string name="message_list_widget_list_item_loading">Ladataan…</string>
+    <string name="openpgp_enabled_error_title">Salaus ei ole mahdollista</string>
+    <string name="openpgp_enabled_error_msg">Jotkut valitut vastaanottajat eivät tue tätä ominaisuutta!</string>
+    <string name="enable_encryption">Käytä salausta</string>
+    <string name="disable_encryption">Poista salaus käytöstä</string>
+    <string name="openpgp_description_text1">Viestin salaus takaa, ettei niitä voi lukea kukaan muu kuin vastaanottaja.</string>
+    <string name="openpgp_description_text3">Salaus ilmestyy näkyviin vain jos kaikki vastaanottajat tukevat sitä, ja kyseiset tahot ovat lähettäneet sinulle sähköpostia aiemmin.</string>
+    <string name="openpgp_description_text2">Ota salaus käyttöön tai poista käytöstä napauttamalla tätä kuvaketta.</string>
+    <string name="openpgp_enabled_error_gotit">Selvä</string>
+    <string name="openpgp_enabled_error_back">Takaisin</string>
+    <string name="openpgp_enabled_error_disable">Poista salaus käytöstä</string>
+    <string name="openpgp_encryption">OpenPGP-salaus</string>
+    <string name="account_settings_crypto_prefer_encrypt">Automattisen salauksen kahdenkeskeinen tila</string>
+    <string name="dialog_autocrypt_mutual_title">Automattisen salauksen kahdenkeskeinen tila</string>
+    <string name="dialog_autocrypt_mutual_description_1">Viestit salataan normaalisti valinnan mukaan, tai kun vastataan salattuun viestiin.</string>
+    <string name="dialog_autocrypt_mutual_description_2">Jos sekä lähettäjä että vastaanottaja ottavat käyttöön kahdenkeskeisen tilan, salaus otetaan käyttöön oletusarvoisesti.</string>
+    <string name="dialog_autocrypt_mutual_learn_more">Voit <a href="https://k9mail.app/2018/02/26/OpenPGP-Considerations-Part-III-Autocrypt.html">napauttaa tästä</a> saadaksesi lisätietoja.</string>
+    <string name="general_settings_title">Yleiset asetukset</string>
+    <string name="dialog_openkeychain_info_title">OpenPGP-sovellusta ei ole asennettu</string>
+    <string name="dialog_openkeychain_info_install">Asenna</string>
+    <string name="dialog_openkeychain_info_text">K-9 Mail vaatii OpenKeychainin päästä päähän -salausta varten.</string>
+    <string name="encrypted_subject">Salattu viesti</string>
+    <string name="account_settings_crypto_encrypt_subject">Salaa viestien aiheet</string>
+    <string name="account_settings_crypto_encrypt_subject_subtitle">Ei välttämättä tuettu kaikkien vastaanottajien osalta</string>
+    <string name="toast_account_not_found">Sisäinen virhe: virheellinen tili!</string>
+    <string name="toast_openpgp_provider_error">Virhe yhdistäessä kohteeseen %s!</string>
+    <string name="ac_transfer_setting_title">Lähetä Autocrypt-asetusviesti</string>
+    <string name="ac_transfer_setting_summary">Jaa päästä päähän -salauksen asetukset turvallisesti muiden laitteiden kanssa</string>
+    <string name="ac_transfer_title">Autocrypt-asetusviesti</string>
+    <string name="ac_transfer_intro">Autocrypt-asetusviesti jakaa päästä päähän -salauksen asetukset turvallisesti muiden laitteidesi kanssa.</string>
+    <string name="ac_transfer_button_send">Lähetä asetusviesti</string>
+    <string name="ac_transfer_will_be_sent">Viesti lähetetään osoitteeseesi:</string>
+    <string name="ac_transfer_generating">Luodaan asetusviestiä…</string>
+    <string name="ac_transfer_sending_to">Lähetetään viesti:</string>
+    <string name="ac_transfer_finish">Viimeistelläksesi avaa viesti toisella laitteellasi ja kirjoita asetuskoodi.</string>
+    <string name="ac_transfer_show_code">Näytä asetuskoodi</string>
+    <string name="ac_transfer_msg_subject">Autocrypt-asetusviesti</string>
+    <string name="ac_transfer_msg_body">Tämä viesti sisältää kaikki tiedot Autocryptin asetusten sekä salausavaimesi siirtämiseksi turvallisesti alkuperäisestä laitteestasi.
 
 Aseta uusi laitteesi käyttämään Autocryptiä noudattamalla ohjeita, jotka uusi laitteesi näyttää.
 
@@ -1041,4 +1064,24 @@ Voit säilyttää tämän viestin ja käyttää sitä varmuuskopioina salausavai
     <string name="push_info_configure_notification_action">Ilmoitusten asetukset</string>
     <string name="push_info_disable_push_text">Jos et tarvitse välitöntä ilmoitusta uudesta viestistä, pushin sijaan on suositeltavaa käyttää pollausta. Pollaus tarkistaa uudet viestit määrätyin aikavälein, eikä tämä vaadi ilmoituksen näyttämistä.</string>
     <string name="push_info_disable_push_action">Poista push käytöstä</string>
+    <!--Name of the swipe action to select a message. Try to keep it short.-->
+    <string name="swipe_action_select">Valitse</string>
+    <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+    <string name="swipe_action_deselect">Poista valinta</string>
+    <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+    <string name="swipe_action_mark_as_read">Merkitse luetuksi</string>
+    <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+    <string name="swipe_action_mark_as_unread">Merkitse lukemattomaksi</string>
+    <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+    <string name="swipe_action_add_star">Lisää tähti</string>
+    <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+    <string name="swipe_action_remove_star">Poista tähti</string>
+    <!--Name of the swipe action to archive a message. Try to keep it short.-->
+    <string name="swipe_action_archive">Arkistoi</string>
+    <!--Name of the swipe action to delete a message. Try to keep it short.-->
+    <string name="swipe_action_delete">Poista</string>
+    <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+    <string name="swipe_action_spam">Roskaposti</string>
+    <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+    <string name="swipe_action_move">Siirrä…</string>
 </resources>
\ No newline at end of file
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
index 250163e32502a12a5ed420fd03baebc764daa29e..aebfec8f96c1d00e2caee3e0d210ecbda04ae7e6 100644
--- a/app/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -255,6 +255,28 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="global_settings_confirm_menu_discard">Berjocht ôfbrekke</string>
   <string name="global_settings_confirm_menu_mark_all_read">Alles as lêzen markearje</string>
   <string name="global_settings_confirm_action_delete_notif">Fuortsmite (fan meldingen)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Fei-aksjes</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Nei rjochts feie</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Nei links feie</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Gjin</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Seleksje wikselje</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">As lêzen/net-lêzen markearje</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Stjer tafoegje/fuortsmite</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Argivearje</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Fuortsmite</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Net-winske</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Ferpleatse</string>
   <string name="global_settings_privacy_hide_useragent">E-mailclient ferstopje</string>
   <string name="global_settings_privacy_hide_useragent_detail">K-9-brûkersagent fan e-mailkopteksten fuortsmite</string>
   <string name="global_settings_privacy_hide_timezone">Tiidsône ferstopje</string>
@@ -628,8 +650,6 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="account_setup_failed_dlg_invalid_certificate_title">Unbekend sertifikaat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Kaai akseptearje</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Kaai wegerje</string>
-  <string name="message_view_help_key">Del (of D) - Fuortsmite\nR - Beäntwurdzje\nA - Elkenien beäntwurdzje\nC - Opstelle\nF - Trochstjoere\nM - Ferpleatse\nV - Argivearje\nY - Kopiearje\nZ - (net)lêzen markearje\nG - Stjer\nO - Sorteartype\nI - Sortearfolchoarder\nQ - Tebek nei Mappen\nS - Selektearje/deselektearje\nJ of P - Foarich berjocht\nK of N - Folgjende berjocht</string>
-  <string name="message_list_help_key">Del (of D) - Fuortsmite\nC - Opstelle\nM - Ferpleatse\nV - Argivearje\nY - Kopiearje\nZ - (net)lêzen markearje\nG - Stjer\nO - Sorteartype\nI - Sortearfolchoarder\nQ - Tebek nei Mappen\nS - Selektearje/deselektearje</string>
   <string name="folder_list_filter_hint">Mapnamme befettet</string>
   <string name="folder_list_display_mode_label">Mappen</string>
   <string name="folder_list_display_mode_all">Alle mappen</string>
@@ -975,7 +995,10 @@ Graach flaterrapporten stjoere, bydragen foar nije funksjes en fragen stelle op
   <string name="crypto_no_provider_message">Dit e-mailberjocht is OpenPGP-fersifere.\nYnstallearje en stel in OpenPGP-app yn om it e-mailberjocht te lêzen.</string>
   <string name="crypto_no_provider_button">Gean nei Ynstellingen</string>
   <string name="mail_list_widget_text">K-9-berjochtelist</string>
-  <string name="mail_list_widget_loading">Berjochten oan it laden…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Lade…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Lade…</string>
   <string name="openpgp_enabled_error_title">Fersifering net mooglik</string>
   <string name="openpgp_enabled_error_msg">Guon fan de ûntfangers stypje dizze funksje net!</string>
   <string name="enable_encryption">Fersifering ynskeakelje</string>
@@ -1037,4 +1060,24 @@ Jo kinne dit berjocht bewarje as reservekopy foar jo geheime kaai. As jo dit dwa
   <string name="push_info_configure_notification_action">Melding ynstelle</string>
   <string name="push_info_disable_push_text">As jo it net nedich fine om daliks meldingen te ûntfangen fan nije berjochten, dan kinne jo better push útskeakelje en yn stee dêrfan kieze foar peilen. Mei peilen wurdt der om de sa folle tiid kontrolearre oft der nije e-mailberjochten ynkommen binne. Dêrfoar is it werjaan fan in melding net kontinu nedich.</string>
   <string name="push_info_disable_push_action">Push útskeakelje</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Selektearje</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Deselektearje</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">As lêzen markearje</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">As net-lêzen markearje</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Stjer tafoegje</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Stjer fuortsmite</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Argivearje</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Fuortsmite</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Net-winske</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Ferpleatse…</string>
 </resources>
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 8edda28a2c84d4fde7d8f079a97944756df566d9..c3bcfe07accb1ef153c551e01408d633fc8b0506 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -215,6 +215,22 @@
   <string name="global_settings_confirm_menu_discard">Tilg an teachdaireachd air falbh</string>
   <string name="global_settings_confirm_menu_mark_all_read">Comharraich gun deach gach teachdaireachd a leughadh</string>
   <string name="global_settings_confirm_action_delete_notif">Sguab às (on bhrath)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Chan eil gin</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Tasg-lann</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Sguab às</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spama</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Gluais</string>
   <string name="global_settings_privacy_hide_useragent">Falaich cliant a’ phuist</string>
   <string name="global_settings_privacy_hide_useragent_detail">Thoir air falbh an raon Mail User-Agent o bhannan-cinn phost</string>
   <string name="global_settings_privacy_hide_timezone">Falaich an roinn-tìde</string>
@@ -545,33 +561,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Teisteanas nach aithne dhuinn</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Gabh ris an iuchair</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Diùlt an iuchair</string>
-  <string name="message_view_help_key">Del (no D) – Sguab às
-\nR – Freagair
-\nA – Freagair a h-uile
-\nC – Sgrìobh
-\nF – Sìn air adhart
-\nM – Gluais
-\nV – Cuir san tasg-lann
-\nY – Dèan lethbhreac
-\nZ – Cuir comharra gun deach/nach deach a leughadh
-\nG – Cuir rionnag ris
-\nO – Seòrsa an t-seòrsachaidh
-\nI – Òrdugh an t-seòrsachaidh
-\nQ – Till dha na pasganan
-\nS – Tagh/Dì-thagh
-\nJ no P – An teachdaireachd roimhpe
-\nK no N – An ath-theachdaireachd</string>
-  <string name="message_list_help_key">Del (no D) – Sguab às
-\nC – Sgrìobh
-\nM – Gluais
-\nV – Cuir san tasg-lann
-\nY – Dèan lethbhreac
-\nZ – Cuir comharra gun deach/nach deach a leughadh
-\nG – Cuir rionnag ris
-\nO – Seòrsa an t-seòrsachaidh
-\nI – Òrdugh an t-seòrsachaidh
-\nQ – Till dha na pasganan
-\nS – Tagh/Dì-thagh</string>
   <string name="folder_list_filter_hint">Ainm a’ phasgain anns a bheil</string>
   <string name="folder_list_display_mode_label">Seall pasganan…</string>
   <string name="folder_list_display_mode_all">Na h-uile pasgan</string>
@@ -885,7 +874,10 @@
 \nFeumaidh tu aplacaid a tha comasach air OpenPGP a stàladh is a rèiteachadh mus urrainn dhut a leughadh.</string>
   <string name="crypto_no_provider_button">Tagh aplacaid OpenPGP</string>
   <string name="mail_list_widget_text">Liosta theachdaireachdan puist</string>
-  <string name="mail_list_widget_loading">A’ luchdadh nan teachdaireachdan…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">’Ga luchdadh…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">’Ga luchdadh…</string>
   <string name="openpgp_enabled_error_title">Cha ghabh a chrioptachadh</string>
   <string name="openpgp_enabled_error_msg">Cha chuir gach faightear a thagh thu taic ris a’ ghleus seo!</string>
   <string name="enable_encryption">Cuir crioptachadh an comas</string>
@@ -906,4 +898,22 @@
   <string name="ac_transfer_title">Teachdaireachd suidheachaidh Autocrypt</string>
   <string name="ac_transfer_msg_subject">Teachdaireachd suidheachaidh Autocrypt</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Tagh</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Dì-thagh</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Comharraich nach deach a leughadh</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Cuir rionnag ris</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Thoir an rionnag air falbh</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Tasg-lann</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Sguab às</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spama</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 e331bad4d1df4ede7e2679e7173fbcfa77c59d3d..4540859d5fef1ce84cf65029161c1a544d8a44b0 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
@@ -163,6 +163,22 @@
   <string name="global_settings_confirm_menu_discard">Desbotar mensaxe</string>
   <string name="global_settings_confirm_action_delete_notif">Eliminar (das notificacións)</string>
   <string name="global_settings_privacy_hide_useragent_detail">Quitar o User-Agent Mail das cabeceiras do correo</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Ningún</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arquivar</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Lixo</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mover</string>
   <string name="global_settings_notification_quick_delete_title">Mostrar botón \'Eliminar\'</string>
   <string name="global_settings_notification_quick_delete_never">Nunca</string>
   <string name="global_settings_notification_quick_delete_when_single_msg">Para notificacións dunha mensaxe</string>
@@ -642,7 +658,29 @@
   <string name="address_type_mobile">Móbil</string>
   <string name="crypto_info_ok">Aceptar</string>
   <string name="message_progress_text">A cargar…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">A cargar…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">A cargar…</string>
   <string name="openpgp_enabled_error_back">Volver</string>
   <string name="general_settings_title">Axustes xerais</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Seleccionar</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Deseleccionar</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marcar como non lida</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Engadir estrela</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Eliminar estrela</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arquivar</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Lixo</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 fefd8abf30474bce3ba1ee517b2573c04bc048f7..e1546a255ee2ae6550f6a2bf2419782c1085b089 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -202,6 +202,22 @@
   <string name="global_settings_confirm_menu_discard">Descartar mensaxe</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marcar todas as mensaxes como lidas</string>
   <string name="global_settings_confirm_action_delete_notif">Borrar (da notificación)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">ningunha</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archivo</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mover</string>
   <string name="global_settings_privacy_hide_useragent">Ocultar cliente de correo</string>
   <string name="global_settings_privacy_hide_useragent_detail">Quitar Mail User-Agent dos cabezallos do correo</string>
   <string name="global_settings_privacy_hide_timezone">Ocultar zona horaria</string>
@@ -554,8 +570,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado descoñecido</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceptar certificado</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rexeitar certificado</string>
-  <string name="message_view_help_key">Del (ou D) - Eliminar\nR - Respostar\nA - Respostar a todos\nC - Compoñer\nF - Reenviar\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar (Non)lido\nG - Estrela\nO - Sort type\nI - Sort order\nQ - Voltar aos cartafoles\nS - Seleccionar/Non seleccionar\nJ ou P - Mensaxe anterior\nK ou N - Seguinte mensaxe</string>
-  <string name="message_list_help_key">Del (ou D) - Eliminar\nC - Compoñer\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar (Non)lido\nG - Estrela\nO - Tipo de orde\nI - Establecer orde\nQ - Voltar aos cartafoles\nS - Seleccionar/Non Seleccionar</string>
   <string name="folder_list_filter_hint">Nome do cartafol contén</string>
   <string name="folder_list_display_mode_label">Carpetas</string>
   <string name="folder_list_display_mode_all">Ver todas as carpetas</string>
@@ -890,6 +904,11 @@
   <string name="crypto_no_provider_message">Este correo foi cifrado con OpenPGP.\nPara lelo, precisa instalar e configurar un app compatible con OpenPGP</string>
   <string name="mail_list_widget_text">Lista de mensaxes Mail</string>
   <string name="mail_list_widget_loading">Cargando mensaxes...</string>
+  <string name="crypto_no_provider_button">Ir a Configuración</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">A cargar…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">A cargar…</string>
   <string name="openpgp_enabled_error_title">Cifrado non posible</string>
   <string name="openpgp_enabled_error_msg">Algún dos destinatarios seleccionados non soportan esta característica!</string>
   <string name="enable_encryption">Habilitar cifrado</string>
@@ -951,4 +970,22 @@ Podes conservar esta mensaxe e usala como copia de seguridade da túa chave secr
   <string name="push_info_configure_notification_action">Configurar notificación</string>
   <string name="push_info_disable_push_text">Se non precisas notificacións instantáneas sobre mensaxes novas, debes desactivar Push e usar a Enquisa. As enquisas comproba se hai correos novos a intervalos regulares e non precisa a notificación.</string>
   <string name="push_info_disable_push_action">Desactivar Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Seleccionar</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Deseleccionar</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marcar Non Lido</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Engadir Estrela</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Eliminar Estrela</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archivo</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 315d9a6272edb3fb9d8a20ec39e1c96f6a581ae3..485099e317b396ad829f5c45c117f836ba911a4c 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -208,6 +208,22 @@
   <string name="global_settings_confirm_menu_discard">Odbaci poruku</string>
   <string name="global_settings_confirm_menu_mark_all_read">Označi sve poruke kao pročitane</string>
   <string name="global_settings_confirm_action_delete_notif">Obriši (iz obavijesti)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nijedna</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arhiva</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Obriši</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Neželjena pošta</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Premjesti</string>
   <string name="global_settings_privacy_hide_useragent">Sakrij klijent e-pošte</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Sakrij vremensku zonu</string>
@@ -551,8 +567,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nepoznat Certifikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Prihvati Ključ</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odbij ključ</string>
-  <string name="message_view_help_key">Del (ili D) - Obriši\nR - Odgovori\nA - Odgovori svima\nC - Sastavi\nF - Proslijedi\nM - Pomakni\nV - Arhiviraj\nY - Kopiraj\nZ - Označi (Ne)pročitano\nG - Dodaj zvijezdicu\nO - Način sortiranja\nI - Poredak sortiranja\nQ - Nazad na mape\nS - Označi/odznači\nJ ili P - Prethodna poruka\nK ili N - Sljedeća poruka</string>
-  <string name="message_list_help_key">Del (ili D) - Obriši\nC - Sastavi\nM - Pomakni\nV - Arhiviraj\nY - Kopiraj\nZ - Označi (Ne)pročitano\nG - Dodaj zvijezdicu\nO - Način sortiranja\nI - Poredak sortiranja\nQ - Nazad na mape\nS - Označi/odznači</string>
   <string name="folder_list_filter_hint">Naziv mape sadrži</string>
   <string name="folder_list_display_mode_label">Prikaži mape…</string>
   <string name="folder_list_display_mode_all">Sve mape</string>
@@ -878,8 +892,12 @@
   <string name="crypto_no_provider_title">Vaš email je šifriran</string>
   <string name="crypto_no_provider_message">Ova e-poruka je šifrirana korištenjem OpenPGP.\nDa bi ste je pročitali, potrebno je da instalirate i postavite odgovarajuću OpenPGP aplikaciju.</string>
   <string name="crypto_no_provider_button">Idi u Postavke</string>
-  <string name="mail_list_widget_text">K-9 Popis Poruka</string>
+  <string name="mail_list_widget_text">Mail Popis Poruka</string>
   <string name="mail_list_widget_loading">Učitavam poruke...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Učitavam…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Učitavam…</string>
   <string name="openpgp_enabled_error_title">Šifriranje nije moguće</string>
   <string name="enable_encryption">Uključi šifriranje</string>
   <string name="disable_encryption">Onemogući šifriranje</string>
@@ -912,4 +930,22 @@
   <string name="switch_off">Isključeno</string>
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Dopusti pristup kontaktima</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Označi</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Odznači</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Označi nepročitanim</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Dodaj zvjezdicu</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Ukloni zvjezdicu</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arhiva</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Obriši</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Neželjena pošta</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 87c2dfda4dde05cdbab69a384b4bc4f1f647dd69..bc1d1ff06f494db2b324b4095ea9041e8b4a1b59 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -234,6 +234,22 @@
   <string name="global_settings_confirm_menu_discard">Üzenet elvetése</string>
   <string name="global_settings_confirm_menu_mark_all_read">Összes üzenet megjelölése olvasottként</string>
   <string name="global_settings_confirm_action_delete_notif">Törlés (az értesítésekből)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nincs</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archívum</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Törlés</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Levélszemét</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Áthelyezés</string>
   <string name="global_settings_privacy_hide_useragent">Levelező alkalmazás elrejtése</string>
   <string name="global_settings_privacy_hide_useragent_detail">A K-9 fazonosító eltávolítása a levél fejlécéből</string>
   <string name="global_settings_privacy_hide_timezone">Időzóna elrejtése</string>
@@ -604,8 +620,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Felismerhetetlen tanúsítvány</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Kulcs elfogadása</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Kulcs visszautasítása</string>
-  <string name="message_view_help_key">Del (vagy D) – Törlés\nR – Válasz\nA – Válasz mindenkinek\nC – Írás\nF – Továbbítás\nM – Áthelyezés\nV – Archiválás\nY – Másolás\nZ – Megjelölés olvasottként/olvasatlanként\nG – Csillagozás\nO – Rendezés típusa\nI – Rendezési sorrend\nQ – Visszatérés a mappákhoz\nS – Kijelölés/Kijelölés megszüntetése\nJ vagy P – Előző üzenet\nK vagy N – Következő üzenet</string>
-  <string name="message_list_help_key">Del (vagy D) – Törlés\nC – Írás\nM – Áthelyezés\nV – Archiválás\nY – Másolás\nZ – Megjelölés olvasottként/olvasatlanként\nG – Csillagozás\nO – Rendezés típusa\nI – Rendezési sorrend\nQ – Visszatérés a mappákhoz\nS – Kijelölés/Kijelölés megszüntetése</string>
   <string name="folder_list_filter_hint">Mappa neve tartalmazza</string>
   <string name="folder_list_display_mode_label">Mappák megjelenítése…</string>
   <string name="folder_list_display_mode_all">Összes mappa</string>
@@ -951,7 +965,10 @@
   <string name="crypto_no_provider_message">Az e-mail titkosítva lett OpenPGP használatával.\nAz elolvasásához egy megfelelő OpenPGP alkalmazást kell telepítenie és beállítania.</string>
   <string name="crypto_no_provider_button">Ugrás a beállításokhoz</string>
   <string name="mail_list_widget_text">K-9 üzenetlista</string>
-  <string name="mail_list_widget_loading">Üzenetek betöltése…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Betöltés…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Betöltés…</string>
   <string name="openpgp_enabled_error_title">A titkosítás nem lehetséges</string>
   <string name="openpgp_enabled_error_msg">Néhány kiválasztott címzett nem támogatja ezt a funkciót!</string>
   <string name="enable_encryption">Titkosítás engedélyezése</string>
@@ -1013,4 +1030,22 @@ Megtarthatja ezt az üzenetet, és felhasználhatja a titkos kulcs biztonsági m
   <string name="push_info_configure_notification_action">Értesítés beállítása</string>
   <string name="push_info_disable_push_text">Ha nincs szüksége azonnali értesítésekre az új levelekről, akkor letilthatja a leküldést, és használhat lekérést. A lekérés rendszeres időközönként ellenőrzi, hogy vannak-e új levelek, és nincs szüksége értesítés megjelenítésére.</string>
   <string name="push_info_disable_push_action">Leküldés letiltása</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Kijelölés</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Kijelölés törlése</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Megjelölés olvasatlanként</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Csillag hozzáadása</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Csillag eltávolítása</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archívum</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Törlés</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Levélszemét</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 54c414fa5656baf3f6ebf7d1770919d788a6efee..f4edbda5cd35d4c17cda85aa97e8137eba415bad 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -215,6 +215,22 @@
   <string name="global_settings_confirm_menu_discard">Buang pesan</string>
   <string name="global_settings_confirm_menu_mark_all_read">Tandai semua pesan sebagai telah dibaca</string>
   <string name="global_settings_confirm_action_delete_notif">Hapus (dari notifikasi)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nihil</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arsipkan</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Hapus</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Pindah</string>
   <string name="global_settings_privacy_hide_useragent">Sembunyikan mail client</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Sembunyikan zona waktu</string>
@@ -558,8 +574,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Sertifikat tidak dikenal</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Terima kunci</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Tolak kunci</string>
-  <string name="message_view_help_key">Del (atau D) - Hapus\nR - Balas\nA - Balas Semua\nC - Tulis\nF - Teruskan\nM - Pindah\nV - Arsipkan\nY - Copy\nZ - Tandai (belum) baca\nG - Star\nO - Urutkan jenis\nI - Urutan sortir\nQ - Kembali ke Folder\nS - Pilih/batalkan pilihan\nJ atau P - Pesan Sebelumnya\nK atau N - Pesan Berikutnya</string>
-  <string name="message_list_help_key">Del (atau D) - Hapus\nC - Tulis\nM - Pindah\nV - Arsipkan\nY - Copy\nZ - Tandai (belum) baca\nG - Star\nO - Urutkan jenis\nI - Urutan sortir\nQ - Kembali ke Folder\nS - Pilih/batalkan pilihan</string>
   <string name="folder_list_filter_hint">Nama folder mengandung</string>
   <string name="folder_list_display_mode_label">Perlihatkan folder...</string>
   <string name="folder_list_display_mode_all">Semua folder</string>
@@ -894,6 +908,10 @@
   <string name="crypto_no_provider_button">Pergi ke pengaturan</string>
   <string name="mail_list_widget_text">Daftar pesan Mail</string>
   <string name="mail_list_widget_loading">Memuat pesan...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Memuat…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Memuat…</string>
   <string name="openpgp_enabled_error_title">Enkripsi tidak mungkin dilakukan</string>
   <string name="openpgp_enabled_error_msg">Beberapa penerima yang dipilih tidak mendukung fitur ini!</string>
   <string name="enable_encryption">Aktifkan Enkripsi</string>
@@ -943,4 +961,22 @@ Anda dapat menyimpan pesan ini dan menggunakannya sebagai cadangan untuk kunci r
   <string name="permission_contacts_rationale_title">Izinkan akses ke kontak</string>
   <string name="permission_contacts_rationale_message">Untuk dapat memberikan saran kontak dan untuk menampilkan nama kontak dan foto, aplikasi perlu akses ke kontak Anda.</string>
   <string name="generic_loading_error">Terjadi kesalahan saat memuat data</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Pilih</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Hapus pilihan</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Tandai belum dibaca</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Tambah bintang</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Buang bintang</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arsipkan</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Hapus</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 8b84e327ddfda6b05b5d8f06c898f3c0cb2f14b0..a93d5264b1781b2dea67ef5f6a4c6987cc4fc343 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache notkunarleyfi, útgáfa 2.0</string>
   <string name="about_project_title">Verkefni með opnum grunnkóða</string>
   <string name="about_website_title">Vefsvæði</string>
+  <string name="user_manual_title">Notandahandbók</string>
+  <string name="get_help_title">Fá aðstoð</string>
   <string name="user_forum_title">Spjallsvæði notenda</string>
   <string name="about_fediverse_title">Samfélagsmiðlun</string>
   <string name="about_twitter_title">Twitter</string>
@@ -80,6 +82,7 @@
   <string name="search_action">Leita</string>
   <string name="search_everywhere_action">Leita allsstaðar</string>
   <string name="search_results">Leitarniðurstöður</string>
+  <string name="new_messages_title">Ný skilaboð</string>
   <string name="preferences_action">Stillingar</string>
   <string name="folders_action">Sýsla með möppur</string>
   <string name="account_settings_action">Aðgangsstillingar</string>
@@ -90,6 +93,7 @@
   <string name="flag_action">Bæta við stjörnu</string>
   <string name="unflag_action">Fjarlægja stjörnu</string>
   <string name="copy_action">Afrita</string>
+  <string name="unsubscribe_action">Hætta áskrift</string>
   <string name="show_headers_action">Birta hausa</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Netfang afritað á klippispjald</item>
@@ -135,12 +139,15 @@
   <string name="notification_action_archive">Geymsla</string>
   <string name="notification_action_archive_all">Setja allt í geymslu</string>
   <string name="notification_action_spam">Ruslpóstur</string>
+  <string name="notification_certificate_error_public">Villa í skilríki</string>
   <string name="notification_certificate_error_title">Villa í skilríki fyrir <xliff:g id="account">%s</xliff:g></string>
   <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-->
+  <string name="notification_notify_error_title">Villa í tilkynningu</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">Villa kom upp þegar reynt var að útbúa kerfistilkynningu vegna nýrra skilaboða. Ástæðan er líklegast sú að það vanti hljóð fyrir tilkynningar.\n\nPikkaðu til að opna stillingar á tilkynningum.</string>
   <string name="notification_bg_sync_ticker">Athuga með póst: <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
@@ -163,6 +170,9 @@
   <string name="debug_enable_debug_logging_summary">Skrá viðbótarupplýsingar fyrir villuleit</string>
   <string name="debug_enable_sensitive_logging_title">Skrá viðkvæmar upplýsingar</string>
   <string name="debug_enable_sensitive_logging_summary">Má birta lykilorð í ánnálum.</string>
+  <string name="debug_export_logs_title">Flytja út atvikaskrár</string>
+  <string name="debug_export_logs_success">Útflutningur tókst. Atvikaskrár geta innihaldið viðkvæmar upplýsingar. Farðu varlega með hverjum þú sendir þær.</string>
+  <string name="debug_export_logs_failure">Útflutningur mistókst.</string>
   <string name="message_list_load_more_messages_action">Hlaða inn fleiri skilaboðum</string>
   <string name="message_to_fmt">Til:<xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_subject_hint">Viðfangsefni</string>
@@ -209,6 +219,7 @@
   <string name="global_settings_show_contact_name_summary">Nota nöfn viðtakenda úr tengiliðaskrá þegar það er mögulegt</string>
   <string name="global_settings_registered_name_color_label">Lita tengiliði</string>
   <string name="global_settings_registered_name_color_changed">Lita nöfn í tengiliðalistanum þínum</string>
+  <string name="general_settings_contact_name_color_label">Litur á nafni tengiliðar</string>
   <string name="global_settings_messageview_fixedwidth_label">Jafnbreitt letur</string>
   <string name="global_settings_messageview_fixedwidth_summary">Nota jafnbreitt letur til að birta skilaboð með hreinum texta</string>
   <string name="global_settings_messageview_autofit_width_label">Skilaboð passi sjálfvirkt</string>
@@ -225,6 +236,28 @@
   <string name="global_settings_confirm_menu_discard">Henda skilaboðum</string>
   <string name="global_settings_confirm_menu_mark_all_read">Merkja öll skilaboð sem lesin</string>
   <string name="global_settings_confirm_action_delete_notif">Eyða (úr tilkynningu)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Aðgerðir við stroku</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Strjúka til hægri</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Strjúka til vinstri</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Engin</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Víxla völdu</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Merkja sem lesið/ólesið</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Bæta við/fjarlægja stjörnu</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Geymsla</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Fjarlægja</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Ruslpóstur</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Færa</string>
   <string name="global_settings_privacy_hide_useragent">Fela póstforrit</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Fela tímabelti</string>
@@ -236,6 +269,7 @@
   <string name="global_settings_lock_screen_notification_visibility_title">Tilkynningar á skjálæsingu</string>
   <string name="global_settings_lock_screen_notification_visibility_nothing">Engar tilkynningar á skjálæsingu</string>
   <string name="global_settings_lock_screen_notification_visibility_app_name">Nafn forritsins</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Fjöldi nýrra skilaboða</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Fjöldi skilaboða og sendenda</string>
   <string name="global_settings_lock_screen_notification_visibility_everything">Sama og þegar skjárinn er ólæstur</string>
   <string name="quiet_time">Kyrrðarstund</string>
@@ -247,8 +281,11 @@
   <string name="account_setup_basics_title">Setja upp nýjan aðgang</string>
   <string name="account_setup_basics_email_hint">Netfang</string>
   <string name="account_setup_basics_password_hint">Lykilorð</string>
+  <string name="account_setup_oauth_description">Til að nota þennan tölvupóstaðgang með K-9 póstinum, þarftu að skrá þig inn og veita forritinu heimild inn á tölvupóstinn þinn.</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in">Skrá inn</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in_with_google">Skrá inn með Google</string>
   <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
   <string name="account_setup_basics_show_password_need_lock">Til að skoða lykilorðið þitt hér skaltu virkja skjálæsingu á þessu tæki</string>
   <string name="account_setup_basics_show_password_biometrics_title">Sannreyndu auðkennin þín</string>
@@ -272,6 +309,7 @@
   <string name="account_setup_auth_type_insecure_password">Lykilorð, sent á óöruggan máta</string>
   <string name="account_setup_auth_type_encrypted_password">Dulritað lykilorð</string>
   <string name="account_setup_auth_type_tls_client_certificate">Skilríki forritsins</string>
+  <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
   <string name="account_setup_incoming_title">Stillingar inn-póstþjóns</string>
   <string name="account_setup_incoming_username_label">Aðgangsnafn</string>
   <string name="account_setup_incoming_password_label">Lykilorð</string>
@@ -290,6 +328,7 @@
   <string name="account_setup_incoming_delete_policy_never_label">Ekki eyða af póstþjóni</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Eyða af póstþjóni</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Merkja sem lesið á póstþjóni</string>
+  <string name="account_setup_incoming_use_compression">Nota þjöppun</string>
   <string name="account_setup_expunge_policy_label">Þurrka út eyddum skilaboðum á póstþjóni</string>
   <string name="account_setup_expunge_policy_immediately">Strax</string>
   <string name="account_setup_expunge_policy_on_poll">Við athuganir</string>
@@ -354,6 +393,10 @@
   <string name="account_setup_failed_dlg_auth_message_fmt">Rangt notandanafn eða lykilorð.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_certificate_message_fmt">Þjónninn gaf upp ógilt SSL-skilríki. Stundum getur þetta gerst vegna vanstillingar á þjóninum. En stundum gerist þetta vegna þess að einhver er að gera árás á þig eða póstþjóninn. Ef þú ert ekki alveg viss, smelltu þá á \'Hafna\' og hafðu samband við þá sem sjá um póstþjóninn þinn.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_server_message_fmt">Gat ekki tengst við póstþjón.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_oauth_flow_canceled">Hætt við auðkenningu</string>
+  <string name="account_setup_failed_dlg_oauth_flow_failed">Auðkenning mistókst með eftirfarandi villuboðum: <xliff:g id="error">%s</xliff:g></string>
+  <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 er ekki stutt í augnablikinu hjá þessari þjónustuveitu.</string>
+  <string name="account_setup_failed_dlg_browser_not_found">Forritið fann engan vafra til að nota til að fá aðgang að notandaaðgangnum þinum.</string>
   <string name="account_setup_failed_dlg_edit_details_action">Breyta upplýsingum</string>
   <string name="account_setup_failed_dlg_continue_action">Áfram</string>
   <string name="account_settings_push_advanced_title">Ítarlegt</string>
@@ -508,11 +551,29 @@
   <string name="account_settings_description_label">Nafn aðgangsins</string>
   <string name="account_settings_name_label">Nafnið þitt</string>
   <string name="notifications_title">Tilkynningar</string>
+  <string name="account_settings_vibration">Titringur</string>
   <string name="account_settings_vibrate_enable">Titra</string>
+  <string name="account_settings_vibrate_pattern_label">Titringsmynstur</string>
   <string name="account_settings_vibrate_pattern_default">Sjálfgefið</string>
+  <string name="account_settings_vibrate_pattern_1">Mynstur 1</string>
+  <string name="account_settings_vibrate_pattern_2">Mynstur 2</string>
+  <string name="account_settings_vibrate_pattern_3">Mynstur 3</string>
+  <string name="account_settings_vibrate_pattern_4">Mynstur 4</string>
+  <string name="account_settings_vibrate_pattern_5">Mynstur 5</string>
   <string name="account_settings_vibrate_times">Endurtaka titring</string>
+  <string name="account_settings_vibrate_summary_disabled">Óvirkt</string>
   <string name="account_settings_ringtone">Nýr hringitónn fyrir póst</string>
+  <string name="account_settings_notification_light_label">Ljós við tilkynningu</string>
+  <string name="account_settings_notification_light_disabled">Óvirkt</string>
   <string name="account_settings_notification_light_account_color">Litur aðgangsins</string>
+  <string name="account_settings_notification_light_default_color">Sjálfgefinn litur í kerfinu</string>
+  <string name="account_settings_notification_light_white">Hvítt</string>
+  <string name="account_settings_notification_light_red">Rautt</string>
+  <string name="account_settings_notification_light_green">Grænt</string>
+  <string name="account_settings_notification_light_blue">Blátt</string>
+  <string name="account_settings_notification_light_yellow">Gult</string>
+  <string name="account_settings_notification_light_cyan">Grænblátt</string>
+  <string name="account_settings_notification_light_magenta">Blárautt</string>
   <string name="account_settings_composition_title">Valkostir við samningu skilaboða</string>
   <string name="account_settings_composition_label">Sjálfgefið við samningu skilaboða</string>
   <string name="account_settings_composition_summary">Settu sjálfgefið Frá, BCC (falið afrit) og undirskrift</string>
@@ -570,8 +631,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Óþekkjanlegt skilríki</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Samþykkja lykil</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Hafna lykli</string>
-  <string name="message_view_help_key">Del (eða D) - Eyða\nR - Svara\nA - Svara öllum\nC - Skrifa\nF - Forward\nM - Færa\nV - Geymsla\nY - Afrita\nZ - Merkja (ó)lesið\nG - Stjörnumerkja\nO - Gerð röðunar\nI - Röðun\nQ - Fara í möppur\nS - Velja/afvelja\nJ eða P - Fyrri skilaboð\nK eða N - Næstu skilaboð</string>
-  <string name="message_list_help_key">Del (eða D) - Eyða\nC - Skrifa\nM - Færa\nV - Geymsla\nY - Afrita\nZ - Merkja (ó)lesið\nG - Stjörnumerkja\nO - Gerð röðunar\nQ - Fara í möppur\nS - Velja/afvelja</string>
   <string name="folder_list_filter_hint">Nafn möppu inniheldur</string>
   <string name="folder_list_display_mode_label">Birta möppur…</string>
   <string name="folder_list_display_mode_all">Allar möppur</string>
@@ -619,6 +678,7 @@
   <string name="account_setup_push_limit_1000">1000 möppur</string>
   <string name="animations_title">Hreyfingar</string>
   <string name="animations_summary">Nota skrautlegar sjónbrellur</string>
+  <string name="volume_navigation_title">Flakk með hljóðstyrkshnöppum í skilaboðasýn</string>
   <string name="show_unified_inbox_title">Birta sameinað innhólf</string>
   <string name="show_starred_count_title">Birta fjölda stjarna</string>
   <string name="integrated_inbox_title">Sameinað innhólf</string>
@@ -712,13 +772,16 @@
   <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
   <string name="settings_import_password_required"> Settu inn lykilorðin</string>
   <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_required">Skráðu þig inn</string>
   <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_and_password_required"> Skráðu þig inn og settu inn lykilorð</string>
   <string name="settings_import_failure">Mistókst að flytja inn stillingar</string>
   <string name="settings_import_read_failure">Mistókst að lesa stillingaskrá</string>
   <string name="settings_import_partial_failure">Mistókst að flytja inn sumar stillingar</string>
   <string name="settings_import_status_success">Innflutningur tókst</string>
   <string name="settings_import_status_password_required">Lykilorðs er krafist</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">Innskráningar krafist</string>
   <string name="settings_import_status_not_imported">Ekki flutt inn</string>
   <string name="settings_import_status_error">Innflutningur mistókst</string>
   <string name="settings_import_later_button">Síðar</string>
@@ -912,8 +975,12 @@
   <string name="crypto_no_provider_title">Þessi tölvupóstur er dulritaður</string>
   <string name="crypto_no_provider_message">Þessi tölvupóstur var dulritaður með OpenPGP.\nTil að lesa hann verður þú að setja upp og stilla samhæft OpenPGP-forrit.</string>
   <string name="crypto_no_provider_button">Fara í stillingar</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Skilaboðalisti Mail</string>
   <string name="mail_list_widget_loading">Hleður skilaboð…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Hleður…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Hleður…</string>
   <string name="openpgp_enabled_error_title">Dulritun er ekki möguleg</string>
   <string name="openpgp_enabled_error_msg">Sumir valinna viðtakenda styðja ekki við þennan eiginleika!</string>
   <string name="enable_encryption">Virkja dulritun</string>
@@ -975,4 +1042,24 @@ Til að setja Autocrypt upp á nýju tæki, farðu þá eftir leiðbeiningunum s
   <string name="push_info_configure_notification_action">Stilla tilkynningu</string>
   <string name="push_info_disable_push_text">Ef þú þarft ekki tilkynningar jafnharðan um ný skilaboð, ættirðu að gera ýtitilkynningar óvirkar og nota frekar vöktun (polling). Vöktun þýðir að athugað er með nýjan póst með reglulegu millibili og þarfnast ekki tilkynningarinnar.</string>
   <string name="push_info_disable_push_action">Gera ýtitilkynningar óvirkar</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Velja</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Afvelja</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Merkja sem lesið</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Merkja sem ólesið</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Bæta við stjörnu</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Fjarlægja stjörnu</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Geymsla</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Fjarlægja</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Ruslpóstur</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Færa…</string>
 </resources>
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 73412ce4f42d48d294300ff26d5704eb1a8aa952..a383d4460c6c9d03bb456636b589cfea7a159aed 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -627,8 +627,6 @@ Invia segnalazioni di bug, contribuisci con nuove funzionalità e poni domande s
     <string name="account_setup_failed_dlg_invalid_certificate_title">Certificato non riconosciuto</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accetta chiave</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Rifiuta chiave</string>
-    <string name="message_view_help_key">Canc (o D) - Elimina\nR - Rispondi\nA - Rispondi a tutti\nC - Componi\nF - Inoltra\nM - Sposta\nV - Archivia\nY - Copia\nZ - Marca come (non) letto\nG - Stella\nO - Tipo di ordinamento\nI - Ordinamento\nQ - Ritorna alle cartelle\nS - Seleziona/deseleziona\nJ o P - Messaggio precedente\nK o N - Messaggio successivo</string>
-    <string name="message_list_help_key">Canc (o D) - Elimina\nC - Componi\nM - Sposta\nV - Archivia\nY - Copia\nZ - Marca come (non) letto\nG - Stella\nO - Tipo di ordinamento\nI - Ordinamento\nQ - Ritorna alle cartelle\nS - Seleziona/deseleziona</string>
     <string name="folder_list_filter_hint">Il nome della cartella contiene</string>
     <string name="folder_list_display_mode_label">Mostra cartelle…</string>
     <string name="folder_list_display_mode_all">Tutte le cartelle</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 ec98662a72c38797bdd1173cf7d481dbb61f6f9a..69ad67c89c70b97bfa5b2741997dedc9536d55e0 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -212,6 +212,22 @@
   <string name="global_settings_confirm_action_spam">דואר זבל</string>
   <string name="global_settings_confirm_menu_discard">מחק הודעה</string>
   <string name="global_settings_confirm_menu_mark_all_read">סמן את כל ההודעות כ\"נקראו\"</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">כלום</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">העבר לארכיון</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">מחק</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">דואר זבל</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">העבר</string>
   <string name="global_settings_privacy_hide_timezone">הסתר איזור זמן</string>
   <string name="global_settings_notification_quick_delete_title">הצג את הכפתור \'מחק\'</string>
   <string name="global_settings_notification_quick_delete_never">אף פעם</string>
@@ -598,6 +614,26 @@
   <string name="address_type_other">אחר</string>
   <string name="address_type_mobile">סלולרי</string>
   <string name="crypto_info_ok">אישור</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
   <string name="general_settings_title">הגדרות כלליות</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">בחר</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">בטל בחירה</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">סמן כלא נקרא</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">הוסף כוכב</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">מחק כוכב</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">העבר לארכיון</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">מחק</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">דואר זבל</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 39c6fc4abc98a638355fb2478112584dfcb98ef7..d2828e47ff513c5d836cc3f0f7ab226fd8921b2f 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -233,6 +233,28 @@
   <string name="global_settings_confirm_menu_discard">メッセージ破棄</string>
   <string name="global_settings_confirm_menu_mark_all_read">すべてのメールを既読にする</string>
   <string name="global_settings_confirm_action_delete_notif">削除(通知領域)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">スワイプ操作</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">右へスワイプ</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">左へスワイプ</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">なし</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">選択の切り替え</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">既読/未読にする</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">スターを付ける/外す</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">アーカイブ</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">削除</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">迷惑メール</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">移動</string>
   <string name="global_settings_privacy_hide_useragent">メールクライアントを隠す</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">タイムゾーンを隠す</string>
@@ -606,8 +628,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">証明書が無効です</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">許可</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒否</string>
-  <string name="message_view_help_key">Del (または D) - 削除\nR - 返信\nA - 全員に返信\nC - 作成\nF - 転送\nM - 移動\nV - アーカイブ\nY - コピー\nZ - 既(未)読のマーク\nG - スター\nO - ソート種別\nI - ソート順\nQ - フォルダ一覧に戻る\nS - 選択/選択解除\nJ または P - 前のメッセージへ\nK または N - 次のメッセージへ</string>
-  <string name="message_list_help_key">Del (または D) - 削除\nC - 作成\nM - 移動\nV - アーカイブ\nY - コピー\nZ - 既(未)読のマーク\nG - スター\nO - ソート種別\nI - ソート順\nQ - フォルダ一覧に戻る\nS - 選択/選択解除</string>
   <string name="folder_list_filter_hint">フォルダ名が含む</string>
   <string name="folder_list_display_mode_label">フォルダ表示…</string>
   <string name="folder_list_display_mode_all">全フォルダ</string>
@@ -948,8 +968,12 @@
   <string name="crypto_no_provider_title">このメールは暗号化されています</string>
   <string name="crypto_no_provider_message">このメールは OpenPGP で暗号化されました。\n読むためには、OpenPGP と互換のアプリをインストールして設定する必要があります。</string>
   <string name="crypto_no_provider_button">設定に移動</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail メッセージ一覧</string>
   <string name="mail_list_widget_loading">メッセージ読み込み中…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">読み込み中…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">読み込み中…</string>
   <string name="openpgp_enabled_error_title">暗号化不可</string>
   <string name="openpgp_enabled_error_msg">選択した受信者の一部が、この機能をサポートしていません!</string>
   <string name="enable_encryption">暗号化を有効にする</string>
@@ -1011,4 +1035,24 @@
   <string name="push_info_configure_notification_action">通知設定</string>
   <string name="push_info_disable_push_text">新しいメッセージの即時通知が不要な場合は、プッシュを無効にして同期を使用してください。同期は、一定の間隔で新着メールを確認するので、通知は必要ありません。</string>
   <string name="push_info_disable_push_action">プッシュを無効にする</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">選択</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">選択解除</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">既読にする</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">未読にする</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">スターを付ける</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">スターをはずす</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">アーカイブ</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">削除</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">迷惑メール</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">移動…</string>
 </resources>
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 b4d99375ddc9d49b04ce87dbbdcacc9983821a8c..27cd84fc15bb893443c83baf40bb769c06eec12c 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -7,10 +7,13 @@
   <string name="shortcuts_title">Mail Accounts</string>
   <string name="unread_widget_label">Mail Unread</string>
   <!--Used in the about dialog-->
+  <string name="app_authors">K-9 개발자들</string>
   <string name="source_code">소소 코드</string>
   <string name="app_license">아파치 라이선스, 버전 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="license">라이선스</string>
   <string name="changelog_title">변경 내용</string>
@@ -194,6 +197,22 @@
   <string name="global_settings_confirm_menu_discard">메시지 버림</string>
   <string name="global_settings_confirm_menu_mark_all_read">모든 메시지를 읽은 상태로 표시</string>
   <string name="global_settings_confirm_action_delete_notif">삭제 (알림에서)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">없음</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">보관</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">삭제</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">스팸</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">이동</string>
   <string name="global_settings_privacy_hide_useragent">메일 클라이언트를 숨김</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">시간 구역을 숨기기</string>
@@ -750,6 +769,10 @@
   <string name="account_settings_crypto_hide_sign_only_off">모든 서명이 보일 것입니다</string>
   <string name="unsigned_text_divider_label">서명되지 않은 글</string>
   <string name="crypto_no_provider_button">설정으로 움직이기</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">로딩 중…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">로딩 중…</string>
   <string name="openpgp_enabled_error_title">암호화가 불가능합니다</string>
   <string name="openpgp_enabled_error_msg">선택된 몇몇 받는 사람들은 이 기능을 지원하지 않습니다!</string>
   <string name="enable_encryption">암호화 사용</string>
@@ -772,4 +795,22 @@
   <string name="switch_on">커져 있음</string>
   <string name="switch_off">꺼 있음</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">선택</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">선택 해제</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">읽지 않은 메일로 표시</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">별표하기</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">별표 해제하기</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">보관</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">삭제</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">스팸</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 a696cd7463801dc9299f8271493c89893583ca2a..83a6cc321d431ce0617eead0cd725f94d63b867f 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -232,6 +232,22 @@
   <string name="global_settings_confirm_menu_discard">Išmesti laišką</string>
   <string name="global_settings_confirm_menu_mark_all_read">Pažymėti visus laiškus kaip perskaitytus</string>
   <string name="global_settings_confirm_action_delete_notif">Pašalinti</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Jokios</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archyvuoti</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Šalinti</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Brukalas</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Perkelti</string>
   <string name="global_settings_privacy_hide_useragent">Slėpti pašto klientą</string>
   <string name="global_settings_privacy_hide_useragent_detail">Pašalinti Mail User-Agent iš pašto antraščių</string>
   <string name="global_settings_privacy_hide_timezone">Slėpti laiko juostą</string>
@@ -602,8 +618,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Neatpažintas sertifikatas</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Priimti raktą</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Atmesti raktą</string>
-  <string name="message_view_help_key">Del (arba D) - Ištrinti\nR - Atsakyti\nA - Atsakyti visiems\nC - Sudaryti\nF - Persiųsti\nM - Perkelti\nV - Archyvuoti\nY - Kopijuoti\nZ - Pažymėti (Ne)perskaitytą\nG - Žvaigždutė\nO - Rūšiavimo tipas\nI - Rūšiavimo tvarka\nQ - Grįžti į aplankus\nS - Pasirinkti/atšaukti pasirinkimą\nJ arba P - Ankstesnis laiškas\nK arba N - Kitas laiškas</string>
-  <string name="message_list_help_key">Del (arba D) - Ištrinti\nC - Sudaryti\nM - Perkelti\nV - Archyvuoti\nY - Kopijuoti\nZ - Pažymėti (Ne)perskaitytą\nG - Žvaigždutė\nO - Rūšiavimo tipas\nI - Rušiavimo tvarka\nQ - Grįžti į aplankus\nS - Pasirinkti/atšaukti pasirinkimą</string>
   <string name="folder_list_filter_hint">Aplanko pavadinime yra</string>
   <string name="folder_list_display_mode_label">Rodyti aplankus…</string>
   <string name="folder_list_display_mode_all">Visus aplankus</string>
@@ -956,6 +970,10 @@
   <string name="crypto_no_provider_button">Eiti į Nustatymus</string>
   <string name="mail_list_widget_text">Mail laiškų sąrašas</string>
   <string name="mail_list_widget_loading">Įkeliami laiškai...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Įkeliama…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Įkeliama…</string>
   <string name="openpgp_enabled_error_title">Šifravimas neįmanomas</string>
   <string name="openpgp_enabled_error_msg">Kai kurie iš pasirinktų gavėjų nepalaiko šios funkcijos!</string>
   <string name="enable_encryption">Įjungti šifravimą</string>
@@ -1017,4 +1035,22 @@ Norėdami nustatyti automatinį šifravimą naujajame prietaise, vadovaukitės i
   <string name="push_info_configure_notification_action">Konfiguruoti pranešimą</string>
   <string name="push_info_disable_push_text">Jei jums nereikia momentinių pranešimų apie naujus laiškus, turėtumėte išjungti Push ir naudoti Polling. Polling reguliariai tikrina, ar yra naujų laiškų, ir pranešimo nereikia.</string>
   <string name="push_info_disable_push_action">Išjungti Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Pasirinkti</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Nebežymėti</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Pažymėti kaip neskaitytą</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Pridėti žvaigždutę</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Pašalinti žvaigždutę</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archyvuoti</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Šalinti</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Brukalas</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 ea9ab4952ff073fa121497761bc7511ef7af5447..625fc62d18c516f42072de6e64304092ef39cb41 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -12,6 +12,8 @@
   <string name="app_license">Apache licence, Versija 2.0</string>
   <string name="about_project_title">Atvērtā koda projekts</string>
   <string name="about_website_title">Tīmekļvietne</string>
+  <string name="user_manual_title">Lietotāja rokasgrāmata</string>
+  <string name="get_help_title">Saņemt palīdzību</string>
   <string name="user_forum_title">Lietotāju forums</string>
   <string name="about_fediverse_title">Fediverse</string>
   <string name="about_twitter_title">Twitter</string>
@@ -80,6 +82,7 @@
   <string name="search_action">Meklēt</string>
   <string name="search_everywhere_action">Meklēt visur</string>
   <string name="search_results">Meklēšanas rezultāti</string>
+  <string name="new_messages_title">Jaunas vēstules</string>
   <string name="preferences_action">Iestatījumi</string>
   <string name="folders_action">Pārvaldīt mapes</string>
   <string name="account_settings_action">Konta iestatījumi</string>
@@ -90,6 +93,7 @@
   <string name="flag_action">Pievienot zvaigznīti</string>
   <string name="unflag_action">Noņemt zvaigznīti</string>
   <string name="copy_action">Kopēt</string>
+  <string name="unsubscribe_action">Atrakstīties</string>
   <string name="show_headers_action">Rādīt vēstules papildinformāciju</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="zero">Adrese nokopēta starpliktuvē</item>
@@ -137,12 +141,15 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="notification_action_archive">Arhīvs</string>
   <string name="notification_action_archive_all">Arhivēt visu</string>
   <string name="notification_action_spam">Surogātpasts</string>
+  <string name="notification_certificate_error_public">Sertifikāta kļūda</string>
   <string name="notification_certificate_error_title">Sertifikāta kļūda kontam <xliff:g id="account">%s</xliff:g></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-->
+  <string name="notification_notify_error_title">Paziņojuma kļūda</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">Neizdevās izveidot sistēmas paziņojumu par jaunu vēstuli. Iespējams, ka trūkst paziņojuma skaņas. \n\nPieskarieties, lai atvērtu paziņojumu iestatījumus.</string>
   <string name="notification_bg_sync_ticker">Pārbauda pastu: <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
@@ -214,6 +221,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="global_settings_show_contact_name_summary">Izmantot vārdus no kontaktu saraksta, kad vien iespējams</string>
   <string name="global_settings_registered_name_color_label">Iekrāsot kontaktus</string>
   <string name="global_settings_registered_name_color_changed">Iekrāsot vārdus kontaktu sarakstā</string>
+  <string name="general_settings_contact_name_color_label">Kontakta vārda krāsa</string>
   <string name="global_settings_messageview_fixedwidth_label">Fiksēta platuma šrifti</string>
   <string name="global_settings_messageview_fixedwidth_summary">Izmantot fiksēta platuma šriftu, lai parādīt vienkārša teksta vēstules</string>
   <string name="global_settings_messageview_autofit_width_label">Automātiski ietilpināt vēstules</string>
@@ -230,6 +238,28 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="global_settings_confirm_menu_discard">Izmest vēstuli</string>
   <string name="global_settings_confirm_menu_mark_all_read">Atzīmēt visas vēstules kā izlasītas</string>
   <string name="global_settings_confirm_action_delete_notif">Dzēst (no paziņojuma)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Pavilkšanas darbības</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Pavilkt pa labi</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Pavilkt pa kreisi</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Neviens</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Pārslēgt izvēli</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Atzīmēt kā izlasītu/nelasītu</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Pielikt/noņemt zvaigznīti</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arhīvs</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Dzēst</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Surogātpasts</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Pārvietot</string>
   <string name="global_settings_privacy_hide_useragent">Paslēpt pasta programmu</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Paslēpt laika zonu</string>
@@ -253,8 +283,11 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_basics_title">Uzlikt jaunu kontu</string>
   <string name="account_setup_basics_email_hint">E-pasta adrese</string>
   <string name="account_setup_basics_password_hint">Parole</string>
+  <string name="account_setup_oauth_description">Lai K-9 Pastā lietotu šo e-pasta kontu, jāpierakstās kontā un jādod atļauja piekļūt saviem e-pastiem.</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in">Pierakstīties</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in_with_google">Pierakstīties ar Google</string>
   <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
   <string name="account_setup_basics_show_password_need_lock">Lai apskatītos savu paroli, ieslēdziet ekrāna bloķēšanu savā ierīcē.</string>
   <string name="account_setup_basics_show_password_biometrics_title">Apstiprināt savu identitāti</string>
@@ -278,6 +311,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_auth_type_insecure_password">Parole bez drošās pārraides</string>
   <string name="account_setup_auth_type_encrypted_password">Šifrēta parole</string>
   <string name="account_setup_auth_type_tls_client_certificate">Klienta sertifikāts</string>
+  <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
   <string name="account_setup_incoming_title">Ienākošā servera iestatījumi</string>
   <string name="account_setup_incoming_username_label">Lietotāja vārds</string>
   <string name="account_setup_incoming_password_label">Parole</string>
@@ -296,6 +330,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_incoming_delete_policy_never_label">Nedzēst to no servera</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Izdzēst to no servera</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Atzīmēt kā izlasītu uz servera</string>
+  <string name="account_setup_incoming_use_compression">Izmantot saspiešanu</string>
   <string name="account_setup_expunge_policy_label">Izdzēst vēstules arī no servera</string>
   <string name="account_setup_expunge_policy_immediately">Uzreiz</string>
   <string name="account_setup_expunge_policy_on_poll">Pārbaudes laikā</string>
@@ -360,6 +395,10 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_failed_dlg_auth_message_fmt">Nepareizs lietotāja vārds vai parole.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_certificate_message_fmt">Serveris norādīja nederīgu SSL sertifikātu. Dažreiz tas ir servera nepareizas konfigurācijas dēļ. Citreiz to izraisījis mēģinājums uzlaust Jūsu e-pasta serveri. Ja nav pārliecības, kas par vainu, nospiediet "Noraidīt" un sazinieties ar sava e-pasta severa uzturētājiem.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_server_message_fmt">Nevar savienoties ar serveri.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_oauth_flow_canceled">Autorizācija atcelta</string>
+  <string name="account_setup_failed_dlg_oauth_flow_failed">Autorizācija atcelta šādas kļūdas dēļ: <xliff:g id="error">%s</xliff:g></string>
+  <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 šobrīd netiek nodrošināta.</string>
+  <string name="account_setup_failed_dlg_browser_not_found">Lietotnei neizdevās atrast pārlūku, lai saņemtu piekļuvi Jūsu kontam.</string>
   <string name="account_setup_failed_dlg_edit_details_action">Rediģēt informāciju</string>
   <string name="account_setup_failed_dlg_continue_action">Turpināt</string>
   <string name="account_settings_push_advanced_title">Papildus</string>
@@ -514,11 +553,29 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_settings_description_label">Konta nosaukums</string>
   <string name="account_settings_name_label">Jūsu vārds</string>
   <string name="notifications_title">Paziņojumi</string>
+  <string name="account_settings_vibration">Vibrācija</string>
   <string name="account_settings_vibrate_enable">Vibrēt</string>
+  <string name="account_settings_vibrate_pattern_label">Vibrācijas veids</string>
   <string name="account_settings_vibrate_pattern_default">Noklusējums</string>
+  <string name="account_settings_vibrate_pattern_1">1. veids</string>
+  <string name="account_settings_vibrate_pattern_2">2. veids</string>
+  <string name="account_settings_vibrate_pattern_3">3. veids</string>
+  <string name="account_settings_vibrate_pattern_4">4. veids</string>
+  <string name="account_settings_vibrate_pattern_5">5. veids</string>
   <string name="account_settings_vibrate_times">Atkārtot vibrēšanu</string>
+  <string name="account_settings_vibrate_summary_disabled">Atslēgts</string>
   <string name="account_settings_ringtone">Jauna pasta skaņas signāls</string>
+  <string name="account_settings_notification_light_label">Paziņojuma gaisma</string>
+  <string name="account_settings_notification_light_disabled">Atslēgts</string>
   <string name="account_settings_notification_light_account_color">Konta krāsa</string>
+  <string name="account_settings_notification_light_default_color">Sistēmas noklusējuma krāsa</string>
+  <string name="account_settings_notification_light_white">Balta</string>
+  <string name="account_settings_notification_light_red">Sarkana</string>
+  <string name="account_settings_notification_light_green">Zaļa</string>
+  <string name="account_settings_notification_light_blue">Zila</string>
+  <string name="account_settings_notification_light_yellow">Dzeltena</string>
+  <string name="account_settings_notification_light_cyan">Ciānkrāsa</string>
+  <string name="account_settings_notification_light_magenta">Sarkana anilīnkrāsa</string>
   <string name="account_settings_composition_title">Vēstules rakstīšanas iespējas</string>
   <string name="account_settings_composition_label">Rakstīšanas noklusējuma iestatījumi</string>
   <string name="account_settings_composition_summary">Norādīt Jūsu noklusējuma \'No\', Bcc un parakstu</string>
@@ -576,8 +633,6 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nekategorizēts sertifikāts</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Pieņemt pieejas kodu</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Noraidīt pieejas kodu</string>
-  <string name="message_view_help_key">Del (vai D) - Dzēst\nR - Atbildēt\nA - Atbildēt visiem\nC - Rakstīt vēstuli\nF - Pārsūtīt\nM - Pārvietot\nV - Arhivēt\nY - Kopēt\nZ - Atzīmēt kā (ne)izlasītu\nG - Zvaigznīte\nO - Kārtošanas veids\nI - Kārtošanas secība\nQ - Atgriezties uz mapēm\nS - Atzīmēt/noņemt atzīmi\nJ vai P - Iepriekšējā vēstule\nK or N - Nākošā vēstule </string>
-  <string name="message_list_help_key">Del (vai D) - Dzēst\nC - Rakstīt vēstuli\nM - Pārvietot\nV - Arhivēt\nY - Kopēt\nZ - Atzīmēt kā (ne)izlasītu\nG - Zvaigznīte\nO - Kārtošanas veids\nI - Kārtošanas secība\nQ - Atgriezties uz mapēm\nS - Atzīmēt/noņemt atzīmi</string>
   <string name="folder_list_filter_hint">Mapes nosaukums ietver</string>
   <string name="folder_list_display_mode_label">Rādīt mapes…</string>
   <string name="folder_list_display_mode_all">Visas mapes</string>
@@ -625,6 +680,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="account_setup_push_limit_1000">1000 mapes</string>
   <string name="animations_title">Animācija</string>
   <string name="animations_summary">Izmantot spilgtus vizuālos efektus</string>
+  <string name="volume_navigation_title">Navigācija ar skaļuma taustiņu vēstules skatā</string>
   <string name="show_unified_inbox_title">Rādīt apvienoto pastkasti</string>
   <string name="show_starred_count_title">Parādīt atzīmēto vēstuļu skaitu</string>
   <string name="integrated_inbox_title">Apvienotā pastkaste</string>
@@ -720,13 +776,16 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
   <string name="settings_import_password_required">Lūdzu, ievadiet paroles</string>
   <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_required">Lūdzu, pierakstieties!</string>
   <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_and_password_required">Lūdzu, pierakstieties un ievadiet paroles!</string>
   <string name="settings_import_failure">Neizdevās importēt iestatījumus</string>
   <string name="settings_import_read_failure">Neizdevās nolasīt iestatījumu datni</string>
   <string name="settings_import_partial_failure">Neizdevās importēt dažus iestatījumus</string>
   <string name="settings_import_status_success">Importēts veiksmīgi</string>
   <string name="settings_import_status_password_required">Nepieciešama parole</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">Nepieciešama pierakstīšanās</string>
   <string name="settings_import_status_not_imported">Nav importēts</string>
   <string name="settings_import_status_error">Importēšana neizdevās</string>
   <string name="settings_import_later_button">Vēlāk</string>
@@ -923,8 +982,12 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="crypto_no_provider_title">Vēstule ir šifrēta</string>
   <string name="crypto_no_provider_message">Šī vēstule ir šifrēta ar OpenPGP. Lai to apskatītos, jāinstalē un jāiestata saderīga OpenPGP lietotne</string>
   <string name="crypto_no_provider_button">Doties uz iestatījumiem</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail Vēstuļu saraksts</string>
   <string name="mail_list_widget_loading">Ielādē vēstules…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Ielādē…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Ielādē…</string>
   <string name="openpgp_enabled_error_title">Nevar iešifrēt</string>
   <string name="openpgp_enabled_error_msg">Daži no izvēlētajiem saņēmējiem šo iespēju neatbalsta!</string>
   <string name="enable_encryption">Ieslēgt šifrēšanu</string>
@@ -986,4 +1049,22 @@ Lai jaunajā ierīcē iestatītu automātisko šifrēšanu, lūdzu sekojiet nor
   <string name="push_info_configure_notification_action">Iestatīt paziņojumu</string>
   <string name="push_info_disable_push_text">Ja nevēlaties saņemt paziņojumus par jaunām vēstulēm, atslēdziet lejupielādēšanu un izmantojiet pārbaudīšanu. Pārbaudē ik pēc noteikta laikā tiek noskaidrots, vai nav saņemts jauns pasts, un tai nav vajadzīgs paziņojums.</string>
   <string name="push_info_disable_push_action">Atslēgt lejupielādēšanu</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Atzīmēt</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Noņemt atzīmi</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Atzīmēt kā nelasītu</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Pievienot zvaigznīti</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Noņemt zvaigznīti</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arhīvs</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Dzēst</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Surogātpasts</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 f4695bc387d05bbfb7ab8d245d27af303b16a60a..fbbf88e1c3b44efb7ba8643a38ce4cb7cd2d9336 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -231,6 +231,22 @@
   <string name="global_settings_confirm_menu_discard">സന്ദേശം നിരസിക്കുക</string>
   <string name="global_settings_confirm_menu_mark_all_read">എല്ലാ സന്ദേശങ്ങളും വായിച്ചതായി അടയാളപ്പെടുത്തുക</string>
   <string name="global_settings_confirm_action_delete_notif">ഇല്ലാതാക്കുക (അറിയിപ്പിൽ നിന്ന്)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">ഒന്നുമില്ല</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">ശേഖരം</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">ഇല്ലാതാക്കുക</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">സ്പാം</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">നീക്കുക</string>
   <string name="global_settings_privacy_hide_useragent">മെയിൽ ക്ലയന്റ് മറയ്‌ക്കുക</string>
   <string name="global_settings_privacy_hide_useragent_detail">മെയിൽ തലക്കെട്ടുകളിൽ നിന്ന് കെ-9 യൂസർ-ഏജന്റിനെ നീക്കം ചെയ്യുക</string>
   <string name="global_settings_privacy_hide_timezone">സമയ മേഖല മറയ്ക്കൂ</string>
@@ -583,8 +599,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">തിരിച്ചറിയാത്ത സർട്ടിഫിക്കറ്റ്</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">കീ സ്വീകരിക്കുക</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">കീ നിരസിക്കുക</string>
-  <string name="message_view_help_key">Del (അല്ലെങ്കിൽ D) - ഇല്ലാതാക്കുക\nR - മറുപടി\nA - എല്ലാത്തിനുമായി മറുപടി നൽകുക\nC - രചിക്കുക\nF - ഫോർവേഡ്\nM - നീക്കുക\nV - ആർക്കൈവ്\nY - പകർത്തുക\nZ - (ഇല്ല) വായിച്ചതായി അടയാളപ്പെടുത്തുക\nG - നക്ഷത്രമിടുക\nO - അടുക്കുക തരം\nI - ക്രമം\nQ - ഫോൾഡറുകളിലേക്ക് മടങ്ങുക\nS - തിരഞ്ഞെടുക്കുക / തിരഞ്ഞെടുത്തത് മാറ്റുക\nJ or P - മുമ്പത്തെ സന്ദേശം\nK or N - അടുത്ത സന്ദേശം</string>
-  <string name="message_list_help_key">Del (അല്ലെങ്കിൽ D) - ഇല്ലാതാക്കുക\nC - രചിക്കുക\nM - നീക്കുക\nV - ആർക്കൈവ്\nY - പകർത്തുക\nZ - (ഇല്ല) വായിച്ചതായി അടയാളപ്പെടുത്തുക\nG - നക്ഷത്രമിടുക\nO - അടുക്കൽ തരം\nI - അടുക്കൽ ക്രമം\nQ - ഫോൾഡറുകളിലേക്ക് മടങ്ങുക\nS - തിരഞ്ഞെടുക്കുക / തിരഞ്ഞെടുത്തത് മാറ്റുക</string>
   <string name="folder_list_filter_hint">ഫോൾഡറിന്റെ പേരിൽ അടങ്ങിയിരിക്കുന്നു</string>
   <string name="folder_list_display_mode_label">ഫോൾഡറുകൾ കാണിക്കൂ…</string>
   <string name="folder_list_display_mode_all">എല്ലാ ഫോൾഡറുകളും</string>
@@ -922,8 +936,12 @@
   <string name="crypto_no_provider_title">ഈ ഇമെയിൽ എൻ‌ക്രിപ്റ്റ് ചെയ്തതാണ്</string>
   <string name="crypto_no_provider_message">ഈ ഇമെയിൽ ഓപ്പൺപിജിപി ഉപയോഗിച്ച് എൻക്രിപ്റ്റുചെയ്‌തതാണ്.\nഇത് വായിക്കാൻ, നിങ്ങൾ ഒരു അനുയോജ്യമായ ഓപ്പൺപിജിപി അപ്ലിക്കേഷൻ ഇൻസ്റ്റാളുചെയ്‌ത് ക്രമീകരിക്കേണ്ടതുണ്ട്. </string>
   <string name="crypto_no_provider_button">ക്രമീകരണങ്ങളിലേക്ക് പോകുക</string>
-  <string name="mail_list_widget_text">കെ-9 സന്ദേശ പട്ടിക</string>
+  <string name="mail_list_widget_text">Mail സന്ദേശ പട്ടിക</string>
   <string name="mail_list_widget_loading">സന്ദേശങ്ങൾ ലോഡുചെയ്യുന്നു...</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">ലോഡുചെയ്യുന്നു…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">ലോഡുചെയ്യുന്നു…</string>
   <string name="openpgp_enabled_error_title">എൻക്രിപ്ഷൻ സാധ്യമല്ല</string>
   <string name="openpgp_enabled_error_msg">തിരഞ്ഞെടുത്ത ചില സ്വീകർത്താക്കൾ ഈ സവിശേഷതയെ പിന്തുണയ്ക്കുന്നില്ല!</string>
   <string name="enable_encryption">എൻക്രിപ്ഷൻ പ്രാപ്തമാക്കുക</string>
@@ -972,4 +990,22 @@
   <!--permissions-->
   <string name="permission_contacts_rationale_title">കോൺ‌ടാക്റ്റുകളിലേക്ക് പ്രവേശനം അനുവദിക്കുക</string>
   <string name="permission_contacts_rationale_message">കോൺ‌ടാക്റ്റ് നിർദ്ദേശങ്ങൾ‌ നൽ‌കുന്നതിനും കോൺ‌ടാക്റ്റ് നാമങ്ങളും ഫോട്ടോകളും പ്രദർശിപ്പിക്കുന്നതിനും, അപ്ലിക്കേഷന് നിങ്ങളുടെ കോൺ‌ടാക്റ്റുകളിലേക്ക് പ്രവേശനം ആവശ്യമാണ്.</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">തിരഞ്ഞെടുക്കുക</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">തിരഞ്ഞെടുത്തത് മാറ്റുക</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">വായിക്കാത്തതായി അടയാളപ്പെടുത്തുക</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">നക്ഷത്രം ചേർക്കുക</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">നക്ഷത്രം കളയുക</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">ശേഖരം</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">ഇല്ലാതാക്കുക</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">സ്പാം</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 d1947321d4af182ba9f36bc9216cf185e7ffcb90..0815357125f20eceea240bfa1f48bf5802f0b4fa 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -214,6 +214,22 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="global_settings_confirm_menu_discard">Forkast melding</string>
   <string name="global_settings_confirm_menu_mark_all_read">Merk alle meldinger som lest</string>
   <string name="global_settings_confirm_action_delete_notif">Slett (fra varsel)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Ingen</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arkiver</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Slett</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Søppelpost</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Flytt</string>
   <string name="global_settings_privacy_hide_useragent">Skjul e-postklient</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Skjul tidssone</string>
@@ -549,8 +565,6 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Ukjent sertifikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Godta nøkkel</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Avvis nøkkel</string>
-  <string name="message_view_help_key">Del (eller D) - Slett\nR - Svar\nA - Svar alle\nC - Skriv\nF - Videresend\nM - Flytt\nV - Arkiver\nY - Kopier\nZ - Marker (U)leste\nG - Stjerne\nO - Sorteringstype\nI - Sorteringsrekkefølge\nQ - Tilbake til mapper\nS - Velg/fjern valg\nJ eller P - Forrige melding\nK eller N - Neste melding</string>
-  <string name="message_list_help_key">Del (eller D) - Slett\nR - Skriv\nM - Flytt\nV - Arkiver\nY - Kopier\nZ - Marker (U)leste\nG - Stjerne\nO - Sorteringstype\nI - Sorteringsrekkefølge\nQ - Tilbake til mapper\nS - Velg/fjern valg</string>
   <string name="folder_list_filter_hint">Mappenavn inneholder</string>
   <string name="folder_list_display_mode_label">Vis mapper …</string>
   <string name="folder_list_display_mode_all">Alle mapper</string>
@@ -873,8 +887,12 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="crypto_no_provider_title">Denne e-posten er kryptert</string>
   <string name="crypto_no_provider_message">Denne e-posten har blitt kryptert med OpenPGP.\nFor å lese den, må du installere og sette opp et kompatibelt OpenPGP-program.</string>
   <string name="crypto_no_provider_button">Gå til \"Innstillinger\"</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail meldingsliste</string>
   <string name="mail_list_widget_loading">Laster inn meldinger…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Laster…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Laster…</string>
   <string name="openpgp_enabled_error_title">Kryptering er ikke mulig</string>
   <string name="openpgp_enabled_error_msg">Noen av de valgte mottakerne støtter ikke denne funksjonen!</string>
   <string name="enable_encryption">Skru på kryptering</string>
@@ -908,4 +926,22 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
   <string name="switch_on">På</string>
   <string name="switch_off">Av</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Velg</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Fjern valg</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Merk uleste</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Legg til stjerne</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Fjern stjerne</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arkiver</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Slett</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Søppelpost</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 a2e488129e52b195a02d0515670c9220f96d1614..64773827935c134e34a9ee075be92f1047b695f5 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -570,8 +570,6 @@
     <string name="account_setup_failed_dlg_invalid_certificate_title">Onbekend certificaat</string>
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accepteer Sleutel</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Verwerp Sleutel</string>
-    <string name="message_view_help_key">Del (of D) - Verwijderen\nR - Antwoord\nA - Iedereen antwoorden\nC - Opstellen\nF - Doorsturen\nM - Verplaatsen\nV - Archiveren\nY - Kopiëren\nZ - Markeer (on)gelezen\nG - Ster\nO - Sorteer type\nI - Sorteer volgorde\nQ - Terug naar Mappen\nS - Selecteer/deselecteer\nJ of P - Vorig bericht\nK of N - Volgende bericht</string>
-    <string name="message_list_help_key">Del (of D) - Verwijderen\nC - Opstellen\nM - Verplaatsen\nV - Archiveren\nY - Kopiëren\nZ - Markeer (on)gelezen\nG - Ster\nO - Sorteer type\nI - Sorteer volgorde\nQ - Terug naar Mappen\nS - Selecteer/deselecteer</string>
     <string name="folder_list_filter_hint">Mapnaam bevat</string>
     <string name="folder_list_display_mode_label">Toon mappen…</string>
     <string name="folder_list_display_mode_all">Laat alle mappen zien</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 c9a22044ce6a9d055421f5237e053a7c832a3b30..ab3733dc586fe8df56281dbef8c86575e1cf536a 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -44,8 +44,8 @@
   <string name="compose_title_forward_as_attachment">Przekaż jako załącznik</string>
   <string name="choose_account_title">Wybierz konto</string>
   <string name="choose_folder_title">Wybierz folder</string>
-  <string name="choose_folder_move_title">Przenieś do...</string>
-  <string name="choose_folder_copy_title">Kopiuj do...</string>
+  <string name="choose_folder_move_title">Przenieś do…</string>
+  <string name="choose_folder_copy_title">Kopiuj do…</string>
   <string name="actionbar_selected">Wybrano <xliff:g id="selection_count">%d</xliff:g></string>
   <string name="next_action">Dalej</string>
   <string name="previous_action">Cofnij</string>
@@ -227,8 +227,8 @@
   <string name="global_settings_messageview_return_to_list_summary">Wraca do listy wiadomości po usunięciu danej wiadomości</string>
   <string name="global_settings_messageview_show_next_label">Pokaż następną wiadomość po usunięciu</string>
   <string name="global_settings_messageview_show_next_summary">Pokaż domyślnie następną wiadomość po usunięciu</string>
-  <string name="global_settings_confirm_actions_title">Potwierdź akcje</string>
-  <string name="global_settings_confirm_actions_summary">Pokaż potwierdzające okno dialogowe, gdy wykonujesz wybrane akcje</string>
+  <string name="global_settings_confirm_actions_title">Potwierdź czynności</string>
+  <string name="global_settings_confirm_actions_summary">Pokaż potwierdzające okno dialogowe, gdy wykonujesz wybrane czynności</string>
   <string name="global_settings_confirm_action_delete">Usuń</string>
   <string name="global_settings_confirm_action_delete_starred">Usuń oznacz. gwiazkdą (tylko widok wiadomości)</string>
   <string name="global_settings_confirm_action_spam">Spam</string>
@@ -237,6 +237,28 @@
   <string name="global_settings_confirm_action_delete_notif">Usuń (powiadomienie)</string>
   <string name="global_settings_privacy_hide_useragent">Usuń nagłówek \"User-Agent\"</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Czynności przesunięcia</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Przesuń w prawo</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Przesuń w lewo</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Żadne</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Przełącz wybór</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Oznacz jako nie/przeczytane</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Dodaj/usuń gwiazdkę</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archiwizuj</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Usuń</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Przenieś</string>
   <string name="global_settings_privacy_hide_timezone">Ukryj strefę czasową</string>
   <string name="global_settings_privacy_hide_timezone_detail">Używaj czasu UTC zamiast czasu lokalnego w nagłówkach wiadomości i odpowiedzi</string>
   <string name="global_settings_notification_quick_delete_title">Pokazuj przycisk „Usuń”</string>
@@ -608,8 +630,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nieznany certyfikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Akceptuj</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odrzuć</string>
-  <string name="message_view_help_key">Del (lub D) - Usuń\nR - Odpowiedz\nA - Odpowiedz wszystkim\nC - Stwórz\nF - Przekaż\nM - Przenieś\nV - Archiwizuj\nY - Kopiuj\nZ - Zaznacz (Nie)przeczytane\nG - Gwiazdka\nO - Typ sortowania\nl - Kolejność sortowania\nQ - Wróć do folderów\nS - Wybierz/odznacz\nJ lub P - Poprzednia wiadomość\nK lub N - Następna wiadomość</string>
-  <string name="message_list_help_key">Del (lub D) - Usuń\nR - Odpowiedz\nA - Odpowiedz wszystkim\nC - Stwórz\nF - Przekaż\nM - Przenieś\nV - Archiwizuj\nY - Kopiuj\nZ - Zaznacz (Nie)przeczytane\nG - Gwiazdka\nO - Typ sortowania\nl - Kolejność sortowania\nQ - Wróć do folderów\nS - Wybierz/odznacz</string>
   <string name="folder_list_filter_hint">Nazwa folderu zawiera</string>
   <string name="folder_list_display_mode_label">Wyświetlanie folderów</string>
   <string name="folder_list_display_mode_all">Wszystkie</string>
@@ -856,8 +876,8 @@
   <string name="mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
   <string name="global_settings_colorize_missing_contact_pictures_label">Pokoloruj zdjęcia kontaktów</string>
   <string name="global_settings_colorize_missing_contact_pictures_summary">Używa kolorów gdy brakuje zdjęć kontaktów</string>
-  <string name="global_settings_messageview_visible_refile_actions_title">Widoczne operacje wiadomości</string>
-  <string name="global_settings_messageview_visible_refile_actions_summary">Pokaż wybrane operacje w menu widoku wiadomości</string>
+  <string name="global_settings_messageview_visible_refile_actions_title">Widoczne czynności wiadomości</string>
+  <string name="global_settings_messageview_visible_refile_actions_summary">Pokaż wybrane czynności w menu widoku wiadomości</string>
   <string name="loading_attachment">Ładowanie załącznika…</string>
   <string name="fetching_attachment_dialog_title_send">Wysyłanie wiadomości</string>
   <string name="fetching_attachment_dialog_title_save">Zapisywanie wersji roboczej</string>
@@ -964,8 +984,12 @@
   <string name="crypto_no_provider_title">Ta wiadomość e-mail jest zaszyfrowana</string>
   <string name="crypto_no_provider_message">Ta wiadomość e-mail została zaszyfrowana z użyciem OpenPGP.\n Aby ją odczytać, należy zainstalować i skonfigurować zgodną aplikację OpenPGP.</string>
   <string name="crypto_no_provider_button">Przejdź do ustawień</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Lista wiadomości Mail</string>
   <string name="mail_list_widget_loading">Ładowanie wiadomości…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Ładowanie…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Ładowanie…</string>
   <string name="openpgp_enabled_error_title">Szyfrowanie nie możliwe</string>
   <string name="openpgp_enabled_error_msg">Część z wybranych odbiorców nie obsługuje tej funkcjonalności.</string>
   <string name="enable_encryption">Włącz szyfrowanie</string>
@@ -1027,4 +1051,24 @@ Tą wiadomość można zachować i użyć w formie kopii zapasowej twojego klucz
   <string name="push_info_configure_notification_action">Skonfiguruj powiadomienie</string>
   <string name="push_info_disable_push_text">Jeśli nie potrzebujesz natychmiastowych powiadomień o nowych wiadomościach, wyłącz notyfikacje push i użyj regularnego odpytywania. Odpytywanie w regularnych odstępach czasu sprawdza nową pocztę i nie wymaga powiadomienia.</string>
   <string name="push_info_disable_push_action">Wyłącz powiadomienia push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Zaznacz</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Odznacz</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Oznacz jako przeczytane</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Oznacz jako nieprzeczytane</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Dodaj gwiazdkę</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Usuń gwiazdkę</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archiwizuj</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Usuń</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Przenieś…</string>
 </resources>
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 52a4f8a64e83206c0d4332137335bc2117ae2ce2..e56be322b1d457636106353b48df6686dfc8896f 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
@@ -237,6 +237,28 @@
   <string name="global_settings_confirm_menu_discard">Descartar mensagem</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marcar todas as mensagens como lidas</string>
   <string name="global_settings_confirm_action_delete_notif">Excluir (na notificação)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Ações de deslizamento</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Deslizar para a direita</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Deslizar para a esquerda</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nenhuma</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Alternar a seleção</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Marcar como lida/não lida</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Adicionar/remover estrela</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arquivar</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Excluir</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mover</string>
   <string name="global_settings_privacy_hide_useragent">Ocultar o cliente de e-mail</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove o User-Agent do Mail dos cabeçalhos das mensagens</string>
   <string name="global_settings_privacy_hide_timezone">Ocultar o fuso horário</string>
@@ -610,8 +632,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado não reconhecido</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceitar chave</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rejeitar chave</string>
-  <string name="message_view_help_key">Del (ou D) - Excluir\nR - Responder\nA - Responder a todos\nC - Escrever\nF - Encaminhar\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar como (não) lida\nG - Sinalizar\nO - Tipo de ordenação\nI - Ordem de classificação\nQ - Retornar às pastas\nS - Marcar/desmarcar\nJ ou P - Mensagem anterior\nK ou N - Próxima Mensagem</string>
-  <string name="message_list_help_key">Del (ou D) - Excluir\nC - Escrever\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar como (não) lida\nG - Sinalizar\nO - Tipo de ordenação\nI - Ordem de classificação\nQ - Retornar às pastas\nS - Marcar/Desmarcar</string>
   <string name="folder_list_filter_hint">O nome da pasta contém</string>
   <string name="folder_list_display_mode_label">Exibir pastas…</string>
   <string name="folder_list_display_mode_all">Todas as pastas</string>
@@ -659,6 +679,7 @@
   <string name="account_setup_push_limit_1000">1000 pastas</string>
   <string name="animations_title">Animação</string>
   <string name="animations_summary">Utilizar efeitos visuais extravagantes</string>
+  <string name="volume_navigation_title">Navegação com os botões de volume na visualização da mensagem</string>
   <string name="show_unified_inbox_title">Exibir a caixa de entrada unificada</string>
   <string name="show_starred_count_title">Mostrar a contagem de sinalizadas</string>
   <string name="integrated_inbox_title">Caixa de Entrada Unificada</string>
@@ -960,8 +981,12 @@
   <string name="crypto_no_provider_title">Esta mensagem está criptografada</string>
   <string name="crypto_no_provider_message">Esta mensagem foi criptografada com OpenPGP.\nPara ler, precisa instalar e configurar um aplicativo OpenPGP compatível.</string>
   <string name="crypto_no_provider_button">Ir para as configurações</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Lista de mensagens do Mail</string>
   <string name="mail_list_widget_loading">Carregando mensagens…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Carregando…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Carregando…</string>
   <string name="openpgp_enabled_error_title">Não foi possível criptografar</string>
   <string name="openpgp_enabled_error_msg">Alguns dos destinatários selecionados não têm suporte a este recurso!</string>
   <string name="enable_encryption">Habilitar a criptografia</string>
@@ -1023,4 +1048,24 @@ Você pode guardar esta mensagem e usá-la como um backup da sua chave secreta.
   <string name="push_info_configure_notification_action">Configurar a notificação</string>
   <string name="push_info_disable_push_text">Caso você não precise de notificações instantâneas sobre novas mensagens, você deve desabilitar o push e usar somente a consulta (\"polling\"). A consulta procura por novas mensagens em intervalos regulares e não necessita da notificação.</string>
   <string name="push_info_disable_push_action">Desabilitar o Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Marcar</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Desmarcar</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Marcar como lida</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marcar como não lida</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Adicionar estrela</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Remover estrela</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arquivar</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Excluir</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Mover…</string>
 </resources>
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 a82b5fa85ec9f10ebc042d0413069f3802e53474..2e3b0ade4f6a7b0d4aeb56c400e844fffa8e4e46 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
@@ -8,9 +8,23 @@
   <string name="unread_widget_label">Mail Unread</string>
   <!--Used in the about dialog-->
   <string name="app_authors">The K-9 Dog Walkers</string>
+  <string name="source_code">Código-fonte</string>
   <string name="app_license">Licença Apache, 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 de utilizador</string>
+  <string name="get_help_title">Obter ajuda</string>
+  <string name="user_forum_title">Fórum de utilizadores</string>
+  <string name="about_fediverse_title">Fediverso</string>
+  <string name="about_twitter_title">Twitter</string>
   <string name="about_libraries">Bibliotecas</string>
   <string name="license">Licença</string>
+  <string name="changelog_title">Registo de alterações</string>
+  <string name="changelog_loading_error">Não foi possível carregar o registo de alterações.</string>
+  <string name="changelog_version_title">Versão %s</string>
+  <string name="changelog_recent_changes_title">O que há de novo?</string>
+  <string name="changelog_show_recent_changes">Mostrar alterações recentes quando a aplicação for atualizada</string>
+  <string name="changelog_snackbar_text">Descubra o que há de novo nesta versão</string>
   <!--Welcome message-->
   <string name="welcome_message_title">Welcome to Mail</string>
   <string name="accounts_welcome">Mail is the default mail client for /e/</string>
@@ -34,6 +48,8 @@
   <string name="compose_title_forward_as_attachment">Encaminhar como anexo</string>
   <string name="choose_account_title">Escolher Conta</string>
   <string name="choose_folder_title">Selecionar pasta</string>
+  <string name="choose_folder_move_title">Mover para…</string>
+  <string name="choose_folder_copy_title">Copiar para…</string>
   <string name="actionbar_selected"><xliff:g id="selection_count">%d</xliff:g> selecionado</string>
   <string name="next_action">Seguinte</string>
   <string name="previous_action">Anterior</string>
@@ -64,7 +80,9 @@
   <string name="add_account_action">Adicionar conta</string>
   <string name="compose_action">Compor</string>
   <string name="search_action">Pesquisar</string>
+  <string name="search_everywhere_action">Procurar em todo o lado</string>
   <string name="search_results">Resultados da pesquisa</string>
+  <string name="new_messages_title">Novas mensagens</string>
   <string name="preferences_action">Configurações</string>
   <string name="folders_action">Gerir pastas</string>
   <string name="account_settings_action">Configurações da conta</string>
@@ -75,12 +93,14 @@
   <string name="flag_action">Adicionar estrela</string>
   <string name="unflag_action">Remover estrela</string>
   <string name="copy_action">Copiar</string>
+  <string name="unsubscribe_action">Dessubscrever</string>
   <string name="show_headers_action">Mostrar cabeçalhos</string>
   <plurals name="copy_address_to_clipboard">
     <item quantity="one">Endereço copiado para a área de transferência</item>
     <item quantity="many">Endereços copiados para a área de transferência</item>
     <item quantity="other">Endereços copiados para a área de transferência</item>
   </plurals>
+  <string name="copy_subject_to_clipboard">Assunto copiado para a área de transferência</string>
   <string name="message_view_theme_action_dark">Mudar para o tema escuro</string>
   <string name="message_view_theme_action_light">Mudar para o tema claro</string>
   <string name="mark_as_unread_action">Marcar como não lido</string>
@@ -120,17 +140,23 @@
   <string name="notification_action_archive">Arquivar</string>
   <string name="notification_action_archive_all">Arquivar tudo</string>
   <string name="notification_action_spam">Spam</string>
+  <string name="notification_certificate_error_public">Erro de certificado</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">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-->
+  <string name="notification_notify_error_title">Erro de notificação</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">Occoreu um erro ao tentar criar uma notificação do sistema para uma nova mensagem. A causa mais provavel é a falta de um som de notificação.\n\nToque para abrir as definições de notificação
+.</string>
   <string name="notification_bg_sync_ticker">A verificar correio: <xliff:g id="account">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
   <string name="notification_bg_send_title">A enviar correio</string>
   <string name="notification_bg_title_separator">:</string>
+  <string name="notification_channel_push_title">Sincronizar (Push)</string>
+  <string name="notification_channel_push_description">Mostrado enquanto à espera de novas mensagens</string>
   <string name="notification_channel_messages_title">Mensagens</string>
   <string name="notification_channel_messages_description">Notificações relacionadas com mensagens</string>
   <string name="notification_channel_miscellaneous_title">Diversos</string>
@@ -146,6 +172,9 @@
   <string name="debug_enable_debug_logging_summary">Registar informação de diagnóstico extra</string>
   <string name="debug_enable_sensitive_logging_title">Registar informação sensível</string>
   <string name="debug_enable_sensitive_logging_summary">Podem aparecer palavras-passe nos registos.</string>
+  <string name="debug_export_logs_title">Exportar registos</string>
+  <string name="debug_export_logs_success">Exportação bem sucedida. Registos podem conter informação sensível. Tenha cuidado com quem os partilha.</string>
+  <string name="debug_export_logs_failure">A exportação falhou.</string>
   <string name="message_list_load_more_messages_action">Carregar mais mensagens</string>
   <string name="message_to_fmt">Para: <xliff:g id="counterParty">%s</xliff:g></string>
   <string name="message_compose_subject_hint">Assunto</string>
@@ -192,6 +221,7 @@
   <string name="global_settings_show_contact_name_summary">Usar nome dos destinatários a partir dos Contactos quando disponível</string>
   <string name="global_settings_registered_name_color_label">Colorir contactos</string>
   <string name="global_settings_registered_name_color_changed">Colorir nomes na sua lista de contactos</string>
+  <string name="general_settings_contact_name_color_label">Cor do nome de contacto</string>
   <string name="global_settings_messageview_fixedwidth_label">Fontes de largura fixa</string>
   <string name="global_settings_messageview_fixedwidth_summary">Usar uma fonte de largura fixa quando forem visualizadas mensagens em texto simples</string>
   <string name="global_settings_messageview_autofit_width_label">Ajustar automaticamente as mensagens</string>
@@ -208,6 +238,25 @@
   <string name="global_settings_confirm_menu_discard">Rejeitar mensagem</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marcar todas as mensagens como lidas</string>
   <string name="global_settings_confirm_action_delete_notif">Eliminar (a partir da notificação)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Deslizo para a direita</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Deslizo para a esquerda</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Nenhuma</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Marcar como lida/não-lida</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arquivo</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mover</string>
   <string name="global_settings_privacy_hide_useragent">Ocultar cliente de email</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Ocultar fuso horário</string>
@@ -219,6 +268,7 @@
   <string name="global_settings_lock_screen_notification_visibility_title">Notificações no ecrã de bloqueio</string>
   <string name="global_settings_lock_screen_notification_visibility_nothing">Sem notificações no ecrã de bloqueio</string>
   <string name="global_settings_lock_screen_notification_visibility_app_name">Nome da aplicação</string>
+  <string name="global_settings_lock_screen_notification_visibility_message_count">Número de novas mensagens</string>
   <string name="global_settings_lock_screen_notification_visibility_senders">Número de mensagens e remetentes</string>
   <string name="global_settings_lock_screen_notification_visibility_everything">O mesmo quando o ecrã está desbloqueado</string>
   <string name="quiet_time">Período de sossego</string>
@@ -230,9 +280,15 @@
   <string name="account_setup_basics_title">Configurar uma nova conta</string>
   <string name="account_setup_basics_email_hint">Endereço de email</string>
   <string name="account_setup_basics_password_hint">Palavra-passe</string>
+  <string name="account_setup_oauth_description">Para usar esta conta com o K-9 Mail, é necessário iniciar sessão e conceder permissão para aceder o seus emails.</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in">Iniciar sessão</string>
   <!--Displayed below the 'account_setup_oauth_description' text-->
+  <string name="account_setup_oauth_sign_in_with_google">Iniciar sessão com o Google</string>
   <!--Please use the same translation for "screen lock" as is used in the 'Security' section in Android's settings app-->
+  <string name="account_setup_basics_show_password_need_lock">Para ver a sua palavra-passe aqui, ative o bloqueio de ecrã neste dispositivo.</string>
+  <string name="account_setup_basics_show_password_biometrics_title">Verificar a sua identidade</string>
+  <string name="account_setup_basics_show_password_biometrics_subtitle">Desbloqueie para ver a sua palavra-passe</string>
   <string name="account_setup_basics_manual_setup_action">Configuração manual</string>
   <string name="account_setup_check_settings_title"/>
   <string name="account_setup_check_settings_retr_info_msg">A obter informações da conta\u2026</string>
@@ -252,6 +308,7 @@
   <string name="account_setup_auth_type_insecure_password">Palavra-passe, transmitida de forma insegura</string>
   <string name="account_setup_auth_type_encrypted_password">Palavra-passe encriptada</string>
   <string name="account_setup_auth_type_tls_client_certificate">Certificado de cliente</string>
+  <string name="account_setup_auth_type_oauth2">OAuth 2.0</string>
   <string name="account_setup_incoming_title">Configurações de entrada do servidor</string>
   <string name="account_setup_incoming_username_label">Nome de utilizador</string>
   <string name="account_setup_incoming_password_label">Palavra-passe</string>
@@ -270,6 +327,7 @@
   <string name="account_setup_incoming_delete_policy_never_label">Não eliminar no servidor</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Eliminar no servidor</string>
   <string name="account_setup_incoming_delete_policy_markread_label">Marcar como lido no servidor</string>
+  <string name="account_setup_incoming_use_compression">Usar compressão</string>
   <string name="account_setup_expunge_policy_label">Apagar mensagens eliminadas no servidor</string>
   <string name="account_setup_expunge_policy_immediately">Imediatamente</string>
   <string name="account_setup_expunge_policy_on_poll">Na verificação</string>
@@ -334,6 +392,10 @@
   <string name="account_setup_failed_dlg_auth_message_fmt">Nome de utilizador ou palavra-passe incorretos.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_certificate_message_fmt">O servidor apresenta um certificado SSL inválido. Por vezes, isto é devido a um erro de configuração no servidor. Outras vezes é alguém numa tentativa de ataque a si ou ao seu servidor de email. Se não tem a certeza do que está a acontecer, clique em Rejeitar e entre em contacto com quem gere o seu servidor de email.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_server_message_fmt">Não foi possível ligar ao servidor.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_oauth_flow_canceled">Autorização cancelada</string>
+  <string name="account_setup_failed_dlg_oauth_flow_failed">A autorização falhou com o seguinte erro: <xliff:g id="error">%s</xliff:g></string>
+  <string name="account_setup_failed_dlg_oauth_not_supported">OAuth 2.0 não é, de momento, suportado com este provedor.</string>
+  <string name="account_setup_failed_dlg_browser_not_found">A aplicação não conseguiu encontrar um navegador para usar na concessão do acesso à sua conta.</string>
   <string name="account_setup_failed_dlg_edit_details_action">Editar detalhes</string>
   <string name="account_setup_failed_dlg_continue_action">Continuar</string>
   <string name="account_settings_push_advanced_title">Avançado</string>
@@ -353,10 +415,15 @@
   <string name="account_settings_notify_self_summary">Mostrar uma notificação para as mensagens que envio</string>
   <string name="account_notify_contacts_mail_only_label">Apenas contactos</string>
   <string name="account_notify_contacts_mail_only_summary">Mostrar notificações apenas para mensagens de contactos conhecidos</string>
+  <string name="account_settings_ignore_chat_messages_label">Ignorar mensagens de conversa</string>
+  <string name="account_settings_ignore_chat_messages_summary">Não mostrar notificações de mensagens pertencentes a conversas de email</string>
   <string name="account_settings_mark_message_as_read_on_view_label">Marcar como lido ao abrir</string>
   <string name="account_settings_mark_message_as_read_on_view_summary">Marcar uma mensagem como lida ao abrir para visualização</string>
   <string name="account_settings_mark_message_as_read_on_delete_label">Marcar como lida quando apagada</string>
   <string name="account_settings_mark_message_as_read_on_delete_summary">Marcar a mensagem como lida quando é apagada</string>
+  <string name="account_settings_notification_channels_label">Categorias de notificação</string>
+  <string name="account_settings_open_notification_settings_messages_summary">Configurar notificações para novas mensagens</string>
+  <string name="account_settings_open_notification_settings_miscellaneous_summary">Configurar notificações de erro e estado</string>
   <string name="account_settings_show_pictures_label">Mostrar sempre as imagens</string>
   <string name="account_settings_show_pictures_never">Não</string>
   <string name="account_settings_show_pictures_only_from_contacts">Apenas dos contactos</string>
@@ -482,11 +549,29 @@
   <string name="account_settings_description_label">Nome da conta</string>
   <string name="account_settings_name_label">O seu nome</string>
   <string name="notifications_title">Notificações</string>
+  <string name="account_settings_vibration">Vibração</string>
   <string name="account_settings_vibrate_enable">Vibrar</string>
+  <string name="account_settings_vibrate_pattern_label">Padrão de vibração</string>
   <string name="account_settings_vibrate_pattern_default">Predefinição</string>
+  <string name="account_settings_vibrate_pattern_1">Padrão 1</string>
+  <string name="account_settings_vibrate_pattern_2">Padrão 2</string>
+  <string name="account_settings_vibrate_pattern_3">Padrão 3</string>
+  <string name="account_settings_vibrate_pattern_4">Padrão 4</string>
+  <string name="account_settings_vibrate_pattern_5">Padrão 5</string>
   <string name="account_settings_vibrate_times">Repetir vibração</string>
+  <string name="account_settings_vibrate_summary_disabled">Desativado</string>
   <string name="account_settings_ringtone">Tom de toque para novos emails</string>
+  <string name="account_settings_notification_light_label">Luz de notificação</string>
+  <string name="account_settings_notification_light_disabled">Desativada</string>
   <string name="account_settings_notification_light_account_color">Cor da conta</string>
+  <string name="account_settings_notification_light_default_color">Cor pré-definida do sistema</string>
+  <string name="account_settings_notification_light_white">Branca</string>
+  <string name="account_settings_notification_light_red">Vermelha</string>
+  <string name="account_settings_notification_light_green">Verde</string>
+  <string name="account_settings_notification_light_blue">Azul</string>
+  <string name="account_settings_notification_light_yellow">Amarela</string>
+  <string name="account_settings_notification_light_cyan">Ciana</string>
+  <string name="account_settings_notification_light_magenta">Magenta</string>
   <string name="account_settings_composition_title">Opções da composição de mensagens</string>
   <string name="account_settings_composition_label">Opções de composição predefinidas</string>
   <string name="account_settings_composition_summary">Defina os valores predefinidos para o De, Bcc e assinatura</string>
@@ -544,8 +629,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificado não reconhecido</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Aceitar chave</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Rejeitar chave</string>
-  <string name="message_view_help_key">Del (ou D) - Eliminar\nR - Responder\nA - Responder a todos\nC - Compor\nF - Reencaminhar\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar como (não) lida\nG - Estrela\nO - Tipo de ordenação\nI - OrdenaçãonQ - Voltar às pastas\nS - Selecionar/desselecionar\nJ ou P - Mensagem anterior\nK ou N - Mensagem seguinte</string>
-  <string name="message_list_help_key">Del (ou D) - Eliminar\nC - Compor\nM - Mover\nV - Arquivar\nY - Copiar\nZ - Marcar como (não)lida\nG - Estrela\nO - Tipo de ordenação\nI - Ordem\nQ - Voltar às pastas\nS - Selecionar/desselecionar</string>
   <string name="folder_list_filter_hint">Nome da pasta contém</string>
   <string name="folder_list_display_mode_label">Mostrar pastas…</string>
   <string name="folder_list_display_mode_all">Todas as pastas</string>
@@ -593,6 +676,8 @@
   <string name="account_setup_push_limit_1000">1000 pastas</string>
   <string name="animations_title">Animação</string>
   <string name="animations_summary">Usar efeitos visuais exuberantes</string>
+  <string name="volume_navigation_title">Navegação com os botões de volume na visualização de mensagens</string>
+  <string name="show_unified_inbox_title">Mostrar caixa de entrada unificada</string>
   <string name="integrated_inbox_title">Caixa de entrada unificada</string>
   <string name="integrated_inbox_detail">Todas as mensagens em pastas unificadas</string>
   <string name="folder_settings_include_in_integrated_inbox_label">Unificar</string>
@@ -639,6 +724,7 @@
   <string name="send_failed_reason">O envio falhou: %s</string>
   <string name="save_or_discard_draft_message_dlg_title">Guardar mensagem de rascunho?</string>
   <string name="save_or_discard_draft_message_instructions_fmt">Guardar ou rejeitar esta mensagem?</string>
+  <string name="save_or_discard_draft_message_changes">Guardar ou descartar alterações?</string>
   <string name="confirm_discard_draft_message_title">Rejeitar mensagem?</string>
   <string name="confirm_discard_draft_message">Tem a certeza que pretende rejeitar esta mensagem?</string>
   <string name="dialog_confirm_clear_local_folder_title">Limpar mensagens locais?</string>
@@ -685,13 +771,16 @@
   <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
   <string name="settings_import_password_required">Por favor inserir palavras-passe</string>
   <!--Displayed after importing accounts when one or multiple accounts require to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_required">Por favor, inicie sessão</string>
   <!--Displayed after importing accounts when some accounts require entering a password and some to use the OAuth authorization flow-->
+  <string name="settings_import_authorization_and_password_required">Por favor, inicie sessão e insira palavras-passe</string>
   <string name="settings_import_failure">Falha na importação de configurações</string>
   <string name="settings_import_read_failure">Falha na leitura do ficheiro de configurações</string>
   <string name="settings_import_partial_failure">Falha na importação de algumas configurações</string>
   <string name="settings_import_status_success">A importação foi bem sucedida</string>
   <string name="settings_import_status_password_required">Necessária palavra-passe</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">Sessão iniciada necessária</string>
   <string name="settings_import_status_not_imported">Não importado</string>
   <string name="settings_import_status_error">Falha na importação</string>
   <string name="settings_import_later_button">Posteriormente</string>
@@ -801,6 +890,7 @@
   <string name="recipient_bcc">Bcc</string>
   <string name="recipient_to">Para</string>
   <string name="recipient_from">De</string>
+  <string name="reply_to_label">Responder a</string>
   <string name="unknown_recipient">&lt;Recipiente desconhecido&gt;</string>
   <string name="unknown_sender">&lt;Remetente Desconhecido&gt;</string>
   <string name="address_type_home">Casa</string>
@@ -887,8 +977,12 @@
   <string name="crypto_no_provider_title">Este email está encriptado</string>
   <string name="crypto_no_provider_message">Este email foi encriptado com OpenPGP.\nPara o ler, necessita de instalar e configurar uma aplicação OpenPGP compatível.</string>
   <string name="crypto_no_provider_button">Ir para as configurações</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail Lista de mensagens</string>
   <string name="mail_list_widget_loading">A carregar mensagens…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">A carregar…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">A carregar…</string>
   <string name="openpgp_enabled_error_title">Não é possível encriptar</string>
   <string name="openpgp_enabled_error_msg">Alguns dos destinatários selecionados não suportam esta funcionalidade!</string>
   <string name="enable_encryption">Ativar encriptação</string>
@@ -937,4 +1031,37 @@ Pode manter esta mensagem e usá-la como uma cópia de segurança para a sua cha
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Permitir acesso aos contactos</string>
   <string name="permission_contacts_rationale_message">Por forma a fornecer sugestões de contactos e para mostrar nomes de contactos e fotografias, a aplicação necessita do acesso aos seus contactos.</string>
+  <string name="generic_loading_error">Occoreu um erro ao carregar os dados</string>
+  <string name="push_notification_state_initializing">Inicializando…</string>
+  <string name="push_notification_state_listening">À espera de novos e-mails</string>
+  <string name="push_notification_state_wait_background_sync">Suspenso até que a sincronização em segundo plano seja permitida.</string>
+  <string name="push_notification_state_wait_network">Suspenso até que a rede esteja disponível</string>
+  <string name="push_notification_info">Toque para saber mais</string>
+  <string name="push_info_title">Informação sobre o Push</string>
+  <string name="push_info_notification_explanation_text">Ao usar o Push, o K-9 Mail mantêm uma conneção com o servidor de mail. O Android requer que seja mostrada uma notificação constante enquanto a aplicação está ativa em segundo plano. %s</string>
+  <string name="push_info_configure_notification_text">Ainda assim, o Android também permite esconder a notificação.</string>
+  <string name="push_info_learn_more_text">Saber mais</string>
+  <string name="push_info_configure_notification_action">Configurar a notificação</string>
+  <string name="push_info_disable_push_text">Se não necessita de notificações instantáneas, deve desligar o Push e utilizar o Polling. O Polling procura novos e-mails num intervalo regular e não requer a notificação</string>
+  <string name="push_info_disable_push_action">Desativar o Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Selecionar</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Desselecionar</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Marcar como lido</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marcar como não lido</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Adicionar estrela</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Remover estrela</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arquivo</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Eliminar</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Mover…</string>
 </resources>
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 345a52ec002e04223e2cc0cb01f708ba18ce9699..9181cbd1869445fc4e21915252db0a21b644705c 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -238,6 +238,28 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
   <string name="global_settings_confirm_menu_discard">Renunță la mesaj</string>
   <string name="global_settings_confirm_menu_mark_all_read">Marchează toate mesajele ca citite</string>
   <string name="global_settings_confirm_action_delete_notif">Șterge (din notificare)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Acțiuni de glisare</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Glisarea spre dreapta</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Glisare spre stânga</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Fără</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Comutarea selecției</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Marcați ca citit/necitit</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Adăugare/eliminare stea</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arhivă</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Şterge</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Mută</string>
   <string name="global_settings_privacy_hide_useragent">Ascunde clientul de mail</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Ascunde fusul orar</string>
@@ -613,8 +635,6 @@ Uneori datorită faptului că cineva încearcă să te atace pe tine sau serveru
   <string name="account_setup_failed_dlg_invalid_certificate_title">Certificat nerecunoscut</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Tastă Accept</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Tastă Refuz</string>
-  <string name="message_view_help_key">Del (sau D) - Șterge\nR - Răspunde\nA - Răspunde tuturor\nC - Compune\nF - Redirecționează\nM - Mută\nV - Arhivează\nY - Copiază\nZ - Marchează (Ne)citit\nG - Stea\nO - Tip sortare\nI - Ordine sortare\nQ - Întoarcere la dosare\nS - Selectează/deselectează\nJ sau P - Mesaj anterior\nK sau N - Mesaj următor</string>
-  <string name="message_list_help_key">Del (sau D) - Șterge\nR - Răspunde\nA - Răspunde tuturor\nC - Compune\nF - Forward\nM - Mută\nV - Arhivează\nY - Copiază\nZ - Marchează (Ne)citit\nG - Stea\nO - Tip sortare\nI - Ordine sortare\nQ - Întoarcere la dosare\nS - Selectează/deselectează\nJ sau P - Mesaj anterior\nK sau N - Mesaj următor</string>
   <string name="folder_list_filter_hint">Numele dosarului conține</string>
   <string name="folder_list_display_mode_label">Afișează dosare…</string>
   <string name="folder_list_display_mode_all">Toate dosarele</string>
@@ -964,8 +984,12 @@ Uneori datorită faptului că cineva încearcă să te atace pe tine sau serveru
   <string name="crypto_no_provider_title">Acest mesaj este criptat</string>
   <string name="crypto_no_provider_message">Acest mesaj a fost criptat cu OpenPGP.\nPentru a-l citi trebuie să instalați și să configurați o aplicație OpenPGP compatibilă.</string>
   <string name="crypto_no_provider_button">Mergi la Setări</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Listă mesaje Mail</string>
   <string name="mail_list_widget_loading">Se încarcă mesajele…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Se încarcă…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Se încarcă…</string>
   <string name="openpgp_enabled_error_title">Criptarea nu este posibilă</string>
   <string name="openpgp_enabled_error_msg">Unii dintre destinatarii selectați nu suportă această facilitate!</string>
   <string name="enable_encryption">Activează criptarea</string>
@@ -1027,4 +1051,24 @@ Poți păstra acest mesaj și să îl folosești drept copie de siguranță a ch
   <string name="push_info_configure_notification_action">Configurați notificarea</string>
   <string name="push_info_disable_push_text">Dacă nu aveți nevoie de notificări instantanee cu privire la mesajele noi, dezactivați funcția Push și utilizați funcția Polling. Polling verifică dacă există mesaje noi la intervale regulate și nu are nevoie de notificare.</string>
   <string name="push_info_disable_push_action">Dezactivați Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Selectează</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Deselectează</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Marcați citit</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Marchează ca necitit</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Adaugă steluță</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Șterge steluță</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arhivă</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Şterge</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Spam</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Mutați…</string>
 </resources>
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 f6faa5f283b2f84a84e6f057bd565bf793fbdfcc..163552f01569a583ba0e572fd11246bd35bfbeba 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -4,7 +4,7 @@
   <!--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">Аккаунты Mail</string>
+  <string name="shortcuts_title">Учётные записи Mail</string>
   <string name="unread_widget_label">Не прочитано</string>
   <!--Used in the about dialog-->
   <string name="app_authors">The Mail Dog Walkers</string>
@@ -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>
@@ -68,7 +70,7 @@ Mail — почтовый клиент для Android.
   <string name="compose_title_reply_all">Ответить всем</string>
   <string name="compose_title_forward">Пересылка</string>
   <string name="compose_title_forward_as_attachment">Переслать вложением</string>
-  <string name="choose_account_title">Выберите ящик</string>
+  <string name="choose_account_title">Выберите учётную запись</string>
   <string name="choose_folder_title">Выбор папки</string>
   <string name="choose_folder_move_title">Переместить в…</string>
   <string name="choose_folder_copy_title">Копировать в…</string>
@@ -83,8 +85,8 @@ Mail — почтовый клиент для Android.
   <string name="reply_action">Ответить</string>
   <string name="reply_all_action">Ответить всем</string>
   <string name="delete_action">Удалить</string>
-  <string name="archive_action">В архив</string>
-  <string name="spam_action">В спам</string>
+  <string name="archive_action">Архивировать</string>
+  <string name="spam_action">Отправить в спам</string>
   <string name="forward_action">Переслать</string>
   <string name="forward_as_attachment_action">Переслать вложением</string>
   <string name="edit_as_new_message_action">Редактировать как новое сообщение</string>
@@ -99,7 +101,7 @@ Mail — почтовый клиент для Android.
   <string name="send_messages_action">Отправить почту</string>
   <string name="refresh_folders_action">Обновить список папок</string>
   <string name="filter_folders_action">Поиск папки</string>
-  <string name="add_account_action">Добавить</string>
+  <string name="add_account_action">Добавить учётную запись</string>
   <string name="compose_action">Создать</string>
   <string name="search_action">Поиск сообщения</string>
   <string name="search_everywhere_action">Искать везде</string>
@@ -107,8 +109,8 @@ Mail — почтовый клиент для Android.
   <string name="new_messages_title">Новые сообщения</string>
   <string name="preferences_action">Настройки</string>
   <string name="folders_action">Выбрать папки</string>
-  <string name="account_settings_action">Настройки ящика</string>
-  <string name="remove_account_action">Удалить ящик</string>
+  <string name="account_settings_action">Настройки учётной записи</string>
+  <string name="remove_account_action">Удалить учётную запись</string>
   <string name="mark_as_read_action">Прочитано</string>
   <string name="send_alternate_action">Передать</string>
   <string name="send_alternate_chooser_title">Выбрать отправителя</string>
@@ -133,7 +135,7 @@ Mail — почтовый клиент для Android.
   <string name="add_attachment_action">Добавить вложение</string>
   <string name="empty_trash_action">Очистить корзину</string>
   <string name="expunge_action">Стереть</string>
-  <string name="about_action">О программе</string>
+  <string name="about_action">О приложении</string>
   <string name="prefs_title">Настройки</string>
   <!--Shown in place of the subject when a message has no subject. Showing this in parentheses is customary.-->
   <string name="general_no_subject">(Без темы)</string>
@@ -162,7 +164,7 @@ Mail — почтовый клиент для Android.
   <string name="notification_action_delete">Удалить</string>
   <string name="notification_action_delete_all">Удалить все</string>
   <string name="notification_action_archive">Архив</string>
-  <string name="notification_action_archive_all">В архив все</string>
+  <string name="notification_action_archive_all">Архивировать все</string>
   <string name="notification_action_spam">Спам</string>
   <string name="notification_certificate_error_public">Ошибка сертификата</string>
   <string name="notification_certificate_error_title">Сбой сертификата <xliff:g id="account">%s</xliff:g></string>
@@ -170,7 +172,9 @@ Mail — почтовый клиент для Android.
   <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">%1$s</xliff:g>:<xliff:g id="folder">%2$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>
@@ -221,7 +225,7 @@ Mail — почтовый клиент для Android.
   <string name="message_view_from_format">От: <xliff:g id="name">%1$s</xliff:g> &lt;<xliff:g id="email">%2$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_bcc_label">Скрытая копия:</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>
@@ -259,6 +263,28 @@ Mail — почтовый клиент для Android.
   <string name="global_settings_confirm_menu_discard">Отменить сообщение</string>
   <string name="global_settings_confirm_menu_mark_all_read">Прочитаны все</string>
   <string name="global_settings_confirm_action_delete_notif">Удалить (в уведомлении)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Управление жестами</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Жест вправо</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Жест влево</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Нет</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Отметить письмо</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Отметить как прочитанное/непрочитанное</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Добавить/удалить звездочку</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Архив</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Удалить</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Переместить в спам</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Перенести</string>
   <string name="global_settings_privacy_hide_useragent">Скрыть почтовый клиент</string>
   <string name="global_settings_privacy_hide_useragent_detail">Убрать Mail User-Agent из заголовков сообщений</string>
   <string name="global_settings_privacy_hide_timezone">Скрыть временную зону</string>
@@ -279,8 +305,8 @@ Mail — почтовый клиент для Android.
   <string name="quiet_time_notification_description">Полностью, в период тишины</string>
   <string name="quiet_time_starts">Начало</string>
   <string name="quiet_time_ends">Конец</string>
-  <string name="account_setup_basics_title">Новый ящик</string>
-  <string name="account_setup_basics_email_hint">Адрес email</string>
+  <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-->
@@ -300,9 +326,9 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_check_settings_fetch">Получение настроек\u2026</string>
   <string name="account_setup_check_settings_canceling_msg">Отмена\u2026</string>
   <string name="account_setup_names_title">Всё почти готово!</string>
-  <string name="account_setup_names_account_name_label">Имя ящика (необязательно):</string>
+  <string name="account_setup_names_account_name_label">Название учётной записи (необязательно):</string>
   <string name="account_setup_names_user_name_label">Ваше имя (видно адресату в сообщениях):</string>
-  <string name="account_setup_account_type_title">Тип ящика</string>
+  <string name="account_setup_account_type_title">Тип учётной записи</string>
   <string name="account_setup_account_type_instructions">Доступные протоколы</string>
   <string name="account_setup_account_type_pop_action">POP3</string>
   <string name="account_setup_account_type_imap_action">IMAP</string>
@@ -312,7 +338,7 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_auth_type_tls_client_certificate">Сертификат клиента</string>
   <string name="account_setup_auth_type_oauth2">Тип аутентификации OAuth 2.0</string>
   <string name="account_setup_incoming_title">Сервер входящей почты</string>
-  <string name="account_setup_incoming_username_label">Логин</string>
+  <string name="account_setup_incoming_username_label">Имя пользователя</string>
   <string name="account_setup_incoming_password_label">Пароль</string>
   <string name="account_setup_incoming_client_certificate_label">Сертификат клиента</string>
   <string name="account_setup_incoming_pop_server_label">Сервер POP3</string>
@@ -336,11 +362,11 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_expunge_policy_manual">Вручную</string>
   <string name="account_setup_incoming_autodetect_namespace_label">Автообласть имён IMAP</string>
   <string name="account_setup_incoming_imap_path_prefix_label">Префикс пути IMAP</string>
-  <string name="drafts_folder_label">Папка черновиков</string>
-  <string name="sent_folder_label">Папка отправленных</string>
-  <string name="trash_folder_label">Папка удалённых</string>
-  <string name="archive_folder_label">Папка архивных</string>
-  <string name="spam_folder_label">Папка спама</string>
+  <string name="drafts_folder_label">Папка черновики</string>
+  <string name="sent_folder_label">Папка отправленные</string>
+  <string name="trash_folder_label">Папка корзина/удалённые</string>
+  <string name="archive_folder_label">Папка архив</string>
+  <string name="spam_folder_label">Папка спам</string>
   <string name="account_setup_incoming_subscribed_folders_only_label">Только подписанные папки</string>
   <string name="account_setup_auto_expand_folder">Автопереход в папку</string>
   <string name="account_setup_incoming_webdav_path_prefix_label">Путь OWA</string>
@@ -351,12 +377,12 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_outgoing_port_label">Порт</string>
   <string name="account_setup_outgoing_security_label">Безопасность</string>
   <string name="account_setup_outgoing_require_login_label">Авторизация</string>
-  <string name="account_setup_outgoing_username_label">Логин</string>
+  <string name="account_setup_outgoing_username_label">Имя пользователя</string>
   <string name="account_setup_outgoing_password_label">Пароль</string>
   <string name="account_setup_outgoing_authentication_label">Аутентификация</string>
   <string name="account_setup_outgoing_invalid_setting_combo_notice">\"<xliff:g id="setting_1_label">%1$s</xliff:g> = <xliff:g id="setting_1_value">%2$s</xliff:g>\" недействителен для \"<xliff:g id="setting_2_label">%3$s</xliff:g> = <xliff:g id="setting_2_value">%4$s</xliff:g>\"</string>
   <string name="account_setup_bad_uri">Неверная настройка: <xliff:g id="err_mess">%s</xliff:g></string>
-  <string name="account_setup_options_title">Настройки ящика</string>
+  <string name="account_setup_options_title">Настройки учётной записи</string>
   <string name="account_setup_options_mail_check_frequency_label">Интервал проверки</string>
   <string name="account_setup_options_mail_check_frequency_never">Вручную</string>
   <string name="account_setup_options_mail_check_frequency_15min">15 минут</string>
@@ -378,20 +404,20 @@ Mail — почтовый клиент для Android.
   <string name="idle_refresh_period_60min">1 час</string>
   <string name="account_setup_options_notify_label">Уведомлять о новой почте</string>
   <string name="account_setup_options_mail_display_count_label">Загружать сообщений</string>
-  <string name="account_setup_options_mail_display_count_10">10</string>
-  <string name="account_setup_options_mail_display_count_25">25</string>
-  <string name="account_setup_options_mail_display_count_50">50</string>
-  <string name="account_setup_options_mail_display_count_100">100</string>
-  <string name="account_setup_options_mail_display_count_250">250</string>
-  <string name="account_setup_options_mail_display_count_500">500</string>
-  <string name="account_setup_options_mail_display_count_1000">1000</string>
+  <string name="account_setup_options_mail_display_count_10">10 сообщений</string>
+  <string name="account_setup_options_mail_display_count_25">25 сообщений</string>
+  <string name="account_setup_options_mail_display_count_50">50 сообщений</string>
+  <string name="account_setup_options_mail_display_count_100">100 сообщений</string>
+  <string name="account_setup_options_mail_display_count_250">250 сообщений</string>
+  <string name="account_setup_options_mail_display_count_500">500 сообщений</string>
+  <string name="account_setup_options_mail_display_count_1000">1000 сообщений</string>
   <string name="account_setup_options_mail_display_count_2500">2500 сообщений</string>
   <string name="account_setup_options_mail_display_count_5000">5000 сообщений</string>
   <string name="account_setup_options_mail_display_count_10000">10000 сообщений</string>
-  <string name="account_setup_options_mail_display_count_all">Все</string>
+  <string name="account_setup_options_mail_display_count_all">Все сообщения</string>
   <string name="move_copy_cannot_copy_unsynced_message">Нельзя скопировать или переместить сообщение, не синхронизированное с сервером</string>
   <string name="account_setup_failed_dlg_title">Настройка не завершена</string>
-  <string name="account_setup_failed_dlg_auth_message_fmt">Неверные логин или пароль.\n(<xliff:g id="error">%s</xliff:g>)</string>
+  <string name="account_setup_failed_dlg_auth_message_fmt">Неверные имя пользователя или пароль.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_certificate_message_fmt">Сервер предоставляет неверный сертификат SSL. Иногда это обусловлено неправильной настройкой. Или кто-то пытается атаковать Ваш почтовый сервер или Ваш компьютер. Если Вы не уверены в причинах, нажмите Отклонить и свяжитесь с персоналом, обслуживающим почтовый сервер.\n\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_server_message_fmt">Не удаётся подключиться к серверу.\n(<xliff:g id="error">%s</xliff:g>)</string>
   <string name="account_setup_failed_dlg_oauth_flow_canceled">Авторизация отменена</string>
@@ -401,16 +427,16 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_failed_dlg_edit_details_action">Правка</string>
   <string name="account_setup_failed_dlg_continue_action">Продолжить</string>
   <string name="account_settings_push_advanced_title">Дополнительно</string>
-  <string name="account_settings_title_fmt">Настройки ящика</string>
+  <string name="account_settings_title_fmt">Настройки учётной записи</string>
   <string name="account_settings_notify_label">Уведомить о почте</string>
   <string name="account_settings_folder_notify_new_mail_mode_label">Уведомления папок</string>
   <string name="account_settings_folder_notify_new_mail_mode_all">Все</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_class">1 класс</string>
-  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">1 и 2 классы </string>
-  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Кроме 2 класса</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_class">Папки только 1-го класса</string>
+  <string name="account_settings_folder_notify_new_mail_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
+  <string name="account_settings_folder_notify_new_mail_mode_not_second_class">Все, кроме папок 2-го класса</string>
   <string name="account_settings_folder_notify_new_mail_mode_none">Нет</string>
   <string name="account_settings_notify_sync_label">Уведомить о проверке</string>
-  <string name="account_settings_email_label">Ваш адрес email</string>
+  <string name="account_settings_email_label">Ваш адрес эл. почты</string>
   <string name="account_settings_notify_summary">Показать уведомление о новой почте</string>
   <string name="account_settings_notify_sync_summary">Показать уведомление о проверке почты</string>
   <string name="account_settings_notify_self_label">Также об исходящей</string>
@@ -439,7 +465,7 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_strip_signature_summary">Удалять подписи из цитируемого текста</string>
   <string name="account_settings_message_format_label">Формат сообщений</string>
   <string name="account_settings_message_format_text">Только текст</string>
-  <string name="account_settings_message_format_html">HTML</string>
+  <string name="account_settings_message_format_html">HTML (сохранять изображения и форматирование)</string>
   <string name="account_settings_message_format_auto">Автоматически</string>
   <string name="account_settings_always_show_cc_bcc_label">Включать Копия/Скрытая</string>
   <string name="account_settings_message_read_receipt_label">Уведомление о прочтении</string>
@@ -461,12 +487,12 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_crypto_summary_off">OpenPGP не настроен</string>
   <string name="account_settings_crypto_summary_on">Соединено с %s</string>
   <string name="account_settings_crypto_summary_config">Конфигурируется…</string>
-  <string name="account_settings_crypto_encrypt_all_drafts">Хранить черновики зашифрованными</string>
-  <string name="account_settings_crypto_encrypt_all_drafts_on">Все черновики будут зашифрованы</string>
+  <string name="account_settings_crypto_encrypt_all_drafts">Хранить все черновики в зашифрованном виде</string>
+  <string name="account_settings_crypto_encrypt_all_drafts_on">Все черновики будут храниться в зашифрованном виде</string>
   <string name="account_settings_crypto_encrypt_all_drafts_off">Зашифровать черновики, если включено шифрование</string>
   <string name="account_settings_mail_check_frequency_label">Интервал проверки</string>
-  <string name="account_settings_color_label">Цвет</string>
-  <string name="account_settings_color_summary">Метка в списке ящиков и папок</string>
+  <string name="account_settings_color_label">Цвет для учётной записи</string>
+  <string name="account_settings_color_summary">Акцентный цвет текущей учётной записи, используемый среди учётных записей и папок</string>
   <string name="account_settings_mail_display_count_label">Отображать сообщений</string>
   <string name="account_settings_autodownload_message_size_label">Загружать фрагмент</string>
   <string name="account_settings_autodownload_message_size_1">1 КиБ</string>
@@ -499,26 +525,26 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_message_age_1_year">1 год</string>
   <string name="account_settings_folder_display_mode_label">Видимость папок</string>
   <string name="account_settings_folder_display_mode_all">Все</string>
-  <string name="account_settings_folder_display_mode_first_class">1-й класс</string>
-  <string name="account_settings_folder_display_mode_first_and_second_class">1-й и 2-й классы</string>
-  <string name="account_settings_folder_display_mode_not_second_class">Кроме 2-го класса</string>
+  <string name="account_settings_folder_display_mode_first_class">Папки только 1-го класса</string>
+  <string name="account_settings_folder_display_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
+  <string name="account_settings_folder_display_mode_not_second_class">Все, кроме папок 2-го класса</string>
   <string name="account_settings_folder_sync_mode_label">Проверка папок</string>
   <string name="account_settings_folder_sync_mode_all">Все</string>
-  <string name="account_settings_folder_sync_mode_first_class">1-й класс</string>
-  <string name="account_settings_folder_sync_mode_first_and_second_class">1-й и 2-й классы</string>
-  <string name="account_settings_folder_sync_mode_not_second_class">Кроме 2-го класса</string>
+  <string name="account_settings_folder_sync_mode_first_class">Папки только 1-го класса</string>
+  <string name="account_settings_folder_sync_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
+  <string name="account_settings_folder_sync_mode_not_second_class">Все, кроме папок 2-го класса</string>
   <string name="account_settings_folder_sync_mode_none">Нет</string>
   <string name="account_settings_folder_push_mode_label">Push</string>
   <string name="account_settings_folder_push_mode_all">Все</string>
-  <string name="account_settings_folder_push_mode_first_class">1-й класс</string>
-  <string name="account_settings_folder_push_mode_first_and_second_class">1-й и 2-й классы</string>
-  <string name="account_settings_folder_push_mode_not_second_class">Кроме 2-го класса</string>
+  <string name="account_settings_folder_push_mode_first_class">Папки только 1-го класса</string>
+  <string name="account_settings_folder_push_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
+  <string name="account_settings_folder_push_mode_not_second_class">Все, кроме папок 2-го класса</string>
   <string name="account_settings_folder_push_mode_none">Нет</string>
   <string name="account_settings_folder_target_mode_label">Приёмник копирования</string>
   <string name="account_settings_folder_target_mode_all">Все</string>
-  <string name="account_settings_folder_target_mode_first_class">1-й класс</string>
-  <string name="account_settings_folder_target_mode_first_and_second_class">1-й и 2-й классы</string>
-  <string name="account_settings_folder_target_mode_not_second_class">Кроме 2-го класса</string>
+  <string name="account_settings_folder_target_mode_first_class">Папки только 1-го класса</string>
+  <string name="account_settings_folder_target_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
+  <string name="account_settings_folder_target_mode_not_second_class">Все, кроме папок 2-го класса</string>
   <string name="account_settings_sync_remote_deletetions_label">Синхронное удаление</string>
   <string name="account_settings_sync_remote_deletetions_summary">Удалять сообщения при удалении на сервере</string>
   <string name="account_settings_openpgp_missing">Отсутствует OpenPGP-приложение – было удалено?</string>
@@ -549,7 +575,7 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_incoming_summary">Настройки сервера входящей почты</string>
   <string name="account_settings_outgoing_label">Сервер исходящих</string>
   <string name="account_settings_outgoing_summary">Настройки сервера исходящей почты</string>
-  <string name="account_settings_description_label">Имя ящика</string>
+  <string name="account_settings_description_label">Название учётной записи</string>
   <string name="account_settings_name_label">Ваше имя</string>
   <string name="notifications_title">Уведомления</string>
   <string name="account_settings_vibration">Вибрация</string>
@@ -563,10 +589,10 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_vibrate_pattern_5">Шаблон 5</string>
   <string name="account_settings_vibrate_times">Повтор</string>
   <string name="account_settings_vibrate_summary_disabled">Выключено</string>
-  <string name="account_settings_ringtone">Мелодия</string>
+  <string name="account_settings_ringtone">Мелодия для оповещения</string>
   <string name="account_settings_notification_light_label">Свет уведомлений</string>
   <string name="account_settings_notification_light_disabled">Выключено</string>
-  <string name="account_settings_notification_light_account_color">Цвет</string>
+  <string name="account_settings_notification_light_account_color">Цвет учётной записи</string>
   <string name="account_settings_notification_light_default_color">Системный цвет</string>
   <string name="account_settings_notification_light_white">Белый</string>
   <string name="account_settings_notification_light_red">Красный</string>
@@ -594,20 +620,20 @@ Mail — почтовый клиент для Android.
   <string name="edit_identity_description_label">Название роли</string>
   <string name="edit_identity_description_hint">опция</string>
   <string name="edit_identity_name_label">Ваше имя</string>
-  <string name="edit_identity_name_hint">опция</string>
-  <string name="edit_identity_email_label">Адрес email</string>
-  <string name="edit_identity_email_hint">обязательно</string>
+  <string name="edit_identity_name_hint">(Необязательно)</string>
+  <string name="edit_identity_email_label">Адрес электронной почты</string>
+  <string name="edit_identity_email_hint">(Обязательно)</string>
   <string name="edit_identity_reply_to_label">Адрес для ответа</string>
-  <string name="edit_identity_reply_to_hint">опция</string>
+  <string name="edit_identity_reply_to_hint">(Необязательно)</string>
   <string name="edit_identity_signature_label">Подпись</string>
-  <string name="edit_identity_signature_hint">опция</string>
+  <string name="edit_identity_signature_hint">(Необязательно)</string>
   <string name="account_settings_signature_use_label">Использовать подпись</string>
   <string name="account_settings_signature_label">Подпись</string>
   <string name="default_identity_description">Основная роль</string>
   <string name="choose_identity_title">Выберите роль</string>
   <string name="send_as">Отправитель</string>
   <string name="no_removable_identity">Нельзя удалить основную роль</string>
-  <string name="identity_has_no_email">Нельзя создать роль без адреса email</string>
+  <string name="identity_has_no_email">Нельзя создать роль без адреса электронной почты</string>
   <string name="sort_earliest_first">Старые – новые</string>
   <string name="sort_latest_first">Новые – старые</string>
   <string name="sort_subject_alpha">Тема А – Я</string>
@@ -628,17 +654,15 @@ Mail — почтовый клиент для Android.
   <string name="sort_by_flag">Важность</string>
   <string name="sort_by_unread">Прочитано</string>
   <string name="sort_by_attach">Вложение</string>
-  <string name="account_delete_dlg_title">Удаление ящика</string>
+  <string name="account_delete_dlg_title">Удаление учётной записи</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Неверный сертификат сервера</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Принять</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Отклонить</string>
-  <string name="message_view_help_key">Del (или D) – удалить\nR – ответить\nA – ответить всем\nC – создать\nF – переслать\nM – переместить\nV – в архив\nY – копировать\nZ – (не) прочитано\nG – важное\nO – сортировка\nI – порядок\nQ – папки\nS – выбрать\nJ или P – назад\nK или N – далее</string>
-  <string name="message_list_help_key">Del (или D) – удалить\nC – создать\nM – переместить\nV – в архив\nY – копировать\nZ – (не) прочитано\nG – важное\nO – сортировка\nI – порядок\nQ – папки\nS – выбрать</string>
   <string name="folder_list_filter_hint">Поиск папки</string>
   <string name="folder_list_display_mode_label">Видимость папок</string>
   <string name="folder_list_display_mode_all">Все папки</string>
-  <string name="folder_list_display_mode_first_class">1-й класс</string>
-  <string name="folder_list_display_mode_first_and_second_class">1-й и 2-й класс</string>
+  <string name="folder_list_display_mode_first_class">Папки 1-го класса</string>
+  <string name="folder_list_display_mode_first_and_second_class">Папки 1-го и 2-го классов</string>
   <string name="folder_list_display_mode_not_second_class">Кроме 2-го класса</string>
   <string name="account_settings_signature__location_label">Размещение подписи</string>
   <string name="account_settings_signature__location_before_quoted_text">Перед цитатой</string>
@@ -653,7 +677,7 @@ Mail — почтовый клиент для Android.
   <string name="privacy_preferences">Личное</string>
   <string name="network_preferences">Сеть</string>
   <string name="interaction_preferences">Интерфейс</string>
-  <string name="accountlist_preferences">Список ящиков</string>
+  <string name="accountlist_preferences">Список учётных записей</string>
   <string name="messagelist_preferences">Список сообщений</string>
   <string name="messageview_preferences">Сообщения</string>
   <string name="settings_theme_label">Тема приложения</string>
@@ -661,9 +685,9 @@ Mail — почтовый клиент для Android.
   <string name="settings_compose_theme_label">Тема редактора</string>
   <string name="settings_language_label">Язык</string>
   <string name="preference_search_no_results">Настройки не найдены</string>
-  <string name="settings_message_theme_selection_label">Фиксированный просмотр</string>
+  <string name="settings_message_theme_selection_label">Задать тему для писем</string>
   <string name="settings_message_theme_selection_summary_off">Разрешить выбор темы при чтении сообщения</string>
-  <string name="settings_message_theme_selection_summary_on">Отключить выбор темы при чтении сообщения</string>
+  <string name="settings_message_theme_selection_summary_on">Возможность выбрать тему для писем отдельно от темы приложения</string>
   <string name="setting_language_system">По умолчанию</string>
   <string name="background_ops_label">Фоновая синхронизация</string>
   <string name="background_ops_never">Никогда</string>
@@ -681,6 +705,7 @@ Mail — почтовый клиент для Android.
   <string name="account_setup_push_limit_1000">1000 папок</string>
   <string name="animations_title">Анимация</string>
   <string name="animations_summary">Анимация интерфейса</string>
+  <string name="volume_navigation_title">Управление клавишами громкости для перехода между письмами</string>
   <string name="show_unified_inbox_title">Показывать общий ящик для входящих</string>
   <string name="show_starred_count_title">Cчетчик важных</string>
   <string name="integrated_inbox_title">Входящие</string>
@@ -695,9 +720,9 @@ Mail — почтовый клиент для Android.
   <string name="account_settings_automatic_special_folder">Автоматически (%s)</string>
   <string name="font_size_settings_title">Шрифт</string>
   <string name="font_size_settings_description">Настройка размера шрифтов</string>
-  <string name="font_size_account_list">Список ящиков</string>
-  <string name="font_size_account_name">Имя ящика</string>
-  <string name="font_size_account_description">Описание ящика</string>
+  <string name="font_size_account_list">Список учётных записей</string>
+  <string name="font_size_account_name">Название учётной записи</string>
+  <string name="font_size_account_description">Описание учётной записи</string>
   <string name="font_size_folder_list">Список папок</string>
   <string name="font_size_folder_name">Имя папки</string>
   <string name="font_size_folder_status">Состояние папки</string>
@@ -771,8 +796,8 @@ Mail — почтовый клиент для Android.
   <string name="settings_export_progress_text">Экспорт настроек…</string>
   <string name="settings_export_success_generic">Настройки успешно экспортированы</string>
   <string name="settings_export_failure">Сбой экспорта настроек</string>
-  <string name="settings_import_title">Импорт</string>
-  <string name="settings_import_pick_document_button">Выберите файл</string>
+  <string name="settings_import_title">Импортировать настройки</string>
+  <string name="settings_import_pick_document_button">Выбрать файл</string>
   <string name="settings_import_button">Импорт</string>
   <string name="settings_import_success_generic">Настройки успешно импортированы</string>
   <!--Displayed after importing accounts when one or multiple accounts require entering a password-->
@@ -797,15 +822,15 @@ Mail — почтовый клиент для Android.
     <item quantity="one">Чтобы использовать ящик \"<xliff:g id="account">%s</xliff:g>\" необходимо ввести пароль.</item>
     <item quantity="few">Чтобы использовать ящик \"<xliff:g id="account">%s</xliff:g>\" необходимо ввести пароли.</item>
     <item quantity="many">Чтобы использовать ящик \"<xliff:g id="account">%s</xliff:g>\" необходимо ввести пароли.</item>
-    <item quantity="other">Чтобы использовать ящик \"<xliff:g id="account">%s</xliff:g>\" необходимо ввести пароли.</item>
+    <item quantity="other">Чтобы использовать учётную запись \"<xliff:g id="account">%s</xliff:g>\" необходимо ввести пароли.</item>
   </plurals>
   <string name="settings_import_incoming_server_password_hint">Входящий пароль сервера</string>
   <string name="settings_import_outgoing_server_password_hint">Исходящий пароль сервера</string>
   <string name="settings_import_use_same_password_for_outgoing_server">Использовать тот же пароль для исходящего сервера</string>
   <string name="server_name_format">Названия серверов: <xliff:g id="hostname">%s</xliff:g></string>
   <string name="unread_widget_select_account">Счётчик непрочитанных</string>
-  <string name="unread_widget_account_title">Ящик</string>
-  <string name="unread_widget_account_summary">Ящик для отображения счётчика непрочитанных</string>
+  <string name="unread_widget_account_title">Учётная запись</string>
+  <string name="unread_widget_account_summary">Учётная запись для отображения счётчика непрочитанных</string>
   <string name="unread_widget_unified_inbox_account_summary">Общие \"Входящие\"</string>
   <string name="unread_widget_folder_enabled_title">Счётчик папок</string>
   <string name="unread_widget_folder_enabled_summary">Показывать счётчик непрочитанных только для одной папки</string>
@@ -813,7 +838,7 @@ Mail — почтовый клиент для Android.
   <string name="unread_widget_folder_summary">Папка для отображения счётчика непрочитанных</string>
   <string name="unread_widget_action_done">Готово</string>
   <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> – <xliff:g id="folder_name">%2$s</xliff:g></string>
-  <string name="unread_widget_account_not_selected">Ящик не выбран</string>
+  <string name="unread_widget_account_not_selected">Учётная запись не выбрана</string>
   <string name="unread_widget_folder_not_selected">Папка не выбрана</string>
   <string name="webview_empty_message">Текст отсутствует</string>
   <string name="webview_contextmenu_link_view_action">Открыть</string>
@@ -835,7 +860,7 @@ Mail — почтовый клиент для Android.
   <string name="webview_contextmenu_email_send_action">Написать</string>
   <string name="webview_contextmenu_email_save_action">В контакты</string>
   <string name="webview_contextmenu_email_copy_action">В буфер</string>
-  <string name="webview_contextmenu_email_clipboard_label">Адрес email</string>
+  <string name="webview_contextmenu_email_clipboard_label">Адрес электронной почты</string>
   <string name="account_settings_remote_search_num_results_entries_all">Все</string>
   <string name="account_settings_remote_search_num_results_entries_10">10</string>
   <string name="account_settings_remote_search_num_results_entries_25">25</string>
@@ -868,11 +893,11 @@ Mail — почтовый клиент для Android.
   <string name="global_settings_threaded_view_summary">Объединить сообщения, показав счётчик</string>
   <string name="upgrade_databases_title">Обновление данных</string>
   <string name="upgrade_databases_unspecified">Обновление данных…</string>
-  <string name="upgrade_database_format">Обновление ящика \"<xliff:g id="account">%s</xliff:g>\"</string>
+  <string name="upgrade_database_format">Обновление учётной записи \"<xliff:g id="account">%s</xliff:g>\"</string>
   <string name="global_settings_splitview_mode_label">Разделить экран</string>
   <string name="global_settings_splitview_always">Всегда</string>
-  <string name="global_settings_splitview_never">Нет</string>
-  <string name="global_settings_splitview_when_in_landscape">Ландшафт</string>
+  <string name="global_settings_splitview_never">Никогда</string>
+  <string name="global_settings_splitview_when_in_landscape">При горизонтальном положении</string>
   <string name="message_view_empty">Выберите сообщение</string>
   <string name="global_settings_show_contact_picture_label">Фото контактов</string>
   <string name="global_settings_show_contact_picture_summary">Показать фото контактов в списке сообщений</string>
@@ -897,7 +922,7 @@ Mail — почтовый клиент для Android.
   <string name="preview_encrypted">*Зашифровано*</string>
   <string name="add_from_contacts">Добавить из Контактов</string>
   <string name="recipient_cc">Копия</string>
-  <string name="recipient_bcc">Скрытая</string>
+  <string name="recipient_bcc">Скрытая копия</string>
   <string name="recipient_to">Кому</string>
   <string name="recipient_from">От</string>
   <string name="reply_to_label">Ответить на</string>
@@ -907,8 +932,8 @@ Mail — почтовый клиент для Android.
   <string name="address_type_work">Работа</string>
   <string name="address_type_other">Прочее</string>
   <string name="address_type_mobile">Мобильный</string>
-  <string name="compose_error_no_draft_folder">Для данного ящика не настроена папка Черновики!</string>
-  <string name="compose_error_no_key_configured">Для данного ящика не настроены ключи! Проверьте настройки</string>
+  <string name="compose_error_no_draft_folder">Для данной учётной записи не настроена папка Черновики!</string>
+  <string name="compose_error_no_key_configured">Для данной учётной записи не настроены ключи! Проверьте настройки</string>
   <string name="error_crypto_provider_incompatible">Криптопровайдер использует несовместимую версию. Проверьте настройки!</string>
   <string name="error_crypto_provider_connect">Нет доступа к криптопровайдеру. Проверьте настройки или нажмите значок шифрования для повтора!</string>
   <string name="error_crypto_provider_ui_required">Ошибка инициализации сквозного шифрования. Проверьте настройки</string>
@@ -989,6 +1014,10 @@ Mail — почтовый клиент для Android.
   <string name="crypto_no_provider_button">В Настройки</string>
   <string name="mail_list_widget_text">Сообщения Mail</string>
   <string name="mail_list_widget_loading">Загрузка сообщений…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Загрузка…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Загрузка…</string>
   <string name="openpgp_enabled_error_title">Шифрование невозможно</string>
   <string name="openpgp_enabled_error_msg">Не все выбранные адресаты поддерживают эту возможность!</string>
   <string name="enable_encryption">Включить шифрование</string>
@@ -1012,7 +1041,7 @@ Mail — почтовый клиент для Android.
   <string name="encrypted_subject">Зашифрованное сообщение</string>
   <string name="account_settings_crypto_encrypt_subject">Шифровать темы сообщений</string>
   <string name="account_settings_crypto_encrypt_subject_subtitle">Может поддерживаться не всеми адресатами</string>
-  <string name="toast_account_not_found">Внутренний сбой: неверный ящик!</string>
+  <string name="toast_account_not_found">Внутренний сбой: неверная учётная запись!</string>
   <string name="toast_openpgp_provider_error">Сбой подключения к %s!</string>
   <string name="ac_transfer_setting_title">Отправка настроек автошифрования</string>
   <string name="ac_transfer_setting_summary">Передать настройки шифрования на другие устройства</string>
@@ -1050,4 +1079,22 @@ Mail — почтовый клиент для Android.
   <string name="push_info_configure_notification_action">Настроить уведомление</string>
   <string name="push_info_disable_push_text">Если вам не нужны мгновенные уведомления о новых сообщениях, вам следует отключить Push и использовать Опрос. Опрос проверяет наличие новой почты через регулярные промежутки времени и не нуждается в уведомлениях.</string>
   <string name="push_info_disable_push_action">Отключить Push</string>
-</resources>
\ No newline at end of file
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Выбрать</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Снять выбор</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Не прочитано</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Важное</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Обычное</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Архивировать</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Удалить</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Отправить в спам</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+</resources>
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 4a17078c98233fd9119a41274a8ae619803abcd3..f868f3948f6c0bb29e4f55204163eaf1e7a62262 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -219,6 +219,22 @@
   <string name="global_settings_confirm_menu_discard">Zahodiť správu</string>
   <string name="global_settings_confirm_menu_mark_all_read">Označiť všetky správy ako prečítané</string>
   <string name="global_settings_confirm_action_delete_notif">Vymazať (z oznámení)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Žiadna</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Archivovať</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Vymazať</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Nevyžiadaná pošta</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Presunúť</string>
   <string name="global_settings_privacy_hide_useragent">Skryť e-mail klienta</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Skryť časové pásmo</string>
@@ -555,8 +571,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Neznámy certifikát</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Prijať kľúč</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Odmietnuť kľúč</string>
-  <string name="message_view_help_key">Delete (Alebo D) – Zmazať\nR – Odpovedať\nA – Odpovedať všetkým\nC – Vytvoriť\nF – Preposlať\nM – Presunúť\nV - Archivovať\nY – Kopírovať\nZ – Označiť (Ne)pprečítané\nG – Hviezdička\nO – Usporiadať podľa typu\nI – Usporiadať podľa poradia\nQ – Späť k priečinkom\nS – Označiť/odznačiť\nJ alebo P – Predošlá správa\nK alebo N – Ďalšia správa</string>
-  <string name="message_list_help_key">Delete (alebo D) – Zmazať\nC – Vytvoriť\nM – presunúť\nV – Archivovať\nY – Skopírovať\nZ – Označiť ako (ne)prečítané\nG – Označit hviezdičkou\nO – Typ zoradenia\nI – Poradie zoradenia\nQ – Návrat na priečinky\nS – Označiť / zrušiť označenie</string>
   <string name="folder_list_filter_hint">Názov priečinku obsahuje</string>
   <string name="folder_list_display_mode_label">Zobraziť priečinky…</string>
   <string name="folder_list_display_mode_all">Všetky priečinky</string>
@@ -847,9 +861,31 @@
   <string name="unsigned_text_divider_label">Nepodpísaný text</string>
   <string name="crypto_no_provider_title">Táto správa je zašifrovaná</string>
   <string name="crypto_no_provider_message">Táto správa bola zašifrovaná pomocou OpenPGP\nJe potrebné nakonfigurovať kompatibilnú OpenPGP aplikáciu.</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Zoznam správ Mail</string>
   <string name="mail_list_widget_loading">Načítavajú sa správy…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Načítavam…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Načítavam…</string>
   <string name="openpgp_enabled_error_back">Späť</string>
   <string name="general_settings_title">Všeobecné nastavenia</string>
   <!--permissions-->
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Vybrať</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Zrušiť výber</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Označiť ako neprečítané</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Pridať hviezdičku</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Odstrániť hviezdičku</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Archivovať</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Vymazať</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Nevyžiadaná pošta</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 1a2f332e7bc1d9fdfa6a0d79e6a83722ed888c8e..4b5a705a005521e9608d80e0cfc2dd19fdc5efcc 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -240,6 +240,22 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="global_settings_confirm_menu_discard">Zavrženje neshranjenega sporočila</string>
   <string name="global_settings_confirm_menu_mark_all_read">Označi vsa sporočila kot prebrana</string>
   <string name="global_settings_confirm_action_delete_notif">Brisanje neposredno iz obvestilne vrstice</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Brez usklajevanja</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arhivirano</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Brisanje vseh vrst sporočil</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Neželena pošta</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Premakni</string>
   <string name="global_settings_privacy_hide_useragent">Skrij program</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Skrij časovni pas</string>
@@ -613,8 +629,6 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="account_setup_failed_dlg_invalid_certificate_title">Nepoznano potrdilo</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Sprejmi ključ</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Zavrni ključ</string>
-  <string name="message_view_help_key">Del (ali D) – Izbriši\nR – Odgovori\nA - Odgovori vsem\nC – Sestavi\nF – Posreduj\nM – Premakni\nV – Arhiviraj\nY – Kopiraj\nZ – Označi (Ne)prebrano\nG – Označi z zvezdico\nO – Način razvrščanja\nI – Razvrščanje\nQ – Nazaj na mape\nS – Izberi/Odstrani izbor\nJ ali P – Predhodno sporočilo\nK ali N – Naslednje sporočilo</string>
-  <string name="message_list_help_key">Del (ali D) – Izbriši\nC – Sestavi\nM – Premakni\nV – Arhiviraj\nY – Kopiraj\nZ – Označi (Ne)Prebrano\nG – Označi z zvezdico\nO – Način razvrščanja\nI – Razvrščanje\nQ – Nazaj na mape\nS – Izberi/Odstrani izbor</string>
   <string name="folder_list_filter_hint">Ime mape vsebuje</string>
   <string name="folder_list_display_mode_label">Pokaži mape …</string>
   <string name="folder_list_display_mode_all">Vse mape</string>
@@ -970,6 +984,10 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
   <string name="crypto_no_provider_button">Pojdi v Nastavitve</string>
   <string name="mail_list_widget_text">Mail Message List</string>
   <string name="mail_list_widget_loading">Poteka nalaganje sporočil …</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Poteka nalaganje …</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Poteka nalaganje …</string>
   <string name="openpgp_enabled_error_title">Šifriranje ni mogoče</string>
   <string name="openpgp_enabled_error_msg">Nekateri izmed izbranih prejemnikov ne podpirajo te možnosti!</string>
   <string name="enable_encryption">Omogoči šifriranje</string>
@@ -1031,4 +1049,22 @@ Sporočilo lahko shranite in ga uporabite kot varno kopijo šifrirnega ključa.
   <string name="push_info_configure_notification_action">Nastavitev obvestila</string>
   <string name="push_info_disable_push_text">Če ne potrebuješ takojšnjih obvestil o novih sporočilih, moraš onemogočiti potiskanje in uporabiti navadno izpraševanje. Izpraševanje išče novo pošto v rednih časovnih presledkih in ne potrebuje obvestila.</string>
   <string name="push_info_disable_push_action">Onemogoči potiskanje</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Izberi</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Odstrani izbor</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Označi kot neprebrano</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Označi z zvezdico</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Odstrani zvezdico</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arhivirano</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Brisanje vseh vrst sporočil</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Neželena pošta</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 621ac885d178b1c4dce86492a1c6028cd35f6e58..afc123ffe4d354ada208fb7d39338106f493a8d7 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -87,7 +87,7 @@
   <string name="folders_action">Administroni dosje</string>
   <string name="account_settings_action">Rregullime llogarie</string>
   <string name="remove_account_action">Hiqe llogarinë</string>
-  <string name="mark_as_read_action">Shënoje si të lexuar</string>
+  <string name="mark_as_read_action">Vëri shenjë si të lexuar</string>
   <string name="send_alternate_action">Ndajeni me të tjerë</string>
   <string name="send_alternate_chooser_title">Zgjidhni dërgues</string>
   <string name="flag_action">Shtoji yll</string>
@@ -234,8 +234,30 @@
   <string name="global_settings_confirm_action_delete_starred">Fshi Ata Me Shenjë (nën pamjen mesazhe)</string>
   <string name="global_settings_confirm_action_spam">Shënoje si të padëshiruar</string>
   <string name="global_settings_confirm_menu_discard">Hidhe tej mesazhin</string>
-  <string name="global_settings_confirm_menu_mark_all_read">Shënoji krejt mesazhet si të lexuar</string>
+  <string name="global_settings_confirm_menu_mark_all_read">Vëru shenjë krejt mesazheve si të lexuar</string>
   <string name="global_settings_confirm_action_delete_notif">Fshije (që prej njoftimit)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Veprime fërkimi</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Fërkim djathtas</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Fërkim majtas</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Asnjë</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Përzgjidheni/shpërzgjidheni</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Vëri/hiqi shenjë si i lexuar</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Shtoni/hiqni yll</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arkivoji</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Fshije</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Shënoje si të padëshiruar</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Lëvizeni</string>
   <string name="global_settings_privacy_hide_useragent">Fshihe klientin e postës</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Fshihe zonën kohore</string>
@@ -305,7 +327,7 @@
   <string name="account_setup_incoming_delete_policy_label">Kur fshij një mesazh</string>
   <string name="account_setup_incoming_delete_policy_never_label">Mos e fshi te shërbyesi</string>
   <string name="account_setup_incoming_delete_policy_delete_label">Fshije te shërbyesi</string>
-  <string name="account_setup_incoming_delete_policy_markread_label">Shënoje si të lexuar te shërbyesi</string>
+  <string name="account_setup_incoming_delete_policy_markread_label">Vëri shenjë si të lexuar te shërbyesi</string>
   <string name="account_setup_incoming_use_compression">Përdor ngjeshje</string>
   <string name="account_setup_expunge_policy_label">Hiqi dhe në shërbyes mesazhet e fshira</string>
   <string name="account_setup_expunge_policy_immediately">Menjëherë</string>
@@ -396,10 +418,10 @@
   <string name="account_notify_contacts_mail_only_summary">Shfaq njoftime vetëm për mesazhe nga kontakte të njohur</string>
   <string name="account_settings_ignore_chat_messages_label">Shpërfill mesazhe fjalosjesh</string>
   <string name="account_settings_ignore_chat_messages_summary">Mos shfaq njoftime për mesazhe që u përkasin një fjalosjeje me email</string>
-  <string name="account_settings_mark_message_as_read_on_view_label">Shënoje si të lexuar kur hapet</string>
-  <string name="account_settings_mark_message_as_read_on_view_summary">Shënoje një mesazh të lexuar, kur hapet për parje</string>
+  <string name="account_settings_mark_message_as_read_on_view_label">Vëri shenjë si të lexuar, kur hapet</string>
+  <string name="account_settings_mark_message_as_read_on_view_summary">Vëri shenjë një mesazhi të lexuar, kur hapet për parje</string>
   <string name="account_settings_mark_message_as_read_on_delete_label">Vëri shenjë si i lexuar, kur fshihet</string>
-  <string name="account_settings_mark_message_as_read_on_delete_summary">Vërini shenjë si i lexuar një mesazhi, kur fshihet</string>
+  <string name="account_settings_mark_message_as_read_on_delete_summary">Vëri shenjë si i lexuar një mesazhi, kur fshihet</string>
   <string name="account_settings_notification_channels_label">Kategori njoftimesh</string>
   <string name="account_settings_open_notification_settings_messages_summary">Formësoni njoftime për mesazhe të rinj</string>
   <string name="account_settings_open_notification_settings_miscellaneous_summary">Formësoni njoftime gabimesh dhe gjendjesh</string>
@@ -609,8 +631,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Dëshmi Jo e Njohur</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Pranoje Kyçin</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Hidhe tej Kyçin</string>
-  <string name="message_view_help_key">Del (ose D) - Fshije\nR - Përgjigju\nA - Përgjigju të Tërëve\nC - Hartoni\nF - Përcille\nM - Lëvize\nV - Arkivoje\nY - Kopjoje\nZ - Vëri shenjë/hiqi shenjë si i (Pa)Lexuar\nG - Vëri Yll\nO - Lloj renditjeje\nI - Rend renditjeje\nQ - Rikthehu te Dosjet\nS - Përzgjidhe/shpërzgjidhe\nJ ose P - Mesai i Mëparshëm\nK ose N - Mesazhi Pasues</string>
-  <string name="message_list_help_key">Del (ose D) - Fshije\nC - Hartoni\nM - Lëvize\nV - Arkivoje\nY - Kopjoje\nZ - Vëri shenjë/hiqi shenjë si i (Pa)Lexuar\nG - Vëri Yll\nO - Lloj renditjeje\nI - Rend renditjeje\nQ - Rikthehu te Dosjet\nS - Përzgjidhe/shpërzgjidhe</string>
   <string name="folder_list_filter_hint">Emri i dosjes përmban</string>
   <string name="folder_list_display_mode_label">Shfaq dosje…</string>
   <string name="folder_list_display_mode_all">Krejt dosjet</string>
@@ -721,7 +741,7 @@
   <string name="dialog_confirm_delete_confirm_button">Po</string>
   <string name="dialog_confirm_delete_cancel_button">Jo</string>
   <string name="dialog_confirm_mark_all_as_read_title">Ripohoni vënien shenjë krejt mesazheve si të lexuar</string>
-  <string name="dialog_confirm_mark_all_as_read_message">Doni të shënohen krejt mesazhet si të lexuar?</string>
+  <string name="dialog_confirm_mark_all_as_read_message">Doni t’u vihet shenjë krejt mesazheve si të lexuar?</string>
   <string name="dialog_confirm_empty_trash_title">Ripohoni zbrazje hedhurinash</string>
   <string name="dialog_confirm_empty_trash_message">Doni të zbrazet dosja e hedhurinave?</string>
   <string name="dialog_confirm_mark_all_as_read_confirm_button">Po</string>
@@ -843,7 +863,7 @@
   <string name="message_view_empty">Ju lutemi, përzgjidhni një mesazh majtas</string>
   <string name="global_settings_show_contact_picture_label">Shfaq foto kontakti</string>
   <string name="global_settings_show_contact_picture_summary">Shfaq foto kontakti te lista e mesazheve</string>
-  <string name="mark_all_as_read">Shënoji të tërë si të lexuar</string>
+  <string name="mark_all_as_read">Vëru shenjë të tërëve si të lexuar</string>
   <string name="global_settings_colorize_missing_contact_pictures_label">Ngjyros foto kontakti</string>
   <string name="global_settings_colorize_missing_contact_pictures_summary">Ngjyros foto për kontakt që mungon</string>
   <string name="global_settings_messageview_visible_refile_actions_title">Veprime të dukshme mbi mesazhet</string>
@@ -956,6 +976,10 @@
   <string name="crypto_no_provider_button">Kaloni te Rregullimet</string>
   <string name="mail_list_widget_text">Mail Message List</string>
   <string name="mail_list_widget_loading">Po ngarkohen mesazhe…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Po ngarkohet…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Po ngarkohet…</string>
   <string name="openpgp_enabled_error_title">Fshehtëzim jo i mundshëm</string>
   <string name="openpgp_enabled_error_msg">Disa nga marrësit e përzgjedhur nuk e mbulojnë këtë veçori!</string>
   <string name="enable_encryption">Aktivizo Fshehtëzimin</string>
@@ -1017,4 +1041,24 @@ Mund ta mbani këtë mesazh dhe ta përdorni si një kopjeruatje të kyçit tuaj
   <string name="push_info_configure_notification_action">Formësoni njoftim</string>
   <string name="push_info_disable_push_text">Nëse nuk ju duhen njoftime të atypëratyshme rreth mesazhesh të reja, duhet ta çaktivizoni Push-in dhe të përdorni Vjelje. Vjelja kontrollon për postë të re sipas intervalesh të rregullta dhe nuk ka nevojë për njoftimin.</string>
   <string name="push_info_disable_push_action">Çaktivizoje Push-in</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Përzgjidhni</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Shpërzgjidhe</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Vëri shenjë si të lexuar</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Shënoje si të palexuar</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Shtoji yll</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Hiqi yll</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arkivoji</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Fshije</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Shënoje si të padëshiruar</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Lëvizeni…</string>
 </resources>
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 901528cbc1ba1630c8da7849b93806f0620b7a58..2e58e8144e35f702d02f08fa51191c5bbdb060b5 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -218,6 +218,22 @@
   <string name="global_settings_confirm_menu_discard">одбацивања поруке</string>
   <string name="global_settings_confirm_menu_mark_all_read">означавање свих као прочитане</string>
   <string name="global_settings_confirm_action_delete_notif">брисања (из обавештења)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">ниједна</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Архивирај</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">брисања</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">померања у нежељене</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Премести</string>
   <string name="global_settings_privacy_hide_useragent">Сакриј клијента</string>
   <string name="global_settings_privacy_hide_useragent_detail">Уклања К-9 идентификацију из заглавља поруке</string>
   <string name="global_settings_privacy_hide_timezone">Сакриј временску зону</string>
@@ -554,8 +570,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Непознат сертификат</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Прихвати кључ</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Одбиј кључ</string>
-  <string name="message_view_help_key">Del (или D) - обриши\nR - одговори\nA - одговори свима\nC - састави\nF - проследи\nM - помери\nV - архивирај\nY - копирај\nZ - означи као (не)прочитано\nG - обележи звездицом\nO - поређај по\nI - ред ређања\nQ - повратак на фасцикле\nS - означи/уклони ознаку\nJ или P - претходна порука\nK или N - следећа порука</string>
-  <string name="message_list_help_key">Del (или D) - обриши\nC - састави\nM - помери\nV - архивирај\nY - копирај\nZ - означи као (не)прочитано\nO - поређај по\nI - ред ређања\nQ - повратак на фасцикле\nS - означи/уклони ознаку</string>
   <string name="folder_list_filter_hint">Назив фасцикле садржи</string>
   <string name="folder_list_display_mode_label">Прикажи фасцикле…</string>
   <string name="folder_list_display_mode_all">све фасцикле</string>
@@ -726,7 +740,7 @@
   <string name="unread_widget_folder_title">Фасцикла</string>
   <string name="unread_widget_folder_summary">Фасцикла за коју ће бројач непрочитаних бити приказан</string>
   <string name="unread_widget_action_done">Заврши</string>
-  <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> - <xliff:g id="folder_name">%2$s</xliff:g></string>
+  <string name="unread_widget_title"><xliff:g id="account_name">%1$s</xliff:g> — <xliff:g id="folder_name">%2$s</xliff:g></string>
   <string name="unread_widget_account_not_selected">Није изабран налог</string>
   <string name="unread_widget_folder_not_selected">Фасцикла није изабрана</string>
   <string name="webview_empty_message">Нема текста</string>
@@ -802,7 +816,7 @@
   <string name="account_setup_basics_client_certificate">Користи сертификат клијента</string>
   <string name="client_certificate_spinner_empty">Нема сертификата клијента</string>
   <string name="client_certificate_spinner_delete">Уклони изабране сертификате</string>
-  <string name="client_certificate_retrieval_failure">Не могу да добавим сертификат клијента за псеудоним „<xliff:g id="alias">%s</xliff:g>“</string>
+  <string name="client_certificate_retrieval_failure">Не могу да добавим сертификат клијента за алијас „<xliff:g id="alias">%s</xliff:g>“</string>
   <string name="client_certificate_advanced_options">Напредне поставке</string>
   <string name="client_certificate_expired">Сертификат клијента „<xliff:g id="certificate_alias">%1$s</xliff:g>“ је истекао или још није важећи (<xliff:g id="exception_message">%2$s</xliff:g>)</string>
   <!--Note: This references message_view_download_remainder-->
@@ -898,8 +912,12 @@
   <string name="crypto_no_provider_title">Ова е-порука је шифрована</string>
   <string name="crypto_no_provider_message">Ова е-порука је шифрована помоћу у ОпенПГП-а.\nДа бисте је прочитали, треба да инсталирате и подесите компатибилну ОпенПГП апликацију.</string>
   <string name="crypto_no_provider_button">Иди на Поставке</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail списак порука</string>
   <string name="mail_list_widget_loading">Учитавам поруке…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Учитавам…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Учитавам…</string>
   <string name="openpgp_enabled_error_title">Шифровање није могуће</string>
   <string name="openpgp_enabled_error_msg">Неки од изабраних прималаца не подржавају ово!</string>
   <string name="enable_encryption">Укључи шифровање</string>
@@ -948,4 +966,22 @@
   <!--permissions-->
   <string name="permission_contacts_rationale_title">Дозволи приступ контактима</string>
   <string name="permission_contacts_rationale_message">Да би давала предлоге, приказивала имена и слике контаката, апликацији је потребна дозвола за приступ контактима.</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Изабери</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Поништи избор</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Означи непрочитаним</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Додај звездицу</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Уклони звездицу</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Архивирај</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">брисања</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">померања у нежељене</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 7bd2052d48f078b93f68a671285985c1a31358a1..7eb61edc4f6f7ecb71f1eaa6fb130ebfaeb8fbdb 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -237,6 +237,28 @@
   <string name="global_settings_confirm_menu_discard">Kassera meddelandet</string>
   <string name="global_settings_confirm_menu_mark_all_read">Markera alla meddelanden som lästa</string>
   <string name="global_settings_confirm_action_delete_notif">Ta bort (från avisering)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">Svepåtgärder</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">Svep åt höger</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">Svep åt vänster</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Inga</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">Växla markering</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">Markera som läst/oläst</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">Lägg till/ta bort stjärna</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arkivera</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Ta bort</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Skräppost</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Flytta</string>
   <string name="global_settings_privacy_hide_useragent">Dölj e-postklient</string>
   <string name="global_settings_privacy_hide_useragent_detail">Ta bort Mail-användaragent från meddelanderubriker</string>
   <string name="global_settings_privacy_hide_timezone">Dölj tidszon</string>
@@ -610,8 +632,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Okänt certifikat</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Acceptera nyckel</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Neka nyckel</string>
-  <string name="message_view_help_key">Del (eller D) - Ta bort\nR - Svara\nA - Svara alla\nC - Skriva\nF - Vidarebefordra\nM - Flytta\nV - Arkivera\nY - Kopiera\nZ - Markera (o)lästa\nG - Stjärna\nO - Sorteringstyp\nI - Sorteringsordning\nQ - Återgå till mappar\nS - Välj/välj bort\nJ eller P - Föregående meddelande\nK eller N - Nästa meddelande</string>
-  <string name="message_list_help_key">Del (or D) - Ta bort\nC - Skriva\nM - Flytta\nV - Arkivera\nY - Kopiera\nZ - Markera (o)lästa\nG - Stjärna\nO - Sorteringstyp\nI - Sorteringsordning\nQ - Återgå till mappar\nS - Välj/välj bort</string>
   <string name="folder_list_filter_hint">Mappnamn innehåller</string>
   <string name="folder_list_display_mode_label">Visa mappar…</string>
   <string name="folder_list_display_mode_all">Alla mappar</string>
@@ -957,7 +977,10 @@
   <string name="crypto_no_provider_message">Detta e-postmeddelande har krypterats med OpenPGP.\nFör att läsa det, måste du installera och konfigurera en kompatibel OpenPGP-app.</string>
   <string name="crypto_no_provider_button">Gå till inställningar</string>
   <string name="mail_list_widget_text">K-9 Meddelandelista</string>
-  <string name="mail_list_widget_loading">Läser in meddelanden…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Läser in…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Läser in…</string>
   <string name="openpgp_enabled_error_title">Kryptering inte möjligt</string>
   <string name="openpgp_enabled_error_msg">Några av de valda mottagarna stöder inte denna funktion!</string>
   <string name="enable_encryption">Aktivera kryptering</string>
@@ -1019,4 +1042,24 @@ Du kan behålla detta meddelande och använda det som en säkerhetskopia för di
   <string name="push_info_configure_notification_action">Anpassa avisering</string>
   <string name="push_info_disable_push_text">Om du inte behöver omedelbara meddelanden om nya meddelanden bör du inaktivera Push och använda Polling. Polling kontrollerar regelbundet efter ny post och behöver inte meddelandet.</string>
   <string name="push_info_disable_push_action">Inaktivera Push</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Välj</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Välj bort</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">Markera som läst</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Markera som oläst</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Lägg till stjärna</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Ta bort stjärna</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arkivera</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Ta bort</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Skräppost</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">Flytta…</string>
 </resources>
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 2bd65f753b2aab0c6ce64bf92c152cfe90e50b53..27cd774be6eba5533f5be2f9c300e704a35caca8 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -24,7 +24,7 @@
   <string name="changelog_show_recent_changes">Uygulama güncellendiğinde son değişiklikleri göster </string>
   <string name="changelog_snackbar_text">Bu sürümdeki yenilikleri öğrenin </string>
   <!--Welcome message-->
-  <string name="welcome_message_title">Welcome to Mail</string>
+  <string name="welcome_message_title">Mail Posta\'ya Hoşgeldiniz</string>
   <string name="accounts_welcome">Mail is the default mail client for /e/</string>
   <!--Default signature-->
   <string name="default_signature">-- Sent from /e/ Mail.</string>
@@ -228,6 +228,22 @@
   <string name="global_settings_confirm_menu_discard">Mesajı yoksay</string>
   <string name="global_settings_confirm_menu_mark_all_read">Tüm iletileri okundu olarak işaretle</string>
   <string name="global_settings_confirm_action_delete_notif">Sil (bildirimden)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Hiçbiri</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Arşiv</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Sil</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Gereksiz posta</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Taşı</string>
   <string name="global_settings_privacy_hide_useragent">Posta istemcisini gizle</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Zaman dilimini gizle</string>
@@ -591,8 +607,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Tanınmayan Sertifika</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Kabul Tuşu</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Reddetme Tuşu</string>
-  <string name="message_view_help_key">Del (veya D) - Sil\nR - Yanıtla\nA - Hepsini yanıtla\nC - Oluştur\nF - İlet\nM - Taşı\nV - Arşiv\nY - Kopyala\nZ - Okun(ma)mış olarak İşaretle\nG - Yıldız\nO - Sıralama türü\nI - Sıralama düzeni\nQ - Klasörlere Geri Dön\nS - Seç/Seçimi kaldır\nK veya P - Önceki İleti\nK veya N - Sonraki İleti</string>
-  <string name="message_list_help_key">Del (veya D) - Sil\nC - Oluştur\nM - Taşı\nV - Arşiv\nY - Kopyala\nZ - Okun(ma)dı\nG - Yıldız\nO - Sıralama türü\nI - Sıralama düzeni\nQ - Klasörlere Geri Dön\nS - Seç/seçimi kaldır</string>
   <string name="folder_list_filter_hint">Klasör adı içeriği</string>
   <string name="folder_list_display_mode_label">Klasörleri göster…</string>
   <string name="folder_list_display_mode_all">Bütün klasörleri göster</string>
@@ -935,8 +949,12 @@
   <string name="crypto_no_provider_title">Bu eposta şifreli</string>
   <string name="crypto_no_provider_message">Bu eposta OpenPGP ile şifrelendi. On okumak için uyumlu bir OpenPGP uygulaması kurup yapılandırmanız gerekir.</string>
   <string name="crypto_no_provider_button">Ayarlara Git</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail İleti Listesi</string>
   <string name="mail_list_widget_loading">İletiler Yükleniyor…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Yükleniyor…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Yükleniyor…</string>
   <string name="openpgp_enabled_error_title">Şifreleme yapılamaz</string>
   <string name="openpgp_enabled_error_msg">Seçilen bazı alıcılar bu özelliği desteklemiyor!</string>
   <string name="enable_encryption">Şifreleme etkin</string>
@@ -994,4 +1012,22 @@ Bu iletiyi saklayabilir ve gizli anahtarınız için bir yedekleme olarak kullan
   <string name="push_info_configure_notification_text">Aynı zamanda Android de bildirimleri gizlemenize olanak sağlamaktadır.</string>
   <string name="push_info_learn_more_text">Daha fazlasını öğren</string>
   <string name="push_info_configure_notification_action">Bildirimleri ayarla</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Seç</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Seçimi Kaldır</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Okunmadı Olarak İşaretle</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Yıldız Ekle</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Yıldızı Kaldır</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Arşiv</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Sil</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Gereksiz posta</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 14c661c9c777b66995f9380eb68a969459c8a630..0279d7d21419445bc04dd0173911ae36e5e92904 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -240,6 +240,22 @@
   <string name="global_settings_confirm_menu_discard">Скасувати повідомлення</string>
   <string name="global_settings_confirm_menu_mark_all_read">Позначити всі повідомлення як прочитані</string>
   <string name="global_settings_confirm_action_delete_notif">Видалити (зі сповіщення)</string>
+  <!--Title of the screen to configure swipe actions-->
+  <!--Name of the setting to configure the right swipe action-->
+  <!--Name of the setting to configure the left swipe action-->
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">Жодна</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <!--Name of the swipe action to add/remove a star-->
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">Архівувати</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">Видалити</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">Перемістити</string>
   <string name="global_settings_privacy_hide_useragent">Приховати поштовий клієнт</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">Приховати часову зону</string>
@@ -613,8 +629,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">Нерозпізнаний сертифікат</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">Прийняти ключ</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">Відхилити ключ</string>
-  <string name="message_view_help_key">Del (або D) - Видалити\nR - Відповісти\nA - Відповісти всім\nC - Написати лист\nF - Переслати\nM - Перемістити\nV - Архівувати\nY - Копіювати\nZ - Позначити (не)прочитаним\nG - Позначити зірочкою\nO - Тип сортування\nI - Порядок сортування\nQ - Повернутися до тек\nS - Вибрати / Зняти вибір\nJ або P - Попереднє повідомлення\nK або N - Наступне повідомлення</string>
-  <string name="message_list_help_key">Del (або D) - Видалити\nC - Написати лист\nM - Перемістити\nV - Архівувати\nY - Копіювати\nZ - Позначити (не)прочитаним\nG - Позначити зірочкою\nO - Тип сортування\nI - Порядок сортування\nQ - Поввернутися до тек\nS - Вибрати / Зняти вибір</string>
   <string name="folder_list_filter_hint">Назва теки містить</string>
   <string name="folder_list_display_mode_label">Показати теки…</string>
   <string name="folder_list_display_mode_all">Відображати усі теки</string>
@@ -968,8 +982,12 @@
   <string name="crypto_no_provider_title">Цей електронний лист зашифровано</string>
   <string name="crypto_no_provider_message">Цей електронний лист було зашифровано за допомогою OpenPGP.\nЩоб його прочитати, необхідно встановити та налаштувати сумісний OpenPGP-додаток.</string>
   <string name="crypto_no_provider_button">Перейти до Налаштувань</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail Список повідомлень</string>
   <string name="mail_list_widget_loading">Завантаження листів…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">Завантаження…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">Завантаження…</string>
   <string name="openpgp_enabled_error_title">Шифрування неможливе</string>
   <string name="openpgp_enabled_error_msg">Деякі з вибраних адресатів не підтримують цю функцію.</string>
   <string name="enable_encryption">Увімкнути шифрування</string>
@@ -1031,4 +1049,22 @@
   <string name="push_info_configure_notification_action">Налаштувати сповіщення</string>
   <string name="push_info_disable_push_text">Якщо вам не потрібне миттєве сповіщення про нові повідомлення, вам варто вимкнути Push і використовувати Polling. Polling перевіряє пошту з регулярними інтервалами і не потребує сповіщення.</string>
   <string name="push_info_disable_push_action">Вимкнути пуш-сповіщення</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">Вибрати</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">Скасувати вибір</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">Позначити непрочитаним</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">Додати зірочку</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">Прибрати зірочку</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">Архівувати</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">Видалити</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">Спам</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
 </resources>
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 144b1cd30e6288589aa431397426bbc8ff30265b..99c62f698112a18b03c02dd777c6be92e82b671e 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
@@ -233,6 +233,28 @@
   <string name="global_settings_confirm_menu_discard">丢弃邮件</string>
   <string name="global_settings_confirm_menu_mark_all_read">全部标为已读</string>
   <string name="global_settings_confirm_action_delete_notif">删除（来自通知）</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">滑动操作</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">右滑</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">左滑</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">无</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">切换选择</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">标为已读/未读</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">添加/删除星标</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">归档</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">删除</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">标记为垃圾邮件</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">移动</string>
   <string name="global_settings_privacy_hide_useragent">隐藏邮件客户端</string>
   <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
   <string name="global_settings_privacy_hide_timezone">隐藏时区</string>
@@ -606,8 +628,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">无法识别的证书信息</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">接收密钥</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒绝密钥</string>
-  <string name="message_view_help_key">Del (D) - 删除\nR - 回复\nA - 回复所有\nC - 群发\nF - 转发\nM - 移动\nV - 存档\nY - 复制\nZ - 标记 (未)阅读\nG - 加星\nO - 排序类型\nI - 排序名称\nQ - 返回文件夹\nS - 选择/删除已选\nJ or P - 上一消息\nK or N - 下一消息</string>
-  <string name="message_list_help_key">Del(D) - 删除\nC - 群组\nM - 移动\nV - 归档\nY - 复制\nZ - 标记 (未)已阅\nG - 加星\nO - 排序类型\nI - 排序名称\nQ - 返回文件夹\nS - 选择/删除已选</string>
   <string name="folder_list_filter_hint">文件夹名称中包含</string>
   <string name="folder_list_display_mode_label">文件夹</string>
   <string name="folder_list_display_mode_all">显示全部文件夹</string>
@@ -947,8 +967,12 @@
   <string name="crypto_no_provider_title">邮件已被加密</string>
   <string name="crypto_no_provider_message">这份邮件使用 OpenPGP 进行了加密。\n请安装并配置一个兼容 OpenPGP 的应用来查看邮件。</string>
   <string name="crypto_no_provider_button">前往设置</string>
-  <string name="mail_list_widget_text">Mail Message List</string>
+  <string name="mail_list_widget_text">Mail消息列表</string>
   <string name="mail_list_widget_loading">正在加载邮件……</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">加载中…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">加载中…</string>
   <string name="openpgp_enabled_error_title">无法加密</string>
   <string name="openpgp_enabled_error_msg">某些选定的收件人不支持此功能！</string>
   <string name="enable_encryption">启用加密</string>
@@ -1010,4 +1034,24 @@
   <string name="push_info_configure_notification_action">配置通知</string>
   <string name="push_info_disable_push_text">如果您不需要新消息的即时通知，则应禁用推送并使用轮询。 轮询会定期检查新邮件，不需要通知。</string>
   <string name="push_info_disable_push_action">禁用推送</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">选择</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">取消选择</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">标记为已读</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">标记为未读</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">添加星标</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">移除星标</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">归档</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">删除</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">标记为垃圾邮件</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">移动…</string>
 </resources>
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 8d6cac07de23910d08e8252b15fbbb677540c58b..27ebd17ea46fe8a50405f218a189c9c691644871 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
@@ -234,6 +234,28 @@
   <string name="global_settings_confirm_action_delete_notif">刪除 (從通知欄)</string>
   <string name="global_settings_privacy_hide_useragent">隱藏郵件用戶端</string>
   <string name="global_settings_privacy_hide_useragent_detail">從郵件標頭中移除 Mail 的 User-Agent</string>
+  <!--Title of the screen to configure swipe actions-->
+  <string name="general_settings_swipe_actions_title">滑動操作</string>
+  <!--Name of the setting to configure the right swipe action-->
+  <string name="general_settings_right_swipe_title">右滑</string>
+  <!--Name of the setting to configure the left swipe action-->
+  <string name="general_settings_left_swipe_title">左滑</string>
+  <!--The list item users select to not use a swipe action for a particular direction-->
+  <string name="general_settings_swipe_action_none">無</string>
+  <!--Name of the swipe action to select/deselect a message-->
+  <string name="general_settings_swipe_action_toggle_selection">切換選擇</string>
+  <!--Name of the swipe action to mark as message as read/unread-->
+  <string name="general_settings_swipe_action_toggle_read">標記為已讀/未讀</string>
+  <!--Name of the swipe action to add/remove a star-->
+  <string name="general_settings_swipe_action_toggle_star">新增/移除星號</string>
+  <!--Name of the swipe action to archive a message-->
+  <string name="general_settings_swipe_action_archive">封存</string>
+  <!--Name of the swipe action to delete a message-->
+  <string name="general_settings_swipe_action_delete">刪除</string>
+  <!--Name of the swipe action to move a message to the spam folder-->
+  <string name="general_settings_swipe_action_spam">標記為垃圾郵件</string>
+  <!--Name of the swipe action to move a message to another folder-->
+  <string name="general_settings_swipe_action_move">移動</string>
   <string name="global_settings_privacy_hide_timezone">隱藏時區</string>
   <string name="global_settings_privacy_hide_timezone_detail">在郵件標頭及回覆標頭中使用 UTC 時間而不是本地時間</string>
   <string name="global_settings_notification_quick_delete_title">顯示「刪除」按鈕</string>
@@ -602,8 +624,6 @@
   <string name="account_setup_failed_dlg_invalid_certificate_title">無法識別的授權憑證</string>
   <string name="account_setup_failed_dlg_invalid_certificate_accept">接收金鑰</string>
   <string name="account_setup_failed_dlg_invalid_certificate_reject">拒絕金鑰</string>
-  <string name="message_view_help_key">Del (D) - 刪除\nR - 回覆\nA - 全部回覆\nC - 寄送\nF - 轉寄\nM - 移動\nV - 封存\nY - 複製\nZ - 標示為 (未) 讀取\nG - 加上星號\nO - 排序類型\nI - 排序名稱\nQ - 返回信件匣\nS - 選擇/取消選擇\nJ or P - 上條訊息\nK or N - 下條訊息</string>
-  <string name="message_list_help_key">Del(D) - 刪除\nC - 寄送\nM - 轉寄\nV - 封存\nY - 複製\nZ - 標示為 (未) 讀取\nG - 加上星號\nO - 排序類型\nI - 排序名稱\nQ - 返回信件匣\nS - 選擇/取消選擇</string>
   <string name="folder_list_filter_hint">信件匣名稱包括</string>
   <string name="folder_list_display_mode_label">信件匣</string>
   <string name="folder_list_display_mode_all">顯示全部信件匣</string>
@@ -651,6 +671,7 @@
   <string name="account_setup_push_limit_1000">1000個信件匣</string>
   <string name="animations_title">動畫</string>
   <string name="animations_summary">使用絢麗的視覺特效</string>
+  <string name="volume_navigation_title">訊息檢視中音量鍵導航</string>
   <string name="show_unified_inbox_title">顯示全域收件匣</string>
   <string name="integrated_inbox_title">全域收件匣</string>
   <string name="integrated_inbox_detail">將所有郵件集中到全域收件匣</string>
@@ -942,7 +963,10 @@
   <string name="crypto_no_provider_message">這封郵件使用 OpenPGP 進行了加密。\n請安裝並配置一個相容 OpenPGP 的應用程式来查看郵件。</string>
   <string name="crypto_no_provider_button">前往設定</string>
   <string name="mail_list_widget_text">K-9 訊息列表</string>
-  <string name="mail_list_widget_loading">正在載入郵件…</string>
+  <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
+  <string name="message_list_widget_initializing">載入中…</string>
+  <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
+  <string name="message_list_widget_list_item_loading">載入中…</string>
   <string name="openpgp_enabled_error_title">無法加密</string>
   <string name="openpgp_enabled_error_msg">有些已選定的收件人不支援此功能！</string>
   <string name="enable_encryption">啟用加密</string>
@@ -1004,4 +1028,24 @@
   <string name="push_info_configure_notification_action">配置通知</string>
   <string name="push_info_disable_push_text">如果您不需要新郵件的即時通知，則應停用推播並使用輪詢。輪詢會定期檢查新郵件，不需要通知權限。</string>
   <string name="push_info_disable_push_action">停用推播</string>
+  <!--Name of the swipe action to select a message. Try to keep it short.-->
+  <string name="swipe_action_select">選擇</string>
+  <!--Name of the swipe action to deselect a message. Try to keep it short.-->
+  <string name="swipe_action_deselect">取消選擇</string>
+  <!--Name of the swipe action to mark a message as read. Try to keep it short.-->
+  <string name="swipe_action_mark_as_read">標記為已讀</string>
+  <!--Name of the swipe action to mark a message as unread. Try to keep it short.-->
+  <string name="swipe_action_mark_as_unread">標記為未讀</string>
+  <!--Name of the swipe action to add the star to a message. Try to keep it short.-->
+  <string name="swipe_action_add_star">加上星號</string>
+  <!--Name of the swipe action to remove the star from a message. Try to keep it short.-->
+  <string name="swipe_action_remove_star">移除星號</string>
+  <!--Name of the swipe action to archive a message. Try to keep it short.-->
+  <string name="swipe_action_archive">封存</string>
+  <!--Name of the swipe action to delete a message. Try to keep it short.-->
+  <string name="swipe_action_delete">刪除</string>
+  <!--Name of the swipe action to move a message to the Spam folder. Try to keep it short.-->
+  <string name="swipe_action_spam">標記為垃圾郵件</string>
+  <!--Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short.-->
+  <string name="swipe_action_move">移動…</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
index 45bf2174c22f628645d958f1647ec16b282a4584..b81a82e8a33c9b4198c01c554f45346cc99dadd7 100644
--- a/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
+++ b/app/ui/legacy/src/main/res/values/arrays_general_settings_strings.xml
@@ -157,4 +157,15 @@
         <item>@string/spam_action</item>
     </string-array>
 
+    <string-array name="swipe_action_names">
+        <item>@string/general_settings_swipe_action_none</item>
+        <item>@string/general_settings_swipe_action_toggle_selection</item>
+        <item>@string/general_settings_swipe_action_toggle_read</item>
+        <item>@string/general_settings_swipe_action_toggle_star</item>
+        <item>@string/general_settings_swipe_action_archive</item>
+        <item>@string/general_settings_swipe_action_delete</item>
+        <item>@string/general_settings_swipe_action_spam</item>
+        <item>@string/general_settings_swipe_action_move</item>
+    </string-array>
+
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/attrs.xml b/app/ui/legacy/src/main/res/values/attrs.xml
index bc4ab1d25a48f358624613ae0787e884094b4a21..9c37626c4c365721d83a70dae237c57b6d3bee6d 100644
--- a/app/ui/legacy/src/main/res/values/attrs.xml
+++ b/app/ui/legacy/src/main/res/values/attrs.xml
@@ -79,6 +79,24 @@
         <attr name="messageListAnswered" format="reference"/>
         <attr name="messageListForwarded" format="reference"/>
         <attr name="messageListAnsweredForwarded" format="reference"/>
+        <attr name="messageListSwipeIconTint" format="reference|color"/>
+        <attr name="messageListSwipeDisabledBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeSelectIcon" format="reference"/>
+        <attr name="messageListSwipeSelectBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeMarkAsReadIcon" format="reference"/>
+        <attr name="messageListSwipeMarkAsUnreadIcon" format="reference"/>
+        <attr name="messageListSwipeToggleReadBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeAddStarIcon" format="reference"/>
+        <attr name="messageListSwipeRemoveStarIcon" format="reference"/>
+        <attr name="messageListSwipeToggleStarBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeArchiveIcon" format="reference"/>
+        <attr name="messageListSwipeArchiveBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeDeleteIcon" format="reference"/>
+        <attr name="messageListSwipeDeleteBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeSpamIcon" format="reference"/>
+        <attr name="messageListSwipeSpamBackgroundColor" format="reference|color"/>
+        <attr name="messageListSwipeMoveIcon" format="reference"/>
+        <attr name="messageListSwipeMoveBackgroundColor" format="reference|color"/>
         <attr name="messageStar" format="reference"/>
         <attr name="messageStarColor" format="color"/>
         <attr name="messageViewBackgroundColor" format="reference|color"/>
@@ -86,6 +104,7 @@
         <attr name="attachmentCardBackground" format="reference|color"/>
         <attr name="composerBackgroundColor" format="color"/>
         <attr name="contactPictureFallbackDefaultBackgroundColor" format="reference|color"/>
+        <attr name="contactPictureFallbackBackgroundColors" format="reference"/>
         <attr name="contactTokenBackgroundColor" format="reference|color"/>
         <attr name="tintColorBulletPointPositive" format="reference|color"/>
         <attr name="tintColorBulletPointNeutral" format="reference|color"/>
diff --git a/app/ui/legacy/src/main/res/values/colors.xml b/app/ui/legacy/src/main/res/values/colors.xml
index 352033c65c5c674a8c68c109d1ce94e48e530d1f..b141bbb03610290aa73ba4f6734caf740d8aefc5 100644
--- a/app/ui/legacy/src/main/res/values/colors.xml
+++ b/app/ui/legacy/src/main/res/values/colors.xml
@@ -23,10 +23,6 @@
     <color name="status_error_cross">#f44336</color>
     <color name="status_ok_checkmark">#7bad45</color>
 
-    <color name="md_grey_50">#FAFAFA</color>
-    <color name="md_grey_100">#F5F5F5</color>
-    <color name="md_grey_900">#212121</color>
-
     <color name="material_drawer_profile_icon">#F9F9F9</color>
 
     <color name="color_selected_background">@color/e_alpha_accent</color>
diff --git a/app/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml b/app/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d7f37afb8265fdef837931a3a2943ec2ebe271fb
--- /dev/null
+++ b/app/ui/legacy/src/main/res/values/contact_picture_fallback_colors.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <integer-array name="contact_picture_fallback_background_colors_light">
+        <item>@color/material_red_300</item>
+        <item>@color/material_deep_purple_300</item>
+        <item>@color/material_light_blue_300</item>
+        <item>@color/material_green_300</item>
+        <item>@color/material_deep_orange_300</item>
+        <item>@color/material_blue_gray_300</item>
+        <item>@color/material_pink_300</item>
+        <item>@color/material_indigo_300</item>
+        <item>@color/material_cyan_300</item>
+        <item>@color/material_amber_400</item>
+        <item>@color/material_brown_300</item>
+        <item>@color/material_purple_300</item>
+        <item>@color/material_blue_300</item>
+        <item>@color/material_teal_300</item>
+        <item>@color/material_orange_400</item>
+    </integer-array>
+
+    <integer-array name="contact_picture_fallback_background_colors_dark">
+        <item>@color/material_red_600</item>
+        <item>@color/material_deep_purple_600</item>
+        <item>@color/material_light_blue_600</item>
+        <item>@color/material_green_600</item>
+        <item>@color/material_deep_orange_600</item>
+        <item>@color/material_blue_gray_600</item>
+        <item>@color/material_pink_600</item>
+        <item>@color/material_indigo_600</item>
+        <item>@color/material_cyan_600</item>
+        <item>@color/material_amber_600</item>
+        <item>@color/material_brown_600</item>
+        <item>@color/material_purple_600</item>
+        <item>@color/material_blue_600</item>
+        <item>@color/material_teal_600</item>
+        <item>@color/material_orange_600</item>
+    </integer-array>
+</resources>
diff --git a/app/ui/legacy/src/main/res/values/dimensions.xml b/app/ui/legacy/src/main/res/values/dimensions.xml
index 3ac09d34d77fc6b86a0f65709e234f2b71429007..d87bb9551ded16dde665aa75c054a6eafc548e8e 100644
--- a/app/ui/legacy/src/main/res/values/dimensions.xml
+++ b/app/ui/legacy/src/main/res/values/dimensions.xml
@@ -11,4 +11,7 @@
     <dimen name="search_icon_searchView_padding">14dp</dimen>
 
     <dimen name="message_view_pager_page_margin">16dp</dimen>
+    <dimen name="messageListSwipeThreshold">72dp</dimen>
+    <dimen name="messageListSwipeIconPadding">24dp</dimen>
+    <dimen name="messageListSwipeTextPadding">12dp</dimen>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/ids.xml b/app/ui/legacy/src/main/res/values/ids.xml
index e308d596bde3040f46134a94be53bb98e1168bee..679f0e73466b614cd0ea8e03d6a75f29769bddbd 100644
--- a/app/ui/legacy/src/main/res/values/ids.xml
+++ b/app/ui/legacy/src/main/res/values/ids.xml
@@ -19,4 +19,6 @@
     <item type="id" name="settings_list_url_item"/>
 
     <item type="id" name="drawer_list_folder_item"/>
+
+    <item type="id" name="message_list_swipe_tag"/>
 </resources>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index 378a5b7afd4f4e03f84de28c216222068d708a2d..cdf6c8fb81ea060edf6c652b69ca890d71fa6587 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -284,6 +284,30 @@
     <string name="global_settings_confirm_menu_mark_all_read">Mark all messages as read</string>
     <string name="global_settings_confirm_action_delete_notif">Delete (from notification)</string>
 
+    <!-- Title of the screen to configure swipe actions -->
+    <string name="general_settings_swipe_actions_title">Swipe actions</string>
+    <!-- Name of the setting to configure the right swipe action -->
+    <string name="general_settings_right_swipe_title">Right swipe</string>
+    <!-- Name of the setting to configure the left swipe action -->
+    <string name="general_settings_left_swipe_title">Left swipe</string>
+
+    <!-- The list item users select to not use a swipe action for a particular direction -->
+    <string name="general_settings_swipe_action_none">None</string>
+    <!-- Name of the swipe action to select/deselect a message -->
+    <string name="general_settings_swipe_action_toggle_selection">Toggle selection</string>
+    <!-- Name of the swipe action to mark as message as read/unread -->
+    <string name="general_settings_swipe_action_toggle_read">Mark as read/unread</string>
+    <!-- Name of the swipe action to add/remove a star -->
+    <string name="general_settings_swipe_action_toggle_star">Add/remove star</string>
+    <!-- Name of the swipe action to archive a message -->
+    <string name="general_settings_swipe_action_archive">Archive</string>
+    <!-- Name of the swipe action to delete a message -->
+    <string name="general_settings_swipe_action_delete">Delete</string>
+    <!-- Name of the swipe action to move a message to the spam folder -->
+    <string name="general_settings_swipe_action_spam">Spam</string>
+    <!-- Name of the swipe action to move a message to another folder -->
+    <string name="general_settings_swipe_action_move">Move</string>
+
     <string name="global_settings_privacy_hide_useragent">Hide mail client</string>
     <string name="global_settings_privacy_hide_useragent_detail">Remove Mail User-Agent from mail headers</string>
     <string name="global_settings_privacy_hide_timezone">Hide timezone</string>
@@ -737,9 +761,6 @@
     <string name="account_setup_failed_dlg_invalid_certificate_accept">Accept Key</string>
     <string name="account_setup_failed_dlg_invalid_certificate_reject">Reject Key</string>
 
-    <string name="message_view_help_key">Del (or D) - Delete\nR - Reply\nA - Reply All\nC - Compose\nF - Forward\nM - Move\nV - Archive\nY - Copy\nZ - Mark (Un)read\nG - Star\nO - Sort type\nI - Sort order\nQ - Return to Folders\nS - Select/deselect\nJ or P - Previous Message\nK or N - Next Message</string>
-    <string name="message_list_help_key">Del (or D) - Delete\nC - Compose\nM - Move\nV - Archive\nY - Copy\nZ - Mark (Un)read\nG - Star\nO - Sort type\nI - Sort order\nQ - Return to Folders\nS - Select/deselect</string>
-
     <string name="folder_list_filter_hint">Folder name contains</string>
 
     <string name="folder_list_display_mode_label">Show folders…</string>
@@ -1163,6 +1184,10 @@
 
     <string name="mail_list_widget_text">Mail Message List</string>
     <string name="mail_list_widget_loading">Loading messages…</string>
+    <!-- Displayed in the the message list widget when the app hasn't had a chance to send content to it yet -->
+    <string name="message_list_widget_initializing">Loading…</string>
+    <!-- Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough -->
+    <string name="message_list_widget_list_item_loading">Loading…</string>
 
     <string name="openpgp_enabled_error_title">Encryption not possible</string>
     <string name="openpgp_enabled_error_msg">Some of the selected recipients don\'t support this feature!</string>
@@ -1256,4 +1281,24 @@ You can keep this message and use it as a backup for your secret key. If you wan
 
     <string name="edit">EDIT</string>
     <string name="clear">CLEAR</string>
+    <!-- Name of the swipe action to select a message. Try to keep it short. -->
+    <string name="swipe_action_select">Select</string>
+    <!-- Name of the swipe action to deselect a message. Try to keep it short. -->
+    <string name="swipe_action_deselect">Deselect</string>
+    <!-- Name of the swipe action to mark a message as read. Try to keep it short. -->
+    <string name="swipe_action_mark_as_read">Mark read</string>
+    <!-- Name of the swipe action to mark a message as unread. Try to keep it short. -->
+    <string name="swipe_action_mark_as_unread">Mark unread</string>
+    <!-- Name of the swipe action to add the star to a message. Try to keep it short. -->
+    <string name="swipe_action_add_star">Add star</string>
+    <!-- Name of the swipe action to remove the star from a message. Try to keep it short. -->
+    <string name="swipe_action_remove_star">Remove star</string>
+    <!-- Name of the swipe action to archive a message. Try to keep it short. -->
+    <string name="swipe_action_archive">Archive</string>
+    <!-- Name of the swipe action to delete a message. Try to keep it short. -->
+    <string name="swipe_action_delete">Delete</string>
+    <!-- Name of the swipe action to move a message to the Spam folder. Try to keep it short. -->
+    <string name="swipe_action_spam">Spam</string>
+    <!-- Name of the swipe action to move a message. The ellipsis (…) indicates that there is another step (selecting a folder) before the action is performed. Try to keep it short. -->
+    <string name="swipe_action_move">Move…</string>
 </resources>
diff --git a/app/ui/legacy/src/main/res/xml/general_settings.xml b/app/ui/legacy/src/main/res/xml/general_settings.xml
index a5777368a1cb20d7a539f00ce15bd29e69280885..70fca719af0ee92c946c483eefaf18539340f1e1 100644
--- a/app/ui/legacy/src/main/res/xml/general_settings.xml
+++ b/app/ui/legacy/src/main/res/xml/general_settings.xml
@@ -428,6 +428,32 @@
             android:summary="@string/global_settings_confirm_actions_summary"
             android:title="@string/global_settings_confirm_actions_title" />
 
+        <PreferenceScreen
+            android:layout="@layout/custom_preference"
+            android:key="swipe_actions"
+            android:title="@string/general_settings_swipe_actions_title"
+            search:ignore="true">
+
+            <ListPreference
+                android:layout="@layout/custom_preference"
+                android:dialogTitle="@string/general_settings_right_swipe_title"
+                android:entries="@array/swipe_action_names"
+                android:entryValues="@array/swipe_action_values"
+                android:key="swipe_action_right"
+                app:useSimpleSummaryProvider="true"
+                android:title="@string/general_settings_right_swipe_title" />
+
+            <ListPreference
+                android:layout="@layout/custom_preference"
+                android:dialogTitle="@string/general_settings_left_swipe_title"
+                android:entries="@array/swipe_action_names"
+                android:entryValues="@array/swipe_action_values"
+                android:key="swipe_action_left"
+                app:useSimpleSummaryProvider="true"
+                android:title="@string/general_settings_left_swipe_title" />
+
+        </PreferenceScreen>
+
     </PreferenceScreen>
 
     <PreferenceScreen
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt
index ca33c808f5b55708e793d228f15b049b8fe414f8..2f606d206a7f6d072bd2321ecc4271dff1a9a063 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/ReplyToPresenterTest.kt
@@ -2,13 +2,12 @@ package com.fsck.k9.activity.compose
 
 import android.os.Bundle
 import com.fsck.k9.Identity
-import com.fsck.k9.K9RobolectricTest
+import com.fsck.k9.RobolectricTest
 import com.fsck.k9.mail.Address
 import com.google.common.truth.Truth.assertThat
 import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.mock
-import org.mockito.kotlin.never
 import org.mockito.kotlin.stubbing
 import org.mockito.kotlin.verify
 
@@ -16,7 +15,7 @@ private const val REPLY_TO_ADDRESS = "reply-to@example.com"
 private const val REPLY_TO_ADDRESS_2 = "reply-to2@example.com"
 private const val REPLY_TO_ADDRESS_3 = "reply-to3@example.com"
 
-class ReplyToPresenterTest : K9RobolectricTest() {
+class ReplyToPresenterTest : RobolectricTest() {
     private val view = mock<ReplyToView>()
     private val replyToPresenter = ReplyToPresenter(view)
 
@@ -115,39 +114,4 @@ class ReplyToPresenterTest : K9RobolectricTest() {
         verify(view).silentlyRemoveAddresses(Address.parse(replyToOne))
         verify(view).silentlyAddAddresses(Address.parse(replyToTwo))
     }
-
-    @Test
-    fun testOnNonRecipientFieldFocused_notVisible_expectNoChange() {
-        stubbing(view) {
-            on { isVisible } doReturn false
-        }
-
-        replyToPresenter.onNonRecipientFieldFocused()
-
-        verify(view, never()).isVisible = false
-    }
-
-    @Test
-    fun testOnNonRecipientFieldFocused_noContentFieldVisible_expectHide() {
-        stubbing(view) {
-            on { isVisible } doReturn true
-            on { getAddresses() } doReturn emptyArray()
-        }
-
-        replyToPresenter.onNonRecipientFieldFocused()
-
-        verify(view).isVisible = false
-    }
-
-    @Test
-    fun testOnNonRecipientFieldFocused_withContentFieldVisible_expectNoChange() {
-        stubbing(view) {
-            on { isVisible } doReturn true
-            on { getAddresses() } doReturn Address.parse(REPLY_TO_ADDRESS)
-        }
-
-        replyToPresenter.onNonRecipientFieldFocused()
-
-        verify(view, never()).isVisible = false
-    }
 }
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
similarity index 99%
rename from app/ui/legacy/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
rename to app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
index 095eb681595e1778c92d0b7ef5e5967924bc6f28..c65312fddfce4822c86d32a4e11240b0c69354d9 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/fragment/MessageListAdapterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
@@ -1,4 +1,4 @@
-package com.fsck.k9.fragment
+package com.fsck.k9.ui.messagelist
 
 import android.content.Context
 import android.text.Spannable
@@ -23,8 +23,6 @@ import com.fsck.k9.mail.Address
 import com.fsck.k9.textString
 import com.fsck.k9.ui.R
 import com.fsck.k9.ui.helper.RelativeDateTimeFormatter
-import com.fsck.k9.ui.messagelist.MessageListAppearance
-import com.fsck.k9.ui.messagelist.MessageListItem
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNull
diff --git a/app/ui/message-list-widget/build.gradle b/app/ui/message-list-widget/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..b22a5989654a5450df875a827216fa1b0793b8b4
--- /dev/null
+++ b/app/ui/message-list-widget/build.gradle
@@ -0,0 +1,44 @@
+apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
+
+dependencies {
+    implementation project(":app:ui:legacy")
+    implementation project(":app:core")
+
+    implementation "com.jakewharton.timber:timber:${versions.timber}"
+}
+
+android {
+    namespace 'app.k9mail.ui.widget.list'
+
+    compileSdkVersion buildConfig.compileSdk
+    buildToolsVersion buildConfig.buildTools
+
+    defaultConfig {
+        minSdkVersion buildConfig.minSdk
+        targetSdkVersion buildConfig.robolectricSdk
+    }
+
+    buildTypes {
+        debug {
+            manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
+        }
+        release {
+            manifestPlaceholders = ['appAuthRedirectScheme': 'FIXME: override this in your app project']
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+    }
+
+    compileOptions {
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
+    }
+
+    kotlinOptions {
+        jvmTarget = kotlinJvmVersion
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/AndroidManifest.xml b/app/ui/message-list-widget/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000000000000000000000000000000000..26b1f44446ca0be5de71c075c763c224ce7aaf31
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+
+        <service
+            android:name=".MessageListWidgetService"
+            android:enabled="true"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+    </application>
+</manifest>
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt
new file mode 100644
index 0000000000000000000000000000000000000000..dbee532f8c52aa867fed2f2a3215a6e034922914
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt
@@ -0,0 +1,8 @@
+package app.k9mail.ui.widget.list
+
+import org.koin.dsl.module
+
+val messageListWidgetModule = module {
+    single { MessageListWidgetManager(context = get(), messageListRepository = get(), config = get()) }
+    factory { MessageListLoader(preferences = get(), messageListRepository = get(), messageHelper = get()) }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt
new file mode 100644
index 0000000000000000000000000000000000000000..ba9d726ef0cd92ec6a8746baf1dda574de5f10ea
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt
@@ -0,0 +1,12 @@
+package app.k9mail.ui.widget.list
+
+import com.fsck.k9.Account.SortType
+import com.fsck.k9.search.LocalSearch
+
+internal data class MessageListConfig(
+    val search: LocalSearch,
+    val showingThreadedList: Boolean,
+    val sortType: SortType,
+    val sortAscending: Boolean,
+    val sortDateAscending: Boolean
+)
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt
new file mode 100644
index 0000000000000000000000000000000000000000..19c266df1088c9aced705f3bc72b7312116414bf
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt
@@ -0,0 +1,22 @@
+package app.k9mail.ui.widget.list
+
+import com.fsck.k9.controller.MessageReference
+
+internal data class MessageListItem(
+    val displayName: String,
+    val displayDate: String,
+    val subject: String,
+    val preview: String,
+    val isRead: Boolean,
+    val hasAttachments: Boolean,
+    val threadCount: Int,
+    val accountColor: Int,
+    val messageReference: MessageReference,
+    val uniqueId: Long,
+
+    val sortSubject: String?,
+    val sortMessageDate: Long,
+    val sortInternalDate: Long,
+    val sortIsStarred: Boolean,
+    val sortDatabaseId: Long,
+)
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt
new file mode 100644
index 0000000000000000000000000000000000000000..e0f765359051c2424a47d8db0ce384f60fb7716c
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt
@@ -0,0 +1,62 @@
+package app.k9mail.ui.widget.list
+
+import com.fsck.k9.Account
+import com.fsck.k9.controller.MessageReference
+import com.fsck.k9.helper.MessageHelper
+import com.fsck.k9.mailstore.MessageDetailsAccessor
+import com.fsck.k9.mailstore.MessageMapper
+import com.fsck.k9.ui.helper.DisplayAddressHelper
+import java.util.Calendar
+import java.util.Locale
+
+internal class MessageListItemMapper(
+    private val messageHelper: MessageHelper,
+    private val account: Account
+) : MessageMapper<MessageListItem> {
+    private val calendar: Calendar = Calendar.getInstance()
+
+    override fun map(message: MessageDetailsAccessor): MessageListItem {
+        val fromAddresses = message.fromAddresses
+        val toAddresses = message.toAddresses
+        val previewResult = message.preview
+        val previewText = if (previewResult.isPreviewTextAvailable) previewResult.previewText else ""
+        val uniqueId = createUniqueId(account, message.id)
+        val showRecipients = DisplayAddressHelper.shouldShowRecipients(account, message.folderId)
+        val displayAddress = if (showRecipients) toAddresses.firstOrNull() else fromAddresses.firstOrNull()
+        val displayName = if (showRecipients) {
+            messageHelper.getRecipientDisplayNames(toAddresses.toTypedArray()).toString()
+        } else {
+            messageHelper.getSenderDisplayName(displayAddress).toString()
+        }
+
+        return MessageListItem(
+            displayName = displayName,
+            displayDate = formatDate(message.messageDate),
+            subject = message.subject.orEmpty(),
+            preview = previewText,
+            isRead = message.isRead,
+            hasAttachments = message.hasAttachments,
+            threadCount = message.threadCount,
+            accountColor = account.chipColor,
+            messageReference = MessageReference(account.uuid, message.folderId, message.messageServerId),
+            uniqueId = uniqueId,
+            sortSubject = message.subject,
+            sortMessageDate = message.messageDate,
+            sortInternalDate = message.internalDate,
+            sortIsStarred = message.isStarred,
+            sortDatabaseId = message.id,
+        )
+    }
+
+    private fun formatDate(date: Long): String {
+        calendar.timeInMillis = date
+        val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)
+        val month = calendar.getDisplayName(Calendar.MONTH, Calendar.SHORT, Locale.getDefault())
+
+        return String.format("%d %s", dayOfMonth, month)
+    }
+
+    private fun createUniqueId(account: Account, messageId: Long): Long {
+        return ((account.accountNumber + 1).toLong() shl 52) + messageId
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt
new file mode 100644
index 0000000000000000000000000000000000000000..b80f3a38b63453cc19b0931229587c2262351d95
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt
@@ -0,0 +1,149 @@
+package app.k9mail.ui.widget.list
+
+import com.fsck.k9.Account
+import com.fsck.k9.Account.SortType
+import com.fsck.k9.Preferences
+import com.fsck.k9.helper.MessageHelper
+import com.fsck.k9.mailstore.MessageColumns
+import com.fsck.k9.mailstore.MessageListRepository
+import com.fsck.k9.search.SqlQueryBuilder
+import com.fsck.k9.search.getAccounts
+import timber.log.Timber
+
+internal class MessageListLoader(
+    private val preferences: Preferences,
+    private val messageListRepository: MessageListRepository,
+    private val messageHelper: MessageHelper
+) {
+
+    fun getMessageList(config: MessageListConfig): List<MessageListItem> {
+        return try {
+            getMessageListInfo(config)
+        } catch (e: Exception) {
+            Timber.e(e, "Error while fetching message list")
+
+            // TODO: Return an error object instead of an empty list
+            emptyList()
+        }
+    }
+
+    private fun getMessageListInfo(config: MessageListConfig): List<MessageListItem> {
+        val accounts = config.search.getAccounts(preferences)
+        val messageListItems = accounts
+            .flatMap { account ->
+                loadMessageListForAccount(account, config)
+            }
+            .sortedWith(config)
+
+        return messageListItems
+    }
+
+    private fun loadMessageListForAccount(account: Account, config: MessageListConfig): List<MessageListItem> {
+        val accountUuid = account.uuid
+        val sortOrder = buildSortOrder(config)
+        val mapper = MessageListItemMapper(messageHelper, account)
+
+        return if (config.showingThreadedList) {
+            val (selection, selectionArgs) = buildSelection(account, config)
+            messageListRepository.getThreadedMessages(accountUuid, selection, selectionArgs, sortOrder, mapper)
+        } else {
+            val (selection, selectionArgs) = buildSelection(account, config)
+            messageListRepository.getMessages(accountUuid, selection, selectionArgs, sortOrder, mapper)
+        }
+    }
+
+    private fun buildSelection(account: Account, config: MessageListConfig): Pair<String, Array<String>> {
+        val query = StringBuilder()
+        val queryArgs = mutableListOf<String>()
+
+        SqlQueryBuilder.buildWhereClause(account, config.search.conditions, query, queryArgs)
+
+        val selection = query.toString()
+        val selectionArgs = queryArgs.toTypedArray()
+
+        return selection to selectionArgs
+    }
+
+    private fun buildSortOrder(config: MessageListConfig): String {
+        val sortColumn = when (config.sortType) {
+            SortType.SORT_ARRIVAL -> MessageColumns.INTERNAL_DATE
+            SortType.SORT_ATTACHMENT -> "(${MessageColumns.ATTACHMENT_COUNT} < 1)"
+            SortType.SORT_FLAGGED -> "(${MessageColumns.FLAGGED} != 1)"
+            SortType.SORT_SENDER -> MessageColumns.SENDER_LIST // FIXME
+            SortType.SORT_SUBJECT -> "${MessageColumns.SUBJECT} COLLATE NOCASE"
+            SortType.SORT_UNREAD -> MessageColumns.READ
+            SortType.SORT_DATE -> MessageColumns.DATE
+            else -> MessageColumns.DATE
+        }
+
+        val sortDirection = if (config.sortAscending) " ASC" else " DESC"
+        val secondarySort = if (config.sortType == SortType.SORT_DATE || config.sortType == SortType.SORT_ARRIVAL) {
+            ""
+        } else {
+            if (config.sortDateAscending) {
+                "${MessageColumns.DATE} ASC, "
+            } else {
+                "${MessageColumns.DATE} DESC, "
+            }
+        }
+
+        return "$sortColumn$sortDirection, $secondarySort${MessageColumns.ID} DESC"
+    }
+
+    private fun List<MessageListItem>.sortedWith(config: MessageListConfig): List<MessageListItem> {
+        val comparator = when (config.sortType) {
+            SortType.SORT_DATE -> {
+                compareBy(config.sortAscending) { it.sortMessageDate }
+            }
+            SortType.SORT_ARRIVAL -> {
+                compareBy(config.sortAscending) { it.sortInternalDate }
+            }
+            SortType.SORT_SUBJECT -> {
+                compareStringBy<MessageListItem>(config.sortAscending) { it.sortSubject.orEmpty() }
+                    .thenByDate(config)
+            }
+            SortType.SORT_SENDER -> {
+                compareStringBy<MessageListItem>(config.sortAscending) { it.displayName }
+                    .thenByDate(config)
+            }
+            SortType.SORT_UNREAD -> {
+                compareBy<MessageListItem>(config.sortAscending) { it.isRead }
+                    .thenByDate(config)
+            }
+            SortType.SORT_FLAGGED -> {
+                compareBy<MessageListItem>(!config.sortAscending) { it.sortIsStarred }
+                    .thenByDate(config)
+            }
+            SortType.SORT_ATTACHMENT -> {
+                compareBy<MessageListItem>(!config.sortAscending) { it.hasAttachments }
+                    .thenByDate(config)
+            }
+        }.thenByDescending { it.sortDatabaseId }
+
+        return this.sortedWith(comparator)
+    }
+}
+
+private inline fun <T> compareBy(sortAscending: Boolean, crossinline selector: (T) -> Comparable<*>?): Comparator<T> {
+    return if (sortAscending) {
+        compareBy(selector)
+    } else {
+        compareByDescending(selector)
+    }
+}
+
+private inline fun <T> compareStringBy(sortAscending: Boolean, crossinline selector: (T) -> String): Comparator<T> {
+    return if (sortAscending) {
+        compareBy(String.CASE_INSENSITIVE_ORDER, selector)
+    } else {
+        compareByDescending(String.CASE_INSENSITIVE_ORDER, selector)
+    }
+}
+
+private fun Comparator<MessageListItem>.thenByDate(config: MessageListConfig): Comparator<MessageListItem> {
+    return if (config.sortDateAscending) {
+        thenBy { it.sortMessageDate }
+    } else {
+        thenByDescending { it.sortMessageDate }
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt
new file mode 100644
index 0000000000000000000000000000000000000000..b446a8b785612076bfcf34c70d39224e01dd4ead
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt
@@ -0,0 +1,127 @@
+package app.k9mail.ui.widget.list
+
+import android.content.Context
+import android.graphics.Typeface
+import android.text.SpannableString
+import android.text.style.StyleSpan
+import android.view.View
+import android.widget.RemoteViews
+import android.widget.RemoteViewsService.RemoteViewsFactory
+import androidx.core.content.ContextCompat
+import com.fsck.k9.Account.SortType
+import com.fsck.k9.K9
+import com.fsck.k9.activity.MessageList
+import com.fsck.k9.search.LocalSearch
+import com.fsck.k9.search.SearchAccount
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import com.fsck.k9.ui.R as UiR
+
+internal class MessageListRemoteViewFactory(private val context: Context) : RemoteViewsFactory, KoinComponent {
+    private val messageListLoader: MessageListLoader by inject()
+
+    private lateinit var unifiedInboxSearch: LocalSearch
+
+    private var messageListItems = emptyList<MessageListItem>()
+    private var senderAboveSubject = false
+    private var readTextColor = 0
+    private var unreadTextColor = 0
+
+    override fun onCreate() {
+        unifiedInboxSearch = SearchAccount.createUnifiedInboxAccount().relatedSearch
+
+        senderAboveSubject = K9.isMessageListSenderAboveSubject
+        readTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_read)
+        unreadTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_unread)
+    }
+
+    override fun onDataSetChanged() {
+        loadMessageList()
+    }
+
+    private fun loadMessageList() {
+        // TODO: Use same sort order that is used for the Unified Inbox inside the app
+        val messageListConfig = MessageListConfig(
+            search = unifiedInboxSearch,
+            showingThreadedList = K9.isThreadedViewEnabled,
+            sortType = SortType.SORT_DATE,
+            sortAscending = false,
+            sortDateAscending = false
+        )
+
+        messageListItems = messageListLoader.getMessageList(messageListConfig)
+    }
+
+    override fun onDestroy() = Unit
+
+    override fun getCount(): Int = messageListItems.size
+
+    override fun getViewAt(position: Int): RemoteViews {
+        val remoteView = RemoteViews(context.packageName, R.layout.message_list_widget_list_item)
+
+        val item = messageListItems[position]
+
+        val displayName = if (item.isRead) item.displayName else bold(item.displayName)
+        val subject = if (item.isRead) item.subject else bold(item.subject)
+
+        if (senderAboveSubject) {
+            remoteView.setTextViewText(R.id.sender, displayName)
+            remoteView.setTextViewText(R.id.mail_subject, subject)
+        } else {
+            remoteView.setTextViewText(R.id.sender, subject)
+            remoteView.setTextViewText(R.id.mail_subject, displayName)
+        }
+
+        remoteView.setTextViewText(R.id.mail_date, item.displayDate)
+        remoteView.setTextViewText(R.id.mail_preview, item.preview)
+
+        if (item.threadCount > 1) {
+            remoteView.setTextViewText(R.id.thread_count, item.threadCount.toString())
+            remoteView.setInt(R.id.thread_count, "setVisibility", View.VISIBLE)
+        } else {
+            remoteView.setInt(R.id.thread_count, "setVisibility", View.GONE)
+        }
+
+        val textColor = getTextColor(item)
+        remoteView.setTextColor(R.id.sender, textColor)
+        remoteView.setTextColor(R.id.mail_subject, textColor)
+        remoteView.setTextColor(R.id.mail_date, textColor)
+        remoteView.setTextColor(R.id.mail_preview, textColor)
+
+        if (item.hasAttachments) {
+            remoteView.setInt(R.id.attachment, "setVisibility", View.VISIBLE)
+        } else {
+            remoteView.setInt(R.id.attachment, "setVisibility", View.GONE)
+        }
+
+        val intent = MessageList.actionDisplayMessageTemplateFillIntent(item.messageReference)
+        remoteView.setOnClickFillInIntent(R.id.mail_list_item, intent)
+
+        remoteView.setInt(R.id.chip, "setBackgroundColor", item.accountColor)
+
+        return remoteView
+    }
+
+    override fun getLoadingView(): RemoteViews {
+        return RemoteViews(context.packageName, R.layout.message_list_widget_list_item_loading).apply {
+            // Set the text here instead of in the layout so the app language override is used
+            setTextViewText(R.id.loadingText, context.getString(UiR.string.message_list_widget_list_item_loading))
+        }
+    }
+
+    override fun getViewTypeCount(): Int = 2
+
+    override fun getItemId(position: Int): Long = messageListItems[position].uniqueId
+
+    override fun hasStableIds(): Boolean = true
+
+    private fun bold(text: String): CharSequence {
+        return SpannableString(text).apply {
+            setSpan(StyleSpan(Typeface.BOLD), 0, text.length, 0)
+        }
+    }
+
+    private fun getTextColor(messageListItem: MessageListItem): Int {
+        return if (messageListItem.isRead) readTextColor else unreadTextColor
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt
new file mode 100644
index 0000000000000000000000000000000000000000..5fc1442f5496dd6ed8c4dac4b95e89013d06d48d
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt
@@ -0,0 +1,5 @@
+package app.k9mail.ui.widget.list
+
+interface MessageListWidgetConfig {
+    val providerClass: Class<out MessageListWidgetProvider>
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt
new file mode 100644
index 0000000000000000000000000000000000000000..6eab9f1d38ba46dd28c96cf5ed02cbcc89faa7be
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt
@@ -0,0 +1,106 @@
+package app.k9mail.ui.widget.list
+
+import android.appwidget.AppWidgetManager
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import com.fsck.k9.core.BuildConfig
+import com.fsck.k9.mailstore.MessageListChangedListener
+import com.fsck.k9.mailstore.MessageListRepository
+import timber.log.Timber
+
+class MessageListWidgetManager(
+    private val context: Context,
+    private val messageListRepository: MessageListRepository,
+    private val config: MessageListWidgetConfig,
+) {
+    private lateinit var appWidgetManager: AppWidgetManager
+
+    private var listenerAdded = false
+    private val listener = MessageListChangedListener {
+        onMessageListChanged()
+    }
+
+    fun init() {
+        appWidgetManager = AppWidgetManager.getInstance(context)
+
+        if (isAtLeastOneMessageListWidgetAdded()) {
+            resetMessageListWidget()
+            registerMessageListChangedListener()
+        }
+    }
+
+    private fun onMessageListChanged() {
+        try {
+            triggerMessageListWidgetUpdate()
+        } catch (e: RuntimeException) {
+            if (BuildConfig.DEBUG) {
+                throw e
+            } else {
+                Timber.e(e, "Error while updating message list widget")
+            }
+        }
+    }
+
+    internal fun onWidgetAdded() {
+        Timber.v("Message list widget added")
+
+        registerMessageListChangedListener()
+    }
+
+    internal fun onWidgetRemoved() {
+        Timber.v("Message list widget removed")
+
+        if (!isAtLeastOneMessageListWidgetAdded()) {
+            unregisterMessageListChangedListener()
+        }
+    }
+
+    @Synchronized
+    private fun registerMessageListChangedListener() {
+        if (!listenerAdded) {
+            listenerAdded = true
+            messageListRepository.addListener(listener)
+
+            Timber.v("Message list widget is now listening for message list changes…")
+        }
+    }
+
+    @Synchronized
+    private fun unregisterMessageListChangedListener() {
+        if (listenerAdded) {
+            listenerAdded = false
+            messageListRepository.removeListener(listener)
+
+            Timber.v("Message list widget stopped listening for message list changes.")
+        }
+    }
+
+    private fun isAtLeastOneMessageListWidgetAdded(): Boolean {
+        return getAppWidgetIds().isNotEmpty()
+    }
+
+    private fun triggerMessageListWidgetUpdate() {
+        val appWidgetIds = getAppWidgetIds()
+        if (appWidgetIds.isNotEmpty()) {
+            appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.listView)
+        }
+    }
+
+    private fun resetMessageListWidget() {
+        val appWidgetIds = getAppWidgetIds()
+        if (appWidgetIds.isNotEmpty()) {
+            val intent = Intent(context, config.providerClass).apply {
+                action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
+                putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
+            }
+
+            context.sendBroadcast(intent)
+        }
+    }
+
+    private fun getAppWidgetIds(): IntArray {
+        val componentName = ComponentName(context, config.providerClass)
+        return appWidgetManager.getAppWidgetIds(componentName)
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt
new file mode 100644
index 0000000000000000000000000000000000000000..fffb2d470f61c7f709c9f4122973b972f464ce65
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt
@@ -0,0 +1,85 @@
+package app.k9mail.ui.widget.list
+
+import android.app.PendingIntent
+import android.appwidget.AppWidgetManager
+import android.appwidget.AppWidgetProvider
+import android.content.Context
+import android.content.Intent
+import android.widget.RemoteViews
+import com.fsck.k9.activity.MessageCompose
+import com.fsck.k9.activity.MessageList
+import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
+import com.fsck.k9.helper.PendingIntentCompat.FLAG_IMMUTABLE
+import com.fsck.k9.helper.PendingIntentCompat.FLAG_MUTABLE
+import com.fsck.k9.search.SearchAccount.Companion.createUnifiedInboxAccount
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import com.fsck.k9.ui.R as UiR
+
+open class MessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
+    private val messageListWidgetManager: MessageListWidgetManager by inject()
+
+    override fun onEnabled(context: Context) {
+        messageListWidgetManager.onWidgetAdded()
+    }
+
+    override fun onDisabled(context: Context) {
+        messageListWidgetManager.onWidgetRemoved()
+    }
+
+    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
+        for (appWidgetId in appWidgetIds) {
+            updateAppWidget(context, appWidgetManager, appWidgetId)
+        }
+    }
+
+    private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {
+        val views = RemoteViews(context.packageName, R.layout.message_list_widget_layout)
+
+        views.setTextViewText(R.id.folder, context.getString(UiR.string.integrated_inbox_title))
+
+        val intent = Intent(context, MessageListWidgetService::class.java)
+        views.setRemoteAdapter(R.id.listView, intent)
+
+        val viewAction = viewActionTemplatePendingIntent(context)
+        views.setPendingIntentTemplate(R.id.listView, viewAction)
+
+        val composeAction = composeActionPendingIntent(context)
+        views.setOnClickPendingIntent(R.id.new_message, composeAction)
+
+        val headerClickAction = viewUnifiedInboxPendingIntent(context)
+        views.setOnClickPendingIntent(R.id.top_controls, headerClickAction)
+
+        appWidgetManager.updateAppWidget(appWidgetId, views)
+    }
+
+    private fun viewActionTemplatePendingIntent(context: Context): PendingIntent {
+        val intent = MessageList.actionDisplayMessageTemplateIntent(
+            context,
+            openInUnifiedInbox = true,
+            messageViewOnly = true
+        )
+
+        return PendingIntent.getActivity(context, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_MUTABLE)
+    }
+
+    private fun viewUnifiedInboxPendingIntent(context: Context): PendingIntent {
+        val unifiedInboxAccount = createUnifiedInboxAccount()
+        val intent = intentDisplaySearch(
+            context = context,
+            search = unifiedInboxAccount.relatedSearch,
+            noThreading = true,
+            newTask = true,
+            clearTop = true
+        )
+
+        return PendingIntent.getActivity(context, -1, intent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    }
+
+    private fun composeActionPendingIntent(context: Context): PendingIntent {
+        val intent = Intent(context, MessageCompose::class.java).apply {
+            action = MessageCompose.ACTION_COMPOSE
+        }
+        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
+    }
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt
new file mode 100644
index 0000000000000000000000000000000000000000..09a82e25240ac8f9a729fdda029e496358ca9a1a
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt
@@ -0,0 +1,10 @@
+package app.k9mail.ui.widget.list
+
+import android.content.Intent
+import android.widget.RemoteViewsService
+
+class MessageListWidgetService : RemoteViewsService() {
+    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
+        return MessageListRemoteViewFactory(applicationContext)
+    }
+}
diff --git a/app/k9mail/src/main/res/drawable-xxhdpi/message_list_widget_preview.png b/app/ui/message-list-widget/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
similarity index 100%
rename from app/k9mail/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
rename to app/ui/message-list-widget/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
diff --git a/app/k9mail/src/main/res/layout/message_list_widget_layout.xml b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
similarity index 97%
rename from app/k9mail/src/main/res/layout/message_list_widget_layout.xml
rename to app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
index 49033130f467cd73f1ad23fb0e0b6ef8f86194d8..f7e889e0ccecc576f95da2cfcb44353c4bf8fa18 100644
--- a/app/k9mail/src/main/res/layout/message_list_widget_layout.xml
+++ b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
@@ -38,7 +38,7 @@
 
     <ListView android:id="@+id/listView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="@android:color/white"
         android:divider="@color/message_list_widget_divider"
         android:dividerHeight="0.5dp" />
diff --git a/app/k9mail/src/main/res/layout/message_list_widget_list_item.xml b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml
similarity index 83%
rename from app/k9mail/src/main/res/layout/message_list_widget_list_item.xml
rename to app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml
index 368ee21e97af4335a124510b6d07fd2338e60520..661b36200100972388b81fa92c249c54811d9db3 100644
--- a/app/k9mail/src/main/res/layout/message_list_widget_list_item.xml
+++ b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml
@@ -39,6 +39,21 @@
             android:visibility="gone"
             tools:visibility="visible" />
 
+        <TextView
+            android:id="@+id/thread_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@id/attachment"
+            android:layout_marginStart="4dp"
+            android:maxLines="1"
+            android:paddingRight="4dip"
+            android:paddingBottom="1dip"
+            android:paddingLeft="4dip"
+            android:textSize="16sp"
+            android:textColor="?android:attr/colorBackground"
+            android:background="@drawable/thread_count_box_light"
+            tools:text="3" />
+
         <TextView
             android:id="@+id/sender"
             android:layout_width="wrap_content"
@@ -46,7 +61,7 @@
             android:layout_alignParentStart="true"
             android:layout_alignParentTop="true"
             android:layout_gravity="start"
-            android:layout_toStartOf="@id/attachment"
+            android:layout_toStartOf="@id/thread_count"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="16sp"
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item_loading.xml b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item_loading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb92fcc430b91284a6291353c14452512de40638
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item_loading.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/loadingText"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:ellipsize="end"
+    android:gravity="center"
+    android:maxLines="1"
+    android:padding="16dp"
+    android:textSize="15sp"
+    tools:text="@string/message_list_widget_list_item_loading" />
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml
new file mode 100644
index 0000000000000000000000000000000000000000..49f087d9dcd028bf8f02692103bb2a4651e0ac9e
--- /dev/null
+++ b/app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white"
+    android:gravity="center"
+    android:padding="16dp"
+    android:text="@string/message_list_widget_initializing"
+    android:textSize="18sp" />
diff --git a/app/k9mail/src/main/res/values/message_list_widget_colors.xml b/app/ui/message-list-widget/src/main/res/values/colors.xml
similarity index 100%
rename from app/k9mail/src/main/res/values/message_list_widget_colors.xml
rename to app/ui/message-list-widget/src/main/res/values/colors.xml
diff --git a/app/k9mail/src/main/res/xml/message_list_widget_info.xml b/app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml
similarity index 82%
rename from app/k9mail/src/main/res/xml/message_list_widget_info.xml
rename to app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml
index e4fff6ea1b070764b2f86be055e00196a64b6d84..cbcd3d4f5668e3f60e9545a12aa6711909455ff7 100644
--- a/app/k9mail/src/main/res/xml/message_list_widget_info.xml
+++ b/app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialKeyguardLayout="@layout/message_list_widget_layout"
-    android:initialLayout="@layout/message_list_widget_layout"
+    android:initialKeyguardLayout="@layout/message_list_widget_loading"
+    android:initialLayout="@layout/message_list_widget_loading"
     android:minHeight="180dp"
     android:minWidth="250dp"
-    android:minResizeWidth="180dp"
+    android:minResizeWidth="110dp"
     android:minResizeHeight="110dp"
     android:previewImage="@drawable/message_list_widget_preview"
     android:resizeMode="horizontal|vertical"
diff --git a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt
index 6e855653a55336c239ac12738067209489d14b02..79a9d666fa3d21acd9af7fd2a8dedee62507f113 100644
--- a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt
+++ b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/WebDavBackend.kt
@@ -13,13 +13,11 @@ import com.fsck.k9.mail.Message
 import com.fsck.k9.mail.MessagingException
 import com.fsck.k9.mail.Part
 import com.fsck.k9.mail.store.webdav.WebDavStore
-import com.fsck.k9.mail.transport.WebDavTransport
 
 class WebDavBackend(
     accountName: String,
     backendStorage: BackendStorage,
-    private val webDavStore: WebDavStore,
-    private val webDavTransport: WebDavTransport
+    private val webDavStore: WebDavStore
 ) : Backend {
     private val webDavSync: WebDavSync = WebDavSync(accountName, backendStorage, webDavStore)
     private val commandGetFolders = CommandRefreshFolderList(backendStorage, webDavStore)
@@ -139,11 +137,11 @@ class WebDavBackend(
     }
 
     override fun sendMessage(message: Message) {
-        webDavTransport.sendMessage(message)
+        webDavStore.sendMessage(message)
     }
 
     override fun checkOutgoingServerSettings() {
-        webDavTransport.checkSettings()
+        webDavStore.checkSettings()
     }
 
     override fun createPusher(callback: BackendPusherCallback): BackendPusher {
diff --git a/build.gradle b/build.gradle
index 3395b7f0e9b29696590bb78247189f3b5b61969f..150e88d00c6ee822717d3540100b9f7f12a4d72e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,31 +13,33 @@ buildscript {
         // Judging the impact of newer library versions on the app requires being intimately familiar with the code
         // base. Please don't open pull requests upgrading dependencies if you're a new contributor.
         versions = [
-                'kotlin': '1.7.10',
+                'kotlin': '1.7.20',
                 'kotlinCoroutines': '1.6.4',
                 'jetbrainsAnnotations': '23.0.0',
                 'androidxAppCompat': '1.5.1',
-                'androidxActivity': '1.5.1',
+                'androidxActivity': '1.6.0',
                 'androidxRecyclerView': '1.2.1',
                 'androidxLifecycle': '2.5.1',
-                'androidxAnnotation': '1.4.0',
+                'androidxAnnotation': '1.5.0',
                 'androidxBiometric': '1.1.0',
                 'androidxNavigation': '2.5.2',
                 'androidxConstraintLayout': '2.1.4',
                 'androidxWorkManager': '2.7.1',
-                'androidxFragment': '1.5.2',
+                'androidxFragment': '1.5.3',
                 'androidxLocalBroadcastManager': '1.1.0',
                 'androidxCore': '1.9.0',
                 'androidxCardView': '1.0.0',
                 'androidxPreference': '1.2.0',
+                'androidxDrawerLayout': '1.1.1',
+                'androidxTransition': '1.4.1',
                 'androidxTestCore': '1.4.0',
                 'materialComponents': '1.6.1',
-                'fastAdapter': '5.6.0',
+                'fastAdapter': '5.7.0',
                 'preferencesFix': '1.1.0',
                 'okio': '3.2.0',
                 'moshi': '1.14.0',
                 'timber': '5.0.1',
-                'koin': '3.2.1',
+                'koin': '3.2.2',
                 // We can't upgrade Commons IO beyond this version because starting with 2.7 it is using Java 8 API
                 // that is not available until Android API 26 (even with desugaring enabled).
                 // See https://issuetracker.google.com/issues/160484830
@@ -45,19 +47,19 @@ buildscript {
                 'mime4j': '0.8.6',
                 'okhttp': '4.10.0',
                 'minidns': '1.0.4',
-                'glide': '4.13.2',
                 'retrofit': '2.9.0',
+                'glide': '4.14.2',
                 'jsoup': '1.15.3',
                 'httpClient': '4.5.13',
 
                 'androidxTestRunner': '1.4.0',
                 'junit': '4.13.2',
-                'robolectric': '4.8.2',
+                'robolectric': '4.9',
                 'mockito': '4.8.0',
                 'mockitoKotlin': '4.0.0',
                 'truth': '1.1.3',
-                'turbine': '0.10.0',
                 'leakcanary': '2.9.1',
+                'turbine': '0.11.0',
                 'ktlint': '0.44.0'
         ]
 
@@ -94,8 +96,21 @@ subprojects {
         resolutionStrategy.dependencySubstitution {
             substitute module("androidx.core:core") using module("androidx.core:core:${versions.androidxCore}")
             substitute module("androidx.activity:activity") using module("androidx.activity:activity:${versions.androidxActivity}")
+            substitute module("androidx.activity:activity-ktx") using module("androidx.activity:activity-ktx:${versions.androidxActivity}")
+            substitute module("androidx.fragment:fragment") using module("androidx.fragment:fragment:${versions.androidxFragment}")
+            substitute module("androidx.fragment:fragment-ktx") using module("androidx.fragment:fragment-ktx:${versions.androidxFragment}")
             substitute module("androidx.appcompat:appcompat") using module("androidx.appcompat:appcompat:${versions.androidxAppCompat}")
             substitute module("androidx.preference:preference") using module("androidx.preference:preference:${versions.androidxPreference}")
+            substitute module("androidx.recyclerview:recyclerview") using module("androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}")
+            substitute module("androidx.constraintlayout:constraintlayout") using module("androidx.constraintlayout:constraintlayout:${versions.androidxConstraintLayout}")
+            substitute module("androidx.drawerlayout:drawerlayout") using module("androidx.drawerlayout:drawerlayout:${versions.androidxDrawerLayout}")
+            substitute module("androidx.lifecycle:lifecycle-livedata") using module("androidx.lifecycle:lifecycle-livedata:${versions.androidxLifecycle}")
+            substitute module("androidx.transition:transition") using module("androidx.transition:transition:${versions.androidxTransition}")
+            substitute module("org.jetbrains:annotations") using module("org.jetbrains:annotations:${versions.jetbrainsAnnotations}")
+            substitute module("org.jetbrains.kotlin:kotlin-stdlib") using module("org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}")
+            substitute module("org.jetbrains.kotlin:kotlin-stdlib-jdk7") using module("org.jetbrains.kotlin:kotlin-stdlib-jdk7:${versions.kotlin}")
+            substitute module("org.jetbrains.kotlin:kotlin-stdlib-jdk8") using module("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}")
+            substitute module("org.jetbrains.kotlinx:kotlinx-coroutines-android") using module("org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutines}")
         }
     }
 
diff --git a/fastlane/metadata/android/en-US/changelogs/33008.txt b/fastlane/metadata/android/en-US/changelogs/33008.txt
new file mode 100644
index 0000000000000000000000000000000000000000..269ecaa2e15e8477511c6ad854d642c0a04143c6
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33008.txt
@@ -0,0 +1,5 @@
+- Added swipe actions to the message list screen
+- Changed the minimum size of the message list widget to 2x2 cells
+- Fixed a bug where the app would start using the light theme before switching to the dark theme resulting in a brief flash of white
+- More minor bug fixes and improvements
+- Updated translations
diff --git a/fastlane/metadata/android/en-US/changelogs/33009.txt b/fastlane/metadata/android/en-US/changelogs/33009.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c72bb703edc6daff2a0ac299d7eabd5635856e1c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33009.txt
@@ -0,0 +1,6 @@
+- Automatically scroll to the top after using pull to refresh, so new messages are visible
+- Fixed a bug that prevented the app from establishing a connection to the outgoing server under certain circumstances
+- Fixed a bug that could lead to messages being sent twice when the send button was double clicked
+- Changed the structure of HTML signatures in outgoing messages to increase compatibility
+- More bug fixes and internal changes
+- Updated translations
diff --git a/fastlane/metadata/android/en-US/changelogs/33010.txt b/fastlane/metadata/android/en-US/changelogs/33010.txt
new file mode 100644
index 0000000000000000000000000000000000000000..fec633ff607379b6182fdbea519075392eff0e8c
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33010.txt
@@ -0,0 +1,5 @@
+- Fixed "K-9 Accounts" shortcuts (you probably have to remove existing shortcuts and add them again)
+- Fixed a couple of bugs and display issues in the message list widget
+- Fixed bug that could lead to a crypto provider popup showing before swiping to the next/previous message was completed
+- Some other minor bug fixes
+- Updated translations
diff --git a/fastlane/metadata/android/en-US/changelogs/33011.txt b/fastlane/metadata/android/en-US/changelogs/33011.txt
new file mode 100644
index 0000000000000000000000000000000000000000..60e4ec7928a52582471e0ad7c4e23d6d6cbefb12
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33011.txt
@@ -0,0 +1,7 @@
+- Don't unexpectedly show and focus the "reply to" field when composing a message
+- Fixed a bug where sometimes toolbar buttons in the message view would affect another message than the one currently being displayed
+- Changed the way the app switches to the next/previous message to avoid a bug that could lead to the toolbar disappearing
+- Fall back to using IPv4 if connecting to a POP3 server using IPv6 fails
+- SMTP: Stop treating all TLS errors as certificate error
+- Added more (local) logging when creating and removing notifications
+- Fixed a couple of rare crashes
diff --git a/fastlane/metadata/android/en-US/changelogs/33012.txt b/fastlane/metadata/android/en-US/changelogs/33012.txt
new file mode 100644
index 0000000000000000000000000000000000000000..0cf6ce190cacd0e79b55c40f8447ebfcbd119c4e
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/33012.txt
@@ -0,0 +1,3 @@
+- Tweaked swipe actions in the message list screen
+- Fixed a bug where canceling account setup was showing a new account in the side drawer
+- Updated translations
diff --git a/fastlane/metadata/android/en-US/changelogs/34000.txt b/fastlane/metadata/android/en-US/changelogs/34000.txt
new file mode 100644
index 0000000000000000000000000000000000000000..26c6ab719e8192faa5f8d205e8094fa0f5255026
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/34000.txt
@@ -0,0 +1,7 @@
+- Added swipe actions to the message list screen
+- Added support for swiping between messages
+- Added a monochromatic app icon for Android 13
+- Fixed "K-9 Accounts" shortcuts (please remove existing shortcuts and add them again)
+- Fixed error reporting for (old) send failures
+- A lot of other bug fixes; see changes for versions 6.3xx
+- Added Western Frisian translation and updated others
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/Transport.java b/mail/common/src/main/java/com/fsck/k9/mail/Transport.java
deleted file mode 100644
index 6fdf523ecf4fff623e72c00c57c1080b054af436..0000000000000000000000000000000000000000
--- a/mail/common/src/main/java/com/fsck/k9/mail/Transport.java
+++ /dev/null
@@ -1,10 +0,0 @@
-
-package com.fsck.k9.mail;
-
-public abstract class Transport {
-    public abstract void open() throws MessagingException;
-
-    public abstract void sendMessage(Message message) throws MessagingException;
-
-    public abstract void close();
-}
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.kt b/mail/common/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.kt
index 712fc09d5633643d8d29ac0f3c5e8adec8d8e0ee..280a0d60297ca4e680909414bc68ec622a25eda7 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.kt
@@ -112,8 +112,24 @@ class LocalKeyStore(private val directoryProvider: KeyStoreDirectoryProvider) {
 
         return try {
             val storedCert = keyStore.getCertificate(getCertKey(host, port))
-            storedCert == certificate
+            if (storedCert == null) {
+                Timber.v("Couldn't find a stored certificate for %s:%d", host, port)
+                false
+            } else if (storedCert != certificate) {
+                Timber.v(
+                    "Stored certificate for %s:%d doesn't match.\nExpected:\n%s\nActual:\n%s",
+                    host,
+                    port,
+                    storedCert,
+                    certificate
+                )
+                false
+            } else {
+                Timber.v("Stored certificate for %s:%d matches the server certificate", host, port)
+                true
+            }
         } catch (e: KeyStoreException) {
+            Timber.w(e, "Error reading from KeyStore")
             false
         }
     }
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapConnection.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapConnection.kt
index 657f585c16c9d102a6a7c3ebaa3e551161c40b85..ec058ea72dafe4542870b2ff9be3bae9aef431a5 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapConnection.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapConnection.kt
@@ -27,6 +27,7 @@ import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
 import java.net.SocketAddress
+import java.net.UnknownHostException
 import java.security.GeneralSecurityException
 import java.security.Security
 import java.security.cert.CertificateException
@@ -154,7 +155,7 @@ internal class RealImapConnection(
             }
         }
 
-        throw MessagingException("Cannot connect to host", connectException)
+        throw connectException ?: UnknownHostException()
     }
 
     private fun connectToAddress(address: InetAddress): Socket {
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapConnectionTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapConnectionTest.kt
index d6a004623d5edf3c0328d22a08dc67905e7f3c20..570e3f299012320b88dccd17388bde2cb1178c5e 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapConnectionTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapConnectionTest.kt
@@ -640,18 +640,12 @@ class RealImapConnectionTest {
         server.verifyInteractionCompleted()
     }
 
-    @Test
+    @Test(expected = IOException::class)
     fun `open() with connection error should throw`() {
         val settings = createImapSettings(host = "127.1.2.3")
         val imapConnection = createImapConnection(settings, socketFactory, oAuth2TokenProvider)
 
-        try {
-            imapConnection.open()
-            fail("Expected exception")
-        } catch (e: MessagingException) {
-            assertThat(e).hasMessageThat().isEqualTo("Cannot connect to host")
-            assertThat(e).hasCauseThat().isInstanceOf(IOException::class.java)
-        }
+        imapConnection.open()
     }
 
     @Test
diff --git a/mail/protocols/pop3/build.gradle b/mail/protocols/pop3/build.gradle
index f798dc66674973431b5677be6db4aafa9f07e4fe..feec06c0f0a39f7131475b36b9c3005e74b4ebdd 100644
--- a/mail/protocols/pop3/build.gradle
+++ b/mail/protocols/pop3/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'java-library'
+apply plugin: 'kotlin'
 apply plugin: 'com.android.lint'
 
 if (rootProject.testCoverage) {
@@ -17,6 +18,7 @@ dependencies {
     testImplementation "junit:junit:${versions.junit}"
     testImplementation "com.google.truth:truth:${versions.truth}"
     testImplementation "org.mockito:mockito-core:${versions.mockito}"
+    testImplementation "org.mockito.kotlin:mockito-kotlin:${versions.mockitoKotlin}"
     testImplementation "com.squareup.okio:okio:${versions.okio}"
     testImplementation "com.jcraft:jzlib:1.0.7"
     testImplementation "commons-io:commons-io:${versions.commonsIo}"
diff --git a/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Connection.java b/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Connection.java
index aaff29d73d0cce5eb4ec85cead0b0dc141ec9a1d..4badc73e5fda82cda734375c7ff0a0e359481198 100644
--- a/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Connection.java
+++ b/mail/protocols/pop3/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Connection.java
@@ -5,9 +5,10 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
-import java.net.SocketAddress;
+import java.net.UnknownHostException;
 import java.security.GeneralSecurityException;
 import java.security.KeyManagementException;
 import java.security.MessageDigest;
@@ -61,15 +62,7 @@ class Pop3Connection {
 
     void open() throws MessagingException {
         try {
-            SocketAddress socketAddress = new InetSocketAddress(settings.getHost(), settings.getPort());
-            if (settings.getConnectionSecurity() == ConnectionSecurity.SSL_TLS_REQUIRED) {
-                socket = trustedSocketFactory.createSocket(null, settings.getHost(),
-                        settings.getPort(), settings.getClientCertificateAlias());
-            } else {
-                socket = new Socket();
-            }
-
-            socket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT);
+            socket = connect();
             in = new BufferedInputStream(socket.getInputStream(), 1024);
             out = new BufferedOutputStream(socket.getOutputStream(), 512);
 
@@ -102,6 +95,44 @@ class Pop3Connection {
         }
     }
 
+    private Socket connect()
+            throws IOException, MessagingException, NoSuchAlgorithmException, KeyManagementException {
+        InetAddress[] inetAddresses = InetAddress.getAllByName(settings.getHost());
+
+        IOException connectException = null;
+        for (InetAddress address : inetAddresses) {
+            try {
+                return connectToAddress(address);
+            } catch (IOException e) {
+                Timber.w(e, "Could not connect to %s", address);
+                connectException = e;
+            }
+        }
+
+        throw connectException != null ? connectException : new UnknownHostException();
+    }
+
+    private Socket connectToAddress(InetAddress address)
+            throws IOException, MessagingException, NoSuchAlgorithmException, KeyManagementException {
+        if (K9MailLib.isDebug() && K9MailLib.DEBUG_PROTOCOL_POP3) {
+            Timber.d("Connecting to %s as %s", settings.getHost(), address);
+        }
+
+        InetSocketAddress socketAddress = new InetSocketAddress(address, settings.getPort());
+
+        final Socket socket;
+        if (settings.getConnectionSecurity() == ConnectionSecurity.SSL_TLS_REQUIRED) {
+            socket = trustedSocketFactory.createSocket(null, settings.getHost(), settings.getPort(),
+                    settings.getClientCertificateAlias());
+        } else {
+            socket = new Socket();
+        }
+
+        socket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT);
+
+        return socket;
+    }
+
     /*
      * If STARTTLS is not available throws a CertificateValidationException which in K-9
      * triggers a "Certificate error" notification that takes the user to the incoming
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.java b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.java
deleted file mode 100644
index 9f8d0b6e18d5116a3532e210452bc96bf33b01e3..0000000000000000000000000000000000000000
--- a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.java
+++ /dev/null
@@ -1,584 +0,0 @@
-package com.fsck.k9.mail.store.pop3;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.cert.CertificateException;
-
-import com.fsck.k9.mail.AuthType;
-import com.fsck.k9.mail.AuthenticationFailedException;
-import com.fsck.k9.mail.CertificateValidationException;
-import com.fsck.k9.mail.CertificateValidationException.Reason;
-import com.fsck.k9.mail.ConnectionSecurity;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.filter.Base64;
-import com.fsck.k9.mail.helpers.TestTrustedSocketFactory;
-import com.fsck.k9.mail.ssl.TrustedSocketFactory;
-import javax.net.ssl.SSLException;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
-
-public class Pop3ConnectionTest {
-
-    private static final String host = "server";
-    private static final int port = 12345;
-    private static String username = "user";
-    private static String password = "password";
-    private static final String INITIAL_RESPONSE = "+OK POP3 server greeting\r\n";
-    private static final String CAPA =
-            "CAPA\r\n";
-    private static final String CAPA_RESPONSE =
-            "+OK Listing of supported mechanisms follows\r\n" +
-            "SASL PLAIN CRAM-MD5 EXTERNAL\r\n" +
-            ".\r\n";
-    private static final String AUTH_PLAIN_WITH_LOGIN = "AUTH PLAIN\r\n" +
-            new String(Base64.encodeBase64(("\000"+username+"\000"+password).getBytes())) + "\r\n";
-    private static final String AUTH_PLAIN_AUTHENTICATED_RESPONSE = "+OK\r\n" + "+OK\r\n";
-
-    private static final String SUCCESSFUL_PLAIN_AUTH = CAPA + AUTH_PLAIN_WITH_LOGIN;
-    private static final String SUCCESSFUL_PLAIN_AUTH_RESPONSE =
-            INITIAL_RESPONSE +
-            CAPA_RESPONSE +
-            AUTH_PLAIN_AUTHENTICATED_RESPONSE;
-/**
-    private static final String AUTH_PLAIN_FAILED_RESPONSE = "+OK\r\n" + "Plain authentication failure";
-    private static final String STAT = "STAT\r\n";
-    private static final String STAT_RESPONSE = "+OK 20 0\r\n";
-    private static final String UIDL_UNSUPPORTED_RESPONSE = "-ERR UIDL unsupported\r\n";
-    private static final String UIDL_SUPPORTED_RESPONSE = "+OK UIDL supported\r\n";
- **/
-
-    private TrustedSocketFactory mockTrustedSocketFactory;
-    private Socket mockSocket;
-    private ByteArrayOutputStream outputStreamForMockSocket;
-    private SimplePop3Settings settings;
-    private TrustedSocketFactory socketFactory;
-
-    @Before
-    public void before() throws Exception {
-        createCommonSettings();
-        createMocks();
-        socketFactory = TestTrustedSocketFactory.newInstance();
-    }
-
-    private void createCommonSettings() {
-        settings = new SimplePop3Settings();
-        settings.setUsername(username);
-        settings.setPassword(password);
-    }
-
-    private void createMocks()
-            throws MessagingException, IOException, NoSuchAlgorithmException, KeyManagementException {
-        mockTrustedSocketFactory = mock(TrustedSocketFactory.class);
-        mockSocket = mock(Socket.class);
-        outputStreamForMockSocket = new ByteArrayOutputStream();
-        when(mockTrustedSocketFactory.createSocket(null, host, port, null))
-                .thenReturn(mockSocket);
-        when(mockSocket.getOutputStream()).thenReturn(outputStreamForMockSocket);
-        when(mockSocket.isConnected()).thenReturn(true);
-    }
-
-    private void addSettingsForValidMockSocket() {
-        settings.setHost(host);
-        settings.setPort(port);
-        settings.setConnectionSecurity(ConnectionSecurity.SSL_TLS_REQUIRED);
-    }
-
-    @Test
-    public void constructor_doesntCreateSocket() throws Exception {
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        new Pop3Connection(settings, mockTrustedSocketFactory);
-
-        verifyNoMoreInteractions(mockTrustedSocketFactory);
-    }
-
-    //Using MockSocketFactory
-
-    @Test(expected = CertificateValidationException.class)
-    public void open_whenTrustedSocketFactoryThrowsSSLCertificateException_throwCertificateValidationException()
-            throws Exception {
-        when(mockTrustedSocketFactory.createSocket(null, host, port, null)).thenThrow(
-                new SSLException(new CertificateException()));
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_whenTrustedSocketFactoryThrowsCertificateException_throwMessagingException() throws Exception {
-        when(mockTrustedSocketFactory.createSocket(null, host, port, null)).thenThrow(
-                new SSLException(""));
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_whenTrustedSocketFactoryThrowsGeneralSecurityException_throwMessagingException() throws Exception {
-        when(mockTrustedSocketFactory.createSocket(null, host, port, null)).thenThrow(
-                new NoSuchAlgorithmException(""));
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_whenTrustedSocketFactoryThrowsIOException_throwMessagingException() throws Exception {
-        when(mockTrustedSocketFactory.createSocket(null, host, port, null)).thenThrow(
-                new IOException(""));
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_whenSocketNotConnected_throwsMessagingException() throws Exception {
-        when(mockSocket.isConnected()).thenReturn(false);
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-    }
-
-    @Test
-    public void open_withTLS_authenticatesOverSocket() throws Exception {
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-        addSettingsForValidMockSocket();
-        settings.setAuthType(AuthType.PLAIN);
-
-        Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-        connection.open();
-
-        assertEquals(SUCCESSFUL_PLAIN_AUTH, new String(outputStreamForMockSocket.toByteArray()));
-    }
-
-
-
-    //Using both
-
-    @Test(expected = CertificateValidationException.class)
-    public void open_withSTLSunavailable_throwsCertificateValidationException() throws Exception {
-        MockPop3Server server = setupUnavailableStartTLSConnection();
-        settings.setAuthType(AuthType.PLAIN);
-        settings.setConnectionSecurity(ConnectionSecurity.STARTTLS_REQUIRED);
-
-        createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-    }
-
-    @Test
-    public void open_withSTLSunavailable_doesntCreateSocket() throws Exception {
-        MockPop3Server server = setupUnavailableStartTLSConnection();
-        settings.setAuthType(AuthType.PLAIN);
-        settings.setConnectionSecurity(ConnectionSecurity.STARTTLS_REQUIRED);
-
-        try {
-            Pop3Connection connection = new Pop3Connection(settings, mockTrustedSocketFactory);
-            connection.open();
-        } catch (Exception ignored) {
-        }
-
-        verify(mockTrustedSocketFactory, never()).createSocket(any(Socket.class), anyString(),
-                anyInt(), anyString());
-    }
-
-    @Test(expected = Pop3ErrorResponse.class)
-    public void open_withStartTLS_withSTLSerr_throwsException() throws Exception {
-        MockPop3Server server = setupFailedStartTLSConnection();
-
-        when(mockTrustedSocketFactory.createSocket(
-                any(Socket.class), eq(server.getHost()), eq(server.getPort()), eq((String) null)))
-                .thenReturn(mockSocket);
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-
-        createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-    }
-
-    @Test
-    public void open_withStartTLS_withSTLSerr_doesntCreateSocket() throws Exception {
-        MockPop3Server server = setupFailedStartTLSConnection();
-
-        when(mockTrustedSocketFactory.createSocket(
-                any(Socket.class), eq(server.getHost()), eq(server.getPort()), eq((String) null)))
-                .thenReturn(mockSocket);
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-
-        try {
-            createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-        } catch (Exception ignored) {
-        }
-
-        verify(mockTrustedSocketFactory, never()).createSocket(any(Socket.class), anyString(),
-                anyInt(), anyString());
-    }
-
-    @Test
-    public void open_withStartTLS_usesSocketFactoryToCreateTLSSocket() throws Exception {
-        MockPop3Server server = setupStartTLSConnection();
-        settings.setAuthType(AuthType.PLAIN);
-
-        when(mockTrustedSocketFactory.createSocket(
-                any(Socket.class), eq(server.getHost()), eq(server.getPort()), eq((String) null)))
-                .thenReturn(mockSocket);
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-
-        createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-
-        verify(mockTrustedSocketFactory).createSocket(any(Socket.class), eq(server.getHost()),
-                eq(server.getPort()), eq((String) null));
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_withStartTLS_whenSocketFactoryThrowsException_ThrowsException() throws Exception {
-        MockPop3Server server = setupStartTLSConnection();
-        settings.setAuthType(AuthType.PLAIN);
-
-        when(mockTrustedSocketFactory.createSocket(
-                any(Socket.class), eq(server.getHost()), eq(server.getPort()), eq((String) null)))
-                .thenThrow(new IOException());
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-
-        createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-
-        verify(mockTrustedSocketFactory).createSocket(any(Socket.class), eq(server.getHost()),
-                eq(server.getPort()), eq((String) null));
-    }
-
-    @Test
-    public void open_withStartTLS_authenticatesOverSecureSocket() throws Exception {
-        MockPop3Server server = setupStartTLSConnection();
-        settings.setAuthType(AuthType.PLAIN);
-
-        when(mockTrustedSocketFactory.createSocket(
-                any(Socket.class), eq(server.getHost()), eq(server.getPort()), eq((String) null)))
-                .thenReturn(mockSocket);
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(SUCCESSFUL_PLAIN_AUTH_RESPONSE.getBytes()));
-
-        createAndOpenPop3Connection(settings, mockTrustedSocketFactory);
-
-        assertEquals(SUCCESSFUL_PLAIN_AUTH, new String(outputStreamForMockSocket.toByteArray()));
-    }
-
-    private MockPop3Server setupStartTLSConnection() throws IOException {new MockPop3Server();
-        MockPop3Server server = new MockPop3Server();
-        setupServerWithStartTLSAvailable(server);
-        server.expect("STLS");
-        server.output("+OK Begin TLS negotiation");
-        server.start();
-        settings.setHost(server.getHost());
-        settings.setPort(server.getPort());
-        settings.setConnectionSecurity(ConnectionSecurity.STARTTLS_REQUIRED);
-        return server;
-    }
-
-    private MockPop3Server setupFailedStartTLSConnection() throws IOException {new MockPop3Server();
-        MockPop3Server server = new MockPop3Server();
-        setupServerWithStartTLSAvailable(server);
-        server.expect("STLS");
-        server.output("-ERR Unavailable");
-        server.start();
-        settings.setHost(server.getHost());
-        settings.setPort(server.getPort());
-        settings.setConnectionSecurity(ConnectionSecurity.STARTTLS_REQUIRED);
-        return server;
-    }
-
-    private MockPop3Server setupUnavailableStartTLSConnection() throws IOException {new MockPop3Server();
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN");
-        server.output(".");
-        server.start();
-        settings.setHost(server.getHost());
-        settings.setPort(server.getPort());
-        settings.setConnectionSecurity(ConnectionSecurity.STARTTLS_REQUIRED);
-        return server;
-    }
-
-    private void setupServerWithStartTLSAvailable(MockPop3Server server) {
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("STLS");
-        server.output("SASL PLAIN");
-        server.output(".");
-    }
-
-    //Using RealSocketFactory with MockPop3Server
-
-    @Test
-    public void open_withAuthTypePlainAndPlainAuthCapability_performsPlainAuth() throws Exception {
-        settings.setAuthType(AuthType.PLAIN);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH PLAIN");
-        server.output("+OK");
-        server.expect(new String(Base64.encodeBase64(("\000"+username+"\000"+password).getBytes())));
-        server.output("+OK");
-        startServerAndCreateOpenConnection(server);
-
-        server.verifyConnectionStillOpen();
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypePlainAndPlainAuthCapabilityAndInvalidPasswordResponse_throwsException() throws Exception {
-        settings.setAuthType(AuthType.PLAIN);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH PLAIN");
-        server.output("+OK");
-        server.expect(new String(Base64.encodeBase64(("\000"+username+"\000"+password).getBytes())));
-        server.output("-ERR");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("Expected auth failure");
-        } catch (AuthenticationFailedException ignored) {}
-
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypePlainAndNoPlainAuthCapability_performsLogin() throws Exception {
-        settings.setAuthType(AuthType.PLAIN);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("USER user");
-        server.output("+OK");
-        server.expect("PASS password");
-        server.output("-ERR");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("Expected auth failure");
-        } catch (AuthenticationFailedException ignored) {}
-
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypePlainAndNoPlainAuthCapabilityAndLoginFailure_throwsException() throws Exception {
-        settings.setAuthType(AuthType.PLAIN);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("USER user");
-        server.output("+OK");
-        server.expect("PASS password");
-        server.output("+OK");
-
-        startServerAndCreateOpenConnection(server);
-
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeCramMd5AndCapability_performsCramMd5Auth() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.CRAM_MD5);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH CRAM-MD5");
-        server.output("+ abcd");
-        server.expect("dXNlciBhZGFhZTU2Zjk1NzAxZjQwNDQwZjhhMWU2YzY1ZjZmZg==");
-        server.output("+OK");
-        startServerAndCreateOpenConnection(server);
-
-        server.verifyConnectionStillOpen();
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeCramMd5AndCapabilityAndCramFailure_throwsException() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.CRAM_MD5);
-
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH CRAM-MD5");
-        server.output("+ abcd");
-        server.expect("dXNlciBhZGFhZTU2Zjk1NzAxZjQwNDQwZjhhMWU2YzY1ZjZmZg==");
-        server.output("-ERR");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("Expected auth failure");
-        } catch (AuthenticationFailedException ignored) {}
-
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeCramMd5AndNoCapability_performsApopAuth() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.CRAM_MD5);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK abc<a>abcd");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN EXTERNAL");
-        server.output(".");
-        server.expect("APOP user c8e8c560e385faaa6367d4145572b8ea");
-        server.output("+OK");
-        startServerAndCreateOpenConnection(server);
-
-        server.verifyConnectionStillOpen();
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeCramMd5AndNoCapabilityAndApopFailure_throwsException() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.CRAM_MD5);
-
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK abc<a>abcd");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN EXTERNAL");
-        server.output(".");
-        server.expect("APOP user c8e8c560e385faaa6367d4145572b8ea");
-        server.output("-ERR");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("Expected auth failure");
-        } catch (AuthenticationFailedException ignored) {}
-
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeExternalAndCapability_performsExternalAuth() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.EXTERNAL);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH EXTERNAL dXNlcg==");
-        server.output("+OK");
-        startServerAndCreateOpenConnection(server);
-
-        server.verifyConnectionStillOpen();
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeExternalAndNoCapability_throwsCVE() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.EXTERNAL);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5");
-        server.output(".");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("CVE expected");
-        } catch (CertificateValidationException e) {
-            assertEquals(Reason.MissingCapability, e.getReason());
-        }
-
-        server.verifyConnectionStillOpen();
-        server.verifyInteractionCompleted();
-    }
-
-    @Test
-    public void open_withAuthTypeExternalAndCapability_withRejection_throwsCVE() throws IOException, MessagingException {
-        settings.setAuthType(AuthType.EXTERNAL);
-
-        MockPop3Server server = new MockPop3Server();
-        server.output("+OK POP3 server greeting");
-        server.expect("CAPA");
-        server.output("+OK Listing of supported mechanisms follows");
-        server.output("SASL PLAIN CRAM-MD5 EXTERNAL");
-        server.output(".");
-        server.expect("AUTH EXTERNAL dXNlcg==");
-        server.output("-ERR Invalid certificate");
-
-        try {
-            startServerAndCreateOpenConnection(server);
-            fail("CVE expected");
-        } catch (CertificateValidationException e) {
-            assertEquals("POP3 client certificate authentication failed: -ERR Invalid certificate", e.getMessage());
-        }
-
-        server.verifyInteractionCompleted();
-    }
-
-    private void startServerAndCreateOpenConnection(MockPop3Server server) throws IOException,
-            MessagingException {
-        server.start();
-        settings.setHost(server.getHost());
-        settings.setPort(server.getPort());
-        createAndOpenPop3Connection(settings, socketFactory);
-    }
-
-    private void createAndOpenPop3Connection(Pop3Settings settings, TrustedSocketFactory socketFactory)
-            throws MessagingException {
-        Pop3Connection connection = new Pop3Connection(settings, socketFactory);
-        connection.open();
-    }
-}
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.kt b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..5d627b1358d689e4fea49a484bc8c38e85aadcc5
--- /dev/null
+++ b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3ConnectionTest.kt
@@ -0,0 +1,416 @@
+package com.fsck.k9.mail.store.pop3
+
+import com.fsck.k9.mail.AuthType
+import com.fsck.k9.mail.AuthType.CRAM_MD5
+import com.fsck.k9.mail.AuthType.EXTERNAL
+import com.fsck.k9.mail.AuthType.LOGIN
+import com.fsck.k9.mail.AuthType.PLAIN
+import com.fsck.k9.mail.AuthenticationFailedException
+import com.fsck.k9.mail.CertificateValidationException
+import com.fsck.k9.mail.ConnectionSecurity
+import com.fsck.k9.mail.ConnectionSecurity.NONE
+import com.fsck.k9.mail.ConnectionSecurity.SSL_TLS_REQUIRED
+import com.fsck.k9.mail.ConnectionSecurity.STARTTLS_REQUIRED
+import com.fsck.k9.mail.MessagingException
+import com.fsck.k9.mail.helpers.TestTrustedSocketFactory
+import com.fsck.k9.mail.ssl.TrustedSocketFactory
+import com.google.common.truth.Truth.assertThat
+import java.io.IOException
+import java.security.NoSuchAlgorithmException
+import java.security.cert.CertificateException
+import javax.net.ssl.SSLException
+import okio.ByteString.Companion.encodeUtf8
+import org.junit.Assert.fail
+import org.junit.Test
+import org.mockito.kotlin.any
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.eq
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verifyNoInteractions
+
+class Pop3ConnectionTest {
+    private val socketFactory = TestTrustedSocketFactory.newInstance()
+
+    @Test(expected = CertificateValidationException::class)
+    fun `when TrustedSocketFactory throws SSLCertificateException, open() should throw CertificateValidationException`() {
+        val server = startTlsServer()
+        val settings = server.createSettings(connectionSecurity = SSL_TLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory> {
+            on { createSocket(null, settings.host, settings.port, null) } doThrow SSLException(CertificateException())
+        }
+
+        createAndOpenPop3Connection(settings, mockSocketFactory)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `when TrustedSocketFactory throws CertificateException, open() should throw MessagingException`() {
+        val server = startTlsServer()
+        val settings = server.createSettings(connectionSecurity = SSL_TLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory> {
+            on { createSocket(null, settings.host, settings.port, null) } doThrow SSLException("")
+        }
+
+        createAndOpenPop3Connection(settings, mockSocketFactory)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `when TrustedSocketFactory throws NoSuchAlgorithmException, open() should throw MessagingException`() {
+        val server = startTlsServer()
+        val settings = server.createSettings(connectionSecurity = SSL_TLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory> {
+            on { createSocket(null, settings.host, settings.port, null) } doThrow NoSuchAlgorithmException()
+        }
+
+        createAndOpenPop3Connection(settings, mockSocketFactory)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `when TrustedSocketFactory throws IOException, open() should throw MessagingException`() {
+        val server = startTlsServer()
+        val settings = server.createSettings(connectionSecurity = SSL_TLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory> {
+            on { createSocket(null, settings.host, settings.port, null) } doThrow IOException()
+        }
+
+        createAndOpenPop3Connection(settings, mockSocketFactory)
+    }
+
+    @Test(expected = CertificateValidationException::class)
+    fun `open() with STLS capability unavailable should throw CertificateValidationException`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN")
+        }
+        val settings = server.createSettings(connectionSecurity = STARTTLS_REQUIRED)
+
+        createAndOpenPop3Connection(settings)
+    }
+
+    @Test(expected = Pop3ErrorResponse::class)
+    fun `open() with error response to STLS command should throw`() {
+        val server = startServer {
+            setupServerWithStartTlsAvailable()
+            expect("STLS")
+            output("-ERR Unavailable")
+        }
+        val settings = server.createSettings(connectionSecurity = STARTTLS_REQUIRED)
+
+        createAndOpenPop3Connection(settings)
+    }
+
+    @Test
+    fun `open() with STLS error response should not call createSocket() to upgrade to TLS`() {
+        val server = startServer {
+            setupServerWithStartTlsAvailable()
+            expect("STLS")
+            output("-ERR Unavailable")
+        }
+        val settings = server.createSettings(connectionSecurity = STARTTLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory>()
+
+        try {
+            createAndOpenPop3Connection(settings, mockSocketFactory)
+        } catch (ignored: Exception) {
+        }
+
+        verifyNoInteractions(mockSocketFactory)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `open() with StartTLS and TrustedSocketFactory throwing should throw`() {
+        val server = startServer {
+            setupServerWithStartTlsAvailable()
+            expect("STLS")
+            output("+OK Begin TLS negotiation")
+        }
+        val settings = server.createSettings(connectionSecurity = STARTTLS_REQUIRED)
+        val mockSocketFactory = mock<TrustedSocketFactory> {
+            on { createSocket(any(), eq(settings.host), eq(settings.port), eq(null)) } doThrow IOException()
+        }
+
+        createAndOpenPop3Connection(settings, mockSocketFactory)
+    }
+
+    @Test
+    fun `open() with AUTH PLAIN`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5 EXTERNAL")
+            expect("AUTH PLAIN")
+            output("+OK")
+            expect(AUTH_PLAIN_ARGUMENT)
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = PLAIN)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with authentication error should throw`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5 EXTERNAL")
+            expect("AUTH PLAIN")
+            output("+OK")
+            expect(AUTH_PLAIN_ARGUMENT)
+            output("-ERR")
+        }
+        val settings = server.createSettings(authType = PLAIN)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("Expected auth failure")
+        } catch (ignored: AuthenticationFailedException) {
+        }
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with AuthType_PLAIN and no SASL PLAIN capability should use USER and PASS commands`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("CRAM-MD5 EXTERNAL")
+            expect("USER user")
+            output("+OK")
+            expect("PASS password")
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = PLAIN)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with authentication failure during fallback to USER and PASS commands should throw`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("CRAM-MD5 EXTERNAL")
+            expect("USER user")
+            output("+OK")
+            expect("PASS password")
+            output("-ERR")
+        }
+        val settings = server.createSettings(authType = PLAIN)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("Expected auth failure")
+        } catch (ignored: AuthenticationFailedException) {
+        }
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with CRAM-MD5 authentication`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5 EXTERNAL")
+            expect("AUTH CRAM-MD5")
+            output("+ abcd")
+            expect("dXNlciBhZGFhZTU2Zjk1NzAxZjQwNDQwZjhhMWU2YzY1ZjZmZg==")
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = CRAM_MD5)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with authentication failure when using CRAM-MD5 should throw`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5 EXTERNAL")
+            expect("AUTH CRAM-MD5")
+            output("+ abcd")
+            expect("dXNlciBhZGFhZTU2Zjk1NzAxZjQwNDQwZjhhMWU2YzY1ZjZmZg==")
+            output("-ERR")
+        }
+        val settings = server.createSettings(authType = CRAM_MD5)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("Expected auth failure")
+        } catch (ignored: AuthenticationFailedException) {
+        }
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with CRAM-MD5 configured but missing capability should use APOP`() {
+        val server = startServer {
+            output("+OK abc<a>abcd")
+            expect("CAPA")
+            output("+OK Listing of supported mechanisms follows")
+            output("SASL PLAIN EXTERNAL")
+            output(".")
+            expect("APOP user c8e8c560e385faaa6367d4145572b8ea")
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = CRAM_MD5)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with authentication failure when using APOP should throw`() {
+        val server = startServer {
+            output("+OK abc<a>abcd")
+            expect("CAPA")
+            output("+OK Listing of supported mechanisms follows")
+            output("SASL PLAIN EXTERNAL")
+            output(".")
+            expect("APOP user c8e8c560e385faaa6367d4145572b8ea")
+            output("-ERR")
+        }
+        val settings = server.createSettings(authType = CRAM_MD5)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("Expected auth failure")
+        } catch (ignored: AuthenticationFailedException) {
+        }
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with AUTH EXTERNAL`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("CRAM-MD5 EXTERNAL")
+            expect("AUTH EXTERNAL dXNlcg==")
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = EXTERNAL)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with AuthType_EXTERNAL configured but missing capability should throw`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5")
+        }
+        val settings = server.createSettings(authType = EXTERNAL)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("CVE expected")
+        } catch (e: CertificateValidationException) {
+            assertThat(e.reason).isEqualTo(CertificateValidationException.Reason.MissingCapability)
+        }
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with authentication failure when using AUTH EXTERNAL should throw`() {
+        val server = startServer {
+            setupServerWithAuthenticationMethods("PLAIN CRAM-MD5 EXTERNAL")
+            expect("AUTH EXTERNAL dXNlcg==")
+            output("-ERR Invalid certificate")
+        }
+        val settings = server.createSettings(authType = EXTERNAL)
+
+        try {
+            createAndOpenPop3Connection(settings)
+            fail("CVE expected")
+        } catch (e: CertificateValidationException) {
+            assertThat(e).hasMessageThat()
+                .isEqualTo("POP3 client certificate authentication failed: -ERR Invalid certificate")
+        }
+
+        server.verifyInteractionCompleted()
+    }
+
+    @Test
+    fun `open() with StartTLS and AUTH PLAIN`() {
+        val server = startServer {
+            setupServerWithStartTlsAvailable()
+            expect("STLS")
+            output("+OK Begin TLS negotiation")
+            startTls()
+            expect("CAPA")
+            output("+OK Listing of supported mechanisms follows")
+            output("SASL PLAIN")
+            output(".")
+            expect("AUTH PLAIN")
+            output("+OK")
+            expect(AUTH_PLAIN_ARGUMENT)
+            output("+OK")
+        }
+        val settings = server.createSettings(authType = PLAIN, connectionSecurity = STARTTLS_REQUIRED)
+
+        createAndOpenPop3Connection(settings)
+
+        server.verifyConnectionStillOpen()
+        server.verifyInteractionCompleted()
+    }
+
+    private fun createAndOpenPop3Connection(
+        settings: Pop3Settings,
+        trustedSocketFactory: TrustedSocketFactory = socketFactory
+    ) {
+        val connection = Pop3Connection(settings, trustedSocketFactory)
+        connection.open()
+    }
+
+    private fun MockPop3Server.setupServerWithAuthenticationMethods(authenticationMethods: String) {
+        output("+OK POP3 server greeting")
+        expect("CAPA")
+        output("+OK Listing of supported mechanisms follows")
+        output("SASL $authenticationMethods")
+        output(".")
+    }
+
+    private fun MockPop3Server.setupServerWithStartTlsAvailable() {
+        output("+OK POP3 server greeting")
+        expect("CAPA")
+        output("+OK Listing of supported mechanisms follows")
+        output("STLS")
+        output("SASL PLAIN")
+        output(".")
+    }
+
+    private fun startTlsServer(): MockPop3Server {
+        // MockPop3Server doesn't actually support implicit TLS. However, all tests using this method will encounter
+        // an exception before sending the first command to the server.
+        return startServer { }
+    }
+
+    private fun MockPop3Server.createSettings(
+        authType: AuthType = LOGIN,
+        connectionSecurity: ConnectionSecurity = NONE
+    ): Pop3Settings {
+        return SimplePop3Settings().apply {
+            username = USERNAME
+            password = PASSWORD
+            this.authType = authType
+            host = this@createSettings.host
+            port = this@createSettings.port
+            this.connectionSecurity = connectionSecurity
+        }
+    }
+
+    private fun startServer(block: MockPop3Server.() -> Unit): MockPop3Server {
+        return MockPop3Server().apply(block).also { it.start() }
+    }
+
+    companion object {
+        private const val USERNAME = "user"
+        private const val PASSWORD = "password"
+
+        private val AUTH_PLAIN_ARGUMENT = "\u0000$USERNAME\u0000$PASSWORD".encodeUtf8().base64()
+    }
+}
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.java b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.java
deleted file mode 100644
index 9051f48a09bd9782905993e650ab1142a91ac862..0000000000000000000000000000000000000000
--- a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package com.fsck.k9.mail.store.pop3;
-
-
-import com.fsck.k9.mail.FetchProfile;
-import com.fsck.k9.mail.FetchProfile.Item;
-import com.fsck.k9.mail.MessageRetrievalListener;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.internet.BinaryTempFileBody;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertSame;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-
-public class Pop3FolderTest {
-    private static final int MAX_DOWNLOAD_SIZE = -1;
-
-    private Pop3Store mockStore;
-    private Pop3Connection mockConnection;
-    private MessageRetrievalListener<Pop3Message> mockListener;
-    private Pop3Folder folder;
-
-    @Before
-    public void before() throws MessagingException {
-        mockStore = mock(Pop3Store.class);
-        mockConnection = mock(Pop3Connection.class);
-        mockListener = mock(MessageRetrievalListener.class);
-        when(mockStore.createConnection()).thenReturn(mockConnection);
-        when(mockConnection.executeSimpleCommand(Pop3Commands.STAT_COMMAND)).thenReturn("+OK 10 0");
-        folder = new Pop3Folder(mockStore, Pop3Folder.INBOX);
-        BinaryTempFileBody.setTempDirectory(new File(System.getProperty("java.io.tmpdir")));
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_withoutInboxFolder_shouldThrow() throws Exception {
-        Pop3Folder folder = new Pop3Folder(mockStore, "TestFolder");
-
-        folder.open();
-    }
-
-    @Test
-    public void open_withoutInboxFolder_shouldNotTryAndCreateConnection() throws Exception {
-        Pop3Folder folder = new Pop3Folder(mockStore, "TestFolder");
-        try {
-            folder.open();
-        } catch (Exception ignored) {}
-        verify(mockStore, never()).createConnection();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_withInboxFolderWithExceptionCreatingConnection_shouldThrow()
-            throws MessagingException {
-
-        when(mockStore.createConnection()).thenThrow(new MessagingException("Test"));
-        folder.open();
-    }
-
-    @Test
-    public void open_withInboxFolder_shouldSetMessageCountFromStatResponse()
-            throws MessagingException {
-        folder.open();
-
-        int messageCount = folder.getMessageCount();
-
-        assertEquals(10, messageCount);
-    }
-
-    @Test(expected = MessagingException.class)
-    public void open_withInboxFolder_whenStatCommandFails_shouldThrow()
-            throws MessagingException {
-        when(mockConnection.executeSimpleCommand(Pop3Commands.STAT_COMMAND))
-                .thenThrow(new MessagingException("Test"));
-
-        folder.open();
-    }
-
-    @Test
-    public void open_createsAndOpensConnection()
-            throws MessagingException {
-        folder.open();
-
-        verify(mockStore, times(1)).createConnection();
-        verify(mockConnection).open();
-    }
-
-    @Test
-    public void open_whenAlreadyOpenWithValidConnection_doesNotCreateAnotherConnection()
-            throws MessagingException {
-        folder.open();
-        when(mockConnection.isOpen()).thenReturn(true);
-
-        folder.open();
-
-        verify(mockStore, times(1)).createConnection();
-    }
-
-    @Test
-    public void close_onNonOpenedFolder_succeeds()
-            throws MessagingException {
-
-
-        folder.close();
-    }
-
-    @Test
-    public void close_onOpenedFolder_succeeds()
-            throws MessagingException {
-
-        folder.open();
-
-        folder.close();
-    }
-
-    @Test
-    public void close_onOpenedFolder_sendsQUIT()
-            throws MessagingException {
-
-        folder.open();
-        when(mockConnection.isOpen()).thenReturn(true);
-
-        folder.close();
-
-        verify(mockConnection).executeSimpleCommand(Pop3Commands.QUIT_COMMAND);
-    }
-
-    @Test
-    public void close_withExceptionQuiting_ignoresException()
-            throws MessagingException {
-
-        folder.open();
-        when(mockConnection.isOpen()).thenReturn(true);
-        doThrow(new MessagingException("Test"))
-                .when(mockConnection)
-                .executeSimpleCommand(Pop3Commands.QUIT_COMMAND);
-
-        folder.close();
-    }
-
-    @Test
-    public void close_onOpenedFolder_closesConnection()
-            throws MessagingException {
-
-        folder.open();
-        when(mockConnection.isOpen()).thenReturn(true);
-
-        folder.close();
-
-        verify(mockConnection).close();
-    }
-
-    @Test
-    public void getMessages_returnsListOfMessagesOnServer() throws IOException, MessagingException {
-        folder.open();
-
-        when(mockConnection.readLine()).thenReturn("1 abcd").thenReturn(".");
-
-        List<Pop3Message> result = folder.getMessages(1, 1, mockListener);
-
-        assertEquals(1, result.size());
-    }
-
-    @Test(expected = MessagingException.class)
-    public void getMessages_withInvalidSet_throwsException() throws IOException, MessagingException {
-        folder.open();
-
-        folder.getMessages(2, 1, mockListener);
-    }
-
-    @Test(expected = MessagingException.class)
-    public void getMessages_withIOExceptionReadingLine_throwsException() throws IOException, MessagingException {
-        folder.open();
-
-        when(mockConnection.readLine()).thenThrow(new IOException("Test"));
-
-        folder.getMessages(1, 1, mockListener);
-    }
-
-    @Test
-    public void getMessage_withPreviouslyFetchedMessage_returnsMessage()
-            throws IOException, MessagingException {
-        folder.open();
-
-        List<Pop3Message> messageList = setupMessageFromServer();
-
-        Pop3Message message = folder.getMessage("abcd");
-
-        assertSame(messageList.get(0), message);
-    }
-
-    @Test
-    public void getMessage_withNoPreviouslyFetchedMessage_returnsNewMessage()
-            throws IOException, MessagingException {
-        folder.open();
-
-        Pop3Message message = folder.getMessage("abcd");
-
-        assertNotNull(message);
-    }
-
-
-    @Test
-    public void fetch_withEnvelopeProfile_setsSizeOfMessage() throws MessagingException, IOException {
-        folder.open();
-        List<Pop3Message> messageList = setupMessageFromServer();
-        FetchProfile fetchProfile = new FetchProfile();
-        fetchProfile.add(Item.ENVELOPE);
-        when(mockConnection.readLine()).thenReturn("1 100").thenReturn(".");
-
-        folder.fetch(messageList, fetchProfile, mockListener, MAX_DOWNLOAD_SIZE);
-
-        assertEquals(100, messageList.get(0).getSize());
-    }
-
-    @Test
-    public void fetch_withBodyProfile_setsContentOfMessage() throws MessagingException, IOException {
-        InputStream messageInputStream = new ByteArrayInputStream((
-                "From: <adam@example.org>\r\n" +
-                "To: <eva@example.org>\r\n" +
-                "Subject: Testmail\r\n" +
-                "MIME-Version: 1.0\r\n" +
-                "Content-type: text/plain\r\n" +
-                "Content-Transfer-Encoding: 7bit\r\n" +
-                "\r\n" +
-                "this is some test text.").getBytes());
-        folder.open();
-        List<Pop3Message> messageList = setupMessageFromServer();
-        FetchProfile fetchProfile = new FetchProfile();
-        fetchProfile.add(Item.BODY);
-        when(mockConnection.readLine()).thenReturn("1 100").thenReturn(".");
-        when(mockConnection.getInputStream()).thenReturn(messageInputStream);
-
-        folder.fetch(messageList, fetchProfile, mockListener, MAX_DOWNLOAD_SIZE);
-
-        ByteArrayOutputStream bodyData = new ByteArrayOutputStream();
-        messageList.get(0).getBody().writeTo(bodyData);
-
-        assertEquals("this is some test text.", new String(bodyData.toByteArray(), "UTF-8"));
-    }
-
-    private List<Pop3Message> setupMessageFromServer() throws IOException, MessagingException {
-        when(mockConnection.readLine()).thenReturn("1 abcd").thenReturn(".");
-        return folder.getMessages(1, 1, mockListener);
-    }
-}
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.kt b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..52d316cf71c10c60963acf201969c69f29c5443f
--- /dev/null
+++ b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3FolderTest.kt
@@ -0,0 +1,260 @@
+package com.fsck.k9.mail.store.pop3
+
+import com.fsck.k9.mail.AuthenticationFailedException
+import com.fsck.k9.mail.Body
+import com.fsck.k9.mail.FetchProfile
+import com.fsck.k9.mail.MessageRetrievalListener
+import com.fsck.k9.mail.MessagingException
+import com.fsck.k9.mail.crlf
+import com.fsck.k9.mail.internet.BinaryTempFileBody
+import com.fsck.k9.mail.store.pop3.Pop3Commands.STAT_COMMAND
+import com.google.common.truth.Truth.assertThat
+import java.io.ByteArrayOutputStream
+import java.io.File
+import java.io.IOException
+import org.junit.Before
+import org.junit.Test
+import org.mockito.Mockito.never
+import org.mockito.Mockito.times
+import org.mockito.Mockito.verify
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stubbing
+
+class Pop3FolderTest {
+    private val connection = mock<Pop3Connection> {
+        on { executeSimpleCommand(STAT_COMMAND) } doReturn "+OK $MESSAGE_COUNT 0"
+        on { isOpen } doReturn true
+    }
+    private val store = mock<Pop3Store> {
+        on { createConnection() } doReturn connection
+    }
+    private val messageRetrievalListener = mock<MessageRetrievalListener<Pop3Message>>()
+    private val folder = Pop3Folder(store, Pop3Folder.INBOX)
+
+    @Before
+    fun setUp() {
+        BinaryTempFileBody.setTempDirectory(File(System.getProperty("java.io.tmpdir")))
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `open() without Inbox folder should throw`() {
+        val folder = Pop3Folder(store, "TestFolder")
+
+        folder.open()
+    }
+
+    @Test
+    fun `open() without Inbox folder should not call Pop3Store_createConnection()`() {
+        val folder = Pop3Folder(store, "TestFolder")
+
+        try {
+            folder.open()
+        } catch (ignored: Exception) {
+        }
+
+        verify(store, never()).createConnection()
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `open() with exception when creating a connection should throw`() {
+        stubbing(store) {
+            on { createConnection() } doThrow MessagingException("Test")
+        }
+
+        folder.open()
+    }
+
+    @Test(expected = AuthenticationFailedException::class)
+    fun `open() with failed authentication should throw`() {
+        stubbing(connection) {
+            on { open() } doThrow AuthenticationFailedException("Test")
+        }
+
+        folder.open()
+    }
+
+    @Test
+    fun `open() should set message count from STAT response`() {
+        folder.open()
+
+        assertThat(folder.messageCount).isEqualTo(MESSAGE_COUNT)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `open() with STAT command failing should throw`() {
+        stubbing(connection) {
+            on { executeSimpleCommand(STAT_COMMAND) } doThrow MessagingException("Test")
+        }
+
+        folder.open()
+    }
+
+    @Test
+    fun `open() should open connection`() {
+        folder.open()
+
+        verify(store, times(1)).createConnection()
+        verify(connection).open()
+    }
+
+    @Test
+    fun `open() with connection already open should not create another connection`() {
+        folder.open()
+
+        folder.open()
+
+        verify(store, times(1)).createConnection()
+    }
+
+    @Test
+    fun `close() with closed folder should not throw`() {
+        folder.close()
+    }
+
+    @Test
+    fun `close() with open folder should not throw`() {
+        folder.open()
+
+        folder.close()
+    }
+
+    @Test
+    fun `close() with open folder should send QUIT command`() {
+        folder.open()
+
+        folder.close()
+
+        verify(connection).executeSimpleCommand(Pop3Commands.QUIT_COMMAND)
+    }
+
+    @Test
+    fun `close() with exception when sending QUIT command should not throw`() {
+        stubbing(connection) {
+            on { executeSimpleCommand(Pop3Commands.QUIT_COMMAND) } doThrow MessagingException("Test")
+        }
+        folder.open()
+
+        folder.close()
+    }
+
+    @Test
+    fun `close() with open folder should close connection`() {
+        folder.open()
+
+        folder.close()
+
+        verify(connection).close()
+    }
+
+    @Test
+    fun `getMessages() should return list of messages on server`() {
+        stubbing(connection) {
+            on { readLine() } doReturn "1 $MESSAGE_SERVER_ID" doReturn "."
+        }
+        folder.open()
+
+        val result = folder.getMessages(1, 1, messageRetrievalListener)
+
+        assertThat(result).hasSize(1)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `getMessages() with invalid set should throw`() {
+        folder.open()
+
+        folder.getMessages(2, 1, messageRetrievalListener)
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `getMessages() with IOException when reading line should throw`() {
+        stubbing(connection) {
+            on { readLine() } doThrow IOException("Test")
+        }
+        folder.open()
+
+        folder.getMessages(1, 1, messageRetrievalListener)
+    }
+
+    @Test
+    fun `getMessage() with previously fetched message should return message`() {
+        folder.open()
+        val messageList = setupMessageFromServer()
+
+        val message = folder.getMessage(MESSAGE_SERVER_ID)
+
+        assertThat(message).isSameInstanceAs(messageList.first())
+    }
+
+    @Test
+    fun `getMessage() without previously fetched message should return new message`() {
+        folder.open()
+
+        val message = folder.getMessage(MESSAGE_SERVER_ID)
+
+        assertThat(message).isNotNull()
+    }
+
+    @Test
+    fun `fetch() with ENVELOPE profile should set size of message`() {
+        folder.open()
+        val messageList = setupMessageFromServer()
+        val fetchProfile = FetchProfile()
+        fetchProfile.add(FetchProfile.Item.ENVELOPE)
+        stubbing(connection) {
+            on { readLine() } doReturn "1 100" doReturn "."
+        }
+
+        folder.fetch(messageList, fetchProfile, messageRetrievalListener, MAX_DOWNLOAD_SIZE)
+
+        assertThat(messageList.first().size).isEqualTo(100)
+    }
+
+    @Test
+    fun `fetch() with BODY profile should set content of message`() {
+        val messageInputStream =
+            """
+            From: <adam@example.org>
+            To: <eva@example.org>
+            Subject: Testmail
+            MIME-Version: 1.0
+            Content-type: text/plain
+            Content-Transfer-Encoding: 7bit
+            
+            this is some test text.
+            """.trimIndent().crlf().byteInputStream()
+        folder.open()
+        val messageList = setupMessageFromServer()
+        val fetchProfile = FetchProfile()
+        fetchProfile.add(FetchProfile.Item.BODY)
+        stubbing(connection) {
+            on { readLine() } doReturn("1 100") doReturn(".")
+            on { inputStream } doReturn messageInputStream
+        }
+
+        folder.fetch(messageList, fetchProfile, messageRetrievalListener, MAX_DOWNLOAD_SIZE)
+
+        assertThat(messageList.first().body.writeToString()).isEqualTo("this is some test text.")
+    }
+
+    private fun setupMessageFromServer(): List<Pop3Message> {
+        stubbing(connection) {
+            on { readLine() } doReturn "1 $MESSAGE_SERVER_ID" doReturn "."
+        }
+
+        return folder.getMessages(1, 1, messageRetrievalListener)
+    }
+
+    private fun Body.writeToString(): String {
+        return ByteArrayOutputStream().also { outputStream ->
+            writeTo(outputStream)
+        }.toByteArray().decodeToString()
+    }
+
+    companion object {
+        private const val MESSAGE_COUNT = 10
+        private const val MESSAGE_SERVER_ID = "abcd"
+        private const val MAX_DOWNLOAD_SIZE = -1
+    }
+}
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java
deleted file mode 100644
index d7021637ca8bd2be6dfd6b2b83f98c6735e804e7..0000000000000000000000000000000000000000
--- a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package com.fsck.k9.mail.store.pop3;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import com.fsck.k9.mail.AuthType;
-import com.fsck.k9.mail.AuthenticationFailedException;
-import com.fsck.k9.mail.ConnectionSecurity;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.ServerSettings;
-import com.fsck.k9.mail.filter.Base64;
-import com.fsck.k9.mail.ssl.TrustedSocketFactory;
-import org.junit.Before;
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-
-public class Pop3StoreTest {
-    private static final String INITIAL_RESPONSE = "+OK POP3 server greeting\r\n";
-    private static final String CAPA = "CAPA\r\n";
-    private static final String CAPA_RESPONSE = "+OK Listing of supported mechanisms follows\r\n" +
-            "SASL PLAIN CRAM-MD5 EXTERNAL\r\n" +
-            ".\r\n";
-    private static final String AUTH_PLAIN_WITH_LOGIN = "AUTH PLAIN\r\n" +
-            new String(Base64.encodeBase64(("\000user\000password").getBytes())) + "\r\n";
-    private static final String AUTH_PLAIN_AUTHENTICATED_RESPONSE = "+OK\r\n" + "+OK\r\n";
-    private static final String AUTH_PLAIN_FAILED_RESPONSE = "+OK\r\n" + "Plain authentication failure";
-    private static final String STAT = "STAT\r\n";
-    private static final String STAT_RESPONSE = "+OK 20 0\r\n";
-    private static final String UIDL_UNSUPPORTED_RESPONSE = "-ERR UIDL unsupported\r\n";
-    private static final String UIDL_SUPPORTED_RESPONSE = "+OK UIDL supported\r\n";
-
-
-    private Pop3Store store;
-    private TrustedSocketFactory mockTrustedSocketFactory = mock(TrustedSocketFactory.class);
-    private Socket mockSocket = mock(Socket.class);
-    private OutputStream mockOutputStream = mock(OutputStream.class);
-
-
-    @Before
-    public void setUp() throws Exception {
-        ServerSettings serverSettings = createServerSettings();
-        when(mockTrustedSocketFactory.createSocket(null, "server", 12345, null)).thenReturn(mockSocket);
-        when(mockSocket.isConnected()).thenReturn(true);
-        when(mockSocket.isClosed()).thenReturn(false);
-
-        when(mockSocket.getOutputStream()).thenReturn(mockOutputStream);
-        store = new Pop3Store(serverSettings, mockTrustedSocketFactory);
-    }
-
-    @Test
-    public void getFolder_shouldReturnSameFolderEachTime() {
-        Pop3Folder folderOne = store.getFolder("TestFolder");
-        Pop3Folder folderTwo = store.getFolder("TestFolder");
-
-        assertSame(folderOne, folderTwo);
-    }
-
-    @Test
-    public void getFolder_shouldReturnFolderWithCorrectName() throws Exception {
-        Pop3Folder folder = store.getFolder("TestFolder");
-
-        assertEquals("TestFolder", folder.getServerId());
-    }
-
-    @Test(expected = MessagingException.class)
-    public void checkSetting_whenConnectionThrowsException_shouldThrowMessagingException()
-            throws Exception {
-        when(mockTrustedSocketFactory.createSocket(any(Socket.class),
-                anyString(), anyInt(), anyString())).thenThrow(new IOException("Test"));
-        store.checkSettings();
-    }
-
-    @Test(expected = MessagingException.class)
-    public void checkSetting_whenUidlUnsupported_shouldThrowMessagingException()
-            throws Exception {
-        String response = INITIAL_RESPONSE +
-                CAPA_RESPONSE +
-                AUTH_PLAIN_AUTHENTICATED_RESPONSE +
-                STAT_RESPONSE +
-                UIDL_UNSUPPORTED_RESPONSE;
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        when(mockSocket.getOutputStream()).thenReturn(byteArrayOutputStream);
-        store.checkSettings();
-    }
-
-    @Test
-    public void checkSetting_whenUidlSupported_shouldReturn()
-            throws Exception {
-        String response = INITIAL_RESPONSE +
-                CAPA_RESPONSE +
-                AUTH_PLAIN_AUTHENTICATED_RESPONSE +
-                STAT_RESPONSE +
-                UIDL_SUPPORTED_RESPONSE;
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        when(mockSocket.getOutputStream()).thenReturn(byteArrayOutputStream);
-        store.checkSettings();
-    }
-
-    // Component Level Tests
-
-    @Test
-    public void open_withAuthResponseUsingAuthPlain_shouldRetrieveMessageCountOnAuthenticatedSocket() throws Exception {
-        String response = INITIAL_RESPONSE +
-                CAPA_RESPONSE +
-                AUTH_PLAIN_AUTHENTICATED_RESPONSE +
-                STAT_RESPONSE;
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
-        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-        when(mockSocket.getOutputStream()).thenReturn(byteArrayOutputStream);
-        Pop3Folder folder = store.getFolder(Pop3Folder.INBOX);
-
-        folder.open();
-
-        assertEquals(20, folder.getMessageCount());
-        assertEquals(CAPA + AUTH_PLAIN_WITH_LOGIN + STAT, byteArrayOutputStream.toString("UTF-8"));
-    }
-
-    @Test(expected = AuthenticationFailedException.class)
-    public void open_withFailedAuth_shouldThrow() throws Exception {
-        String response = INITIAL_RESPONSE +
-                CAPA_RESPONSE +
-                AUTH_PLAIN_FAILED_RESPONSE;
-        when(mockSocket.getInputStream()).thenReturn(new ByteArrayInputStream(response.getBytes("UTF-8")));
-        Pop3Folder folder = store.getFolder(Pop3Folder.INBOX);
-
-        folder.open();
-    }
-
-    private ServerSettings createServerSettings() {
-        return new ServerSettings(
-                "pop3",
-                "server",
-                12345,
-                ConnectionSecurity.SSL_TLS_REQUIRED,
-                AuthType.PLAIN,
-                "user",
-                "password",
-                null);
-    }
-}
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.kt b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.kt
new file mode 100644
index 0000000000000000000000000000000000000000..554f766833394fcd843dc374aab5c708cf3a13ce
--- /dev/null
+++ b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/Pop3StoreTest.kt
@@ -0,0 +1,117 @@
+package com.fsck.k9.mail.store.pop3
+
+import com.fsck.k9.mail.AuthType
+import com.fsck.k9.mail.ConnectionSecurity
+import com.fsck.k9.mail.MessagingException
+import com.fsck.k9.mail.ServerSettings
+import com.fsck.k9.mail.ssl.TrustedSocketFactory
+import com.google.common.truth.Truth.assertThat
+import java.io.ByteArrayOutputStream
+import java.io.IOException
+import java.net.Socket
+import org.junit.Test
+import org.mockito.kotlin.doReturn
+import org.mockito.kotlin.doThrow
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.stubbing
+
+class Pop3StoreTest {
+    private val trustedSocketFactory = mock<TrustedSocketFactory>()
+    private val store: Pop3Store = Pop3Store(createServerSettings(), trustedSocketFactory)
+
+    @Test
+    fun `getFolder() should return same instance every time`() {
+        val folderOne = store.getFolder("TestFolder")
+        val folderTwo = store.getFolder("TestFolder")
+
+        assertThat(folderTwo).isSameInstanceAs(folderOne)
+    }
+
+    @Test
+    fun `getFolder() should return folder with correct server ID`() {
+        val folder = store.getFolder("TestFolder")
+
+        assertThat(folder.serverId).isEqualTo("TestFolder")
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `checkSettings() with TrustedSocketFactory throwing should throw MessagingException`() {
+        stubbing(trustedSocketFactory) {
+            on { createSocket(null, HOST, 12345, null) } doThrow IOException()
+        }
+
+        store.checkSettings()
+    }
+
+    @Test(expected = MessagingException::class)
+    fun `checkSettings() with UIDL command not supported should throw MessagingException`() {
+        setupSocketWithResponse(
+            INITIAL_RESPONSE +
+                CAPA_RESPONSE +
+                AUTH_PLAIN_AUTHENTICATED_RESPONSE +
+                STAT_RESPONSE +
+                UIDL_UNSUPPORTED_RESPONSE
+        )
+
+        store.checkSettings()
+    }
+
+    @Test
+    fun `checkSettings() with UIDL supported`() {
+        setupSocketWithResponse(
+            INITIAL_RESPONSE +
+                CAPA_RESPONSE +
+                AUTH_PLAIN_AUTHENTICATED_RESPONSE +
+                STAT_RESPONSE +
+                UIDL_SUPPORTED_RESPONSE
+        )
+
+        store.checkSettings()
+    }
+
+    private fun createServerSettings(): ServerSettings {
+        return ServerSettings(
+            type = "pop3",
+            host = HOST,
+            port = 12345,
+            connectionSecurity = ConnectionSecurity.SSL_TLS_REQUIRED,
+            authenticationType = AuthType.PLAIN,
+            username = "user",
+            password = "password",
+            clientCertificateAlias = null
+        )
+    }
+
+    private fun setupSocketWithResponse(response: String): ByteArrayOutputStream {
+        val outputStream = ByteArrayOutputStream()
+
+        val socket = mock<Socket> {
+            on { isConnected } doReturn true
+            on { isClosed } doReturn false
+            on { getOutputStream() } doReturn outputStream
+            on { getInputStream() } doReturn response.byteInputStream()
+        }
+
+        stubbing(trustedSocketFactory) {
+            on { createSocket(null, HOST, 12345, null) } doReturn socket
+        }
+
+        return outputStream
+    }
+
+    companion object {
+        private const val HOST = "127.0.0.1"
+        private const val INITIAL_RESPONSE = "+OK POP3 server greeting\r\n"
+
+        private const val CAPA_RESPONSE = "+OK Listing of supported mechanisms follows\r\n" +
+            "SASL PLAIN CRAM-MD5 EXTERNAL\r\n" +
+            ".\r\n"
+
+        private const val AUTH_PLAIN_AUTHENTICATED_RESPONSE = "+OK\r\n" + "+OK\r\n"
+
+        private const val STAT_RESPONSE = "+OK 20 0\r\n"
+
+        private const val UIDL_UNSUPPORTED_RESPONSE = "-ERR UIDL unsupported\r\n"
+        private const val UIDL_SUPPORTED_RESPONSE = "+OK UIDL supported\r\n"
+    }
+}
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParser.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParser.kt
index a7ceefaa10115066087d50416c7d7bf81af14a30..5428e12b7e41bb6008853bf6336e1cfca80bf50b 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParser.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParser.kt
@@ -33,6 +33,8 @@ internal class SmtpResponseParser(
     }
 
     fun readHelloResponse(): SmtpHelloResponse {
+        logBuffer.clear()
+
         val replyCode = readReplyCode()
 
         if (replyCode != 250) {
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
index b62b3a0458e2dff8a75e8b5ce76bee25723a8a8c..eb728642649c62b48d181d676b68f503a37fbd57 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpTransport.kt
@@ -14,7 +14,6 @@ import com.fsck.k9.mail.MessagingException
 import com.fsck.k9.mail.NetworkTimeouts.SOCKET_CONNECT_TIMEOUT
 import com.fsck.k9.mail.NetworkTimeouts.SOCKET_READ_TIMEOUT
 import com.fsck.k9.mail.ServerSettings
-import com.fsck.k9.mail.Transport
 import com.fsck.k9.mail.filter.Base64
 import com.fsck.k9.mail.filter.EOLConvertingOutputStream
 import com.fsck.k9.mail.filter.LineWrapOutputStream
@@ -33,11 +32,13 @@ import java.net.Inet6Address
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.net.Socket
-import java.net.SocketException
+import java.net.UnknownHostException
 import java.security.GeneralSecurityException
+import java.security.cert.CertificateException
 import java.util.Locale
 import javax.net.ssl.SSLException
 import org.apache.commons.io.IOUtils
+import org.jetbrains.annotations.VisibleForTesting
 
 private const val SOCKET_SEND_MESSAGE_READ_TIMEOUT = 5 * 60 * 1000 // 5 minutes
 
@@ -48,7 +49,7 @@ class SmtpTransport(
     serverSettings: ServerSettings,
     private val trustedSocketFactory: TrustedSocketFactory,
     private val oauthTokenProvider: OAuth2TokenProvider?
-) : Transport() {
+) {
     private val host = serverSettings.host
     private val port = serverSettings.port
     private val username = serverSettings.username
@@ -80,38 +81,15 @@ class SmtpTransport(
         require(serverSettings.type == "smtp") { "Expected SMTP ServerSettings!" }
     }
 
+    // TODO: Fix tests to not use open() directly
+    @VisibleForTesting
     @Throws(MessagingException::class)
-    override fun open() {
+    internal fun open() {
         try {
-            var secureConnection = false
-            val addresses = InetAddress.getAllByName(host)
-            for ((index, address) in addresses.withIndex()) {
-                try {
-                    val socketAddress = InetSocketAddress(address, port)
-                    if (connectionSecurity == ConnectionSecurity.SSL_TLS_REQUIRED) {
-                        socket = trustedSocketFactory.createSocket(null, host, port, clientCertificateAlias).also {
-                            it.connect(socketAddress, SOCKET_CONNECT_TIMEOUT)
-                        }
-                        secureConnection = true
-                    } else {
-                        socket = Socket().also {
-                            it.connect(socketAddress, SOCKET_CONNECT_TIMEOUT)
-                        }
-                    }
-                } catch (e: SocketException) {
-                    if (index < addresses.lastIndex) {
-                        // there are still other addresses for that host to try
-                        continue
-                    }
+            var secureConnection = connectionSecurity == ConnectionSecurity.SSL_TLS_REQUIRED
 
-                    throw MessagingException("Cannot connect to host", e)
-                }
-
-                // connection success
-                break
-            }
-
-            val socket = this.socket ?: error("socket == null")
+            val socket = connect()
+            this.socket = socket
 
             socket.soTimeout = SOCKET_READ_TIMEOUT
 
@@ -253,7 +231,11 @@ class SmtpTransport(
             throw e
         } catch (e: SSLException) {
             close()
-            throw CertificateValidationException(e.message, e)
+            if (e.cause is CertificateException) {
+                throw CertificateValidationException(e.message, e)
+            } else {
+                throw e
+            }
         } catch (e: GeneralSecurityException) {
             close()
             throw MessagingException("Unable to open connection to SMTP server due to security error.", e)
@@ -263,6 +245,39 @@ class SmtpTransport(
         }
     }
 
+    private fun connect(): Socket {
+        val inetAddresses = InetAddress.getAllByName(host)
+
+        var connectException: Exception? = null
+        for (address in inetAddresses) {
+            connectException = try {
+                return connectToAddress(address)
+            } catch (e: IOException) {
+                Timber.w(e, "Could not connect to %s", address)
+                e
+            }
+        }
+
+        throw connectException ?: UnknownHostException()
+    }
+
+    private fun connectToAddress(address: InetAddress): Socket {
+        if (K9MailLib.isDebug() && K9MailLib.DEBUG_PROTOCOL_SMTP) {
+            Timber.d("Connecting to %s as %s", host, address)
+        }
+
+        val socketAddress = InetSocketAddress(address, port)
+        val socket = if (connectionSecurity == ConnectionSecurity.SSL_TLS_REQUIRED) {
+            trustedSocketFactory.createSocket(null, host, port, clientCertificateAlias)
+        } else {
+            Socket()
+        }
+
+        socket.connect(socketAddress, SOCKET_CONNECT_TIMEOUT)
+
+        return socket
+    }
+
     private fun readGreeting() {
         val smtpResponse = responseParser!!.readGreeting()
         logResponse(smtpResponse)
@@ -335,7 +350,7 @@ class SmtpTransport(
     }
 
     @Throws(MessagingException::class)
-    override fun sendMessage(message: Message) {
+    fun sendMessage(message: Message) {
         val addresses = buildSet<String> {
             for (address in message.getRecipients(RecipientType.TO)) {
                 add(address.address)
@@ -356,7 +371,7 @@ class SmtpTransport(
 
         message.removeHeader("Bcc")
 
-        close()
+        ensureClosed()
         open()
 
         // If the message has attachments and our server has told us about a limit on the size of messages, count
@@ -427,11 +442,15 @@ class SmtpTransport(
         }
     }
 
-    override fun close() {
-        try {
-            executeCommand("QUIT")
-        } catch (ignored: Exception) {
+    private fun ensureClosed() {
+        if (inputStream != null || outputStream != null || socket != null || responseParser != null) {
+            Timber.w(RuntimeException(), "SmtpTransport was open when it was expected to be closed")
+            close()
         }
+    }
+
+    private fun close() {
+        writeQuitCommand()
 
         IOUtils.closeQuietly(inputStream)
         IOUtils.closeQuietly(outputStream)
@@ -443,6 +462,14 @@ class SmtpTransport(
         socket = null
     }
 
+    private fun writeQuitCommand() {
+        try {
+            // We don't care about the server's response to the QUIT command
+            writeLine("QUIT")
+        } catch (ignored: Exception) {
+        }
+    }
+
     private fun writeLine(command: String, sensitive: Boolean = false) {
         if (K9MailLib.isDebug() && K9MailLib.DEBUG_PROTOCOL_SMTP) {
             val commandToLog = if (sensitive && !K9MailLib.isDebugSensitive()) {
@@ -630,7 +657,7 @@ class SmtpTransport(
 
     @Throws(MessagingException::class)
     fun checkSettings() {
-        close()
+        ensureClosed()
 
         try {
             open()
diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParserTest.kt b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParserTest.kt
index a9d4d3e62ba7609a4a320098072305fd2d069137..75923e5f1b7ea4cf8d96e1085a58433bd2eda9ac 100644
--- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParserTest.kt
+++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseParserTest.kt
@@ -219,6 +219,30 @@ class SmtpResponseParserTest {
             .isEqualTo("Ignoring EHLO keyword line: KEYWORD para${"\t"}meter")
     }
 
+    @Test
+    fun `error in EHLO response after successfully reading greeting`() {
+        val input = """
+            220 Greeting
+            INVALID
+        """.toPeekableInputStream()
+        val parser = SmtpResponseParser(logger, input)
+        parser.readGreeting()
+
+        assertFailsWithMessage("Unexpected character: I (73)") {
+            parser.readHelloResponse()
+        }
+
+        assertThat(logger.logEntries).containsExactly(
+            LogEntry(
+                throwable = null,
+                message = """
+                    SMTP response data on parser error:
+                    I
+                """.trimIndent()
+            )
+        )
+    }
+
     @Test
     fun `positive response`() {
         val input = "200 OK".toPeekableInputStream()
diff --git a/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java b/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
index 7a6fdada9518400921b805d57ce44698152abc7c..aafe20641929be766dbbc68fbe04207536a4ff66 100644
--- a/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
+++ b/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
@@ -11,6 +11,7 @@ import java.net.URISyntaxException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -937,7 +938,8 @@ public class WebDavStore {
         return dataset;
     }
 
-    public void sendMessages(List<Message> messages) throws MessagingException {
+    public void sendMessage(Message message) throws MessagingException {
+        List<Message> messages = Collections.singletonList(message);
         WebDavFolder tmpFolder = getFolder(draftsFolderProvider.getDraftsFolder());
         try {
             tmpFolder.open();
diff --git a/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java b/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java
deleted file mode 100644
index eddf97680d73e9c31a858bb53618cd53b443330d..0000000000000000000000000000000000000000
--- a/mail/protocols/webdav/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.fsck.k9.mail.transport;
-
-
-import java.util.Collections;
-
-import com.fsck.k9.logging.Timber;
-import com.fsck.k9.mail.K9MailLib;
-import com.fsck.k9.mail.Message;
-import com.fsck.k9.mail.MessagingException;
-import com.fsck.k9.mail.ServerSettings;
-import com.fsck.k9.mail.Transport;
-import com.fsck.k9.mail.ssl.TrustManagerFactory;
-import com.fsck.k9.mail.store.webdav.DraftsFolderProvider;
-import com.fsck.k9.mail.store.webdav.SniHostSetter;
-import com.fsck.k9.mail.store.webdav.WebDavStore;
-
-public class WebDavTransport extends Transport {
-    private WebDavStore store;
-
-    public WebDavTransport(TrustManagerFactory trustManagerFactory, SniHostSetter sniHostSetter,
-            ServerSettings serverSettings, DraftsFolderProvider draftsFolderProvider) {
-        store = new WebDavStore(trustManagerFactory, sniHostSetter, serverSettings, draftsFolderProvider);
-
-        if (K9MailLib.isDebug())
-            Timber.d(">>> New WebDavTransport creation complete");
-    }
-
-    @Override
-    public void open() throws MessagingException {
-        if (K9MailLib.isDebug())
-            Timber.d( ">>> open called on WebDavTransport ");
-
-        store.getHttpClient();
-    }
-
-    @Override
-    public void close() {
-    }
-
-    @Override
-    public void sendMessage(Message message) throws MessagingException {
-        store.sendMessages(Collections.singletonList(message));
-    }
-
-    public void checkSettings() throws MessagingException {
-        store.checkSettings();
-    }
-}
diff --git a/settings.gradle b/settings.gradle
index ef71eb59485f61032432b3461d6c521bfa9e6245..2971d3a86690322e63fca379ee4bdb84d01662c8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,6 +2,7 @@ include ':app:k9mail'
 include ':app:ui:base'
 include ':app:ui:setup'
 include ':app:ui:legacy'
+include ':app:ui:message-list-widget'
 include ':app:core'
 include ':app:storage'
 include ':app:crypto-openpgp'
@@ -11,6 +12,8 @@ include ':app:autodiscovery:providersxml'
 include ':app:autodiscovery:srvrecords'
 include ':app:autodiscovery:thunderbird'
 include ':app:html-cleaner'
+include ':ui-utils:LinearLayoutManager'
+include ':ui-utils:ItemTouchHelper'
 include ':mail:common'
 include ':mail:testing'
 include ':mail:protocols:imap'
diff --git a/ui-utils/ItemTouchHelper/build.gradle b/ui-utils/ItemTouchHelper/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..922deebf986711def20e5b55e2114f06279343bd
--- /dev/null
+++ b/ui-utils/ItemTouchHelper/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+dependencies {
+    api "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"
+}
+
+android {
+    namespace 'app.k9mail.ui.utils.itemtouchhelper'
+
+    compileSdkVersion buildConfig.compileSdk
+    buildToolsVersion buildConfig.buildTools
+
+    defaultConfig {
+        minSdkVersion buildConfig.minSdk
+        targetSdkVersion buildConfig.robolectricSdk
+    }
+
+    lintOptions {
+        abortOnError false
+        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+    }
+
+    compileOptions {
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
+    }
+}
diff --git a/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchHelper.java b/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..7a205b1ff8f949400613c77964b41e256017283e
--- /dev/null
+++ b/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchHelper.java
@@ -0,0 +1,2638 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.k9mail.ui.utils.itemtouchhelper; 
+
+import android.animation.Animator;
+import android.animation.ValueAnimator;
+import android.content.res.Resources;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.os.Build;
+import android.util.Log;
+import android.view.GestureDetector;
+import android.view.HapticFeedbackConstants;
+import android.view.MotionEvent;
+import android.view.VelocityTracker;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewParent;
+import android.view.animation.Interpolator;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.core.view.GestureDetectorCompat;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.R;
+import androidx.recyclerview.widget.ItemTouchUIUtil;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnItemTouchListener;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fork of {@link androidx.recyclerview.widget.ItemTouchHelper} that supports horizontal swipe actions that don't
+ * remove the list item. In that case item views are not animated all the way off the screen.
+ * <br>
+ * See {@link Callback#shouldAnimateOut(int)} and {@link Callback#getMaxSwipeDistance(RecyclerView, int)}.
+ */
+public class ItemTouchHelper extends RecyclerView.ItemDecoration
+        implements RecyclerView.OnChildAttachStateChangeListener {
+
+    /**
+     * Up direction, used for swipe & drag control.
+     */
+    public static final int UP = 1;
+
+    /**
+     * Down direction, used for swipe & drag control.
+     */
+    public static final int DOWN = 1 << 1;
+
+    /**
+     * Left direction, used for swipe & drag control.
+     */
+    public static final int LEFT = 1 << 2;
+
+    /**
+     * Right direction, used for swipe & drag control.
+     */
+    public static final int RIGHT = 1 << 3;
+
+    // If you change these relative direction values, update Callback#convertToAbsoluteDirection,
+    // Callback#convertToRelativeDirection.
+    /**
+     * Horizontal start direction. Resolved to LEFT or RIGHT depending on RecyclerView's layout
+     * direction. Used for swipe & drag control.
+     */
+    public static final int START = LEFT << 2;
+
+    /**
+     * Horizontal end direction. Resolved to LEFT or RIGHT depending on RecyclerView's layout
+     * direction. Used for swipe & drag control.
+     */
+    public static final int END = RIGHT << 2;
+
+    /**
+     * Flag that indicates a swipe was performed using a fling.
+     */
+    private static final int FLING = 1 << 20;
+
+    /**
+     * ItemTouchHelper is in idle state. At this state, either there is no related motion event by
+     * the user or latest motion events have not yet triggered a swipe or drag.
+     */
+    public static final int ACTION_STATE_IDLE = 0;
+
+    /**
+     * A View is currently being swiped.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static final int ACTION_STATE_SWIPE = 1;
+
+    /**
+     * A View is currently being dragged.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static final int ACTION_STATE_DRAG = 2;
+
+    /**
+     * Animation type for views which are swiped successfully.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static final int ANIMATION_TYPE_SWIPE_SUCCESS = 1 << 1;
+
+    /**
+     * Animation type for views which are not completely swiped thus will animate back to their
+     * original position.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static final int ANIMATION_TYPE_SWIPE_CANCEL = 1 << 2;
+
+    /**
+     * Animation type for views that were dragged and now will animate to their final position.
+     */
+    @SuppressWarnings("WeakerAccess")
+    public static final int ANIMATION_TYPE_DRAG = 1 << 3;
+
+    private static final String TAG = "ItemTouchHelper";
+
+    private static final boolean DEBUG = false;
+
+    private static final int ACTIVE_POINTER_ID_NONE = -1;
+
+    static final int DIRECTION_FLAG_COUNT = 8;
+
+    private static final int ACTION_MODE_IDLE_MASK = (1 << DIRECTION_FLAG_COUNT) - 1;
+
+    static final int ACTION_MODE_SWIPE_MASK = ACTION_MODE_IDLE_MASK << DIRECTION_FLAG_COUNT;
+
+    static final int ACTION_MODE_DRAG_MASK = ACTION_MODE_SWIPE_MASK << DIRECTION_FLAG_COUNT;
+
+    /**
+     * The unit we are using to track velocity
+     */
+    private static final int PIXELS_PER_SECOND = 1000;
+
+    /**
+     * Views, whose state should be cleared after they are detached from RecyclerView.
+     * This is necessary after swipe dismissing an item. We wait until animator finishes its job
+     * to clean these views.
+     */
+    final List<View> mPendingCleanup = new ArrayList<>();
+
+    /**
+     * Re-use array to calculate dx dy for a ViewHolder
+     */
+    private final float[] mTmpPosition = new float[2];
+
+    /**
+     * Currently selected view holder
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    ViewHolder mSelected = null;
+
+    /**
+     * The reference coordinates for the action start. For drag & drop, this is the time long
+     * press is completed vs for swipe, this is the initial touch point.
+     */
+    float mInitialTouchX;
+
+    float mInitialTouchY;
+
+    /**
+     * Set when ItemTouchHelper is assigned to a RecyclerView.
+     */
+    private float mSwipeEscapeVelocity;
+
+    /**
+     * Set when ItemTouchHelper is assigned to a RecyclerView.
+     */
+    private float mMaxSwipeVelocity;
+
+    /**
+     * The diff between the last event and initial touch.
+     */
+    float mDx;
+
+    float mDy;
+
+    /**
+     * Current swipe direction. Used for {@link Callback#onSwipeDirectionChanged(ViewHolder, int)}
+     */
+    private int mSwipeDirection = 0;
+
+    /**
+     * The coordinates of the selected view at the time it is selected. We record these values
+     * when action starts so that we can consistently position it even if LayoutManager moves the
+     * View.
+     */
+    private float mSelectedStartX;
+
+    private float mSelectedStartY;
+
+    /**
+     * The pointer we are tracking.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    int mActivePointerId = ACTIVE_POINTER_ID_NONE;
+
+    /**
+     * Developer callback which controls the behavior of ItemTouchHelper.
+     */
+    @NonNull
+    Callback mCallback;
+
+    /**
+     * Current mode.
+     */
+    private int mActionState = ACTION_STATE_IDLE;
+
+    /**
+     * The direction flags obtained from unmasking
+     * {@link Callback#getAbsoluteMovementFlags(RecyclerView, ViewHolder)} for the current
+     * action state.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    int mSelectedFlags;
+
+    /**
+     * When a View is dragged or swiped and needs to go back to where it was, we create a Recover
+     * Animation and animate it to its location using this custom Animator, instead of using
+     * framework Animators.
+     * Using framework animators has the side effect of clashing with ItemAnimator, creating
+     * jumpy UIs.
+     */
+    @VisibleForTesting
+    List<RecoverAnimation> mRecoverAnimations = new ArrayList<>();
+
+    private int mSlop;
+
+    RecyclerView mRecyclerView;
+
+    /**
+     * When user drags a view to the edge, we start scrolling the LayoutManager as long as View
+     * is partially out of bounds.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    final Runnable mScrollRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (mSelected != null && scrollIfNecessary()) {
+                if (mSelected != null) { //it might be lost during scrolling
+                    moveIfNecessary(mSelected);
+                }
+                mRecyclerView.removeCallbacks(mScrollRunnable);
+                ViewCompat.postOnAnimation(mRecyclerView, this);
+            }
+        }
+    };
+
+    /**
+     * Used for detecting fling swipe
+     */
+    VelocityTracker mVelocityTracker;
+
+    //re-used list for selecting a swap target
+    private List<ViewHolder> mSwapTargets;
+
+    //re used for for sorting swap targets
+    private List<Integer> mDistances;
+
+    /**
+     * If drag & drop is supported, we use child drawing order to bring them to front.
+     */
+    private RecyclerView.ChildDrawingOrderCallback mChildDrawingOrderCallback = null;
+
+    /**
+     * This keeps a reference to the child dragged by the user. Even after user stops dragging,
+     * until view reaches its final position (end of recover animation), we keep a reference so
+     * that it can be drawn above other children.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    View mOverdrawChild = null;
+
+    /**
+     * We cache the position of the overdraw child to avoid recalculating it each time child
+     * position callback is called. This value is invalidated whenever a child is attached or
+     * detached.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    int mOverdrawChildPosition = -1;
+
+    /**
+     * Used to detect long press.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    GestureDetectorCompat mGestureDetector;
+
+    /**
+     * Callback for when long press occurs.
+     */
+    private ItemTouchHelperGestureListener mItemTouchHelperGestureListener;
+
+    private final OnItemTouchListener mOnItemTouchListener = new OnItemTouchListener() {
+        @Override
+        public boolean onInterceptTouchEvent(@NonNull RecyclerView recyclerView,
+                @NonNull MotionEvent event) {
+            mGestureDetector.onTouchEvent(event);
+            if (DEBUG) {
+                Log.d(TAG, "intercept: x:" + event.getX() + ",y:" + event.getY() + ", " + event);
+            }
+            final int action = event.getActionMasked();
+            if (action == MotionEvent.ACTION_DOWN) {
+                mActivePointerId = event.getPointerId(0);
+                mInitialTouchX = event.getX();
+                mInitialTouchY = event.getY();
+                obtainVelocityTracker();
+                if (mSelected == null) {
+                    final RecoverAnimation animation = findAnimation(event);
+                    if (animation != null) {
+                        mInitialTouchX -= animation.mX;
+                        mInitialTouchY -= animation.mY;
+                        endRecoverAnimation(animation.mViewHolder, true);
+                        if (mPendingCleanup.remove(animation.mViewHolder.itemView)) {
+                            mCallback.clearView(mRecyclerView, animation.mViewHolder);
+                        }
+                        select(animation.mViewHolder, animation.mActionState);
+                        updateDxDy(event, mSelectedFlags, 0);
+                    }
+                }
+            } else if (action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_UP) {
+                mActivePointerId = ACTIVE_POINTER_ID_NONE;
+                select(null, ACTION_STATE_IDLE);
+            } else if (mActivePointerId != ACTIVE_POINTER_ID_NONE) {
+                // in a non scroll orientation, if distance change is above threshold, we
+                // can select the item
+                final int index = event.findPointerIndex(mActivePointerId);
+                if (DEBUG) {
+                    Log.d(TAG, "pointer index " + index);
+                }
+                if (index >= 0) {
+                    checkSelectForSwipe(action, event, index);
+                }
+            }
+            if (mVelocityTracker != null) {
+                mVelocityTracker.addMovement(event);
+            }
+            return mSelected != null;
+        }
+
+        @Override
+        public void onTouchEvent(@NonNull RecyclerView recyclerView, @NonNull MotionEvent event) {
+            mGestureDetector.onTouchEvent(event);
+            if (DEBUG) {
+                Log.d(TAG,
+                        "on touch: x:" + mInitialTouchX + ",y:" + mInitialTouchY + ", :" + event);
+            }
+            if (mVelocityTracker != null) {
+                mVelocityTracker.addMovement(event);
+            }
+            if (mActivePointerId == ACTIVE_POINTER_ID_NONE) {
+                return;
+            }
+            final int action = event.getActionMasked();
+            final int activePointerIndex = event.findPointerIndex(mActivePointerId);
+            if (activePointerIndex >= 0) {
+                checkSelectForSwipe(action, event, activePointerIndex);
+            }
+            ViewHolder viewHolder = mSelected;
+            if (viewHolder == null) {
+                return;
+            }
+            switch (action) {
+                case MotionEvent.ACTION_MOVE: {
+                    // Find the index of the active pointer and fetch its position
+                    if (activePointerIndex >= 0) {
+                        updateDxDy(event, mSelectedFlags, activePointerIndex);
+                        moveIfNecessary(viewHolder);
+                        mRecyclerView.removeCallbacks(mScrollRunnable);
+                        mScrollRunnable.run();
+                        mRecyclerView.invalidate();
+                    }
+                    break;
+                }
+                case MotionEvent.ACTION_CANCEL:
+                    if (mVelocityTracker != null) {
+                        mVelocityTracker.clear();
+                    }
+                    // fall through
+                case MotionEvent.ACTION_UP:
+                    select(null, ACTION_STATE_IDLE);
+                    mActivePointerId = ACTIVE_POINTER_ID_NONE;
+                    break;
+                case MotionEvent.ACTION_POINTER_UP: {
+                    final int pointerIndex = event.getActionIndex();
+                    final int pointerId = event.getPointerId(pointerIndex);
+                    if (pointerId == mActivePointerId) {
+                        // This was our active pointer going up. Choose a new
+                        // active pointer and adjust accordingly.
+                        final int newPointerIndex = pointerIndex == 0 ? 1 : 0;
+                        mActivePointerId = event.getPointerId(newPointerIndex);
+                        updateDxDy(event, mSelectedFlags, pointerIndex);
+                    }
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public void onRequestDisallowInterceptTouchEvent(boolean disallowIntercept) {
+            if (!disallowIntercept) {
+                return;
+            }
+            select(null, ACTION_STATE_IDLE);
+        }
+    };
+
+    /**
+     * Temporary rect instance that is used when we need to lookup Item decorations.
+     */
+    private Rect mTmpRect;
+
+    /**
+     * When user started to drag scroll. Reset when we don't scroll
+     */
+    private long mDragScrollStartTimeInMs;
+
+    /**
+     * Creates an ItemTouchHelper that will work with the given Callback.
+     * <p>
+     * You can attach ItemTouchHelper to a RecyclerView via
+     * {@link #attachToRecyclerView(RecyclerView)}. Upon attaching, it will add an item decoration,
+     * an onItemTouchListener and a Child attach / detach listener to the RecyclerView.
+     *
+     * @param callback The Callback which controls the behavior of this touch helper.
+     */
+    public ItemTouchHelper(@NonNull Callback callback) {
+        mCallback = callback;
+    }
+
+    private static boolean hitTest(View child, float x, float y, float left, float top) {
+        return x >= left
+                && x <= left + child.getWidth()
+                && y >= top
+                && y <= top + child.getHeight();
+    }
+
+    /**
+     * Attaches the ItemTouchHelper to the provided RecyclerView. If TouchHelper is already
+     * attached to a RecyclerView, it will first detach from the previous one. You can call this
+     * method with {@code null} to detach it from the current RecyclerView.
+     *
+     * @param recyclerView The RecyclerView instance to which you want to add this helper or
+     *                     {@code null} if you want to remove ItemTouchHelper from the current
+     *                     RecyclerView.
+     */
+    public void attachToRecyclerView(@Nullable RecyclerView recyclerView) {
+        if (mRecyclerView == recyclerView) {
+            return; // nothing to do
+        }
+        if (mRecyclerView != null) {
+            destroyCallbacks();
+        }
+        mRecyclerView = recyclerView;
+        if (recyclerView != null) {
+            final Resources resources = recyclerView.getResources();
+            mSwipeEscapeVelocity = resources
+                    .getDimension(R.dimen.item_touch_helper_swipe_escape_velocity);
+            mMaxSwipeVelocity = resources
+                    .getDimension(R.dimen.item_touch_helper_swipe_escape_max_velocity);
+            setupCallbacks();
+        }
+    }
+
+    private void setupCallbacks() {
+        ViewConfiguration vc = ViewConfiguration.get(mRecyclerView.getContext());
+        mSlop = vc.getScaledTouchSlop();
+        mRecyclerView.addItemDecoration(this);
+        mRecyclerView.addOnItemTouchListener(mOnItemTouchListener);
+        mRecyclerView.addOnChildAttachStateChangeListener(this);
+        startGestureDetection();
+    }
+
+    private void destroyCallbacks() {
+        mRecyclerView.removeItemDecoration(this);
+        mRecyclerView.removeOnItemTouchListener(mOnItemTouchListener);
+        mRecyclerView.removeOnChildAttachStateChangeListener(this);
+        // clean all attached
+        final int recoverAnimSize = mRecoverAnimations.size();
+        for (int i = recoverAnimSize - 1; i >= 0; i--) {
+            final RecoverAnimation recoverAnimation = mRecoverAnimations.get(0);
+            recoverAnimation.cancel();
+            mCallback.clearView(mRecyclerView, recoverAnimation.mViewHolder);
+        }
+        mRecoverAnimations.clear();
+        mOverdrawChild = null;
+        mOverdrawChildPosition = -1;
+        releaseVelocityTracker();
+        stopGestureDetection();
+    }
+
+    private void startGestureDetection() {
+        mItemTouchHelperGestureListener = new ItemTouchHelperGestureListener();
+        mGestureDetector = new GestureDetectorCompat(mRecyclerView.getContext(),
+                mItemTouchHelperGestureListener);
+    }
+
+    private void stopGestureDetection() {
+        if (mItemTouchHelperGestureListener != null) {
+            mItemTouchHelperGestureListener.doNotReactToLongPress();
+            mItemTouchHelperGestureListener = null;
+        }
+        if (mGestureDetector != null) {
+            mGestureDetector = null;
+        }
+    }
+
+    private void getSelectedDxDy(float[] outPosition) {
+        if ((mSelectedFlags & (LEFT | RIGHT)) != 0) {
+            outPosition[0] = mSelectedStartX + mDx - mSelected.itemView.getLeft();
+        } else {
+            outPosition[0] = mSelected.itemView.getTranslationX();
+        }
+        if ((mSelectedFlags & (UP | DOWN)) != 0) {
+            outPosition[1] = mSelectedStartY + mDy - mSelected.itemView.getTop();
+        } else {
+            outPosition[1] = mSelected.itemView.getTranslationY();
+        }
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        float dx = 0, dy = 0;
+        if (mSelected != null) {
+            getSelectedDxDy(mTmpPosition);
+            dx = mTmpPosition[0];
+            dy = mTmpPosition[1];
+        }
+        mCallback.onDrawOver(c, parent, mSelected,
+                mRecoverAnimations, mActionState, dx, dy);
+    }
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        // we don't know if RV changed something so we should invalidate this index.
+        mOverdrawChildPosition = -1;
+        float dx = 0, dy = 0;
+        if (mSelected != null) {
+            getSelectedDxDy(mTmpPosition);
+            dx = mTmpPosition[0];
+            dy = mTmpPosition[1];
+
+            if ((mSelectedFlags & (LEFT | RIGHT)) != 0 && dx != 0) {
+                dx = limitDeltaX(parent, dx);
+            }
+
+            if (dx != 0) {
+                int direction = dx > 0 ? RIGHT : LEFT;
+                if (direction != mSwipeDirection) {
+                    mSwipeDirection = direction;
+                    mCallback.onSwipeDirectionChanged(mSelected, direction);
+                }
+            }
+        }
+
+        mCallback.onDraw(c, parent, mSelected,
+                mRecoverAnimations, mActionState, dx, dy);
+    }
+
+    private float limitDeltaX(RecyclerView recyclerView, float deltaX) {
+        int swipeDirection = deltaX > 0 ? RIGHT : LEFT;
+        if (!mCallback.shouldAnimateOut(swipeDirection)) {
+            int maxWidth = mCallback.getMaxSwipeDistance(recyclerView, swipeDirection);
+            deltaX = Math.abs(deltaX) > maxWidth ? Math.signum(deltaX) * maxWidth : deltaX;
+        }
+
+        return deltaX;
+    }
+
+    /**
+     * Starts dragging or swiping the given View. Call with null if you want to clear it.
+     *
+     * @param selected    The ViewHolder to drag or swipe. Can be null if you want to cancel the
+     *                    current action, but may not be null if actionState is ACTION_STATE_DRAG.
+     * @param actionState The type of action
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void select(@Nullable ViewHolder selected, int actionState) {
+        if (selected == mSelected && actionState == mActionState) {
+            return;
+        }
+
+        mDragScrollStartTimeInMs = Long.MIN_VALUE;
+        final int prevActionState = mActionState;
+        // prevent duplicate animations
+        endRecoverAnimation(selected, true);
+        mActionState = actionState;
+        if (actionState == ACTION_STATE_DRAG) {
+            if (selected == null) {
+                throw new IllegalArgumentException("Must pass a ViewHolder when dragging");
+            }
+
+            // we remove after animation is complete. this means we only elevate the last drag
+            // child but that should perform good enough as it is very hard to start dragging a
+            // new child before the previous one settles.
+            mOverdrawChild = selected.itemView;
+            addChildDrawingOrderCallback();
+        }
+        int actionStateMask = (1 << (DIRECTION_FLAG_COUNT + DIRECTION_FLAG_COUNT * actionState))
+                - 1;
+        boolean preventLayout = false;
+
+        if (mSelected != null) {
+            final ViewHolder prevSelected = mSelected;
+            if (prevSelected.itemView.getParent() != null) {
+                final int swipeFlags = prevActionState == ACTION_STATE_DRAG ? 0
+                        : swipeIfNecessary(prevSelected);
+                final boolean wasFling = (swipeFlags & FLING) != 0;
+                final int swipeDir = swipeFlags & ~FLING;
+                releaseVelocityTracker();
+
+                getSelectedDxDy(mTmpPosition);
+                final float currentTranslateX = limitDeltaX(mRecyclerView, mTmpPosition[0]);
+                final float currentTranslateY = mTmpPosition[1];
+
+                final int animationType;
+                if (prevActionState == ACTION_STATE_DRAG) {
+                    animationType = ANIMATION_TYPE_DRAG;
+                } else if (swipeDir > 0) {
+                    animationType = ANIMATION_TYPE_SWIPE_SUCCESS;
+                } else {
+                    animationType = ANIMATION_TYPE_SWIPE_CANCEL;
+                }
+
+                final RecoverAnimation animation;
+                final boolean useDefaultDuration;
+                switch (swipeDir) {
+                    case LEFT:
+                    case RIGHT:
+                    case START:
+                    case END:
+                        if (mCallback.shouldAnimateOut(swipeDir)) {
+                            float targetTranslateX = Math.signum(mDx) * mRecyclerView.getWidth();
+
+                            animation = new MoveOutAnimation(prevSelected, animationType, prevActionState,
+                                    currentTranslateX, currentTranslateY, targetTranslateX, currentTranslateY, swipeDir,
+                                    /* moveBackAfterwards */ false);
+
+                            useDefaultDuration = true;
+                        } else if (wasFling) {
+                            int maxSwipeDistance = mCallback.getMaxSwipeDistance(mRecyclerView, swipeDir);
+                            float targetTranslateX = Math.signum(mDx) * maxSwipeDistance;
+
+                            animation = new MoveOutAnimation(prevSelected, animationType, prevActionState,
+                                    currentTranslateX, currentTranslateY, targetTranslateX, currentTranslateY, swipeDir,
+                                    /* moveBackAfterwards */ true);
+
+                            useDefaultDuration = true;
+                        } else {
+                            // This is a dummy animation to ensure mCallback.onChildDraw() calls will be made even if
+                            // the animating back part is delayed.
+                            animation = new MoveOutAnimation(prevSelected, animationType, prevActionState,
+                                    currentTranslateX, currentTranslateY, currentTranslateX, currentTranslateY,
+                                    swipeDir, /* moveBackAfterwards */ true);
+
+                            animation.setDuration(0);
+                            useDefaultDuration = false;
+                        }
+                        break;
+                    case UP:
+                    case DOWN:
+                        throw new UnsupportedOperationException();
+                    default:
+                        animation = new MoveBackAnimation(prevSelected, animationType, prevActionState,
+                                currentTranslateX, currentTranslateY);
+                        useDefaultDuration = true;
+                }
+
+                if (useDefaultDuration) {
+                    long duration = mCallback.getAnimationDuration(mRecyclerView, animationType,
+                            animation.mTargetX - animation.mStartDx, animation.mTargetY - animation.mStartDy);
+                    animation.setDuration(duration);
+                }
+
+                mRecoverAnimations.add(animation);
+                animation.start();
+
+                preventLayout = true;
+            } else {
+                removeChildDrawingOrderCallbackIfNecessary(prevSelected.itemView);
+                mCallback.clearView(mRecyclerView, prevSelected);
+            }
+            mSelected = null;
+        }
+        if (selected != null) {
+            mSelectedFlags =
+                    (mCallback.getAbsoluteMovementFlags(mRecyclerView, selected) & actionStateMask)
+                            >> (mActionState * DIRECTION_FLAG_COUNT);
+            mSelectedStartX = selected.itemView.getLeft();
+            mSelectedStartY = selected.itemView.getTop();
+            mSelected = selected;
+
+            if (actionState == ACTION_STATE_DRAG) {
+                mSelected.itemView.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
+            }
+        }
+        final ViewParent rvParent = mRecyclerView.getParent();
+        if (rvParent != null) {
+            rvParent.requestDisallowInterceptTouchEvent(mSelected != null);
+        }
+        if (!preventLayout) {
+            mRecyclerView.getLayoutManager().requestSimpleAnimationsInNextLayout();
+        }
+        mCallback.onSelectedChanged(mSelected, mActionState);
+        mRecyclerView.invalidate();
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void postDispatchSwipe(final RecoverAnimation anim, final int swipeDir, final boolean moveBackAfterwards) {
+        // wait until animations are complete.
+        mRecyclerView.post(new Runnable() {
+            @Override
+            public void run() {
+                if (mRecyclerView != null && mRecyclerView.isAttachedToWindow()
+                        && !anim.mOverridden
+                        && anim.mViewHolder.getAbsoluteAdapterPosition()
+                        != RecyclerView.NO_POSITION) {
+                    final RecyclerView.ItemAnimator animator = mRecyclerView.getItemAnimator();
+                    // if animator is running or we have other active recover animations, we try
+                    // not to call onSwiped because DefaultItemAnimator is not good at merging
+                    // animations. Instead, we wait and batch.
+                    if ((animator == null || !animator.isRunning(null))
+                            && !hasRunningRecoverAnim()) {
+                        mCallback.onSwiped(anim.mViewHolder, swipeDir);
+                        if (moveBackAfterwards) {
+                            startMoveBackAnimation(anim);
+                        } else {
+                            mCallback.onSwipeEnded(anim.mViewHolder);
+                        }
+                    } else {
+                        mRecyclerView.post(this);
+                    }
+                }
+            }
+        });
+    }
+
+    private void startMoveBackAnimation(RecoverAnimation animation) {
+        MoveBackAnimation moveBackAnimation = new MoveBackAnimation(animation.mViewHolder, animation.mAnimationType,
+                animation.mActionState, animation.mTargetX, animation.mTargetY);
+
+        long duration = mCallback.getAnimationDuration(mRecyclerView, animation.mAnimationType,
+                -animation.mTargetX, -animation.mTargetY);
+        moveBackAnimation.setDuration(duration);
+
+        mRecoverAnimations.remove(animation);
+        mRecoverAnimations.add(moveBackAnimation);
+
+        moveBackAnimation.start();
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    boolean hasRunningRecoverAnim() {
+        final int size = mRecoverAnimations.size();
+        for (int i = 0; i < size; i++) {
+            if (!mRecoverAnimations.get(i).mEnded) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * If user drags the view to the edge, trigger a scroll if necessary.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    boolean scrollIfNecessary() {
+        if (mSelected == null) {
+            mDragScrollStartTimeInMs = Long.MIN_VALUE;
+            return false;
+        }
+        final long now = System.currentTimeMillis();
+        final long scrollDuration = mDragScrollStartTimeInMs
+                == Long.MIN_VALUE ? 0 : now - mDragScrollStartTimeInMs;
+        RecyclerView.LayoutManager lm = mRecyclerView.getLayoutManager();
+        if (mTmpRect == null) {
+            mTmpRect = new Rect();
+        }
+        int scrollX = 0;
+        int scrollY = 0;
+        lm.calculateItemDecorationsForChild(mSelected.itemView, mTmpRect);
+        if (lm.canScrollHorizontally()) {
+            int curX = (int) (mSelectedStartX + mDx);
+            final int leftDiff = curX - mTmpRect.left - mRecyclerView.getPaddingLeft();
+            if (mDx < 0 && leftDiff < 0) {
+                scrollX = leftDiff;
+            } else if (mDx > 0) {
+                final int rightDiff =
+                        curX + mSelected.itemView.getWidth() + mTmpRect.right
+                                - (mRecyclerView.getWidth() - mRecyclerView.getPaddingRight());
+                if (rightDiff > 0) {
+                    scrollX = rightDiff;
+                }
+            }
+        }
+        if (lm.canScrollVertically()) {
+            int curY = (int) (mSelectedStartY + mDy);
+            final int topDiff = curY - mTmpRect.top - mRecyclerView.getPaddingTop();
+            if (mDy < 0 && topDiff < 0) {
+                scrollY = topDiff;
+            } else if (mDy > 0) {
+                final int bottomDiff = curY + mSelected.itemView.getHeight() + mTmpRect.bottom
+                        - (mRecyclerView.getHeight() - mRecyclerView.getPaddingBottom());
+                if (bottomDiff > 0) {
+                    scrollY = bottomDiff;
+                }
+            }
+        }
+        if (scrollX != 0) {
+            scrollX = mCallback.interpolateOutOfBoundsScroll(mRecyclerView,
+                    mSelected.itemView.getWidth(), scrollX,
+                    mRecyclerView.getWidth(), scrollDuration);
+        }
+        if (scrollY != 0) {
+            scrollY = mCallback.interpolateOutOfBoundsScroll(mRecyclerView,
+                    mSelected.itemView.getHeight(), scrollY,
+                    mRecyclerView.getHeight(), scrollDuration);
+        }
+        if (scrollX != 0 || scrollY != 0) {
+            if (mDragScrollStartTimeInMs == Long.MIN_VALUE) {
+                mDragScrollStartTimeInMs = now;
+            }
+            mRecyclerView.scrollBy(scrollX, scrollY);
+            return true;
+        }
+        mDragScrollStartTimeInMs = Long.MIN_VALUE;
+        return false;
+    }
+
+    private List<ViewHolder> findSwapTargets(ViewHolder viewHolder) {
+        if (mSwapTargets == null) {
+            mSwapTargets = new ArrayList<>();
+            mDistances = new ArrayList<>();
+        } else {
+            mSwapTargets.clear();
+            mDistances.clear();
+        }
+        final int margin = mCallback.getBoundingBoxMargin();
+        final int left = Math.round(mSelectedStartX + mDx) - margin;
+        final int top = Math.round(mSelectedStartY + mDy) - margin;
+        final int right = left + viewHolder.itemView.getWidth() + 2 * margin;
+        final int bottom = top + viewHolder.itemView.getHeight() + 2 * margin;
+        final int centerX = (left + right) / 2;
+        final int centerY = (top + bottom) / 2;
+        final RecyclerView.LayoutManager lm = mRecyclerView.getLayoutManager();
+        final int childCount = lm.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            View other = lm.getChildAt(i);
+            if (other == viewHolder.itemView) {
+                continue; //myself!
+            }
+            if (other.getBottom() < top || other.getTop() > bottom
+                    || other.getRight() < left || other.getLeft() > right) {
+                continue;
+            }
+            final ViewHolder otherVh = mRecyclerView.getChildViewHolder(other);
+            if (mCallback.canDropOver(mRecyclerView, mSelected, otherVh)) {
+                // find the index to add
+                final int dx = Math.abs(centerX - (other.getLeft() + other.getRight()) / 2);
+                final int dy = Math.abs(centerY - (other.getTop() + other.getBottom()) / 2);
+                final int dist = dx * dx + dy * dy;
+
+                int pos = 0;
+                final int cnt = mSwapTargets.size();
+                for (int j = 0; j < cnt; j++) {
+                    if (dist > mDistances.get(j)) {
+                        pos++;
+                    } else {
+                        break;
+                    }
+                }
+                mSwapTargets.add(pos, otherVh);
+                mDistances.add(pos, dist);
+            }
+        }
+        return mSwapTargets;
+    }
+
+    /**
+     * Checks if we should swap w/ another view holder.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void moveIfNecessary(ViewHolder viewHolder) {
+        if (mRecyclerView.isLayoutRequested()) {
+            return;
+        }
+        if (mActionState != ACTION_STATE_DRAG) {
+            return;
+        }
+
+        final float threshold = mCallback.getMoveThreshold(viewHolder);
+        final int x = (int) (mSelectedStartX + mDx);
+        final int y = (int) (mSelectedStartY + mDy);
+        if (Math.abs(y - viewHolder.itemView.getTop()) < viewHolder.itemView.getHeight() * threshold
+                && Math.abs(x - viewHolder.itemView.getLeft())
+                < viewHolder.itemView.getWidth() * threshold) {
+            return;
+        }
+        List<ViewHolder> swapTargets = findSwapTargets(viewHolder);
+        if (swapTargets.size() == 0) {
+            return;
+        }
+        // may swap.
+        ViewHolder target = mCallback.chooseDropTarget(viewHolder, swapTargets, x, y);
+        if (target == null) {
+            mSwapTargets.clear();
+            mDistances.clear();
+            return;
+        }
+        final int toPosition = target.getAbsoluteAdapterPosition();
+        final int fromPosition = viewHolder.getAbsoluteAdapterPosition();
+        if (mCallback.onMove(mRecyclerView, viewHolder, target)) {
+            // keep target visible
+            mCallback.onMoved(mRecyclerView, viewHolder, fromPosition,
+                    target, toPosition, x, y);
+        }
+    }
+
+    @Override
+    public void onChildViewAttachedToWindow(@NonNull View view) {
+    }
+
+    @Override
+    public void onChildViewDetachedFromWindow(@NonNull View view) {
+        resetSwipeView(view);
+    }
+
+    private void resetSwipeView(@NonNull View view) {
+        removeChildDrawingOrderCallbackIfNecessary(view);
+        final ViewHolder holder = mRecyclerView.getChildViewHolder(view);
+        if (holder == null) {
+            return;
+        }
+        if (mSelected != null && holder == mSelected) {
+            select(null, ACTION_STATE_IDLE);
+        } else {
+            endRecoverAnimation(holder, false); // this may push it into pending cleanup list.
+            if (mPendingCleanup.remove(holder.itemView)) {
+                mCallback.clearView(mRecyclerView, holder);
+            }
+        }
+    }
+
+    public void stopSwipe(@NonNull ViewHolder viewHolder) {
+        resetSwipeView(viewHolder.itemView);
+    }
+
+    /**
+     * Returns the animation type or 0 if cannot be found.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void endRecoverAnimation(ViewHolder viewHolder, boolean override) {
+        final int recoverAnimSize = mRecoverAnimations.size();
+        for (int i = recoverAnimSize - 1; i >= 0; i--) {
+            final RecoverAnimation anim = mRecoverAnimations.get(i);
+            if (anim.mViewHolder == viewHolder) {
+                anim.mOverridden |= override;
+                if (!anim.mEnded) {
+                    anim.cancel();
+                }
+                mRecoverAnimations.remove(i);
+                return;
+            }
+        }
+    }
+
+    @Override
+    public void getItemOffsets(Rect outRect, View view, RecyclerView parent,
+            RecyclerView.State state) {
+        outRect.setEmpty();
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void obtainVelocityTracker() {
+        if (mVelocityTracker != null) {
+            mVelocityTracker.recycle();
+        }
+        mVelocityTracker = VelocityTracker.obtain();
+    }
+
+    private void releaseVelocityTracker() {
+        if (mVelocityTracker != null) {
+            mVelocityTracker.recycle();
+            mVelocityTracker = null;
+        }
+    }
+
+    private ViewHolder findSwipedView(MotionEvent motionEvent) {
+        final RecyclerView.LayoutManager lm = mRecyclerView.getLayoutManager();
+        if (mActivePointerId == ACTIVE_POINTER_ID_NONE) {
+            return null;
+        }
+        final int pointerIndex = motionEvent.findPointerIndex(mActivePointerId);
+        final float dx = motionEvent.getX(pointerIndex) - mInitialTouchX;
+        final float dy = motionEvent.getY(pointerIndex) - mInitialTouchY;
+        final float absDx = Math.abs(dx);
+        final float absDy = Math.abs(dy);
+
+        if (absDx < mSlop && absDy < mSlop) {
+            return null;
+        }
+        if (absDx > absDy && lm.canScrollHorizontally()) {
+            return null;
+        } else if (absDy > absDx && lm.canScrollVertically()) {
+            return null;
+        }
+        View child = findChildView(motionEvent);
+        if (child == null) {
+            return null;
+        }
+        return mRecyclerView.getChildViewHolder(child);
+    }
+
+    /**
+     * Checks whether we should select a View for swiping.
+     */
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void checkSelectForSwipe(int action, MotionEvent motionEvent, int pointerIndex) {
+        if (mSelected != null || action != MotionEvent.ACTION_MOVE
+                || mActionState == ACTION_STATE_DRAG || !mCallback.isItemViewSwipeEnabled()) {
+            return;
+        }
+        if (mRecyclerView.getScrollState() == RecyclerView.SCROLL_STATE_DRAGGING) {
+            return;
+        }
+        final ViewHolder vh = findSwipedView(motionEvent);
+        if (vh == null) {
+            return;
+        }
+        final int movementFlags = mCallback.getAbsoluteMovementFlags(mRecyclerView, vh);
+
+        final int swipeFlags = (movementFlags & ACTION_MODE_SWIPE_MASK)
+                >> (DIRECTION_FLAG_COUNT * ACTION_STATE_SWIPE);
+
+        if (swipeFlags == 0) {
+            return;
+        }
+
+        // mDx and mDy are only set in allowed directions. We use custom x/y here instead of
+        // updateDxDy to avoid swiping if user moves more in the other direction
+        final float x = motionEvent.getX(pointerIndex);
+        final float y = motionEvent.getY(pointerIndex);
+
+        // Calculate the distance moved
+        final float dx = x - mInitialTouchX;
+        final float dy = y - mInitialTouchY;
+        // swipe target is chose w/o applying flags so it does not really check if swiping in that
+        // direction is allowed. This why here, we use mDx mDy to check slope value again.
+        final float absDx = Math.abs(dx);
+        final float absDy = Math.abs(dy);
+
+        if (absDx < mSlop && absDy < mSlop) {
+            return;
+        }
+        if (absDx > absDy) {
+            if (dx < 0 && (swipeFlags & LEFT) == 0) {
+                return;
+            }
+            if (dx > 0 && (swipeFlags & RIGHT) == 0) {
+                return;
+            }
+        } else {
+            if (dy < 0 && (swipeFlags & UP) == 0) {
+                return;
+            }
+            if (dy > 0 && (swipeFlags & DOWN) == 0) {
+                return;
+            }
+        }
+        mDx = mDy = 0f;
+        mActivePointerId = motionEvent.getPointerId(0);
+
+        mSwipeDirection = dx > 0 ? RIGHT : LEFT;
+        mCallback.onSwipeStarted(vh, mSwipeDirection);
+
+        select(vh, ACTION_STATE_SWIPE);
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    View findChildView(MotionEvent event) {
+        // first check elevated views, if none, then call RV
+        final float x = event.getX();
+        final float y = event.getY();
+        if (mSelected != null) {
+            final View selectedView = mSelected.itemView;
+            if (hitTest(selectedView, x, y, mSelectedStartX + mDx, mSelectedStartY + mDy)) {
+                return selectedView;
+            }
+        }
+        for (int i = mRecoverAnimations.size() - 1; i >= 0; i--) {
+            final RecoverAnimation anim = mRecoverAnimations.get(i);
+            final View view = anim.mViewHolder.itemView;
+            if (hitTest(view, x, y, anim.mX, anim.mY)) {
+                return view;
+            }
+        }
+        return mRecyclerView.findChildViewUnder(x, y);
+    }
+
+    /**
+     * Starts dragging the provided ViewHolder. By default, ItemTouchHelper starts a drag when a
+     * View is long pressed. You can disable that behavior by overriding
+     * {@link ItemTouchHelper.Callback#isLongPressDragEnabled()}.
+     * <p>
+     * For this method to work:
+     * <ul>
+     * <li>The provided ViewHolder must be a child of the RecyclerView to which this
+     * ItemTouchHelper
+     * is attached.</li>
+     * <li>{@link ItemTouchHelper.Callback} must have dragging enabled.</li>
+     * <li>There must be a previous touch event that was reported to the ItemTouchHelper
+     * through RecyclerView's ItemTouchListener mechanism. As long as no other ItemTouchListener
+     * grabs previous events, this should work as expected.</li>
+     * </ul>
+     *
+     * For example, if you would like to let your user to be able to drag an Item by touching one
+     * of its descendants, you may implement it as follows:
+     * <pre>
+     *     viewHolder.dragButton.setOnTouchListener(new View.OnTouchListener() {
+     *         public boolean onTouch(View v, MotionEvent event) {
+     *             if (MotionEvent.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+     *                 mItemTouchHelper.startDrag(viewHolder);
+     *             }
+     *             return false;
+     *         }
+     *     });
+     * </pre>
+     * <p>
+     *
+     * @param viewHolder The ViewHolder to start dragging. It must be a direct child of
+     *                   RecyclerView.
+     * @see ItemTouchHelper.Callback#isItemViewSwipeEnabled()
+     */
+    public void startDrag(@NonNull ViewHolder viewHolder) {
+        if (!mCallback.hasDragFlag(mRecyclerView, viewHolder)) {
+            Log.e(TAG, "Start drag has been called but dragging is not enabled");
+            return;
+        }
+        if (viewHolder.itemView.getParent() != mRecyclerView) {
+            Log.e(TAG, "Start drag has been called with a view holder which is not a child of "
+                    + "the RecyclerView which is controlled by this ItemTouchHelper.");
+            return;
+        }
+        obtainVelocityTracker();
+        mDx = mDy = 0f;
+        select(viewHolder, ACTION_STATE_DRAG);
+    }
+
+    /**
+     * Starts swiping the provided ViewHolder. By default, ItemTouchHelper starts swiping a View
+     * when user swipes their finger (or mouse pointer) over the View. You can disable this
+     * behavior
+     * by overriding {@link ItemTouchHelper.Callback}
+     * <p>
+     * For this method to work:
+     * <ul>
+     * <li>The provided ViewHolder must be a child of the RecyclerView to which this
+     * ItemTouchHelper is attached.</li>
+     * <li>{@link ItemTouchHelper.Callback} must have swiping enabled.</li>
+     * <li>There must be a previous touch event that was reported to the ItemTouchHelper
+     * through RecyclerView's ItemTouchListener mechanism. As long as no other ItemTouchListener
+     * grabs previous events, this should work as expected.</li>
+     * </ul>
+     *
+     * For example, if you would like to let your user to be able to swipe an Item by touching one
+     * of its descendants, you may implement it as follows:
+     * <pre>
+     *     viewHolder.dragButton.setOnTouchListener(new View.OnTouchListener() {
+     *         public boolean onTouch(View v, MotionEvent event) {
+     *             if (MotionEvent.getActionMasked(event) == MotionEvent.ACTION_DOWN) {
+     *                 mItemTouchHelper.startSwipe(viewHolder);
+     *             }
+     *             return false;
+     *         }
+     *     });
+     * </pre>
+     *
+     * @param viewHolder The ViewHolder to start swiping. It must be a direct child of
+     *                   RecyclerView.
+     */
+    public void startSwipe(@NonNull ViewHolder viewHolder) {
+        if (!mCallback.hasSwipeFlag(mRecyclerView, viewHolder)) {
+            Log.e(TAG, "Start swipe has been called but swiping is not enabled");
+            return;
+        }
+        if (viewHolder.itemView.getParent() != mRecyclerView) {
+            Log.e(TAG, "Start swipe has been called with a view holder which is not a child of "
+                    + "the RecyclerView controlled by this ItemTouchHelper.");
+            return;
+        }
+        obtainVelocityTracker();
+        mDx = mDy = 0f;
+        select(viewHolder, ACTION_STATE_SWIPE);
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    RecoverAnimation findAnimation(MotionEvent event) {
+        if (mRecoverAnimations.isEmpty()) {
+            return null;
+        }
+        View target = findChildView(event);
+        for (int i = mRecoverAnimations.size() - 1; i >= 0; i--) {
+            final RecoverAnimation anim = mRecoverAnimations.get(i);
+            if (anim.mViewHolder.itemView == target) {
+                return anim;
+            }
+        }
+        return null;
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void updateDxDy(MotionEvent ev, int directionFlags, int pointerIndex) {
+        final float x = ev.getX(pointerIndex);
+        final float y = ev.getY(pointerIndex);
+
+        // Calculate the distance moved
+        mDx = x - mInitialTouchX;
+        mDy = y - mInitialTouchY;
+        if ((directionFlags & LEFT) == 0) {
+            mDx = Math.max(0, mDx);
+        }
+        if ((directionFlags & RIGHT) == 0) {
+            mDx = Math.min(0, mDx);
+        }
+        if ((directionFlags & UP) == 0) {
+            mDy = Math.max(0, mDy);
+        }
+        if ((directionFlags & DOWN) == 0) {
+            mDy = Math.min(0, mDy);
+        }
+    }
+
+    private int swipeIfNecessary(ViewHolder viewHolder) {
+        if (mActionState == ACTION_STATE_DRAG) {
+            return 0;
+        }
+        final int originalMovementFlags = mCallback.getMovementFlags(mRecyclerView, viewHolder);
+        final int absoluteMovementFlags = mCallback.convertToAbsoluteDirection(
+                originalMovementFlags,
+                ViewCompat.getLayoutDirection(mRecyclerView));
+        final int flags = (absoluteMovementFlags
+                & ACTION_MODE_SWIPE_MASK) >> (ACTION_STATE_SWIPE * DIRECTION_FLAG_COUNT);
+        if (flags == 0) {
+            return 0;
+        }
+        final int originalFlags = (originalMovementFlags
+                & ACTION_MODE_SWIPE_MASK) >> (ACTION_STATE_SWIPE * DIRECTION_FLAG_COUNT);
+        int swipeFlags;
+        if (Math.abs(mDx) > Math.abs(mDy)) {
+            if ((swipeFlags = checkHorizontalSwipe(viewHolder, flags)) > 0) {
+                int fling = swipeFlags & FLING;
+                int swipeDir = swipeFlags & ~FLING;
+                // if swipe dir is not in original flags, it should be the relative direction
+                if ((originalFlags & swipeDir) == 0) {
+                    // convert to relative
+                    return Callback.convertToRelativeDirection(swipeDir,
+                            ViewCompat.getLayoutDirection(mRecyclerView)) | fling;
+                }
+                return swipeFlags;
+            }
+            if ((swipeFlags = checkVerticalSwipe(viewHolder, flags)) > 0) {
+                return swipeFlags;
+            }
+        } else {
+            if ((swipeFlags = checkVerticalSwipe(viewHolder, flags)) > 0) {
+                return swipeFlags;
+            }
+            if ((swipeFlags = checkHorizontalSwipe(viewHolder, flags)) > 0) {
+                int fling = swipeFlags & FLING;
+                int swipeDir = swipeFlags & ~FLING;
+                // if swipe dir is not in original flags, it should be the relative direction
+                if ((originalFlags & swipeDir) == 0) {
+                    // convert to relative
+                    return Callback.convertToRelativeDirection(swipeDir,
+                            ViewCompat.getLayoutDirection(mRecyclerView)) | fling;
+                }
+                return swipeFlags;
+            }
+        }
+        return 0;
+    }
+
+    private int checkHorizontalSwipe(ViewHolder viewHolder, int flags) {
+        if ((flags & (LEFT | RIGHT)) != 0) {
+            final int dirFlag = mDx > 0 ? RIGHT : LEFT;
+            if (mVelocityTracker != null && mActivePointerId > -1) {
+                mVelocityTracker.computeCurrentVelocity(PIXELS_PER_SECOND,
+                        mCallback.getSwipeVelocityThreshold(mMaxSwipeVelocity));
+                final float xVelocity = mVelocityTracker.getXVelocity(mActivePointerId);
+                final float yVelocity = mVelocityTracker.getYVelocity(mActivePointerId);
+                final int velDirFlag = xVelocity > 0f ? RIGHT : LEFT;
+                final float absXVelocity = Math.abs(xVelocity);
+                if ((velDirFlag & flags) != 0 && dirFlag == velDirFlag
+                        && absXVelocity >= mCallback.getSwipeEscapeVelocity(mSwipeEscapeVelocity)
+                        && absXVelocity > Math.abs(yVelocity)) {
+                    return velDirFlag | FLING;
+                }
+            }
+
+            final float threshold = mRecyclerView.getWidth() * mCallback
+                    .getSwipeThreshold(viewHolder);
+
+            if ((flags & dirFlag) != 0 && Math.abs(mDx) > threshold) {
+                return dirFlag;
+            }
+        }
+        return 0;
+    }
+
+    private int checkVerticalSwipe(ViewHolder viewHolder, int flags) {
+        if ((flags & (UP | DOWN)) != 0) {
+            final int dirFlag = mDy > 0 ? DOWN : UP;
+            if (mVelocityTracker != null && mActivePointerId > -1) {
+                mVelocityTracker.computeCurrentVelocity(PIXELS_PER_SECOND,
+                        mCallback.getSwipeVelocityThreshold(mMaxSwipeVelocity));
+                final float xVelocity = mVelocityTracker.getXVelocity(mActivePointerId);
+                final float yVelocity = mVelocityTracker.getYVelocity(mActivePointerId);
+                final int velDirFlag = yVelocity > 0f ? DOWN : UP;
+                final float absYVelocity = Math.abs(yVelocity);
+                if ((velDirFlag & flags) != 0 && velDirFlag == dirFlag
+                        && absYVelocity >= mCallback.getSwipeEscapeVelocity(mSwipeEscapeVelocity)
+                        && absYVelocity > Math.abs(xVelocity)) {
+                    return velDirFlag;
+                }
+            }
+
+            final float threshold = mRecyclerView.getHeight() * mCallback
+                    .getSwipeThreshold(viewHolder);
+            if ((flags & dirFlag) != 0 && Math.abs(mDy) > threshold) {
+                return dirFlag;
+            }
+        }
+        return 0;
+    }
+
+    private void addChildDrawingOrderCallback() {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return; // we use elevation on Lollipop
+        }
+        if (mChildDrawingOrderCallback == null) {
+            mChildDrawingOrderCallback = new RecyclerView.ChildDrawingOrderCallback() {
+                @Override
+                public int onGetChildDrawingOrder(int childCount, int i) {
+                    if (mOverdrawChild == null) {
+                        return i;
+                    }
+                    int childPosition = mOverdrawChildPosition;
+                    if (childPosition == -1) {
+                        childPosition = mRecyclerView.indexOfChild(mOverdrawChild);
+                        mOverdrawChildPosition = childPosition;
+                    }
+                    if (i == childCount - 1) {
+                        return childPosition;
+                    }
+                    return i < childPosition ? i : i + 1;
+                }
+            };
+        }
+        mRecyclerView.setChildDrawingOrderCallback(mChildDrawingOrderCallback);
+    }
+
+    @SuppressWarnings("WeakerAccess") /* synthetic access */
+    void removeChildDrawingOrderCallbackIfNecessary(View view) {
+        if (view == mOverdrawChild) {
+            mOverdrawChild = null;
+            // only remove if we've added
+            if (mChildDrawingOrderCallback != null) {
+                mRecyclerView.setChildDrawingOrderCallback(null);
+            }
+        }
+    }
+
+    /**
+     * An interface which can be implemented by LayoutManager for better integration with
+     * {@link ItemTouchHelper}.
+     */
+    public interface ViewDropHandler {
+
+        /**
+         * Called by the {@link ItemTouchHelper} after a View is dropped over another View.
+         * <p>
+         * A LayoutManager should implement this interface to get ready for the upcoming move
+         * operation.
+         * <p>
+         * For example, LinearLayoutManager sets up a "scrollToPositionWithOffset" calls so that
+         * the View under drag will be used as an anchor View while calculating the next layout,
+         * making layout stay consistent.
+         *
+         * @param view   The View which is being dragged. It is very likely that user is still
+         *               dragging this View so there might be other calls to
+         *               {@code prepareForDrop()} after this one.
+         * @param target The target view which is being dropped on.
+         * @param x      The <code>left</code> offset of the View that is being dragged. This value
+         *               includes the movement caused by the user.
+         * @param y      The <code>top</code> offset of the View that is being dragged. This value
+         *               includes the movement caused by the user.
+         */
+        void prepareForDrop(@NonNull View view, @NonNull View target, int x, int y);
+    }
+
+    /**
+     * This class is the contract between ItemTouchHelper and your application. It lets you control
+     * which touch behaviors are enabled per each ViewHolder and also receive callbacks when user
+     * performs these actions.
+     * <p>
+     * To control which actions user can take on each view, you should override
+     * {@link #getMovementFlags(RecyclerView, ViewHolder)} and return appropriate set
+     * of direction flags. ({@link #LEFT}, {@link #RIGHT}, {@link #START}, {@link #END},
+     * {@link #UP}, {@link #DOWN}). You can use
+     * {@link #makeMovementFlags(int, int)} to easily construct it. Alternatively, you can use
+     * {@link SimpleCallback}.
+     * <p>
+     * If user drags an item, ItemTouchHelper will call
+     * {@link Callback#onMove(RecyclerView, ViewHolder, ViewHolder)
+     * onMove(recyclerView, dragged, target)}.
+     * Upon receiving this callback, you should move the item from the old position
+     * ({@code dragged.getAdapterPosition()}) to new position ({@code target.getAdapterPosition()})
+     * in your adapter and also call {@link RecyclerView.Adapter#notifyItemMoved(int, int)}.
+     * To control where a View can be dropped, you can override
+     * {@link #canDropOver(RecyclerView, ViewHolder, ViewHolder)}. When a
+     * dragging View overlaps multiple other views, Callback chooses the closest View with which
+     * dragged View might have changed positions. Although this approach works for many use cases,
+     * if you have a custom LayoutManager, you can override
+     * {@link #chooseDropTarget(ViewHolder, java.util.List, int, int)} to select a
+     * custom drop target.
+     * <p>
+     * When a View is swiped, ItemTouchHelper animates it until it goes out of bounds, then calls
+     * {@link #onSwiped(ViewHolder, int)}. At this point, you should update your
+     * adapter (e.g. remove the item) and call related Adapter#notify event.
+     */
+    @SuppressWarnings("UnusedParameters")
+    public abstract static class Callback {
+
+        @SuppressWarnings("WeakerAccess")
+        public static final int DEFAULT_DRAG_ANIMATION_DURATION = 200;
+
+        @SuppressWarnings("WeakerAccess")
+        public static final int DEFAULT_SWIPE_ANIMATION_DURATION = 250;
+
+        static final int RELATIVE_DIR_FLAGS = START | END
+                | ((START | END) << DIRECTION_FLAG_COUNT)
+                | ((START | END) << (2 * DIRECTION_FLAG_COUNT));
+
+        private static final int ABS_HORIZONTAL_DIR_FLAGS = LEFT | RIGHT
+                | ((LEFT | RIGHT) << DIRECTION_FLAG_COUNT)
+                | ((LEFT | RIGHT) << (2 * DIRECTION_FLAG_COUNT));
+
+        private static final Interpolator sDragScrollInterpolator = new Interpolator() {
+            @Override
+            public float getInterpolation(float t) {
+                return t * t * t * t * t;
+            }
+        };
+
+        private static final Interpolator sDragViewScrollCapInterpolator = new Interpolator() {
+            @Override
+            public float getInterpolation(float t) {
+                t -= 1.0f;
+                return t * t * t * t * t + 1.0f;
+            }
+        };
+
+        /**
+         * Drag scroll speed keeps accelerating until this many milliseconds before being capped.
+         */
+        private static final long DRAG_SCROLL_ACCELERATION_LIMIT_TIME_MS = 2000;
+
+        private int mCachedMaxScrollSpeed = -1;
+
+        /**
+         * Returns the {@link ItemTouchUIUtil} that is used by the {@link Callback} class for
+         * visual
+         * changes on Views in response to user interactions. {@link ItemTouchUIUtil} has different
+         * implementations for different platform versions.
+         * <p>
+         * By default, {@link Callback} applies these changes on
+         * {@link RecyclerView.ViewHolder#itemView}.
+         * <p>
+         * For example, if you have a use case where you only want the text to move when user
+         * swipes over the view, you can do the following:
+         * <pre>
+         *     public void clearView(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder){
+         *         getDefaultUIUtil().clearView(((ItemTouchViewHolder) viewHolder).textView);
+         *     }
+         *     public void onSelectedChanged(RecyclerView.ViewHolder viewHolder, int actionState) {
+         *         if (viewHolder != null){
+         *             getDefaultUIUtil().onSelected(((ItemTouchViewHolder) viewHolder).textView);
+         *         }
+         *     }
+         *     public void onChildDraw(Canvas c, RecyclerView recyclerView,
+         *             RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState,
+         *             boolean isCurrentlyActive) {
+         *         getDefaultUIUtil().onDraw(c, recyclerView,
+         *                 ((ItemTouchViewHolder) viewHolder).textView, dX, dY,
+         *                 actionState, isCurrentlyActive);
+         *         return true;
+         *     }
+         *     public void onChildDrawOver(Canvas c, RecyclerView recyclerView,
+         *             RecyclerView.ViewHolder viewHolder, float dX, float dY, int actionState,
+         *             boolean isCurrentlyActive) {
+         *         getDefaultUIUtil().onDrawOver(c, recyclerView,
+         *                 ((ItemTouchViewHolder) viewHolder).textView, dX, dY,
+         *                 actionState, isCurrentlyActive);
+         *         return true;
+         *     }
+         * </pre>
+         *
+         * @return The {@link ItemTouchUIUtil} instance that is used by the {@link Callback}
+         */
+        @SuppressWarnings("WeakerAccess")
+        @NonNull
+        public static ItemTouchUIUtil getDefaultUIUtil() {
+            return ItemTouchUIUtilImpl.INSTANCE;
+        }
+
+        /**
+         * Replaces a movement direction with its relative version by taking layout direction into
+         * account.
+         *
+         * @param flags           The flag value that include any number of movement flags.
+         * @param layoutDirection The layout direction of the View. Can be obtained from
+         *                        {@link ViewCompat#getLayoutDirection(android.view.View)}.
+         * @return Updated flags which uses relative flags ({@link #START}, {@link #END}) instead
+         * of {@link #LEFT}, {@link #RIGHT}.
+         * @see #convertToAbsoluteDirection(int, int)
+         */
+        @SuppressWarnings("WeakerAccess")
+        public static int convertToRelativeDirection(int flags, int layoutDirection) {
+            int masked = flags & ABS_HORIZONTAL_DIR_FLAGS;
+            if (masked == 0) {
+                return flags; // does not have any abs flags, good.
+            }
+            flags &= ~masked; //remove left / right.
+            if (layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR) {
+                // no change. just OR with 2 bits shifted mask and return
+                flags |= masked << 2; // START is 2 bits after LEFT, END is 2 bits after RIGHT.
+                return flags;
+            } else {
+                // add RIGHT flag as START
+                flags |= ((masked << 1) & ~ABS_HORIZONTAL_DIR_FLAGS);
+                // first clean RIGHT bit then add LEFT flag as END
+                flags |= ((masked << 1) & ABS_HORIZONTAL_DIR_FLAGS) << 2;
+            }
+            return flags;
+        }
+
+        /**
+         * Convenience method to create movement flags.
+         * <p>
+         * For instance, if you want to let your items be drag & dropped vertically and swiped
+         * left to be dismissed, you can call this method with:
+         * <code>makeMovementFlags(UP | DOWN, LEFT);</code>
+         *
+         * @param dragFlags  The directions in which the item can be dragged.
+         * @param swipeFlags The directions in which the item can be swiped.
+         * @return Returns an integer composed of the given drag and swipe flags.
+         */
+        public static int makeMovementFlags(int dragFlags, int swipeFlags) {
+            return makeFlag(ACTION_STATE_IDLE, swipeFlags | dragFlags)
+                    | makeFlag(ACTION_STATE_SWIPE, swipeFlags)
+                    | makeFlag(ACTION_STATE_DRAG, dragFlags);
+        }
+
+        /**
+         * Shifts the given direction flags to the offset of the given action state.
+         *
+         * @param actionState The action state you want to get flags in. Should be one of
+         *                    {@link #ACTION_STATE_IDLE}, {@link #ACTION_STATE_SWIPE} or
+         *                    {@link #ACTION_STATE_DRAG}.
+         * @param directions  The direction flags. Can be composed from {@link #UP}, {@link #DOWN},
+         *                    {@link #RIGHT}, {@link #LEFT} {@link #START} and {@link #END}.
+         * @return And integer that represents the given directions in the provided actionState.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public static int makeFlag(int actionState, int directions) {
+            return directions << (actionState * DIRECTION_FLAG_COUNT);
+        }
+
+        /**
+         * Should return a composite flag which defines the enabled move directions in each state
+         * (idle, swiping, dragging).
+         * <p>
+         * Instead of composing this flag manually, you can use {@link #makeMovementFlags(int,
+         * int)}
+         * or {@link #makeFlag(int, int)}.
+         * <p>
+         * This flag is composed of 3 sets of 8 bits, where first 8 bits are for IDLE state, next
+         * 8 bits are for SWIPE state and third 8 bits are for DRAG state.
+         * Each 8 bit sections can be constructed by simply OR'ing direction flags defined in
+         * {@link ItemTouchHelper}.
+         * <p>
+         * For example, if you want it to allow swiping LEFT and RIGHT but only allow starting to
+         * swipe by swiping RIGHT, you can return:
+         * <pre>
+         *      makeFlag(ACTION_STATE_IDLE, RIGHT) | makeFlag(ACTION_STATE_SWIPE, LEFT | RIGHT);
+         * </pre>
+         * This means, allow right movement while IDLE and allow right and left movement while
+         * swiping.
+         *
+         * @param recyclerView The RecyclerView to which ItemTouchHelper is attached.
+         * @param viewHolder   The ViewHolder for which the movement information is necessary.
+         * @return flags specifying which movements are allowed on this ViewHolder.
+         * @see #makeMovementFlags(int, int)
+         * @see #makeFlag(int, int)
+         */
+        public abstract int getMovementFlags(@NonNull RecyclerView recyclerView,
+                @NonNull ViewHolder viewHolder);
+
+        /**
+         * Converts a given set of flags to absolution direction which means {@link #START} and
+         * {@link #END} are replaced with {@link #LEFT} and {@link #RIGHT} depending on the layout
+         * direction.
+         *
+         * @param flags           The flag value that include any number of movement flags.
+         * @param layoutDirection The layout direction of the RecyclerView.
+         * @return Updated flags which includes only absolute direction values.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public int convertToAbsoluteDirection(int flags, int layoutDirection) {
+            int masked = flags & RELATIVE_DIR_FLAGS;
+            if (masked == 0) {
+                return flags; // does not have any relative flags, good.
+            }
+            flags &= ~masked; //remove start / end
+            if (layoutDirection == ViewCompat.LAYOUT_DIRECTION_LTR) {
+                // no change. just OR with 2 bits shifted mask and return
+                flags |= masked >> 2; // START is 2 bits after LEFT, END is 2 bits after RIGHT.
+                return flags;
+            } else {
+                // add START flag as RIGHT
+                flags |= ((masked >> 1) & ~RELATIVE_DIR_FLAGS);
+                // first clean start bit then add END flag as LEFT
+                flags |= ((masked >> 1) & RELATIVE_DIR_FLAGS) >> 2;
+            }
+            return flags;
+        }
+
+        final int getAbsoluteMovementFlags(RecyclerView recyclerView,
+                ViewHolder viewHolder) {
+            final int flags = getMovementFlags(recyclerView, viewHolder);
+            return convertToAbsoluteDirection(flags, ViewCompat.getLayoutDirection(recyclerView));
+        }
+
+        boolean hasDragFlag(RecyclerView recyclerView, ViewHolder viewHolder) {
+            final int flags = getAbsoluteMovementFlags(recyclerView, viewHolder);
+            return (flags & ACTION_MODE_DRAG_MASK) != 0;
+        }
+
+        boolean hasSwipeFlag(RecyclerView recyclerView,
+                ViewHolder viewHolder) {
+            final int flags = getAbsoluteMovementFlags(recyclerView, viewHolder);
+            return (flags & ACTION_MODE_SWIPE_MASK) != 0;
+        }
+
+        /**
+         * Return true if the current ViewHolder can be dropped over the the target ViewHolder.
+         * <p>
+         * This method is used when selecting drop target for the dragged View. After Views are
+         * eliminated either via bounds check or via this method, resulting set of views will be
+         * passed to {@link #chooseDropTarget(ViewHolder, java.util.List, int, int)}.
+         * <p>
+         * Default implementation returns true.
+         *
+         * @param recyclerView The RecyclerView to which ItemTouchHelper is attached to.
+         * @param current      The ViewHolder that user is dragging.
+         * @param target       The ViewHolder which is below the dragged ViewHolder.
+         * @return True if the dragged ViewHolder can be replaced with the target ViewHolder, false
+         * otherwise.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public boolean canDropOver(@NonNull RecyclerView recyclerView, @NonNull ViewHolder current,
+                @NonNull ViewHolder target) {
+            return true;
+        }
+
+        /**
+         * Called when ItemTouchHelper wants to move the dragged item from its old position to
+         * the new position.
+         * <p>
+         * If this method returns true, ItemTouchHelper assumes {@code viewHolder} has been moved
+         * to the adapter position of {@code target} ViewHolder
+         * ({@link ViewHolder#getAbsoluteAdapterPosition()
+         * ViewHolder#getAdapterPositionInRecyclerView()}).
+         * <p>
+         * If you don't support drag & drop, this method will never be called.
+         *
+         * @param recyclerView The RecyclerView to which ItemTouchHelper is attached to.
+         * @param viewHolder   The ViewHolder which is being dragged by the user.
+         * @param target       The ViewHolder over which the currently active item is being
+         *                     dragged.
+         * @return True if the {@code viewHolder} has been moved to the adapter position of
+         * {@code target}.
+         * @see #onMoved(RecyclerView, ViewHolder, int, ViewHolder, int, int, int)
+         */
+        public abstract boolean onMove(@NonNull RecyclerView recyclerView,
+                @NonNull ViewHolder viewHolder, @NonNull ViewHolder target);
+
+        /**
+         * Returns whether ItemTouchHelper should start a drag and drop operation if an item is
+         * long pressed.
+         * <p>
+         * Default value returns true but you may want to disable this if you want to start
+         * dragging on a custom view touch using {@link #startDrag(ViewHolder)}.
+         *
+         * @return True if ItemTouchHelper should start dragging an item when it is long pressed,
+         * false otherwise. Default value is <code>true</code>.
+         * @see #startDrag(ViewHolder)
+         */
+        public boolean isLongPressDragEnabled() {
+            return true;
+        }
+
+        /**
+         * Returns whether ItemTouchHelper should start a swipe operation if a pointer is swiped
+         * over the View.
+         * <p>
+         * Default value returns true but you may want to disable this if you want to start
+         * swiping on a custom view touch using {@link #startSwipe(ViewHolder)}.
+         *
+         * @return True if ItemTouchHelper should start swiping an item when user swipes a pointer
+         * over the View, false otherwise. Default value is <code>true</code>.
+         * @see #startSwipe(ViewHolder)
+         */
+        public boolean isItemViewSwipeEnabled() {
+            return true;
+        }
+
+        /**
+         * When finding views under a dragged view, by default, ItemTouchHelper searches for views
+         * that overlap with the dragged View. By overriding this method, you can extend or shrink
+         * the search box.
+         *
+         * @return The extra margin to be added to the hit box of the dragged View.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public int getBoundingBoxMargin() {
+            return 0;
+        }
+
+        /**
+         * Returns the fraction that the user should move the View to be considered as swiped.
+         * The fraction is calculated with respect to RecyclerView's bounds.
+         * <p>
+         * Default value is .5f, which means, to swipe a View, user must move the View at least
+         * half of RecyclerView's width or height, depending on the swipe direction.
+         *
+         * @param viewHolder The ViewHolder that is being dragged.
+         * @return A float value that denotes the fraction of the View size. Default value
+         * is .5f .
+         */
+        @SuppressWarnings("WeakerAccess")
+        public float getSwipeThreshold(@NonNull ViewHolder viewHolder) {
+            return .5f;
+        }
+
+        /**
+         * Returns the fraction that the user should move the View to be considered as it is
+         * dragged. After a view is moved this amount, ItemTouchHelper starts checking for Views
+         * below it for a possible drop.
+         *
+         * @param viewHolder The ViewHolder that is being dragged.
+         * @return A float value that denotes the fraction of the View size. Default value is
+         * .5f .
+         */
+        @SuppressWarnings("WeakerAccess")
+        public float getMoveThreshold(@NonNull ViewHolder viewHolder) {
+            return .5f;
+        }
+
+        /**
+         * Defines the minimum velocity which will be considered as a swipe action by the user.
+         * <p>
+         * You can increase this value to make it harder to swipe or decrease it to make it easier.
+         * Keep in mind that ItemTouchHelper also checks the perpendicular velocity and makes sure
+         * current direction velocity is larger then the perpendicular one. Otherwise, user's
+         * movement is ambiguous. You can change the threshold by overriding
+         * {@link #getSwipeVelocityThreshold(float)}.
+         * <p>
+         * The velocity is calculated in pixels per second.
+         * <p>
+         * The default framework value is passed as a parameter so that you can modify it with a
+         * multiplier.
+         *
+         * @param defaultValue The default value (in pixels per second) used by the
+         *                     ItemTouchHelper.
+         * @return The minimum swipe velocity. The default implementation returns the
+         * <code>defaultValue</code> parameter.
+         * @see #getSwipeVelocityThreshold(float)
+         * @see #getSwipeThreshold(ViewHolder)
+         */
+        @SuppressWarnings("WeakerAccess")
+        public float getSwipeEscapeVelocity(float defaultValue) {
+            return defaultValue;
+        }
+
+        /**
+         * Defines the maximum velocity ItemTouchHelper will ever calculate for pointer movements.
+         * <p>
+         * To consider a movement as swipe, ItemTouchHelper requires it to be larger than the
+         * perpendicular movement. If both directions reach to the max threshold, none of them will
+         * be considered as a swipe because it is usually an indication that user rather tried to
+         * scroll then swipe.
+         * <p>
+         * The velocity is calculated in pixels per second.
+         * <p>
+         * You can customize this behavior by changing this method. If you increase the value, it
+         * will be easier for the user to swipe diagonally and if you decrease the value, user will
+         * need to make a rather straight finger movement to trigger a swipe.
+         *
+         * @param defaultValue The default value(in pixels per second) used by the ItemTouchHelper.
+         * @return The velocity cap for pointer movements. The default implementation returns the
+         * <code>defaultValue</code> parameter.
+         * @see #getSwipeEscapeVelocity(float)
+         */
+        @SuppressWarnings("WeakerAccess")
+        public float getSwipeVelocityThreshold(float defaultValue) {
+            return defaultValue;
+        }
+
+        /**
+         * Called by ItemTouchHelper to select a drop target from the list of ViewHolders that
+         * are under the dragged View.
+         * <p>
+         * Default implementation filters the View with which dragged item have changed position
+         * in the drag direction. For instance, if the view is dragged UP, it compares the
+         * <code>view.getTop()</code> of the two views before and after drag started. If that value
+         * is different, the target view passes the filter.
+         * <p>
+         * Among these Views which pass the test, the one closest to the dragged view is chosen.
+         * <p>
+         * This method is called on the main thread every time user moves the View. If you want to
+         * override it, make sure it does not do any expensive operations.
+         *
+         * @param selected    The ViewHolder being dragged by the user.
+         * @param dropTargets The list of ViewHolder that are under the dragged View and
+         *                    candidate as a drop.
+         * @param curX        The updated left value of the dragged View after drag translations
+         *                    are applied. This value does not include margins added by
+         *                    {@link RecyclerView.ItemDecoration}s.
+         * @param curY        The updated top value of the dragged View after drag translations
+         *                    are applied. This value does not include margins added by
+         *                    {@link RecyclerView.ItemDecoration}s.
+         * @return A ViewHolder to whose position the dragged ViewHolder should be
+         * moved to.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public ViewHolder chooseDropTarget(@NonNull ViewHolder selected,
+                @NonNull List<ViewHolder> dropTargets, int curX, int curY) {
+            int right = curX + selected.itemView.getWidth();
+            int bottom = curY + selected.itemView.getHeight();
+            ViewHolder winner = null;
+            int winnerScore = -1;
+            final int dx = curX - selected.itemView.getLeft();
+            final int dy = curY - selected.itemView.getTop();
+            final int targetsSize = dropTargets.size();
+            for (int i = 0; i < targetsSize; i++) {
+                final ViewHolder target = dropTargets.get(i);
+                if (dx > 0) {
+                    int diff = target.itemView.getRight() - right;
+                    if (diff < 0 && target.itemView.getRight() > selected.itemView.getRight()) {
+                        final int score = Math.abs(diff);
+                        if (score > winnerScore) {
+                            winnerScore = score;
+                            winner = target;
+                        }
+                    }
+                }
+                if (dx < 0) {
+                    int diff = target.itemView.getLeft() - curX;
+                    if (diff > 0 && target.itemView.getLeft() < selected.itemView.getLeft()) {
+                        final int score = Math.abs(diff);
+                        if (score > winnerScore) {
+                            winnerScore = score;
+                            winner = target;
+                        }
+                    }
+                }
+                if (dy < 0) {
+                    int diff = target.itemView.getTop() - curY;
+                    if (diff > 0 && target.itemView.getTop() < selected.itemView.getTop()) {
+                        final int score = Math.abs(diff);
+                        if (score > winnerScore) {
+                            winnerScore = score;
+                            winner = target;
+                        }
+                    }
+                }
+
+                if (dy > 0) {
+                    int diff = target.itemView.getBottom() - bottom;
+                    if (diff < 0 && target.itemView.getBottom() > selected.itemView.getBottom()) {
+                        final int score = Math.abs(diff);
+                        if (score > winnerScore) {
+                            winnerScore = score;
+                            winner = target;
+                        }
+                    }
+                }
+            }
+            return winner;
+        }
+
+        /**
+         * Called when a ViewHolder is swiped by the user.
+         * <p>
+         * If you are returning relative directions ({@link #START} , {@link #END}) from the
+         * {@link #getMovementFlags(RecyclerView, ViewHolder)} method, this method
+         * will also use relative directions. Otherwise, it will use absolute directions.
+         * <p>
+         * If you don't support swiping, this method will never be called.
+         * <p>
+         * ItemTouchHelper will keep a reference to the View until it is detached from
+         * RecyclerView.
+         * As soon as it is detached, ItemTouchHelper will call
+         * {@link #clearView(RecyclerView, ViewHolder)}.
+         *
+         * @param viewHolder The ViewHolder which has been swiped by the user.
+         * @param direction  The direction to which the ViewHolder is swiped. It is one of
+         *                   {@link #UP}, {@link #DOWN},
+         *                   {@link #LEFT} or {@link #RIGHT}. If your
+         *                   {@link #getMovementFlags(RecyclerView, ViewHolder)}
+         *                   method
+         *                   returned relative flags instead of {@link #LEFT} / {@link #RIGHT};
+         *                   `direction` will be relative as well. ({@link #START} or {@link
+         *                   #END}).
+         */
+        public abstract void onSwiped(@NonNull ViewHolder viewHolder, int direction);
+
+        /**
+         * Called when the ViewHolder swiped or dragged by the ItemTouchHelper is changed.
+         * <p/>
+         * If you override this method, you should call super.
+         *
+         * @param viewHolder  The new ViewHolder that is being swiped or dragged. Might be null if
+         *                    it is cleared.
+         * @param actionState One of {@link ItemTouchHelper#ACTION_STATE_IDLE},
+         *                    {@link ItemTouchHelper#ACTION_STATE_SWIPE} or
+         *                    {@link ItemTouchHelper#ACTION_STATE_DRAG}.
+         * @see #clearView(RecyclerView, RecyclerView.ViewHolder)
+         */
+        public void onSelectedChanged(@Nullable ViewHolder viewHolder, int actionState) {
+            if (viewHolder != null) {
+                ItemTouchUIUtilImpl.INSTANCE.onSelected(viewHolder.itemView);
+            }
+        }
+
+        private int getMaxDragScroll(RecyclerView recyclerView) {
+            if (mCachedMaxScrollSpeed == -1) {
+                mCachedMaxScrollSpeed = recyclerView.getResources().getDimensionPixelSize(
+                        R.dimen.item_touch_helper_max_drag_scroll_per_frame);
+            }
+            return mCachedMaxScrollSpeed;
+        }
+
+        /**
+         * Called when {@link #onMove(RecyclerView, ViewHolder, ViewHolder)} returns true.
+         * <p>
+         * ItemTouchHelper does not create an extra Bitmap or View while dragging, instead, it
+         * modifies the existing View. Because of this reason, it is important that the View is
+         * still part of the layout after it is moved. This may not work as intended when swapped
+         * Views are close to RecyclerView bounds or there are gaps between them (e.g. other Views
+         * which were not eligible for dropping over).
+         * <p>
+         * This method is responsible to give necessary hint to the LayoutManager so that it will
+         * keep the View in visible area. For example, for LinearLayoutManager, this is as simple
+         * as calling {@link LinearLayoutManager#scrollToPositionWithOffset(int, int)}.
+         *
+         * Default implementation calls {@link RecyclerView#scrollToPosition(int)} if the View's
+         * new position is likely to be out of bounds.
+         * <p>
+         * It is important to ensure the ViewHolder will stay visible as otherwise, it might be
+         * removed by the LayoutManager if the move causes the View to go out of bounds. In that
+         * case, drag will end prematurely.
+         *
+         * @param recyclerView The RecyclerView controlled by the ItemTouchHelper.
+         * @param viewHolder   The ViewHolder under user's control.
+         * @param fromPos      The previous adapter position of the dragged item (before it was
+         *                     moved).
+         * @param target       The ViewHolder on which the currently active item has been dropped.
+         * @param toPos        The new adapter position of the dragged item.
+         * @param x            The updated left value of the dragged View after drag translations
+         *                     are applied. This value does not include margins added by
+         *                     {@link RecyclerView.ItemDecoration}s.
+         * @param y            The updated top value of the dragged View after drag translations
+         *                     are applied. This value does not include margins added by
+         *                     {@link RecyclerView.ItemDecoration}s.
+         */
+        public void onMoved(@NonNull final RecyclerView recyclerView,
+                @NonNull final ViewHolder viewHolder, int fromPos, @NonNull final ViewHolder target,
+                int toPos, int x, int y) {
+            final RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+            if (layoutManager instanceof ViewDropHandler) {
+                ((ViewDropHandler) layoutManager).prepareForDrop(viewHolder.itemView,
+                        target.itemView, x, y);
+                return;
+            }
+
+            // if layout manager cannot handle it, do some guesswork
+            if (layoutManager.canScrollHorizontally()) {
+                final int minLeft = layoutManager.getDecoratedLeft(target.itemView);
+                if (minLeft <= recyclerView.getPaddingLeft()) {
+                    recyclerView.scrollToPosition(toPos);
+                }
+                final int maxRight = layoutManager.getDecoratedRight(target.itemView);
+                if (maxRight >= recyclerView.getWidth() - recyclerView.getPaddingRight()) {
+                    recyclerView.scrollToPosition(toPos);
+                }
+            }
+
+            if (layoutManager.canScrollVertically()) {
+                final int minTop = layoutManager.getDecoratedTop(target.itemView);
+                if (minTop <= recyclerView.getPaddingTop()) {
+                    recyclerView.scrollToPosition(toPos);
+                }
+                final int maxBottom = layoutManager.getDecoratedBottom(target.itemView);
+                if (maxBottom >= recyclerView.getHeight() - recyclerView.getPaddingBottom()) {
+                    recyclerView.scrollToPosition(toPos);
+                }
+            }
+        }
+
+        void onDraw(Canvas c, RecyclerView parent, ViewHolder selected,
+                List<ItemTouchHelper.RecoverAnimation> recoverAnimationList,
+                int actionState, float dX, float dY) {
+            final int recoverAnimSize = recoverAnimationList.size();
+            for (int i = 0; i < recoverAnimSize; i++) {
+                final ItemTouchHelper.RecoverAnimation anim = recoverAnimationList.get(i);
+                anim.update();
+                final int count = c.save();
+                boolean isCurrentlyActive = anim instanceof MoveOutAnimation;
+                boolean success = anim.mAnimationType == ANIMATION_TYPE_SWIPE_SUCCESS;
+                onChildDraw(c, parent, anim.mViewHolder, anim.mX, anim.mY, anim.mActionState,
+                        isCurrentlyActive, success);
+                c.restoreToCount(count);
+            }
+            if (selected != null) {
+                final int count = c.save();
+                onChildDraw(c, parent, selected, dX, dY, actionState, true, false);
+                c.restoreToCount(count);
+            }
+        }
+
+        void onDrawOver(Canvas c, RecyclerView parent, ViewHolder selected,
+                List<ItemTouchHelper.RecoverAnimation> recoverAnimationList,
+                int actionState, float dX, float dY) {
+            final int recoverAnimSize = recoverAnimationList.size();
+            for (int i = 0; i < recoverAnimSize; i++) {
+                final ItemTouchHelper.RecoverAnimation anim = recoverAnimationList.get(i);
+                final int count = c.save();
+                onChildDrawOver(c, parent, anim.mViewHolder, anim.mX, anim.mY, anim.mActionState,
+                        false);
+                c.restoreToCount(count);
+            }
+            if (selected != null) {
+                final int count = c.save();
+                onChildDrawOver(c, parent, selected, dX, dY, actionState, true);
+                c.restoreToCount(count);
+            }
+            boolean hasRunningAnimation = false;
+            for (int i = recoverAnimSize - 1; i >= 0; i--) {
+                final RecoverAnimation anim = recoverAnimationList.get(i);
+                if (anim.mEnded && !anim.mIsPendingCleanup) {
+                    recoverAnimationList.remove(i);
+                } else if (!anim.mEnded) {
+                    hasRunningAnimation = true;
+                }
+            }
+            if (hasRunningAnimation) {
+                parent.invalidate();
+            }
+        }
+
+        /**
+         * Called by the ItemTouchHelper when the user interaction with an element is over and it
+         * also completed its animation.
+         * <p>
+         * This is a good place to clear all changes on the View that was done in
+         * {@link #onSelectedChanged(RecyclerView.ViewHolder, int)},
+         * {@link #onChildDraw(Canvas, RecyclerView, ViewHolder, float, float, int,
+         * boolean, boolean)} or
+         * {@link #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int, boolean)}.
+         *
+         * @param recyclerView The RecyclerView which is controlled by the ItemTouchHelper.
+         * @param viewHolder   The View that was interacted by the user.
+         */
+        public void clearView(@NonNull RecyclerView recyclerView, @NonNull ViewHolder viewHolder) {
+            ItemTouchUIUtilImpl.INSTANCE.clearView(viewHolder.itemView);
+        }
+
+        /**
+         * Called by ItemTouchHelper on RecyclerView's onDraw callback.
+         * <p>
+         * If you would like to customize how your View's respond to user interactions, this is
+         * a good place to override.
+         * <p>
+         * Default implementation translates the child by the given <code>dX</code>,
+         * <code>dY</code>.
+         * ItemTouchHelper also takes care of drawing the child after other children if it is being
+         * dragged. This is done using child re-ordering mechanism. On platforms prior to L, this
+         * is
+         * achieved via {@link android.view.ViewGroup#getChildDrawingOrder(int, int)} and on L
+         * and after, it changes View's elevation value to be greater than all other children.)
+         *
+         * @param c                 The canvas which RecyclerView is drawing its children
+         * @param recyclerView      The RecyclerView to which ItemTouchHelper is attached to
+         * @param viewHolder        The ViewHolder which is being interacted by the User or it was
+         *                          interacted and simply animating to its original position
+         * @param dX                The amount of horizontal displacement caused by user's action
+         * @param dY                The amount of vertical displacement caused by user's action
+         * @param actionState       The type of interaction on the View. Is either {@link
+         *                          #ACTION_STATE_DRAG} or {@link #ACTION_STATE_SWIPE}.
+         * @param isCurrentlyActive True if this view is currently being controlled by the user or
+         *                          false it is simply animating back to its original state.
+         * @see #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int,
+         * boolean)
+         */
+        public void onChildDraw(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
+                @NonNull ViewHolder viewHolder,
+                float dX, float dY, int actionState, boolean isCurrentlyActive, boolean success) {
+            ItemTouchUIUtilImpl.INSTANCE.onDraw(c, recyclerView, viewHolder.itemView, dX, dY,
+                    actionState, isCurrentlyActive);
+        }
+
+        /**
+         * Called by ItemTouchHelper on RecyclerView's onDraw callback.
+         * <p>
+         * If you would like to customize how your View's respond to user interactions, this is
+         * a good place to override.
+         * <p>
+         * Default implementation translates the child by the given <code>dX</code>,
+         * <code>dY</code>.
+         * ItemTouchHelper also takes care of drawing the child after other children if it is being
+         * dragged. This is done using child re-ordering mechanism. On platforms prior to L, this
+         * is
+         * achieved via {@link android.view.ViewGroup#getChildDrawingOrder(int, int)} and on L
+         * and after, it changes View's elevation value to be greater than all other children.)
+         *
+         * @param c                 The canvas which RecyclerView is drawing its children
+         * @param recyclerView      The RecyclerView to which ItemTouchHelper is attached to
+         * @param viewHolder        The ViewHolder which is being interacted by the User or it was
+         *                          interacted and simply animating to its original position
+         * @param dX                The amount of horizontal displacement caused by user's action
+         * @param dY                The amount of vertical displacement caused by user's action
+         * @param actionState       The type of interaction on the View. Is either {@link
+         *                          #ACTION_STATE_DRAG} or {@link #ACTION_STATE_SWIPE}.
+         * @param isCurrentlyActive True if this view is currently being controlled by the user or
+         *                          false it is simply animating back to its original state.
+         * @see #onChildDrawOver(Canvas, RecyclerView, ViewHolder, float, float, int,
+         * boolean)
+         */
+        public void onChildDrawOver(@NonNull Canvas c, @NonNull RecyclerView recyclerView,
+                ViewHolder viewHolder,
+                float dX, float dY, int actionState, boolean isCurrentlyActive) {
+            ItemTouchUIUtilImpl.INSTANCE.onDrawOver(c, recyclerView, viewHolder.itemView, dX, dY,
+                    actionState, isCurrentlyActive);
+        }
+
+        /**
+         * Called by the ItemTouchHelper when user action finished on a ViewHolder and now the View
+         * will be animated to its final position.
+         * <p>
+         * Default implementation uses ItemAnimator's duration values. If
+         * <code>animationType</code> is {@link #ANIMATION_TYPE_DRAG}, it returns
+         * {@link RecyclerView.ItemAnimator#getMoveDuration()}, otherwise, it returns
+         * {@link RecyclerView.ItemAnimator#getRemoveDuration()}. If RecyclerView does not have
+         * any {@link RecyclerView.ItemAnimator} attached, this method returns
+         * {@code DEFAULT_DRAG_ANIMATION_DURATION} or {@code DEFAULT_SWIPE_ANIMATION_DURATION}
+         * depending on the animation type.
+         *
+         * @param recyclerView  The RecyclerView to which the ItemTouchHelper is attached to.
+         * @param animationType The type of animation. Is one of {@link #ANIMATION_TYPE_DRAG},
+         *                      {@link #ANIMATION_TYPE_SWIPE_CANCEL} or
+         *                      {@link #ANIMATION_TYPE_SWIPE_SUCCESS}.
+         * @param animateDx     The horizontal distance that the animation will offset
+         * @param animateDy     The vertical distance that the animation will offset
+         * @return The duration for the animation
+         */
+        @SuppressWarnings("WeakerAccess")
+        public long getAnimationDuration(@NonNull RecyclerView recyclerView, int animationType,
+                float animateDx, float animateDy) {
+            final RecyclerView.ItemAnimator itemAnimator = recyclerView.getItemAnimator();
+            if (itemAnimator == null) {
+                return animationType == ANIMATION_TYPE_DRAG ? DEFAULT_DRAG_ANIMATION_DURATION
+                        : DEFAULT_SWIPE_ANIMATION_DURATION;
+            } else {
+                return animationType == ANIMATION_TYPE_DRAG ? itemAnimator.getMoveDuration()
+                        : itemAnimator.getRemoveDuration();
+            }
+        }
+
+        /**
+         * Called by the ItemTouchHelper when user is dragging a view out of bounds.
+         * <p>
+         * You can override this method to decide how much RecyclerView should scroll in response
+         * to this action. Default implementation calculates a value based on the amount of View
+         * out of bounds and the time it spent there. The longer user keeps the View out of bounds,
+         * the faster the list will scroll. Similarly, the larger portion of the View is out of
+         * bounds, the faster the RecyclerView will scroll.
+         *
+         * @param recyclerView        The RecyclerView instance to which ItemTouchHelper is
+         *                            attached to.
+         * @param viewSize            The total size of the View in scroll direction, excluding
+         *                            item decorations.
+         * @param viewSizeOutOfBounds The total size of the View that is out of bounds. This value
+         *                            is negative if the View is dragged towards left or top edge.
+         * @param totalSize           The total size of RecyclerView in the scroll direction.
+         * @param msSinceStartScroll  The time passed since View is kept out of bounds.
+         * @return The amount that RecyclerView should scroll. Keep in mind that this value will
+         * be passed to {@link RecyclerView#scrollBy(int, int)} method.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public int interpolateOutOfBoundsScroll(@NonNull RecyclerView recyclerView,
+                int viewSize, int viewSizeOutOfBounds,
+                int totalSize, long msSinceStartScroll) {
+            final int maxScroll = getMaxDragScroll(recyclerView);
+            final int absOutOfBounds = Math.abs(viewSizeOutOfBounds);
+            final int direction = (int) Math.signum(viewSizeOutOfBounds);
+            // might be negative if other direction
+            float outOfBoundsRatio = Math.min(1f, 1f * absOutOfBounds / viewSize);
+            final int cappedScroll = (int) (direction * maxScroll
+                    * sDragViewScrollCapInterpolator.getInterpolation(outOfBoundsRatio));
+            final float timeRatio;
+            if (msSinceStartScroll > DRAG_SCROLL_ACCELERATION_LIMIT_TIME_MS) {
+                timeRatio = 1f;
+            } else {
+                timeRatio = (float) msSinceStartScroll / DRAG_SCROLL_ACCELERATION_LIMIT_TIME_MS;
+            }
+            final int value = (int) (cappedScroll * sDragScrollInterpolator
+                    .getInterpolation(timeRatio));
+            if (value == 0) {
+                return viewSizeOutOfBounds > 0 ? 1 : -1;
+            }
+            return value;
+        }
+
+        /**
+         * Called to find out whether or not views should be animated out when the swipe action was successfully
+         * triggered.
+         *
+         * @param direction The swipe direction.
+         * @return {@code true} if the swipe action removes the item from the list. {@code false} otherwise.
+         */
+        public boolean shouldAnimateOut(int direction) {
+            return true;
+        }
+
+        /**
+         * Called to find out how far a view can be moved during a swipe when the swipe action doesn't remove the item
+         * from the list. See {@link #shouldAnimateOut(int)}.
+         *
+         * @param recyclerView The RecyclerView instance to which ItemTouchHelper is attached to.
+         * @param direction The swipe direction.
+         * @return The maximum distance in pixels that a view can be moved during a swipe.
+         */
+        public int getMaxSwipeDistance(@NonNull RecyclerView recyclerView, int direction) {
+            return recyclerView.getWidth();
+        }
+
+        public void onSwipeStarted(@NonNull ViewHolder viewHolder, int direction) {
+        }
+
+        public void onSwipeDirectionChanged(@NonNull ViewHolder viewHolder, int direction) {
+        }
+
+        public void onSwipeEnded(@NonNull ViewHolder viewHolder) {
+        }
+    }
+
+    /**
+     * A simple wrapper to the default Callback which you can construct with drag and swipe
+     * directions and this class will handle the flag callbacks. You should still override onMove
+     * or
+     * onSwiped depending on your use case.
+     *
+     * <pre>
+     * ItemTouchHelper mIth = new ItemTouchHelper(
+     *     new ItemTouchHelper.SimpleCallback(ItemTouchHelper.UP | ItemTouchHelper.DOWN,
+     *         ItemTouchHelper.LEFT) {
+     *         public boolean onMove(RecyclerView recyclerView,
+     *             ViewHolder viewHolder, ViewHolder target) {
+     *             final int fromPos = viewHolder.getAdapterPosition();
+     *             final int toPos = target.getAdapterPosition();
+     *             // move item in `fromPos` to `toPos` in adapter.
+     *             return true;// true if moved, false otherwise
+     *         }
+     *         public void onSwiped(ViewHolder viewHolder, int direction) {
+     *             // remove from adapter
+     *         }
+     * });
+     * </pre>
+     */
+    public abstract static class SimpleCallback extends Callback {
+
+        private int mDefaultSwipeDirs;
+
+        private int mDefaultDragDirs;
+
+        /**
+         * Creates a Callback for the given drag and swipe allowance. These values serve as
+         * defaults
+         * and if you want to customize behavior per ViewHolder, you can override
+         * {@link #getSwipeDirs(RecyclerView, ViewHolder)}
+         * and / or {@link #getDragDirs(RecyclerView, ViewHolder)}.
+         *
+         * @param dragDirs  Binary OR of direction flags in which the Views can be dragged. Must be
+         *                  composed of {@link #LEFT}, {@link #RIGHT}, {@link #START}, {@link
+         *                  #END},
+         *                  {@link #UP} and {@link #DOWN}.
+         * @param swipeDirs Binary OR of direction flags in which the Views can be swiped. Must be
+         *                  composed of {@link #LEFT}, {@link #RIGHT}, {@link #START}, {@link
+         *                  #END},
+         *                  {@link #UP} and {@link #DOWN}.
+         */
+        public SimpleCallback(int dragDirs, int swipeDirs) {
+            mDefaultSwipeDirs = swipeDirs;
+            mDefaultDragDirs = dragDirs;
+        }
+
+        /**
+         * Updates the default swipe directions. For example, you can use this method to toggle
+         * certain directions depending on your use case.
+         *
+         * @param defaultSwipeDirs Binary OR of directions in which the ViewHolders can be swiped.
+         */
+        @SuppressWarnings({"WeakerAccess", "unused"})
+        public void setDefaultSwipeDirs(@SuppressWarnings("unused") int defaultSwipeDirs) {
+            mDefaultSwipeDirs = defaultSwipeDirs;
+        }
+
+        /**
+         * Updates the default drag directions. For example, you can use this method to toggle
+         * certain directions depending on your use case.
+         *
+         * @param defaultDragDirs Binary OR of directions in which the ViewHolders can be dragged.
+         */
+        @SuppressWarnings({"WeakerAccess", "unused"})
+        public void setDefaultDragDirs(@SuppressWarnings("unused") int defaultDragDirs) {
+            mDefaultDragDirs = defaultDragDirs;
+        }
+
+        /**
+         * Returns the swipe directions for the provided ViewHolder.
+         * Default implementation returns the swipe directions that was set via constructor or
+         * {@link #setDefaultSwipeDirs(int)}.
+         *
+         * @param recyclerView The RecyclerView to which the ItemTouchHelper is attached to.
+         * @param viewHolder   The ViewHolder for which the swipe direction is queried.
+         * @return A binary OR of direction flags.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public int getSwipeDirs(@SuppressWarnings("unused") @NonNull RecyclerView recyclerView,
+                @NonNull @SuppressWarnings("unused") ViewHolder viewHolder) {
+            return mDefaultSwipeDirs;
+        }
+
+        /**
+         * Returns the drag directions for the provided ViewHolder.
+         * Default implementation returns the drag directions that was set via constructor or
+         * {@link #setDefaultDragDirs(int)}.
+         *
+         * @param recyclerView The RecyclerView to which the ItemTouchHelper is attached to.
+         * @param viewHolder   The ViewHolder for which the swipe direction is queried.
+         * @return A binary OR of direction flags.
+         */
+        @SuppressWarnings("WeakerAccess")
+        public int getDragDirs(@SuppressWarnings("unused") @NonNull RecyclerView recyclerView,
+                @SuppressWarnings("unused") @NonNull ViewHolder viewHolder) {
+            return mDefaultDragDirs;
+        }
+
+        @Override
+        public int getMovementFlags(@NonNull RecyclerView recyclerView,
+                @NonNull ViewHolder viewHolder) {
+            return makeMovementFlags(getDragDirs(recyclerView, viewHolder),
+                    getSwipeDirs(recyclerView, viewHolder));
+        }
+    }
+
+    private class ItemTouchHelperGestureListener extends GestureDetector.SimpleOnGestureListener {
+
+        /**
+         * Whether to execute code in response to the the invoking of
+         * {@link ItemTouchHelperGestureListener#onLongPress(MotionEvent)}.
+         *
+         * It is necessary to control this here because
+         * {@link GestureDetector.SimpleOnGestureListener} can only be set on a
+         * {@link GestureDetector} in a GestureDetector's constructor, a GestureDetector will call
+         * onLongPress if an {@link MotionEvent#ACTION_DOWN} event is not followed by another event
+         * that would cancel it (like {@link MotionEvent#ACTION_UP} or
+         * {@link MotionEvent#ACTION_CANCEL}), the long press responding to the long press event
+         * needs to be cancellable to prevent unexpected behavior.
+         *
+         * @see #doNotReactToLongPress()
+         */
+        private boolean mShouldReactToLongPress = true;
+
+        ItemTouchHelperGestureListener() {
+        }
+
+        /**
+         * Call to prevent executing code in response to
+         * {@link ItemTouchHelperGestureListener#onLongPress(MotionEvent)} being called.
+         */
+        void doNotReactToLongPress() {
+            mShouldReactToLongPress = false;
+        }
+
+        @Override
+        public boolean onDown(MotionEvent e) {
+            return true;
+        }
+
+        @Override
+        public void onLongPress(MotionEvent e) {
+            if (!mShouldReactToLongPress) {
+                return;
+            }
+            View child = findChildView(e);
+            if (child != null) {
+                ViewHolder vh = mRecyclerView.getChildViewHolder(child);
+                if (vh != null) {
+                    if (!mCallback.hasDragFlag(mRecyclerView, vh)) {
+                        return;
+                    }
+                    int pointerId = e.getPointerId(0);
+                    // Long press is deferred.
+                    // Check w/ active pointer id to avoid selecting after motion
+                    // event is canceled.
+                    if (pointerId == mActivePointerId) {
+                        final int index = e.findPointerIndex(mActivePointerId);
+                        final float x = e.getX(index);
+                        final float y = e.getY(index);
+                        mInitialTouchX = x;
+                        mInitialTouchY = y;
+                        mDx = mDy = 0f;
+                        if (DEBUG) {
+                            Log.d(TAG,
+                                    "onlong press: x:" + mInitialTouchX + ",y:" + mInitialTouchY);
+                        }
+                        if (mCallback.isLongPressDragEnabled()) {
+                            select(vh, ACTION_STATE_DRAG);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    @VisibleForTesting
+    static class RecoverAnimation implements Animator.AnimatorListener {
+
+        final float mStartDx;
+
+        final float mStartDy;
+
+        final float mTargetX;
+
+        final float mTargetY;
+
+        final ViewHolder mViewHolder;
+
+        final int mActionState;
+
+        @VisibleForTesting
+        final ValueAnimator mValueAnimator;
+
+        final int mAnimationType;
+
+        boolean mIsPendingCleanup;
+
+        float mX;
+
+        float mY;
+
+        // if user starts touching a recovering view, we put it into interaction mode again,
+        // instantly.
+        boolean mOverridden = false;
+
+        boolean mEnded = false;
+
+        private float mFraction;
+
+        RecoverAnimation(ViewHolder viewHolder, int animationType,
+                int actionState, float startDx, float startDy, float targetX, float targetY) {
+            mActionState = actionState;
+            mAnimationType = animationType;
+            mViewHolder = viewHolder;
+            mStartDx = startDx;
+            mStartDy = startDy;
+            mTargetX = targetX;
+            mTargetY = targetY;
+            mValueAnimator = ValueAnimator.ofFloat(0f, 1f);
+            mValueAnimator.addUpdateListener(
+                    new ValueAnimator.AnimatorUpdateListener() {
+                        @Override
+                        public void onAnimationUpdate(ValueAnimator animation) {
+                            setFraction(animation.getAnimatedFraction());
+                        }
+                    });
+            mValueAnimator.setTarget(viewHolder.itemView);
+            mValueAnimator.addListener(this);
+            setFraction(0f);
+        }
+
+        public void setDuration(long duration) {
+            mValueAnimator.setDuration(duration);
+        }
+
+        public void start() {
+            mViewHolder.setIsRecyclable(false);
+            mValueAnimator.start();
+        }
+
+        public void cancel() {
+            mValueAnimator.cancel();
+        }
+
+        public void setFraction(float fraction) {
+            mFraction = fraction;
+        }
+
+        /**
+         * We run updates on onDraw method but use the fraction from animator callback.
+         * This way, we can sync translate x/y values w/ the animators to avoid one-off frames.
+         */
+        public void update() {
+            if (mStartDx == mTargetX) {
+                mX = mViewHolder.itemView.getTranslationX();
+            } else {
+                mX = mStartDx + mFraction * (mTargetX - mStartDx);
+            }
+            if (mStartDy == mTargetY) {
+                mY = mViewHolder.itemView.getTranslationY();
+            } else {
+                mY = mStartDy + mFraction * (mTargetY - mStartDy);
+            }
+        }
+
+        @Override
+        public void onAnimationStart(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            if (!mEnded) {
+                mViewHolder.setIsRecyclable(true);
+            }
+            mEnded = true;
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+            setFraction(1f); //make sure we recover the view's state.
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+
+        }
+    }
+
+    private class MoveBackAnimation extends RecoverAnimation {
+        MoveBackAnimation(ViewHolder viewHolder, int animationType, int actionState, float startDx, float startDy) {
+            super(viewHolder, animationType, actionState, startDx, startDy, /* targetX */ 0, /* targetY */ 0);
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            super.onAnimationEnd(animation);
+            if (this.mOverridden) {
+                return;
+            }
+
+            mCallback.onSwipeEnded(mViewHolder);
+
+            mCallback.clearView(mRecyclerView, mViewHolder);
+            // full cleanup will happen on onDrawOver
+
+            // removed from the list after it is drawn for the last time
+            if (mOverdrawChild == mViewHolder.itemView) {
+                removeChildDrawingOrderCallbackIfNecessary(mViewHolder.itemView);
+            }
+        }
+    }
+
+    private class MoveOutAnimation extends RecoverAnimation {
+        private final int mSwipeDirection;
+        private final boolean mMoveBackAfterwards;
+
+        MoveOutAnimation(ViewHolder viewHolder, int animationType, int actionState, float startDx, float startDy,
+                float targetX, float targetY, int swipeDirection, boolean moveBackAfterwards) {
+            super(viewHolder, animationType, actionState, startDx, startDy, targetX, targetY);
+            this.mSwipeDirection = swipeDirection;
+            this.mMoveBackAfterwards = moveBackAfterwards;
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            super.onAnimationEnd(animation);
+            if (this.mOverridden) {
+                return;
+            }
+
+            if (!mMoveBackAfterwards) {
+                mPendingCleanup.add(mViewHolder.itemView);
+            }
+            mIsPendingCleanup = true;
+
+            // Animation might be ended by other animators during a layout.
+            // We defer callback to avoid editing adapter during a layout.
+            postDispatchSwipe(this, mSwipeDirection, mMoveBackAfterwards);
+
+            if (!mMoveBackAfterwards) {
+                // removed from the list after it is drawn for the last time
+                if (mOverdrawChild == mViewHolder.itemView) {
+                    removeChildDrawingOrderCallbackIfNecessary(mViewHolder.itemView);
+                }
+            }
+        }
+    }
+}
diff --git a/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchUIUtilImpl.java b/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchUIUtilImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..82c854926c919a29ca3d398479b1adc3ec990bbf
--- /dev/null
+++ b/ui-utils/ItemTouchHelper/src/main/java/app/k9mail/ui/utils/itemtouchhelper/ItemTouchUIUtilImpl.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.k9mail.ui.utils.itemtouchhelper;
+
+import android.graphics.Canvas;
+import android.os.Build;
+import android.view.View;
+
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.R;
+import androidx.recyclerview.widget.ItemTouchUIUtil;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * Package private class to keep implementations. Putting them inside ItemTouchUIUtil makes them
+ * public API, which is not desired in this case.
+ */
+class ItemTouchUIUtilImpl implements ItemTouchUIUtil {
+    static final ItemTouchUIUtil INSTANCE =  new ItemTouchUIUtilImpl();
+
+    @Override
+    public void onDraw(Canvas c, RecyclerView recyclerView, View view, float dX, float dY,
+            int actionState, boolean isCurrentlyActive) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            if (isCurrentlyActive) {
+                Object originalElevation = view.getTag(R.id.item_touch_helper_previous_elevation);
+                if (originalElevation == null) {
+                    originalElevation = ViewCompat.getElevation(view);
+                    float newElevation = 1f + findMaxElevation(recyclerView, view);
+                    ViewCompat.setElevation(view, newElevation);
+                    view.setTag(R.id.item_touch_helper_previous_elevation, originalElevation);
+                }
+            }
+        }
+
+        view.setTranslationX(dX);
+        view.setTranslationY(dY);
+    }
+
+    private static float findMaxElevation(RecyclerView recyclerView, View itemView) {
+        final int childCount = recyclerView.getChildCount();
+        float max = 0;
+        for (int i = 0; i < childCount; i++) {
+            final View child = recyclerView.getChildAt(i);
+            if (child == itemView) {
+                continue;
+            }
+            final float elevation = ViewCompat.getElevation(child);
+            if (elevation > max) {
+                max = elevation;
+            }
+        }
+        return max;
+    }
+
+    @Override
+    public void onDrawOver(Canvas c, RecyclerView recyclerView, View view, float dX, float dY,
+            int actionState, boolean isCurrentlyActive) {
+    }
+
+    @Override
+    public void clearView(View view) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            final Object tag = view.getTag(R.id.item_touch_helper_previous_elevation);
+            if (tag instanceof Float) {
+                ViewCompat.setElevation(view, (Float) tag);
+            }
+            view.setTag(R.id.item_touch_helper_previous_elevation, null);
+        }
+
+        view.setTranslationX(0f);
+        view.setTranslationY(0f);
+    }
+
+    @Override
+    public void onSelected(View view) {
+    }
+}
diff --git a/ui-utils/LinearLayoutManager/build.gradle b/ui-utils/LinearLayoutManager/build.gradle
new file mode 100644
index 0000000000000000000000000000000000000000..b4dfdb71164013576ef1095e4a15c7600b935db3
--- /dev/null
+++ b/ui-utils/LinearLayoutManager/build.gradle
@@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+dependencies {
+    api "androidx.recyclerview:recyclerview:${versions.androidxRecyclerView}"
+}
+
+android {
+    namespace 'app.k9mail.ui.utils.linearlayoutmanager'
+
+    compileSdkVersion buildConfig.compileSdk
+    buildToolsVersion buildConfig.buildTools
+
+    defaultConfig {
+        minSdkVersion buildConfig.minSdk
+        targetSdkVersion buildConfig.robolectricSdk
+    }
+
+    lintOptions {
+        abortOnError false
+        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+    }
+
+    compileOptions {
+        sourceCompatibility javaVersion
+        targetCompatibility javaVersion
+    }
+}
diff --git a/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LayoutManager.java b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LayoutManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..2de9c56f48b4ad13a1ca05a13f96d5376ad78f8f
--- /dev/null
+++ b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LayoutManager.java
@@ -0,0 +1,102 @@
+package app.k9mail.ui.utils.linearlayoutmanager;
+
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+// Source: https://github.com/SchildiChat/SchildiChat-android/blob/a321d6a79a1dc93bcfea442390e49c557285eabe/vector/src/main/java/de/spiritcroc/recyclerview/widget/LayoutManager.java
+/**
+ * Exposing/replicating some internal functions from RecylerView.LayoutManager
+ */
+public abstract class LayoutManager extends RecyclerView.LayoutManager {
+
+
+   /*
+    * Exposed things from RecyclerView.java
+    */
+
+   /**
+    * The callback used for retrieving information about a RecyclerView and its children in the
+    * horizontal direction.
+    */
+   private final ViewBoundsCheck.Callback mHorizontalBoundCheckCallback =
+           new ViewBoundsCheck.Callback() {
+              @Override
+              public View getChildAt(int index) {
+                 return LayoutManager.this.getChildAt(index);
+              }
+
+              @Override
+              public int getParentStart() {
+                 return LayoutManager.this.getPaddingLeft();
+              }
+
+              @Override
+              public int getParentEnd() {
+                 return LayoutManager.this.getWidth() - LayoutManager.this.getPaddingRight();
+              }
+
+              @Override
+              public int getChildStart(View view) {
+                 final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                         view.getLayoutParams();
+                 return LayoutManager.this.getDecoratedLeft(view) - params.leftMargin;
+              }
+
+              @Override
+              public int getChildEnd(View view) {
+                 final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                         view.getLayoutParams();
+                 return LayoutManager.this.getDecoratedRight(view) + params.rightMargin;
+              }
+           };
+
+   /**
+    * The callback used for retrieving information about a RecyclerView and its children in the
+    * vertical direction.
+    */
+   private final ViewBoundsCheck.Callback mVerticalBoundCheckCallback =
+           new ViewBoundsCheck.Callback() {
+              @Override
+              public View getChildAt(int index) {
+                 return LayoutManager.this.getChildAt(index);
+              }
+
+              @Override
+              public int getParentStart() {
+                 return LayoutManager.this.getPaddingTop();
+              }
+
+              @Override
+              public int getParentEnd() {
+                 return LayoutManager.this.getHeight()
+                         - LayoutManager.this.getPaddingBottom();
+              }
+
+              @Override
+              public int getChildStart(View view) {
+                 final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                         view.getLayoutParams();
+                 return LayoutManager.this.getDecoratedTop(view) - params.topMargin;
+              }
+
+              @Override
+              public int getChildEnd(View view) {
+                 final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams)
+                         view.getLayoutParams();
+                 return LayoutManager.this.getDecoratedBottom(view) + params.bottomMargin;
+              }
+           };
+
+   /**
+    * Utility objects used to check the boundaries of children against their parent
+    * RecyclerView.
+    *
+    * @see #isViewPartiallyVisible(View, boolean, boolean),
+    * {@link LinearLayoutManager#findOneVisibleChild(int, int, boolean, boolean)},
+    * and {@link LinearLayoutManager#findOnePartiallyOrCompletelyInvisibleChild(int, int)}.
+    */
+   ViewBoundsCheck mHorizontalBoundCheck = new ViewBoundsCheck(mHorizontalBoundCheckCallback);
+   ViewBoundsCheck mVerticalBoundCheck = new ViewBoundsCheck(mVerticalBoundCheckCallback);
+
+}
diff --git a/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LinearLayoutManager.java b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LinearLayoutManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..4e812428e121cea973928e7ecd72b20317b8bcb5
--- /dev/null
+++ b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/LinearLayoutManager.java
@@ -0,0 +1,2635 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.k9mail.ui.utils.linearlayoutmanager;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.PointF;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.accessibility.AccessibilityEvent;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearSmoothScroller;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+/**
+ * A {@link RecyclerView.LayoutManager} implementation which provides
+ * similar functionality to {@link android.widget.ListView}.
+ */
+public class LinearLayoutManager extends LayoutManager implements
+        ItemTouchHelper.ViewDropHandler, RecyclerView.SmoothScroller.ScrollVectorProvider {
+
+    private static final String TAG = "LinearLayoutManager";
+
+    static final boolean DEBUG = false;
+
+    public static final int HORIZONTAL = RecyclerView.HORIZONTAL;
+
+    public static final int VERTICAL = RecyclerView.VERTICAL;
+
+    public static final int INVALID_OFFSET = Integer.MIN_VALUE;
+
+
+    /**
+     * While trying to find next view to focus, LayoutManager will not try to scroll more
+     * than this factor times the total space of the list. If layout is vertical, total space is the
+     * height minus padding, if layout is horizontal, total space is the width minus padding.
+     */
+    private static final float MAX_SCROLL_FACTOR = 1 / 3f;
+
+    /**
+     * Current orientation. Either {@link #HORIZONTAL} or {@link #VERTICAL}
+     */
+    @RecyclerView.Orientation
+    int mOrientation = RecyclerView.VERTICAL;
+
+    /**
+     * Helper class that keeps temporary layout state.
+     * It does not keep state after layout is complete but we still keep a reference to re-use
+     * the same object.
+     */
+    private LayoutState mLayoutState;
+
+    /**
+     * Many calculations are made depending on orientation. To keep it clean, this interface
+     * helps {@link LinearLayoutManager} make those decisions.
+     */
+    OrientationHelper mOrientationHelper;
+
+    /**
+     * We need to track this so that we can ignore current position when it changes.
+     */
+    private boolean mLastStackFromEnd;
+
+
+    /**
+     * Defines if layout should be calculated from end to start.
+     *
+     * @see #mShouldReverseLayout
+     */
+    private boolean mReverseLayout = false;
+
+    /**
+     * This keeps the final value for how LayoutManager should start laying out views.
+     * It is calculated by checking {@link #getReverseLayout()} and View's layout direction.
+     * {@link #onLayoutChildren(RecyclerView.Recycler, RecyclerView.State)} is run.
+     */
+    boolean mShouldReverseLayout = false;
+
+    /**
+     * Works the same way as {@link android.widget.AbsListView#setStackFromBottom(boolean)} and
+     * it supports both orientations.
+     * see {@link android.widget.AbsListView#setStackFromBottom(boolean)}
+     */
+    private boolean mStackFromEnd = false;
+
+    /**
+     * Works the same way as {@link android.widget.AbsListView#setSmoothScrollbarEnabled(boolean)}.
+     * see {@link android.widget.AbsListView#setSmoothScrollbarEnabled(boolean)}
+     */
+    private boolean mSmoothScrollbarEnabled = true;
+
+    /**
+     * When LayoutManager needs to scroll to a position, it sets this variable and requests a
+     * layout which will check this variable and re-layout accordingly.
+     */
+    int mPendingScrollPosition = RecyclerView.NO_POSITION;
+
+    /**
+     * Used to keep the offset value when {@link #scrollToPositionWithOffset(int, int)} is
+     * called.
+     */
+    int mPendingScrollPositionOffset = INVALID_OFFSET;
+
+    private boolean mRecycleChildrenOnDetach;
+
+    SavedState mPendingSavedState = null;
+
+    /**
+     * Re-used variable to keep anchor information on re-layout.
+     * Anchor position and coordinate defines the reference point for LLM while doing a layout.
+     */
+    final AnchorInfo mAnchorInfo = new AnchorInfo();
+
+    /**
+     * Stashed to avoid allocation, currently only used in #fill()
+     */
+    private final LayoutChunkResult mLayoutChunkResult = new LayoutChunkResult();
+
+    /**
+     * Number of items to prefetch when first coming on screen with new data.
+     */
+    private int mInitialPrefetchItemCount = 2;
+
+    // Reusable int array to be passed to method calls that mutate it in order to "return" two ints.
+    // This should only be used used transiently and should not be used to retain any state over
+    // time.
+    private int[] mReusableIntPair = new int[2];
+
+    private boolean mScrolledToTop = false;
+
+    /**
+     * Creates a vertical LinearLayoutManager
+     *
+     * @param context Current context, will be used to access resources.
+     */
+    public LinearLayoutManager(Context context) {
+        this(context, RecyclerView.VERTICAL, false);
+    }
+
+    /**
+     * @param context       Current context, will be used to access resources.
+     * @param orientation   Layout orientation. Should be {@link #HORIZONTAL} or {@link
+     *                      #VERTICAL}.
+     * @param reverseLayout When set to true, layouts from end to start.
+     */
+    public LinearLayoutManager(Context context, @RecyclerView.Orientation int orientation,
+            boolean reverseLayout) {
+        setOrientation(orientation);
+        setReverseLayout(reverseLayout);
+    }
+
+    /**
+     * Constructor used when layout manager is set in XML by RecyclerView attribute
+     * "layoutManager". Defaults to vertical orientation.
+     *
+     * {@link android.R.attr#orientation}
+     * {@link androidx.recyclerview.R.attr#reverseLayout}
+     * {@link androidx.recyclerview.R.attr#stackFromEnd}
+     */
+    public LinearLayoutManager(Context context, AttributeSet attrs, int defStyleAttr,
+            int defStyleRes) {
+        Properties properties = getProperties(context, attrs, defStyleAttr, defStyleRes);
+        setOrientation(properties.orientation);
+        setReverseLayout(properties.reverseLayout);
+        setStackFromEnd(properties.stackFromEnd);
+    }
+
+    @Override
+    public boolean isAutoMeasureEnabled() {
+        return true;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public RecyclerView.LayoutParams generateDefaultLayoutParams() {
+        return new RecyclerView.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+                ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
+    /**
+     * Returns whether LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     *
+     * @return true if LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     */
+    public boolean getRecycleChildrenOnDetach() {
+        return mRecycleChildrenOnDetach;
+    }
+
+    /**
+     * Set whether LayoutManager will recycle its children when it is detached from
+     * RecyclerView.
+     * <p>
+     * If you are using a {@link RecyclerView.RecycledViewPool}, it might be a good idea to set
+     * this flag to <code>true</code> so that views will be available to other RecyclerViews
+     * immediately.
+     * <p>
+     * Note that, setting this flag will result in a performance drop if RecyclerView
+     * is restored.
+     *
+     * @param recycleChildrenOnDetach Whether children should be recycled in detach or not.
+     */
+    public void setRecycleChildrenOnDetach(boolean recycleChildrenOnDetach) {
+        mRecycleChildrenOnDetach = recycleChildrenOnDetach;
+    }
+
+    @Override
+    public void onDetachedFromWindow(RecyclerView view, RecyclerView.Recycler recycler) {
+        super.onDetachedFromWindow(view, recycler);
+        if (mRecycleChildrenOnDetach) {
+            removeAndRecycleAllViews(recycler);
+            recycler.clear();
+        }
+    }
+
+    @Override
+    public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
+        super.onInitializeAccessibilityEvent(event);
+        if (getChildCount() > 0) {
+            event.setFromIndex(findFirstVisibleItemPosition());
+            event.setToIndex(findLastVisibleItemPosition());
+        }
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        if (mPendingSavedState != null) {
+            return new SavedState(mPendingSavedState);
+        }
+        SavedState state = new SavedState();
+        if (getChildCount() > 0) {
+            ensureLayoutState();
+            boolean didLayoutFromEnd = mLastStackFromEnd ^ mShouldReverseLayout;
+            state.mAnchorLayoutFromEnd = didLayoutFromEnd;
+            if (didLayoutFromEnd) {
+                final View refChild = getChildClosestToEnd();
+                state.mAnchorOffset = mOrientationHelper.getEndAfterPadding()
+                        - mOrientationHelper.getDecoratedEnd(refChild);
+                state.mAnchorPosition = getPosition(refChild);
+            } else {
+                final View refChild = getChildClosestToStart();
+                state.mAnchorPosition = getPosition(refChild);
+                state.mAnchorOffset = mOrientationHelper.getDecoratedStart(refChild)
+                        - mOrientationHelper.getStartAfterPadding();
+            }
+        } else {
+            state.invalidateAnchor();
+        }
+        return state;
+    }
+
+    @Override
+    public void onRestoreInstanceState(Parcelable state) {
+        if (state instanceof SavedState) {
+            mPendingSavedState = (SavedState) state;
+            if (mPendingScrollPosition != RecyclerView.NO_POSITION) {
+                mPendingSavedState.invalidateAnchor();
+            }
+            requestLayout();
+            if (DEBUG) {
+                Log.d(TAG, "loaded saved state");
+            }
+        } else if (DEBUG) {
+            Log.d(TAG, "invalid saved state class");
+        }
+    }
+
+    /**
+     * @return true if {@link #getOrientation()} is {@link #HORIZONTAL}
+     */
+    @Override
+    public boolean canScrollHorizontally() {
+        return mOrientation == HORIZONTAL;
+    }
+
+    /**
+     * @return true if {@link #getOrientation()} is {@link #VERTICAL}
+     */
+    @Override
+    public boolean canScrollVertically() {
+        return mOrientation == VERTICAL;
+    }
+
+    /**
+     * Compatibility support for {@link android.widget.AbsListView#setStackFromBottom(boolean)}
+     */
+    public void setStackFromEnd(boolean stackFromEnd) {
+        assertNotInLayoutOrScroll(null);
+        if (mStackFromEnd == stackFromEnd) {
+            return;
+        }
+        mStackFromEnd = stackFromEnd;
+        requestLayout();
+    }
+
+    public boolean getStackFromEnd() {
+        return mStackFromEnd;
+    }
+
+    /**
+     * Returns the current orientation of the layout.
+     *
+     * @return Current orientation,  either {@link #HORIZONTAL} or {@link #VERTICAL}
+     * @see #setOrientation(int)
+     */
+    @RecyclerView.Orientation
+    public int getOrientation() {
+        return mOrientation;
+    }
+
+    /**
+     * Sets the orientation of the layout. {@link LinearLayoutManager}
+     * will do its best to keep scroll position.
+     *
+     * @param orientation {@link #HORIZONTAL} or {@link #VERTICAL}
+     */
+    public void setOrientation(@RecyclerView.Orientation int orientation) {
+        if (orientation != HORIZONTAL && orientation != VERTICAL) {
+            throw new IllegalArgumentException("invalid orientation:" + orientation);
+        }
+
+        assertNotInLayoutOrScroll(null);
+
+        if (orientation != mOrientation || mOrientationHelper == null) {
+            mOrientationHelper =
+                    OrientationHelper.createOrientationHelper(this, orientation);
+            mAnchorInfo.mOrientationHelper = mOrientationHelper;
+            mOrientation = orientation;
+            requestLayout();
+        }
+    }
+
+    /**
+     * Calculates the view layout order. (e.g. from end to start or start to end)
+     * RTL layout support is applied automatically. So if layout is RTL and
+     * {@link #getReverseLayout()} is {@code true}, elements will be laid out starting from left.
+     */
+    private void resolveShouldLayoutReverse() {
+        // A == B is the same result, but we rather keep it readable
+        if (mOrientation == VERTICAL || !isLayoutRTL()) {
+            mShouldReverseLayout = mReverseLayout;
+        } else {
+            mShouldReverseLayout = !mReverseLayout;
+        }
+    }
+
+    /**
+     * Returns if views are laid out from the opposite direction of the layout.
+     *
+     * @return If layout is reversed or not.
+     * @see #setReverseLayout(boolean)
+     */
+    public boolean getReverseLayout() {
+        return mReverseLayout;
+    }
+
+    /**
+     * Used to reverse item traversal and layout order.
+     * This behaves similar to the layout change for RTL views. When set to true, first item is
+     * laid out at the end of the UI, second item is laid out before it etc.
+     *
+     * For horizontal layouts, it depends on the layout direction.
+     * When set to true, If {@link RecyclerView} is LTR, than it will
+     * layout from RTL, if {@link RecyclerView}} is RTL, it will layout
+     * from LTR.
+     *
+     * If you are looking for the exact same behavior of
+     * {@link android.widget.AbsListView#setStackFromBottom(boolean)}, use
+     * {@link #setStackFromEnd(boolean)}
+     */
+    public void setReverseLayout(boolean reverseLayout) {
+        assertNotInLayoutOrScroll(null);
+        if (reverseLayout == mReverseLayout) {
+            return;
+        }
+        mReverseLayout = reverseLayout;
+        requestLayout();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public View findViewByPosition(int position) {
+        final int childCount = getChildCount();
+        if (childCount == 0) {
+            return null;
+        }
+        final int firstChild = getPosition(getChildAt(0));
+        final int viewPosition = position - firstChild;
+        if (viewPosition >= 0 && viewPosition < childCount) {
+            final View child = getChildAt(viewPosition);
+            if (getPosition(child) == position) {
+                return child; // in pre-layout, this may not match
+            }
+        }
+        // fallback to traversal. This might be necessary in pre-layout.
+        return super.findViewByPosition(position);
+    }
+
+    /**
+     * <p>Returns the amount of extra space that should be laid out by LayoutManager.</p>
+     *
+     * <p>By default, {@link LinearLayoutManager} lays out 1 extra page
+     * of items while smooth scrolling and 0 otherwise. You can override this method to implement
+     * your custom layout pre-cache logic.</p>
+     *
+     * <p><strong>Note:</strong>Laying out invisible elements generally comes with significant
+     * performance cost. It's typically only desirable in places like smooth scrolling to an unknown
+     * location, where 1) the extra content helps LinearLayoutManager know in advance when its
+     * target is approaching, so it can decelerate early and smoothly and 2) while motion is
+     * continuous.</p>
+     *
+     * <p>Extending the extra layout space is especially expensive if done while the user may change
+     * scrolling direction. Changing direction will cause the extra layout space to swap to the
+     * opposite side of the viewport, incurring many rebinds/recycles, unless the cache is large
+     * enough to handle it.</p>
+     *
+     * @return The extra space that should be laid out (in pixels).
+     * @deprecated Use {@link #calculateExtraLayoutSpace(RecyclerView.State, int[])} instead.
+     */
+    @SuppressWarnings("DeprecatedIsStillUsed")
+    @Deprecated
+    protected int getExtraLayoutSpace(RecyclerView.State state) {
+        if (state.hasTargetScrollPosition()) {
+            return mOrientationHelper.getTotalSpace();
+        } else {
+            return 0;
+        }
+    }
+
+    /**
+     * <p>Calculates the amount of extra space (in pixels) that should be laid out by {@link
+     * LinearLayoutManager} and stores the result in {@code extraLayoutSpace}. {@code
+     * extraLayoutSpace[0]} should be used for the extra space at the top/left, and {@code
+     * extraLayoutSpace[1]} should be used for the extra space at the bottom/right (depending on the
+     * orientation). Thus, the side where it is applied is unaffected by {@link
+     * #getLayoutDirection()} (LTR vs RTL), {@link #getStackFromEnd()} and {@link
+     * #getReverseLayout()}. Negative values are ignored.</p>
+     *
+     * <p>By default, {@code LinearLayoutManager} lays out 1 extra page of items while smooth
+     * scrolling, in the direction of the scroll, and no extra space is laid out in all other
+     * situations. You can override this method to implement your own custom pre-cache logic. Use
+     * {@link RecyclerView.State#hasTargetScrollPosition()} to find out if a smooth scroll to a
+     * position is in progress, and {@link RecyclerView.State#getTargetScrollPosition()} to find out
+     * which item it is scrolling to.</p>
+     *
+     * <p><strong>Note:</strong>Laying out extra items generally comes with significant performance
+     * cost. It's typically only desirable in places like smooth scrolling to an unknown location,
+     * where 1) the extra content helps LinearLayoutManager know in advance when its target is
+     * approaching, so it can decelerate early and smoothly and 2) while motion is continuous.</p>
+     *
+     * <p>Extending the extra layout space is especially expensive if done while the user may change
+     * scrolling direction. In the default implementation, changing direction will cause the extra
+     * layout space to swap to the opposite side of the viewport, incurring many rebinds/recycles,
+     * unless the cache is large enough to handle it.</p>
+     */
+    protected void calculateExtraLayoutSpace(@NonNull RecyclerView.State state,
+            @NonNull int[] extraLayoutSpace) {
+        int extraLayoutSpaceStart = 0;
+        int extraLayoutSpaceEnd = 0;
+
+        // If calculateExtraLayoutSpace is not overridden, call the
+        // deprecated getExtraLayoutSpace for backwards compatibility
+        @SuppressWarnings("deprecation")
+        int extraScrollSpace = getExtraLayoutSpace(state);
+        if (mLayoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            extraLayoutSpaceStart = extraScrollSpace;
+        } else {
+            extraLayoutSpaceEnd = extraScrollSpace;
+        }
+
+        extraLayoutSpace[0] = extraLayoutSpaceStart;
+        extraLayoutSpace[1] = extraLayoutSpaceEnd;
+    }
+
+    @Override
+    public void smoothScrollToPosition(RecyclerView recyclerView, RecyclerView.State state,
+            int position) {
+        LinearSmoothScroller linearSmoothScroller =
+                new LinearSmoothScroller(recyclerView.getContext());
+        linearSmoothScroller.setTargetPosition(position);
+        startSmoothScroll(linearSmoothScroller);
+    }
+
+    @Override
+    public PointF computeScrollVectorForPosition(int targetPosition) {
+        if (getChildCount() == 0) {
+            return null;
+        }
+        final int firstChildPos = getPosition(getChildAt(0));
+        final int direction = targetPosition < firstChildPos != mShouldReverseLayout ? -1 : 1;
+        if (mOrientation == HORIZONTAL) {
+            return new PointF(direction, 0);
+        } else {
+            return new PointF(0, direction);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onLayoutChildren(RecyclerView.Recycler recycler, RecyclerView.State state) {
+        // layout algorithm:
+        // 1) by checking children and other variables, find an anchor coordinate and an anchor
+        //  item position.
+        // 2) fill towards start, stacking from bottom
+        // 3) fill towards end, stacking from top
+        // 4) scroll to fulfill requirements like stack from bottom.
+        // create layout state
+        if (DEBUG) {
+            Log.d(TAG, "is pre layout:" + state.isPreLayout());
+        }
+        if (mPendingSavedState != null || mPendingScrollPosition != RecyclerView.NO_POSITION) {
+            if (state.getItemCount() == 0) {
+                removeAndRecycleAllViews(recycler);
+                return;
+            }
+        }
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor()) {
+            mPendingScrollPosition = mPendingSavedState.mAnchorPosition;
+        }
+
+        ensureLayoutState();
+        mLayoutState.mRecycle = false;
+        // resolve layout direction
+        resolveShouldLayoutReverse();
+
+        final View focused = getFocusedChild();
+        if (!mAnchorInfo.mValid || mPendingScrollPosition != RecyclerView.NO_POSITION
+                || mPendingSavedState != null) {
+            mAnchorInfo.reset();
+            mAnchorInfo.mLayoutFromEnd = mShouldReverseLayout ^ mStackFromEnd;
+            // calculate anchor position and coordinate
+            updateAnchorInfoForLayout(recycler, state, mAnchorInfo);
+            mAnchorInfo.mValid = true;
+        } else if (focused != null && (mOrientationHelper.getDecoratedStart(focused)
+                >= mOrientationHelper.getEndAfterPadding()
+                || mOrientationHelper.getDecoratedEnd(focused)
+                <= mOrientationHelper.getStartAfterPadding())) {
+            // This case relates to when the anchor child is the focused view and due to layout
+            // shrinking the focused view fell outside the viewport, e.g. when soft keyboard shows
+            // up after tapping an EditText which shrinks RV causing the focused view (The tapped
+            // EditText which is the anchor child) to get kicked out of the screen. Will update the
+            // anchor coordinate in order to make sure that the focused view is laid out. Otherwise,
+            // the available space in layoutState will be calculated as negative preventing the
+            // focused view from being laid out in fill.
+            // Note that we won't update the anchor position between layout passes (refer to
+            // TestResizingRelayoutWithAutoMeasure), which happens if we were to call
+            // updateAnchorInfoForLayout for an anchor that's not the focused view (e.g. a reference
+            // child which can change between layout passes).
+            mAnchorInfo.assignFromViewAndKeepVisibleRect(focused, getPosition(focused));
+        }
+        if (DEBUG) {
+            Log.d(TAG, "Anchor info:" + mAnchorInfo);
+        }
+
+        // LLM may decide to layout items for "extra" pixels to account for scrolling target,
+        // caching or predictive animations.
+
+        mLayoutState.mLayoutDirection = mLayoutState.mLastScrollDelta >= 0
+                ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        mReusableIntPair[0] = 0;
+        mReusableIntPair[1] = 0;
+        calculateExtraLayoutSpace(state, mReusableIntPair);
+        int extraForStart = Math.max(0, mReusableIntPair[0])
+                + mOrientationHelper.getStartAfterPadding();
+        int extraForEnd = Math.max(0, mReusableIntPair[1])
+                + mOrientationHelper.getEndPadding();
+        if (state.isPreLayout() && mPendingScrollPosition != RecyclerView.NO_POSITION
+                && mPendingScrollPositionOffset != INVALID_OFFSET) {
+            // if the child is visible and we are going to move it around, we should layout
+            // extra items in the opposite direction to make sure new items animate nicely
+            // instead of just fading in
+            final View existing = findViewByPosition(mPendingScrollPosition);
+            if (existing != null) {
+                final int current;
+                final int upcomingOffset;
+                if (mShouldReverseLayout) {
+                    current = mOrientationHelper.getEndAfterPadding()
+                            - mOrientationHelper.getDecoratedEnd(existing);
+                    upcomingOffset = current - mPendingScrollPositionOffset;
+                } else {
+                    current = mOrientationHelper.getDecoratedStart(existing)
+                            - mOrientationHelper.getStartAfterPadding();
+                    upcomingOffset = mPendingScrollPositionOffset - current;
+                }
+                if (upcomingOffset > 0) {
+                    extraForStart += upcomingOffset;
+                } else {
+                    extraForEnd -= upcomingOffset;
+                }
+            }
+        }
+        int startOffset;
+        int endOffset;
+        final int firstLayoutDirection;
+        if (mAnchorInfo.mLayoutFromEnd) {
+            firstLayoutDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_TAIL
+                    : LayoutState.ITEM_DIRECTION_HEAD;
+        } else {
+            firstLayoutDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_HEAD
+                    : LayoutState.ITEM_DIRECTION_TAIL;
+        }
+
+        onAnchorReady(recycler, state, mAnchorInfo, firstLayoutDirection);
+        detachAndScrapAttachedViews(recycler);
+        mLayoutState.mInfinite = resolveIsInfinite();
+        mLayoutState.mIsPreLayout = state.isPreLayout();
+        // noRecycleSpace not needed: recycling doesn't happen in below's fill
+        // invocations because mScrollingOffset is set to SCROLLING_OFFSET_NaN
+        mLayoutState.mNoRecycleSpace = 0;
+        if (mAnchorInfo.mLayoutFromEnd) {
+            // fill towards start
+            updateLayoutStateToFillStart(mAnchorInfo);
+            mLayoutState.mExtraFillSpace = extraForStart;
+            fill(recycler, mLayoutState, state, false);
+            startOffset = mLayoutState.mOffset;
+            final int firstElement = mLayoutState.mCurrentPosition;
+            if (mLayoutState.mAvailable > 0) {
+                extraForEnd += mLayoutState.mAvailable;
+            }
+            // fill towards end
+            updateLayoutStateToFillEnd(mAnchorInfo);
+            mLayoutState.mExtraFillSpace = extraForEnd;
+            mLayoutState.mCurrentPosition += mLayoutState.mItemDirection;
+            fill(recycler, mLayoutState, state, false);
+            endOffset = mLayoutState.mOffset;
+
+            if (mLayoutState.mAvailable > 0) {
+                // end could not consume all. add more items towards start
+                extraForStart = mLayoutState.mAvailable;
+                updateLayoutStateToFillStart(firstElement, startOffset);
+                mLayoutState.mExtraFillSpace = extraForStart;
+                fill(recycler, mLayoutState, state, false);
+                startOffset = mLayoutState.mOffset;
+            }
+        } else {
+            // fill towards end
+            updateLayoutStateToFillEnd(mAnchorInfo);
+            mLayoutState.mExtraFillSpace = extraForEnd;
+            fill(recycler, mLayoutState, state, false);
+            endOffset = mLayoutState.mOffset;
+            final int lastElement = mLayoutState.mCurrentPosition;
+            if (mLayoutState.mAvailable > 0) {
+                extraForStart += mLayoutState.mAvailable;
+            }
+            // fill towards start
+            updateLayoutStateToFillStart(mAnchorInfo);
+            mLayoutState.mExtraFillSpace = extraForStart;
+            mLayoutState.mCurrentPosition += mLayoutState.mItemDirection;
+            fill(recycler, mLayoutState, state, false);
+            startOffset = mLayoutState.mOffset;
+
+            if (mLayoutState.mAvailable > 0) {
+                extraForEnd = mLayoutState.mAvailable;
+                // start could not consume all it should. add more items towards end
+                updateLayoutStateToFillEnd(lastElement, endOffset);
+                mLayoutState.mExtraFillSpace = extraForEnd;
+                fill(recycler, mLayoutState, state, false);
+                endOffset = mLayoutState.mOffset;
+            }
+        }
+
+        // changes may cause gaps on the UI, try to fix them.
+        // TODO we can probably avoid this if neither stackFromEnd/reverseLayout/RTL values have
+        // changed
+        if (getChildCount() > 0) {
+            // because layout from end may be changed by scroll to position
+            // we re-calculate it.
+            // find which side we should check for gaps.
+            if (mShouldReverseLayout ^ mStackFromEnd) {
+                int fixOffset = fixLayoutEndGap(endOffset, recycler, state, true);
+                startOffset += fixOffset;
+                endOffset += fixOffset;
+                fixOffset = fixLayoutStartGap(startOffset, recycler, state, false);
+                startOffset += fixOffset;
+                endOffset += fixOffset;
+            } else {
+                int fixOffset = fixLayoutStartGap(startOffset, recycler, state, true);
+                startOffset += fixOffset;
+                endOffset += fixOffset;
+                fixOffset = fixLayoutEndGap(endOffset, recycler, state, false);
+                startOffset += fixOffset;
+                endOffset += fixOffset;
+            }
+        }
+        layoutForPredictiveAnimations(recycler, state, startOffset, endOffset);
+        if (!state.isPreLayout()) {
+            mOrientationHelper.onLayoutComplete();
+        } else {
+            mAnchorInfo.reset();
+        }
+        mLastStackFromEnd = mStackFromEnd;
+        if (DEBUG) {
+            validateChildOrder();
+        }
+    }
+
+    @Override
+    public void onLayoutCompleted(RecyclerView.State state) {
+        super.onLayoutCompleted(state);
+        mPendingSavedState = null; // we don't need this anymore
+        mPendingScrollPosition = RecyclerView.NO_POSITION;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        mAnchorInfo.reset();
+
+        updateScrolledToTop();
+    }
+
+    private void updateScrolledToTop() {
+        boolean oldScrolledToTop = mScrolledToTop;
+        mScrolledToTop = isScrolledToTop();
+
+        if (DEBUG && mScrolledToTop != oldScrolledToTop) {
+            Log.d(TAG, "Scrolled to top: " + mScrolledToTop);
+        }
+    }
+
+    private boolean isScrolledToTop() {
+        if (getChildCount() == 0) {
+            return true;
+        }
+
+        View firstChild = getChildAt(0);
+        if (firstChild == null) {
+            // This probably doesn't happen when getChildCount() != 0. But we really don't want to crash here.
+            return false;
+        }
+
+        int position = getPosition(firstChild);
+        if (position != 0) {
+            return false;
+        }
+
+        int recyclerViewStart = mOrientationHelper.getStartAfterPadding();
+        int firstVisibleChildStart = mOrientationHelper.getDecoratedStart(firstChild);
+
+        return recyclerViewStart == firstVisibleChildStart;
+    }
+
+    /**
+     * Method called when Anchor position is decided. Extending class can setup accordingly or
+     * even update anchor info if necessary.
+     *
+     * @param recycler                 The recycler for the layout
+     * @param state                    The layout state
+     * @param anchorInfo               The mutable POJO that keeps the position and offset.
+     * @param firstLayoutItemDirection The direction of the first layout filling in terms of adapter
+     *                                 indices.
+     */
+    void onAnchorReady(RecyclerView.Recycler recycler, RecyclerView.State state,
+            AnchorInfo anchorInfo, int firstLayoutItemDirection) {
+    }
+
+    /**
+     * If necessary, layouts new items for predictive animations
+     */
+    private void layoutForPredictiveAnimations(RecyclerView.Recycler recycler,
+            RecyclerView.State state, int startOffset,
+            int endOffset) {
+        // If there are scrap children that we did not layout, we need to find where they did go
+        // and layout them accordingly so that animations can work as expected.
+        // This case may happen if new views are added or an existing view expands and pushes
+        // another view out of bounds.
+        if (!state.willRunPredictiveAnimations() || getChildCount() == 0 || state.isPreLayout()
+                || !supportsPredictiveItemAnimations()) {
+            return;
+        }
+        // to make the logic simpler, we calculate the size of children and call fill.
+        int scrapExtraStart = 0, scrapExtraEnd = 0;
+        final List<RecyclerView.ViewHolder> scrapList = recycler.getScrapList();
+        final int scrapSize = scrapList.size();
+        final int firstChildPos = getPosition(getChildAt(0));
+        for (int i = 0; i < scrapSize; i++) {
+            RecyclerView.ViewHolder scrap = scrapList.get(i);
+            if (scrap.getBindingAdapterPosition() == RecyclerView.NO_POSITION) {
+                continue;
+            }
+            final int position = scrap.getLayoutPosition();
+            final int direction = position < firstChildPos != mShouldReverseLayout
+                    ? LayoutState.LAYOUT_START : LayoutState.LAYOUT_END;
+            if (direction == LayoutState.LAYOUT_START) {
+                scrapExtraStart += mOrientationHelper.getDecoratedMeasurement(scrap.itemView);
+            } else {
+                scrapExtraEnd += mOrientationHelper.getDecoratedMeasurement(scrap.itemView);
+            }
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "for unused scrap, decided to add " + scrapExtraStart
+                    + " towards start and " + scrapExtraEnd + " towards end");
+        }
+        mLayoutState.mScrapList = scrapList;
+        if (scrapExtraStart > 0) {
+            View anchor = getChildClosestToStart();
+            updateLayoutStateToFillStart(getPosition(anchor), startOffset);
+            mLayoutState.mExtraFillSpace = scrapExtraStart;
+            mLayoutState.mAvailable = 0;
+            mLayoutState.assignPositionFromScrapList();
+            fill(recycler, mLayoutState, state, false);
+        }
+
+        if (scrapExtraEnd > 0) {
+            View anchor = getChildClosestToEnd();
+            updateLayoutStateToFillEnd(getPosition(anchor), endOffset);
+            mLayoutState.mExtraFillSpace = scrapExtraEnd;
+            mLayoutState.mAvailable = 0;
+            mLayoutState.assignPositionFromScrapList();
+            fill(recycler, mLayoutState, state, false);
+        }
+        mLayoutState.mScrapList = null;
+    }
+
+    private void updateAnchorInfoForLayout(RecyclerView.Recycler recycler, RecyclerView.State state,
+            AnchorInfo anchorInfo) {
+        if (updateAnchorFromPendingData(state, anchorInfo)) {
+            if (DEBUG) {
+                Log.d(TAG, "updated anchor info from pending information");
+            }
+            return;
+        }
+
+        if (updateAnchorFromChildren(recycler, state, anchorInfo)) {
+            if (DEBUG) {
+                Log.d(TAG, "updated anchor info from existing children");
+            }
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "deciding anchor info for fresh state");
+        }
+        anchorInfo.assignCoordinateFromPadding();
+        anchorInfo.mPosition = mStackFromEnd ? state.getItemCount() - 1 : 0;
+    }
+
+    /**
+     * Finds an anchor child from existing Views. Most of the time, this is the view closest to
+     * start or end that has a valid position (e.g. not removed).
+     * <p>
+     * If a child has focus, it is given priority.
+     */
+    private boolean updateAnchorFromChildren(RecyclerView.Recycler recycler,
+            RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (getChildCount() == 0) {
+            return false;
+        }
+        final View focused = getFocusedChild();
+        if (focused != null && anchorInfo.isViewValidAsAnchor(focused, state)) {
+            anchorInfo.assignFromViewAndKeepVisibleRect(focused, getPosition(focused));
+            return true;
+        }
+        if (mLastStackFromEnd != mStackFromEnd) {
+            return false;
+        }
+
+        if (updateAnchorFromScrollPosition(state, anchorInfo)) {
+            return true;
+        }
+
+        View referenceChild =
+                findReferenceChild(
+                        recycler,
+                        state,
+                        anchorInfo.mLayoutFromEnd,
+                        mStackFromEnd);
+        if (referenceChild != null) {
+            anchorInfo.assignFromView(referenceChild, getPosition(referenceChild));
+            // If all visible views are removed in 1 pass, reference child might be out of bounds.
+            // If that is the case, offset it back to 0 so that we use these pre-layout children.
+            if (!state.isPreLayout() && supportsPredictiveItemAnimations()) {
+                // validate this child is at least partially visible. if not, offset it to start
+                final int childStart = mOrientationHelper.getDecoratedStart(referenceChild);
+                final int childEnd = mOrientationHelper.getDecoratedEnd(referenceChild);
+                final int boundsStart = mOrientationHelper.getStartAfterPadding();
+                final int boundsEnd = mOrientationHelper.getEndAfterPadding();
+                // b/148869110: usually if childStart >= boundsEnd the child is out of
+                // bounds, except if the child is 0 pixels!
+                boolean outOfBoundsBefore = childEnd <= boundsStart && childStart < boundsStart;
+                boolean outOfBoundsAfter = childStart >= boundsEnd && childEnd > boundsEnd;
+                if (outOfBoundsBefore || outOfBoundsAfter) {
+                    anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd ? boundsEnd : boundsStart;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+
+    private boolean updateAnchorFromScrollPosition(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (state.isPreLayout() || !mScrolledToTop) {
+            return false;
+        }
+
+        anchorInfo.mLayoutFromEnd = false;
+        anchorInfo.mPosition = 0;
+        anchorInfo.mValid = true;
+        anchorInfo.assignCoordinateFromPadding();
+        return true;
+    }
+
+    /**
+     * If there is a pending scroll position or saved states, updates the anchor info from that
+     * data and returns true
+     */
+    private boolean updateAnchorFromPendingData(RecyclerView.State state, AnchorInfo anchorInfo) {
+        if (state.isPreLayout() || mPendingScrollPosition == RecyclerView.NO_POSITION) {
+            return false;
+        }
+        // validate scroll position
+        if (mPendingScrollPosition < 0 || mPendingScrollPosition >= state.getItemCount()) {
+            mPendingScrollPosition = RecyclerView.NO_POSITION;
+            mPendingScrollPositionOffset = INVALID_OFFSET;
+            if (DEBUG) {
+                Log.e(TAG, "ignoring invalid scroll position " + mPendingScrollPosition);
+            }
+            return false;
+        }
+
+        // if child is visible, try to make it a reference child and ensure it is fully visible.
+        // if child is not visible, align it depending on its virtual position.
+        anchorInfo.mPosition = mPendingScrollPosition;
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor()) {
+            // Anchor offset depends on how that child was laid out. Here, we update it
+            // according to our current view bounds
+            anchorInfo.mLayoutFromEnd = mPendingSavedState.mAnchorLayoutFromEnd;
+            if (anchorInfo.mLayoutFromEnd) {
+                anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding()
+                        - mPendingSavedState.mAnchorOffset;
+            } else {
+                anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding()
+                        + mPendingSavedState.mAnchorOffset;
+            }
+            return true;
+        }
+
+        if (mPendingScrollPositionOffset == INVALID_OFFSET) {
+            View child = findViewByPosition(mPendingScrollPosition);
+            if (child != null) {
+                final int childSize = mOrientationHelper.getDecoratedMeasurement(child);
+                if (childSize > mOrientationHelper.getTotalSpace()) {
+                    // item does not fit. fix depending on layout direction
+                    anchorInfo.assignCoordinateFromPadding();
+                    return true;
+                }
+                final int startGap = mOrientationHelper.getDecoratedStart(child)
+                        - mOrientationHelper.getStartAfterPadding();
+                if (startGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding();
+                    anchorInfo.mLayoutFromEnd = false;
+                    return true;
+                }
+                final int endGap = mOrientationHelper.getEndAfterPadding()
+                        - mOrientationHelper.getDecoratedEnd(child);
+                if (endGap < 0) {
+                    anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding();
+                    anchorInfo.mLayoutFromEnd = true;
+                    return true;
+                }
+                anchorInfo.mCoordinate = anchorInfo.mLayoutFromEnd
+                        ? (mOrientationHelper.getDecoratedEnd(child) + mOrientationHelper
+                        .getTotalSpaceChange())
+                        : mOrientationHelper.getDecoratedStart(child);
+            } else { // item is not visible.
+                if (getChildCount() > 0) {
+                    // get position of any child, does not matter
+                    int pos = getPosition(getChildAt(0));
+                    anchorInfo.mLayoutFromEnd = mPendingScrollPosition < pos
+                            == mShouldReverseLayout;
+                }
+                anchorInfo.assignCoordinateFromPadding();
+            }
+            return true;
+        }
+        // override layout from end values for consistency
+        anchorInfo.mLayoutFromEnd = mShouldReverseLayout;
+        // if this changes, we should update prepareForDrop as well
+        if (mShouldReverseLayout) {
+            anchorInfo.mCoordinate = mOrientationHelper.getEndAfterPadding()
+                    - mPendingScrollPositionOffset;
+        } else {
+            anchorInfo.mCoordinate = mOrientationHelper.getStartAfterPadding()
+                    + mPendingScrollPositionOffset;
+        }
+        return true;
+    }
+
+    /**
+     * @return The final offset amount for children
+     */
+    private int fixLayoutEndGap(int endOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+        int fixOffset = 0;
+        if (gap > 0) {
+            fixOffset = -scrollBy(-gap, recycler, state);
+        } else {
+            return 0; // nothing to fix
+        }
+        // move offset according to scroll amount
+        endOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = mOrientationHelper.getEndAfterPadding() - endOffset;
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(gap);
+                return gap + fixOffset;
+            }
+        }
+        return fixOffset;
+    }
+
+    /**
+     * @return The final offset amount for children
+     */
+    private int fixLayoutStartGap(int startOffset, RecyclerView.Recycler recycler,
+            RecyclerView.State state, boolean canOffsetChildren) {
+        int gap = startOffset - mOrientationHelper.getStartAfterPadding();
+        int fixOffset = 0;
+        if (gap > 0) {
+            // check if we should fix this gap.
+            fixOffset = -scrollBy(gap, recycler, state);
+        } else {
+            return 0; // nothing to fix
+        }
+        startOffset += fixOffset;
+        if (canOffsetChildren) {
+            // re-calculate gap, see if we could fix it
+            gap = startOffset - mOrientationHelper.getStartAfterPadding();
+            if (gap > 0) {
+                mOrientationHelper.offsetChildren(-gap);
+                return fixOffset - gap;
+            }
+        }
+        return fixOffset;
+    }
+
+    private void updateLayoutStateToFillEnd(AnchorInfo anchorInfo) {
+        updateLayoutStateToFillEnd(anchorInfo.mPosition, anchorInfo.mCoordinate);
+    }
+
+    private void updateLayoutStateToFillEnd(int itemPosition, int offset) {
+        mLayoutState.mAvailable = mOrientationHelper.getEndAfterPadding() - offset;
+        mLayoutState.mItemDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_HEAD :
+                LayoutState.ITEM_DIRECTION_TAIL;
+        mLayoutState.mCurrentPosition = itemPosition;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_END;
+        mLayoutState.mOffset = offset;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+    }
+
+    private void updateLayoutStateToFillStart(AnchorInfo anchorInfo) {
+        updateLayoutStateToFillStart(anchorInfo.mPosition, anchorInfo.mCoordinate);
+    }
+
+    private void updateLayoutStateToFillStart(int itemPosition, int offset) {
+        mLayoutState.mAvailable = offset - mOrientationHelper.getStartAfterPadding();
+        mLayoutState.mCurrentPosition = itemPosition;
+        mLayoutState.mItemDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_TAIL :
+                LayoutState.ITEM_DIRECTION_HEAD;
+        mLayoutState.mLayoutDirection = LayoutState.LAYOUT_START;
+        mLayoutState.mOffset = offset;
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+
+    }
+
+    protected boolean isLayoutRTL() {
+        return getLayoutDirection() == ViewCompat.LAYOUT_DIRECTION_RTL;
+    }
+
+    void ensureLayoutState() {
+        if (mLayoutState == null) {
+            mLayoutState = createLayoutState();
+        }
+    }
+
+    /**
+     * Test overrides this to plug some tracking and verification.
+     *
+     * @return A new LayoutState
+     */
+    LayoutState createLayoutState() {
+        return new LayoutState();
+    }
+
+    /**
+     * <p>Scroll the RecyclerView to make the position visible.</p>
+     *
+     * <p>RecyclerView will scroll the minimum amount that is necessary to make the
+     * target position visible. If you are looking for a similar behavior to
+     * {@link android.widget.ListView#setSelection(int)} or
+     * {@link android.widget.ListView#setSelectionFromTop(int, int)}, use
+     * {@link #scrollToPositionWithOffset(int, int)}.</p>
+     *
+     * <p>Note that scroll position change will not be reflected until the next layout call.</p>
+     *
+     * @param position Scroll to this adapter position
+     * @see #scrollToPositionWithOffset(int, int)
+     */
+    @Override
+    public void scrollToPosition(int position) {
+        mPendingScrollPosition = position;
+        mPendingScrollPositionOffset = INVALID_OFFSET;
+        if (mPendingSavedState != null) {
+            mPendingSavedState.invalidateAnchor();
+        }
+        requestLayout();
+    }
+
+    /**
+     * Scroll to the specified adapter position with the given offset from resolved layout
+     * start. Resolved layout start depends on {@link #getReverseLayout()},
+     * {@link ViewCompat#getLayoutDirection(android.view.View)} and {@link #getStackFromEnd()}.
+     * <p>
+     * For example, if layout is {@link #VERTICAL} and {@link #getStackFromEnd()} is true, calling
+     * <code>scrollToPositionWithOffset(10, 20)</code> will layout such that
+     * <code>item[10]</code>'s bottom is 20 pixels above the RecyclerView's bottom.
+     * <p>
+     * Note that scroll position change will not be reflected until the next layout call.
+     * <p>
+     * If you are just trying to make a position visible, use {@link #scrollToPosition(int)}.
+     *
+     * @param position Index (starting at 0) of the reference item.
+     * @param offset   The distance (in pixels) between the start edge of the item view and
+     *                 start edge of the RecyclerView.
+     * @see #setReverseLayout(boolean)
+     * @see #scrollToPosition(int)
+     */
+    public void scrollToPositionWithOffset(int position, int offset) {
+        mPendingScrollPosition = position;
+        mPendingScrollPositionOffset = offset;
+        if (mPendingSavedState != null) {
+            mPendingSavedState.invalidateAnchor();
+        }
+        requestLayout();
+    }
+
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int scrollHorizontallyBy(int dx, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (mOrientation == VERTICAL) {
+            return 0;
+        }
+        return scrollBy(dx, recycler, state);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int scrollVerticallyBy(int dy, RecyclerView.Recycler recycler,
+            RecyclerView.State state) {
+        if (mOrientation == HORIZONTAL) {
+            return 0;
+        }
+        return scrollBy(dy, recycler, state);
+    }
+
+    @Override
+    public int computeHorizontalScrollOffset(RecyclerView.State state) {
+        return computeScrollOffset(state);
+    }
+
+    @Override
+    public int computeVerticalScrollOffset(RecyclerView.State state) {
+        return computeScrollOffset(state);
+    }
+
+    @Override
+    public int computeHorizontalScrollExtent(RecyclerView.State state) {
+        return computeScrollExtent(state);
+    }
+
+    @Override
+    public int computeVerticalScrollExtent(RecyclerView.State state) {
+        return computeScrollExtent(state);
+    }
+
+    @Override
+    public int computeHorizontalScrollRange(RecyclerView.State state) {
+        return computeScrollRange(state);
+    }
+
+    @Override
+    public int computeVerticalScrollRange(RecyclerView.State state) {
+        return computeScrollRange(state);
+    }
+
+    private int computeScrollOffset(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        ensureLayoutState();
+        return ScrollbarHelper.computeScrollOffset(state, mOrientationHelper,
+                findFirstVisibleChildClosestToStart(!mSmoothScrollbarEnabled, true),
+                findFirstVisibleChildClosestToEnd(!mSmoothScrollbarEnabled, true),
+                this, mSmoothScrollbarEnabled, mShouldReverseLayout);
+    }
+
+    private int computeScrollExtent(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        ensureLayoutState();
+        return ScrollbarHelper.computeScrollExtent(state, mOrientationHelper,
+                findFirstVisibleChildClosestToStart(!mSmoothScrollbarEnabled, true),
+                findFirstVisibleChildClosestToEnd(!mSmoothScrollbarEnabled, true),
+                this, mSmoothScrollbarEnabled);
+    }
+
+    private int computeScrollRange(RecyclerView.State state) {
+        if (getChildCount() == 0) {
+            return 0;
+        }
+        ensureLayoutState();
+        return ScrollbarHelper.computeScrollRange(state, mOrientationHelper,
+                findFirstVisibleChildClosestToStart(!mSmoothScrollbarEnabled, true),
+                findFirstVisibleChildClosestToEnd(!mSmoothScrollbarEnabled, true),
+                this, mSmoothScrollbarEnabled);
+    }
+
+    /**
+     * When smooth scrollbar is enabled, the position and size of the scrollbar thumb is computed
+     * based on the number of visible pixels in the visible items. This however assumes that all
+     * list items have similar or equal widths or heights (depending on list orientation).
+     * If you use a list in which items have different dimensions, the scrollbar will change
+     * appearance as the user scrolls through the list. To avoid this issue,  you need to disable
+     * this property.
+     *
+     * When smooth scrollbar is disabled, the position and size of the scrollbar thumb is based
+     * solely on the number of items in the adapter and the position of the visible items inside
+     * the adapter. This provides a stable scrollbar as the user navigates through a list of items
+     * with varying widths / heights.
+     *
+     * @param enabled Whether or not to enable smooth scrollbar.
+     * @see #setSmoothScrollbarEnabled(boolean)
+     */
+    public void setSmoothScrollbarEnabled(boolean enabled) {
+        mSmoothScrollbarEnabled = enabled;
+    }
+
+    /**
+     * Returns the current state of the smooth scrollbar feature. It is enabled by default.
+     *
+     * @return True if smooth scrollbar is enabled, false otherwise.
+     * @see #setSmoothScrollbarEnabled(boolean)
+     */
+    public boolean isSmoothScrollbarEnabled() {
+        return mSmoothScrollbarEnabled;
+    }
+
+    private void updateLayoutState(int layoutDirection, int requiredSpace,
+            boolean canUseExistingSpace, RecyclerView.State state) {
+        // If parent provides a hint, don't measure unlimited.
+        mLayoutState.mInfinite = resolveIsInfinite();
+        mLayoutState.mLayoutDirection = layoutDirection;
+        mReusableIntPair[0] = 0;
+        mReusableIntPair[1] = 0;
+        calculateExtraLayoutSpace(state, mReusableIntPair);
+        int extraForStart = Math.max(0, mReusableIntPair[0]);
+        int extraForEnd = Math.max(0, mReusableIntPair[1]);
+        boolean layoutToEnd = layoutDirection == LayoutState.LAYOUT_END;
+        mLayoutState.mExtraFillSpace = layoutToEnd ? extraForEnd : extraForStart;
+        mLayoutState.mNoRecycleSpace = layoutToEnd ? extraForStart : extraForEnd;
+        int scrollingOffset;
+        if (layoutToEnd) {
+            mLayoutState.mExtraFillSpace += mOrientationHelper.getEndPadding();
+            // get the first child in the direction we are going
+            final View child = getChildClosestToEnd();
+            // the direction in which we are traversing children
+            mLayoutState.mItemDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_HEAD
+                    : LayoutState.ITEM_DIRECTION_TAIL;
+            mLayoutState.mCurrentPosition = getPosition(child) + mLayoutState.mItemDirection;
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedEnd(child);
+            // calculate how much we can scroll without adding new children (independent of layout)
+            scrollingOffset = mOrientationHelper.getDecoratedEnd(child)
+                    - mOrientationHelper.getEndAfterPadding();
+
+        } else {
+            final View child = getChildClosestToStart();
+            mLayoutState.mExtraFillSpace += mOrientationHelper.getStartAfterPadding();
+            mLayoutState.mItemDirection = mShouldReverseLayout ? LayoutState.ITEM_DIRECTION_TAIL
+                    : LayoutState.ITEM_DIRECTION_HEAD;
+            mLayoutState.mCurrentPosition = getPosition(child) + mLayoutState.mItemDirection;
+            mLayoutState.mOffset = mOrientationHelper.getDecoratedStart(child);
+            scrollingOffset = -mOrientationHelper.getDecoratedStart(child)
+                    + mOrientationHelper.getStartAfterPadding();
+        }
+        mLayoutState.mAvailable = requiredSpace;
+        if (canUseExistingSpace) {
+            mLayoutState.mAvailable -= scrollingOffset;
+        }
+        mLayoutState.mScrollingOffset = scrollingOffset;
+    }
+
+    boolean resolveIsInfinite() {
+        return mOrientationHelper.getMode() == View.MeasureSpec.UNSPECIFIED
+                && mOrientationHelper.getEnd() == 0;
+    }
+
+    void collectPrefetchPositionsForLayoutState(RecyclerView.State state, LayoutState layoutState,
+            LayoutPrefetchRegistry layoutPrefetchRegistry) {
+        final int pos = layoutState.mCurrentPosition;
+        if (pos >= 0 && pos < state.getItemCount()) {
+            layoutPrefetchRegistry.addPosition(pos, Math.max(0, layoutState.mScrollingOffset));
+        }
+    }
+
+    @Override
+    public void collectInitialPrefetchPositions(int adapterItemCount,
+            LayoutPrefetchRegistry layoutPrefetchRegistry) {
+        final boolean fromEnd;
+        final int anchorPos;
+        if (mPendingSavedState != null && mPendingSavedState.hasValidAnchor()) {
+            // use restored state, since it hasn't been resolved yet
+            fromEnd = mPendingSavedState.mAnchorLayoutFromEnd;
+            anchorPos = mPendingSavedState.mAnchorPosition;
+        } else {
+            resolveShouldLayoutReverse();
+            fromEnd = mShouldReverseLayout;
+            if (mPendingScrollPosition == RecyclerView.NO_POSITION) {
+                anchorPos = fromEnd ? adapterItemCount - 1 : 0;
+            } else {
+                anchorPos = mPendingScrollPosition;
+            }
+        }
+
+        final int direction = fromEnd
+                ? LayoutState.ITEM_DIRECTION_HEAD
+                : LayoutState.ITEM_DIRECTION_TAIL;
+        int targetPos = anchorPos;
+        for (int i = 0; i < mInitialPrefetchItemCount; i++) {
+            if (targetPos >= 0 && targetPos < adapterItemCount) {
+                layoutPrefetchRegistry.addPosition(targetPos, 0);
+            } else {
+                break; // no more to prefetch
+            }
+            targetPos += direction;
+        }
+    }
+
+    /**
+     * Sets the number of items to prefetch in
+     * {@link #collectInitialPrefetchPositions(int, LayoutPrefetchRegistry)}, which defines
+     * how many inner items should be prefetched when this LayoutManager's RecyclerView
+     * is nested inside another RecyclerView.
+     *
+     * <p>Set this value to the number of items this inner LayoutManager will display when it is
+     * first scrolled into the viewport. RecyclerView will attempt to prefetch that number of items
+     * so they are ready, avoiding jank as the inner RecyclerView is scrolled into the viewport.</p>
+     *
+     * <p>For example, take a vertically scrolling RecyclerView with horizontally scrolling inner
+     * RecyclerViews. The rows always have 4 items visible in them (or 5 if not aligned). Passing
+     * <code>4</code> to this method for each inner RecyclerView's LinearLayoutManager will enable
+     * RecyclerView's prefetching feature to do create/bind work for 4 views within a row early,
+     * before it is scrolled on screen, instead of just the default 2.</p>
+     *
+     * <p>Calling this method does nothing unless the LayoutManager is in a RecyclerView
+     * nested in another RecyclerView.</p>
+     *
+     * <p class="note"><strong>Note:</strong> Setting this value to be larger than the number of
+     * views that will be visible in this view can incur unnecessary bind work, and an increase to
+     * the number of Views created and in active use.</p>
+     *
+     * @param itemCount Number of items to prefetch
+     * @see #isItemPrefetchEnabled()
+     * @see #getInitialPrefetchItemCount()
+     * @see #collectInitialPrefetchPositions(int, LayoutPrefetchRegistry)
+     */
+    public void setInitialPrefetchItemCount(int itemCount) {
+        mInitialPrefetchItemCount = itemCount;
+    }
+
+    /**
+     * Gets the number of items to prefetch in
+     * {@link #collectInitialPrefetchPositions(int, LayoutPrefetchRegistry)}, which defines
+     * how many inner items should be prefetched when this LayoutManager's RecyclerView
+     * is nested inside another RecyclerView.
+     *
+     * @return number of items to prefetch.
+     * @see #isItemPrefetchEnabled()
+     * @see #setInitialPrefetchItemCount(int)
+     * @see #collectInitialPrefetchPositions(int, LayoutPrefetchRegistry)
+     */
+    public int getInitialPrefetchItemCount() {
+        return mInitialPrefetchItemCount;
+    }
+
+    @Override
+    public void collectAdjacentPrefetchPositions(int dx, int dy, RecyclerView.State state,
+            LayoutPrefetchRegistry layoutPrefetchRegistry) {
+        int delta = (mOrientation == HORIZONTAL) ? dx : dy;
+        if (getChildCount() == 0 || delta == 0) {
+            // can't support this scroll, so don't bother prefetching
+            return;
+        }
+
+        ensureLayoutState();
+        final int layoutDirection = delta > 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        final int absDelta = Math.abs(delta);
+        updateLayoutState(layoutDirection, absDelta, true, state);
+        collectPrefetchPositionsForLayoutState(state, mLayoutState, layoutPrefetchRegistry);
+    }
+
+    int scrollBy(int delta, RecyclerView.Recycler recycler, RecyclerView.State state) {
+        if (getChildCount() == 0 || delta == 0) {
+            return 0;
+        }
+        ensureLayoutState();
+        mLayoutState.mRecycle = true;
+        final int layoutDirection = delta > 0 ? LayoutState.LAYOUT_END : LayoutState.LAYOUT_START;
+        final int absDelta = Math.abs(delta);
+        updateLayoutState(layoutDirection, absDelta, true, state);
+        final int consumed = mLayoutState.mScrollingOffset
+                + fill(recycler, mLayoutState, state, false);
+        if (consumed < 0) {
+            if (DEBUG) {
+                Log.d(TAG, "Don't have any more elements to scroll");
+            }
+            updateScrolledToTop();
+            return 0;
+        }
+        final int scrolled = absDelta > consumed ? layoutDirection * consumed : delta;
+        mOrientationHelper.offsetChildren(-scrolled);
+        if (DEBUG) {
+            Log.d(TAG, "scroll req: " + delta + " scrolled: " + scrolled);
+        }
+        mLayoutState.mLastScrollDelta = scrolled;
+
+        updateScrolledToTop();
+        return scrolled;
+    }
+
+    @Override
+    public void assertNotInLayoutOrScroll(String message) {
+        if (mPendingSavedState == null) {
+            super.assertNotInLayoutOrScroll(message);
+        }
+    }
+
+    /**
+     * Recycles children between given indices.
+     *
+     * @param startIndex inclusive
+     * @param endIndex   exclusive
+     */
+    private void recycleChildren(RecyclerView.Recycler recycler, int startIndex, int endIndex) {
+        if (startIndex == endIndex) {
+            return;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "Recycling " + Math.abs(startIndex - endIndex) + " items");
+        }
+        if (endIndex > startIndex) {
+            for (int i = endIndex - 1; i >= startIndex; i--) {
+                removeAndRecycleViewAt(i, recycler);
+            }
+        } else {
+            for (int i = startIndex; i > endIndex; i--) {
+                removeAndRecycleViewAt(i, recycler);
+            }
+        }
+    }
+
+    /**
+     * Recycles views that went out of bounds after scrolling towards the end of the layout.
+     * <p>
+     * Checks both layout position and visible position to guarantee that the view is not visible.
+     *
+     * @param recycler        Recycler instance of {@link RecyclerView}
+     * @param scrollingOffset This can be used to add additional padding to the visible area. This
+     *                        is used to detect children that will go out of bounds after scrolling,
+     *                        without actually moving them.
+     * @param noRecycleSpace  Extra space that should be excluded from recycling. This is the space
+     *                        from {@code extraLayoutSpace[0]}, calculated in {@link
+     *                        #calculateExtraLayoutSpace}.
+     */
+    private void recycleViewsFromStart(RecyclerView.Recycler recycler, int scrollingOffset,
+            int noRecycleSpace) {
+        if (scrollingOffset < 0) {
+            if (DEBUG) {
+                Log.d(TAG, "Called recycle from start with a negative value. This might happen"
+                        + " during layout changes but may be sign of a bug");
+            }
+            return;
+        }
+        // ignore padding, ViewGroup may not clip children.
+        final int limit = scrollingOffset - noRecycleSpace;
+        final int childCount = getChildCount();
+        if (mShouldReverseLayout) {
+            for (int i = childCount - 1; i >= 0; i--) {
+                View child = getChildAt(i);
+                if (mOrientationHelper.getDecoratedEnd(child) > limit
+                        || mOrientationHelper.getTransformedEndWithDecoration(child) > limit) {
+                    // stop here
+                    recycleChildren(recycler, childCount - 1, i);
+                    return;
+                }
+            }
+        } else {
+            for (int i = 0; i < childCount; i++) {
+                View child = getChildAt(i);
+                if (mOrientationHelper.getDecoratedEnd(child) > limit
+                        || mOrientationHelper.getTransformedEndWithDecoration(child) > limit) {
+                    // stop here
+                    recycleChildren(recycler, 0, i);
+                    return;
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Recycles views that went out of bounds after scrolling towards the start of the layout.
+     * <p>
+     * Checks both layout position and visible position to guarantee that the view is not visible.
+     *
+     * @param recycler        Recycler instance of {@link RecyclerView}
+     * @param scrollingOffset This can be used to add additional padding to the visible area. This
+     *                        is used to detect children that will go out of bounds after scrolling,
+     *                        without actually moving them.
+     * @param noRecycleSpace  Extra space that should be excluded from recycling. This is the space
+     *                        from {@code extraLayoutSpace[1]}, calculated in {@link
+     *                        #calculateExtraLayoutSpace}.
+     */
+    private void recycleViewsFromEnd(RecyclerView.Recycler recycler, int scrollingOffset,
+            int noRecycleSpace) {
+        final int childCount = getChildCount();
+        if (scrollingOffset < 0) {
+            if (DEBUG) {
+                Log.d(TAG, "Called recycle from end with a negative value. This might happen"
+                        + " during layout changes but may be sign of a bug");
+            }
+            return;
+        }
+        final int limit = mOrientationHelper.getEnd() - scrollingOffset + noRecycleSpace;
+        if (mShouldReverseLayout) {
+            for (int i = 0; i < childCount; i++) {
+                View child = getChildAt(i);
+                if (mOrientationHelper.getDecoratedStart(child) < limit
+                        || mOrientationHelper.getTransformedStartWithDecoration(child) < limit) {
+                    // stop here
+                    recycleChildren(recycler, 0, i);
+                    return;
+                }
+            }
+        } else {
+            for (int i = childCount - 1; i >= 0; i--) {
+                View child = getChildAt(i);
+                if (mOrientationHelper.getDecoratedStart(child) < limit
+                        || mOrientationHelper.getTransformedStartWithDecoration(child) < limit) {
+                    // stop here
+                    recycleChildren(recycler, childCount - 1, i);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     * Helper method to call appropriate recycle method depending on current layout direction
+     *
+     * @param recycler    Current recycler that is attached to RecyclerView
+     * @param layoutState Current layout state. Right now, this object does not change but
+     *                    we may consider moving it out of this view so passing around as a
+     *                    parameter for now, rather than accessing {@link #mLayoutState}
+     * @see #recycleViewsFromStart(RecyclerView.Recycler, int, int)
+     * @see #recycleViewsFromEnd(RecyclerView.Recycler, int, int)
+     * @see LinearLayoutManager.LayoutState#mLayoutDirection
+     */
+    private void recycleByLayoutState(RecyclerView.Recycler recycler, LayoutState layoutState) {
+        if (!layoutState.mRecycle || layoutState.mInfinite) {
+            return;
+        }
+        int scrollingOffset = layoutState.mScrollingOffset;
+        int noRecycleSpace = layoutState.mNoRecycleSpace;
+        if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+            recycleViewsFromEnd(recycler, scrollingOffset, noRecycleSpace);
+        } else {
+            recycleViewsFromStart(recycler, scrollingOffset, noRecycleSpace);
+        }
+    }
+
+    /**
+     * The magic functions :). Fills the given layout, defined by the layoutState. This is fairly
+     * independent from the rest of the {@link LinearLayoutManager}
+     * and with little change, can be made publicly available as a helper class.
+     *
+     * @param recycler        Current recycler that is attached to RecyclerView
+     * @param layoutState     Configuration on how we should fill out the available space.
+     * @param state           Context passed by the RecyclerView to control scroll steps.
+     * @param stopOnFocusable If true, filling stops in the first focusable new child
+     * @return Number of pixels that it added. Useful for scroll functions.
+     */
+    int fill(RecyclerView.Recycler recycler, LayoutState layoutState,
+            RecyclerView.State state, boolean stopOnFocusable) {
+        // max offset we should set is mFastScroll + available
+        final int start = layoutState.mAvailable;
+        if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+            // TODO ugly bug fix. should not happen
+            if (layoutState.mAvailable < 0) {
+                layoutState.mScrollingOffset += layoutState.mAvailable;
+            }
+            recycleByLayoutState(recycler, layoutState);
+        }
+        int remainingSpace = layoutState.mAvailable + layoutState.mExtraFillSpace;
+        LayoutChunkResult layoutChunkResult = mLayoutChunkResult;
+        while ((layoutState.mInfinite || remainingSpace > 0) && layoutState.hasMore(state)) {
+            layoutChunkResult.resetInternal();
+            layoutChunk(recycler, state, layoutState, layoutChunkResult);
+            if (layoutChunkResult.mFinished) {
+                break;
+            }
+            layoutState.mOffset += layoutChunkResult.mConsumed * layoutState.mLayoutDirection;
+            /**
+             * Consume the available space if:
+             * * layoutChunk did not request to be ignored
+             * * OR we are laying out scrap children
+             * * OR we are not doing pre-layout
+             */
+            if (!layoutChunkResult.mIgnoreConsumed || layoutState.mScrapList != null
+                    || !state.isPreLayout()) {
+                layoutState.mAvailable -= layoutChunkResult.mConsumed;
+                // we keep a separate remaining space because mAvailable is important for recycling
+                remainingSpace -= layoutChunkResult.mConsumed;
+            }
+
+            if (layoutState.mScrollingOffset != LayoutState.SCROLLING_OFFSET_NaN) {
+                layoutState.mScrollingOffset += layoutChunkResult.mConsumed;
+                if (layoutState.mAvailable < 0) {
+                    layoutState.mScrollingOffset += layoutState.mAvailable;
+                }
+                recycleByLayoutState(recycler, layoutState);
+            }
+            if (stopOnFocusable && layoutChunkResult.mFocusable) {
+                break;
+            }
+        }
+        if (DEBUG) {
+            validateChildOrder();
+        }
+        return start - layoutState.mAvailable;
+    }
+
+    void layoutChunk(RecyclerView.Recycler recycler, RecyclerView.State state,
+            LayoutState layoutState, LayoutChunkResult result) {
+        View view = layoutState.next(recycler);
+        if (view == null) {
+            if (DEBUG && layoutState.mScrapList == null) {
+                throw new RuntimeException("received null view when unexpected");
+            }
+            // if we are laying out views in scrap, this may return null which means there is
+            // no more items to layout.
+            result.mFinished = true;
+            return;
+        }
+        RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) view.getLayoutParams();
+        if (layoutState.mScrapList == null) {
+            if (mShouldReverseLayout == (layoutState.mLayoutDirection
+                    == LayoutState.LAYOUT_START)) {
+                addView(view);
+            } else {
+                addView(view, 0);
+            }
+        } else {
+            if (mShouldReverseLayout == (layoutState.mLayoutDirection
+                    == LayoutState.LAYOUT_START)) {
+                addDisappearingView(view);
+            } else {
+                addDisappearingView(view, 0);
+            }
+        }
+        measureChildWithMargins(view, 0, 0);
+        result.mConsumed = mOrientationHelper.getDecoratedMeasurement(view);
+        int left, top, right, bottom;
+        if (mOrientation == VERTICAL) {
+            if (isLayoutRTL()) {
+                right = getWidth() - getPaddingRight();
+                left = right - mOrientationHelper.getDecoratedMeasurementInOther(view);
+            } else {
+                left = getPaddingLeft();
+                right = left + mOrientationHelper.getDecoratedMeasurementInOther(view);
+            }
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+                bottom = layoutState.mOffset;
+                top = layoutState.mOffset - result.mConsumed;
+            } else {
+                top = layoutState.mOffset;
+                bottom = layoutState.mOffset + result.mConsumed;
+            }
+        } else {
+            top = getPaddingTop();
+            bottom = top + mOrientationHelper.getDecoratedMeasurementInOther(view);
+
+            if (layoutState.mLayoutDirection == LayoutState.LAYOUT_START) {
+                right = layoutState.mOffset;
+                left = layoutState.mOffset - result.mConsumed;
+            } else {
+                left = layoutState.mOffset;
+                right = layoutState.mOffset + result.mConsumed;
+            }
+        }
+        // We calculate everything with View's bounding box (which includes decor and margins)
+        // To calculate correct layout position, we subtract margins.
+        layoutDecoratedWithMargins(view, left, top, right, bottom);
+        if (DEBUG) {
+            Log.d(TAG, "laid out child at position " + getPosition(view) + ", with l:"
+                    + (left + params.leftMargin) + ", t:" + (top + params.topMargin) + ", r:"
+                    + (right - params.rightMargin) + ", b:" + (bottom - params.bottomMargin));
+        }
+        // Consume the available space if the view is not removed OR changed
+        if (params.isItemRemoved() || params.isItemChanged()) {
+            result.mIgnoreConsumed = true;
+        }
+        result.mFocusable = view.hasFocusable();
+    }
+
+    /**
+     * Converts a focusDirection to orientation.
+     *
+     * @param focusDirection One of {@link View#FOCUS_UP}, {@link View#FOCUS_DOWN},
+     *                       {@link View#FOCUS_LEFT}, {@link View#FOCUS_RIGHT},
+     *                       {@link View#FOCUS_BACKWARD}, {@link View#FOCUS_FORWARD}
+     *                       or 0 for not applicable
+     * @return {@link LayoutState#LAYOUT_START} or {@link LayoutState#LAYOUT_END} if focus direction
+     * is applicable to current state, {@link LayoutState#INVALID_LAYOUT} otherwise.
+     */
+    int convertFocusDirectionToLayoutDirection(int focusDirection) {
+        switch (focusDirection) {
+            case View.FOCUS_BACKWARD:
+                if (mOrientation == VERTICAL) {
+                    return LayoutState.LAYOUT_START;
+                } else if (isLayoutRTL()) {
+                    return LayoutState.LAYOUT_END;
+                } else {
+                    return LayoutState.LAYOUT_START;
+                }
+            case View.FOCUS_FORWARD:
+                if (mOrientation == VERTICAL) {
+                    return LayoutState.LAYOUT_END;
+                } else if (isLayoutRTL()) {
+                    return LayoutState.LAYOUT_START;
+                } else {
+                    return LayoutState.LAYOUT_END;
+                }
+            case View.FOCUS_UP:
+                return mOrientation == VERTICAL ? LayoutState.LAYOUT_START
+                        : LayoutState.INVALID_LAYOUT;
+            case View.FOCUS_DOWN:
+                return mOrientation == VERTICAL ? LayoutState.LAYOUT_END
+                        : LayoutState.INVALID_LAYOUT;
+            case View.FOCUS_LEFT:
+                return mOrientation == HORIZONTAL ? LayoutState.LAYOUT_START
+                        : LayoutState.INVALID_LAYOUT;
+            case View.FOCUS_RIGHT:
+                return mOrientation == HORIZONTAL ? LayoutState.LAYOUT_END
+                        : LayoutState.INVALID_LAYOUT;
+            default:
+                if (DEBUG) {
+                    Log.d(TAG, "Unknown focus request:" + focusDirection);
+                }
+                return LayoutState.INVALID_LAYOUT;
+        }
+
+    }
+
+    /**
+     * Convenience method to find the child closes to start. Caller should check it has enough
+     * children.
+     *
+     * @return The child closes to start of the layout from user's perspective.
+     */
+    private View getChildClosestToStart() {
+        return getChildAt(mShouldReverseLayout ? getChildCount() - 1 : 0);
+    }
+
+    /**
+     * Convenience method to find the child closes to end. Caller should check it has enough
+     * children.
+     *
+     * @return The child closes to end of the layout from user's perspective.
+     */
+    private View getChildClosestToEnd() {
+        return getChildAt(mShouldReverseLayout ? 0 : getChildCount() - 1);
+    }
+
+    /**
+     * Convenience method to find the visible child closes to start. Caller should check if it has
+     * enough children.
+     *
+     * @param completelyVisible Whether child should be completely visible or not
+     * @return The first visible child closest to start of the layout from user's perspective.
+     */
+    View findFirstVisibleChildClosestToStart(boolean completelyVisible,
+            boolean acceptPartiallyVisible) {
+        if (mShouldReverseLayout) {
+            return findOneVisibleChild(getChildCount() - 1, -1, completelyVisible,
+                    acceptPartiallyVisible);
+        } else {
+            return findOneVisibleChild(0, getChildCount(), completelyVisible,
+                    acceptPartiallyVisible);
+        }
+    }
+
+    /**
+     * Convenience method to find the visible child closes to end. Caller should check if it has
+     * enough children.
+     *
+     * @param completelyVisible Whether child should be completely visible or not
+     * @return The first visible child closest to end of the layout from user's perspective.
+     */
+    View findFirstVisibleChildClosestToEnd(boolean completelyVisible,
+            boolean acceptPartiallyVisible) {
+        if (mShouldReverseLayout) {
+            return findOneVisibleChild(0, getChildCount(), completelyVisible,
+                    acceptPartiallyVisible);
+        } else {
+            return findOneVisibleChild(getChildCount() - 1, -1, completelyVisible,
+                    acceptPartiallyVisible);
+        }
+    }
+
+    // overridden by GridLayoutManager
+
+    /**
+     * Finds a suitable anchor child.
+     * <p>
+     * Due to ambiguous adapter updates or children being removed, some children's positions may be
+     * invalid. This method is a best effort to find a position within adapter bounds if possible.
+     * <p>
+     * It also prioritizes children from best to worst in this order:
+     * <ol>
+     *   <li> An in bounds child.
+     *   <li> An out of bounds child.
+     *   <li> An invalid child.
+     * </ol>
+     *
+     * @param layoutFromEnd True if the RV scrolls in the reverse direction, which is the same as
+     *                      (reverseLayout ^ stackFromEnd).
+     * @param traverseChildrenInReverseOrder True if the children should be traversed in reverse
+     *                                       order (stackFromEnd).
+     * @return A View that can be used an an anchor View.
+     */
+    View findReferenceChild(RecyclerView.Recycler recycler, RecyclerView.State state,
+            boolean layoutFromEnd, boolean traverseChildrenInReverseOrder) {
+        ensureLayoutState();
+
+        // Determine which direction through the view children we are going iterate.
+        int start = 0;
+        int end = getChildCount();
+        int diff = 1;
+        if (traverseChildrenInReverseOrder) {
+            start = getChildCount() - 1;
+            end = -1;
+            diff = -1;
+        }
+
+        int itemCount = state.getItemCount();
+
+        final int boundsStart = mOrientationHelper.getStartAfterPadding();
+        final int boundsEnd = mOrientationHelper.getEndAfterPadding();
+
+        View invalidMatch = null;
+        View bestFirstFind = null;
+        View bestSecondFind = null;
+
+        for (int i = start; i != end; i += diff) {
+            final View view = getChildAt(i);
+            final int position = getPosition(view);
+            final int childStart = mOrientationHelper.getDecoratedStart(view);
+            final int childEnd = mOrientationHelper.getDecoratedEnd(view);
+            if (position >= 0 && position < itemCount) {
+                if (((RecyclerView.LayoutParams) view.getLayoutParams()).isItemRemoved()) {
+                    if (invalidMatch == null) {
+                        invalidMatch = view; // removed item, least preferred
+                    }
+                } else {
+                    // b/148869110: usually if childStart >= boundsEnd the child is out of
+                    // bounds, except if the child is 0 pixels!
+                    boolean outOfBoundsBefore = childEnd <= boundsStart && childStart < boundsStart;
+                    boolean outOfBoundsAfter = childStart >= boundsEnd && childEnd > boundsEnd;
+                    if (outOfBoundsBefore || outOfBoundsAfter) {
+                        // The item is out of bounds.
+                        // We want to find the items closest to the in bounds items and because we
+                        // are always going through the items linearly, the 2 items we want are the
+                        // last out of bounds item on the side we start searching on, and the first
+                        // out of bounds item on the side we are ending on.  The side that we are
+                        // ending on ultimately takes priority because we want items later in the
+                        // layout to move forward if no in bounds anchors are found.
+                        if (layoutFromEnd) {
+                            if (outOfBoundsAfter) {
+                                bestFirstFind = view;
+                            } else if (bestSecondFind == null) {
+                                bestSecondFind = view;
+                            }
+                        } else {
+                            if (outOfBoundsBefore) {
+                                bestFirstFind = view;
+                            } else if (bestSecondFind == null) {
+                                bestSecondFind = view;
+                            }
+                        }
+                    } else {
+                        // We found an in bounds item, greedily return it.
+                        return view;
+                    }
+                }
+            }
+        }
+        // We didn't find an in bounds item so we will settle for an item in this order:
+        // 1. bestSecondFind
+        // 2. bestFirstFind
+        // 3. invalidMatch
+        return bestSecondFind != null ? bestSecondFind :
+                (bestFirstFind != null ? bestFirstFind : invalidMatch);
+    }
+
+    // returns the out-of-bound child view closest to RV's end bounds. An out-of-bound child is
+    // defined as a child that's either partially or fully invisible (outside RV's padding area).
+    private View findPartiallyOrCompletelyInvisibleChildClosestToEnd() {
+        return mShouldReverseLayout ? findFirstPartiallyOrCompletelyInvisibleChild()
+                : findLastPartiallyOrCompletelyInvisibleChild();
+    }
+
+    // returns the out-of-bound child view closest to RV's starting bounds. An out-of-bound child is
+    // defined as a child that's either partially or fully invisible (outside RV's padding area).
+    private View findPartiallyOrCompletelyInvisibleChildClosestToStart() {
+        return mShouldReverseLayout ? findLastPartiallyOrCompletelyInvisibleChild() :
+                findFirstPartiallyOrCompletelyInvisibleChild();
+    }
+
+    private View findFirstPartiallyOrCompletelyInvisibleChild() {
+        return findOnePartiallyOrCompletelyInvisibleChild(0, getChildCount());
+    }
+
+    private View findLastPartiallyOrCompletelyInvisibleChild() {
+        return findOnePartiallyOrCompletelyInvisibleChild(getChildCount() - 1, -1);
+    }
+
+    /**
+     * Returns the adapter position of the first visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     * <p>
+     * Note that, this value is not affected by layout orientation or item order traversal.
+     * ({@link #setReverseLayout(boolean)}). Views are sorted by their positions in the adapter,
+     * not in the layout.
+     * <p>
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * <p>
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the first visible item or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findFirstCompletelyVisibleItemPosition()
+     * @see #findLastVisibleItemPosition()
+     */
+    public int findFirstVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), false, true);
+        return child == null ? RecyclerView.NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the first fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     * <p>
+     * Note that bounds check is only performed in the current orientation. That means, if
+     * LayoutManager is horizontal, it will only check the view's left and right edges.
+     *
+     * @return The adapter position of the first fully visible item or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findFirstVisibleItemPosition()
+     * @see #findLastCompletelyVisibleItemPosition()
+     */
+    public int findFirstCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(0, getChildCount(), true, false);
+        return child == null ? RecyclerView.NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     * <p>
+     * Note that, this value is not affected by layout orientation or item order traversal.
+     * ({@link #setReverseLayout(boolean)}). Views are sorted by their positions in the adapter,
+     * not in the layout.
+     * <p>
+     * If RecyclerView has item decorators, they will be considered in calculations as well.
+     * <p>
+     * LayoutManager may pre-cache some views that are not necessarily visible. Those views
+     * are ignored in this method.
+     *
+     * @return The adapter position of the last visible view or {@link RecyclerView#NO_POSITION} if
+     * there aren't any visible items.
+     * @see #findLastCompletelyVisibleItemPosition()
+     * @see #findFirstVisibleItemPosition()
+     */
+    public int findLastVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, false, true);
+        return child == null ? RecyclerView.NO_POSITION : getPosition(child);
+    }
+
+    /**
+     * Returns the adapter position of the last fully visible view. This position does not include
+     * adapter changes that were dispatched after the last layout pass.
+     * <p>
+     * Note that bounds check is only performed in the current orientation. That means, if
+     * LayoutManager is horizontal, it will only check the view's left and right edges.
+     *
+     * @return The adapter position of the last fully visible view or
+     * {@link RecyclerView#NO_POSITION} if there aren't any visible items.
+     * @see #findLastVisibleItemPosition()
+     * @see #findFirstCompletelyVisibleItemPosition()
+     */
+    public int findLastCompletelyVisibleItemPosition() {
+        final View child = findOneVisibleChild(getChildCount() - 1, -1, true, false);
+        return child == null ? RecyclerView.NO_POSITION : getPosition(child);
+    }
+
+    // Returns the first child that is visible in the provided index range, i.e. either partially or
+    // fully visible depending on the arguments provided. Completely invisible children are not
+    // acceptable by this method, but could be returned
+    // using #findOnePartiallyOrCompletelyInvisibleChild
+    View findOneVisibleChild(int fromIndex, int toIndex, boolean completelyVisible,
+            boolean acceptPartiallyVisible) {
+        ensureLayoutState();
+        @ViewBoundsCheck.ViewBounds int preferredBoundsFlag = 0;
+        @ViewBoundsCheck.ViewBounds int acceptableBoundsFlag = 0;
+        if (completelyVisible) {
+            preferredBoundsFlag = (ViewBoundsCheck.FLAG_CVS_GT_PVS | ViewBoundsCheck.FLAG_CVS_EQ_PVS
+                    | ViewBoundsCheck.FLAG_CVE_LT_PVE | ViewBoundsCheck.FLAG_CVE_EQ_PVE);
+        } else {
+            preferredBoundsFlag = (ViewBoundsCheck.FLAG_CVS_LT_PVE
+                    | ViewBoundsCheck.FLAG_CVE_GT_PVS);
+        }
+        if (acceptPartiallyVisible) {
+            acceptableBoundsFlag = (ViewBoundsCheck.FLAG_CVS_LT_PVE
+                    | ViewBoundsCheck.FLAG_CVE_GT_PVS);
+        }
+        return (mOrientation == HORIZONTAL) ? mHorizontalBoundCheck
+                .findOneViewWithinBoundFlags(fromIndex, toIndex, preferredBoundsFlag,
+                        acceptableBoundsFlag) : mVerticalBoundCheck
+                .findOneViewWithinBoundFlags(fromIndex, toIndex, preferredBoundsFlag,
+                        acceptableBoundsFlag);
+    }
+
+    View findOnePartiallyOrCompletelyInvisibleChild(int fromIndex, int toIndex) {
+        ensureLayoutState();
+        final int next = toIndex > fromIndex ? 1 : (toIndex < fromIndex ? -1 : 0);
+        if (next == 0) {
+            return getChildAt(fromIndex);
+        }
+        @ViewBoundsCheck.ViewBounds int preferredBoundsFlag = 0;
+        @ViewBoundsCheck.ViewBounds int acceptableBoundsFlag = 0;
+        if (mOrientationHelper.getDecoratedStart(getChildAt(fromIndex))
+                < mOrientationHelper.getStartAfterPadding()) {
+            preferredBoundsFlag = (ViewBoundsCheck.FLAG_CVS_LT_PVS | ViewBoundsCheck.FLAG_CVE_LT_PVE
+                    | ViewBoundsCheck.FLAG_CVE_GT_PVS);
+            acceptableBoundsFlag = (ViewBoundsCheck.FLAG_CVS_LT_PVS
+                    | ViewBoundsCheck.FLAG_CVE_LT_PVE);
+        } else {
+            preferredBoundsFlag = (ViewBoundsCheck.FLAG_CVE_GT_PVE | ViewBoundsCheck.FLAG_CVS_GT_PVS
+                    | ViewBoundsCheck.FLAG_CVS_LT_PVE);
+            acceptableBoundsFlag = (ViewBoundsCheck.FLAG_CVE_GT_PVE
+                    | ViewBoundsCheck.FLAG_CVS_GT_PVS);
+        }
+        return (mOrientation == HORIZONTAL) ? mHorizontalBoundCheck
+                .findOneViewWithinBoundFlags(fromIndex, toIndex, preferredBoundsFlag,
+                        acceptableBoundsFlag) : mVerticalBoundCheck
+                .findOneViewWithinBoundFlags(fromIndex, toIndex, preferredBoundsFlag,
+                        acceptableBoundsFlag);
+    }
+
+    @Override
+    public View onFocusSearchFailed(View focused, int focusDirection,
+            RecyclerView.Recycler recycler, RecyclerView.State state) {
+        resolveShouldLayoutReverse();
+        if (getChildCount() == 0) {
+            return null;
+        }
+
+        final int layoutDir = convertFocusDirectionToLayoutDirection(focusDirection);
+        if (layoutDir == LayoutState.INVALID_LAYOUT) {
+            return null;
+        }
+        ensureLayoutState();
+        final int maxScroll = (int) (MAX_SCROLL_FACTOR * mOrientationHelper.getTotalSpace());
+        updateLayoutState(layoutDir, maxScroll, false, state);
+        mLayoutState.mScrollingOffset = LayoutState.SCROLLING_OFFSET_NaN;
+        mLayoutState.mRecycle = false;
+        fill(recycler, mLayoutState, state, true);
+
+        // nextCandidate is the first child view in the layout direction that's partially
+        // within RV's bounds, i.e. part of it is visible or it's completely invisible but still
+        // touching RV's bounds. This will be the unfocusable candidate view to become visible onto
+        // the screen if no focusable views are found in the given layout direction.
+        final View nextCandidate;
+        if (layoutDir == LayoutState.LAYOUT_START) {
+            nextCandidate = findPartiallyOrCompletelyInvisibleChildClosestToStart();
+        } else {
+            nextCandidate = findPartiallyOrCompletelyInvisibleChildClosestToEnd();
+        }
+        // nextFocus is meaningful only if it refers to a focusable child, in which case it
+        // indicates the next view to gain focus.
+        final View nextFocus;
+        if (layoutDir == LayoutState.LAYOUT_START) {
+            nextFocus = getChildClosestToStart();
+        } else {
+            nextFocus = getChildClosestToEnd();
+        }
+        if (nextFocus.hasFocusable()) {
+            if (nextCandidate == null) {
+                return null;
+            }
+            return nextFocus;
+        }
+        return nextCandidate;
+    }
+
+    /**
+     * Used for debugging.
+     * Logs the internal representation of children to default logger.
+     */
+    private void logChildren() {
+        Log.d(TAG, "internal representation of views on the screen");
+        for (int i = 0; i < getChildCount(); i++) {
+            View child = getChildAt(i);
+            Log.d(TAG, "item " + getPosition(child) + ", coord:"
+                    + mOrientationHelper.getDecoratedStart(child));
+        }
+        Log.d(TAG, "==============");
+    }
+
+    /**
+     * Used for debugging.
+     * Validates that child views are laid out in correct order. This is important because rest of
+     * the algorithm relies on this constraint.
+     *
+     * In default layout, child 0 should be closest to screen position 0 and last child should be
+     * closest to position WIDTH or HEIGHT.
+     * In reverse layout, last child should be closes to screen position 0 and first child should
+     * be closest to position WIDTH  or HEIGHT
+     */
+    void validateChildOrder() {
+        Log.d(TAG, "validating child count " + getChildCount());
+        if (getChildCount() < 1) {
+            return;
+        }
+        int lastPos = getPosition(getChildAt(0));
+        int lastScreenLoc = mOrientationHelper.getDecoratedStart(getChildAt(0));
+        if (mShouldReverseLayout) {
+            for (int i = 1; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                int pos = getPosition(child);
+                int screenLoc = mOrientationHelper.getDecoratedStart(child);
+                if (pos < lastPos) {
+                    logChildren();
+                    throw new RuntimeException("detected invalid position. loc invalid? "
+                            + (screenLoc < lastScreenLoc));
+                }
+                if (screenLoc > lastScreenLoc) {
+                    logChildren();
+                    throw new RuntimeException("detected invalid location");
+                }
+            }
+        } else {
+            for (int i = 1; i < getChildCount(); i++) {
+                View child = getChildAt(i);
+                int pos = getPosition(child);
+                int screenLoc = mOrientationHelper.getDecoratedStart(child);
+                if (pos < lastPos) {
+                    logChildren();
+                    throw new RuntimeException("detected invalid position. loc invalid? "
+                            + (screenLoc < lastScreenLoc));
+                }
+                if (screenLoc < lastScreenLoc) {
+                    logChildren();
+                    throw new RuntimeException("detected invalid location");
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean supportsPredictiveItemAnimations() {
+        return mPendingSavedState == null && mLastStackFromEnd == mStackFromEnd;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    // This method is only intended to be called (and should only ever be called) by
+    // ItemTouchHelper.
+    @Override
+    public void prepareForDrop(@NonNull View view, @NonNull View target, int x, int y) {
+        assertNotInLayoutOrScroll("Cannot drop a view during a scroll or layout calculation");
+        ensureLayoutState();
+        resolveShouldLayoutReverse();
+        final int myPos = getPosition(view);
+        final int targetPos = getPosition(target);
+        final int dropDirection = myPos < targetPos ? LayoutState.ITEM_DIRECTION_TAIL
+                : LayoutState.ITEM_DIRECTION_HEAD;
+        if (mShouldReverseLayout) {
+            if (dropDirection == LayoutState.ITEM_DIRECTION_TAIL) {
+                scrollToPositionWithOffset(targetPos,
+                        mOrientationHelper.getEndAfterPadding()
+                                - (mOrientationHelper.getDecoratedStart(target)
+                                + mOrientationHelper.getDecoratedMeasurement(view)));
+            } else {
+                scrollToPositionWithOffset(targetPos,
+                        mOrientationHelper.getEndAfterPadding()
+                                - mOrientationHelper.getDecoratedEnd(target));
+            }
+        } else {
+            if (dropDirection == LayoutState.ITEM_DIRECTION_HEAD) {
+                scrollToPositionWithOffset(targetPos, mOrientationHelper.getDecoratedStart(target));
+            } else {
+                scrollToPositionWithOffset(targetPos,
+                        mOrientationHelper.getDecoratedEnd(target)
+                                - mOrientationHelper.getDecoratedMeasurement(view));
+            }
+        }
+    }
+
+    /**
+     * Helper class that keeps temporary state while {LayoutManager} is filling out the empty
+     * space.
+     */
+    static class LayoutState {
+
+        static final String TAG = "LLM#LayoutState";
+
+        static final int LAYOUT_START = -1;
+
+        static final int LAYOUT_END = 1;
+
+        static final int INVALID_LAYOUT = Integer.MIN_VALUE;
+
+        static final int ITEM_DIRECTION_HEAD = -1;
+
+        static final int ITEM_DIRECTION_TAIL = 1;
+
+        static final int SCROLLING_OFFSET_NaN = Integer.MIN_VALUE;
+
+        /**
+         * We may not want to recycle children in some cases (e.g. layout)
+         */
+        boolean mRecycle = true;
+
+        /**
+         * Pixel offset where layout should start
+         */
+        int mOffset;
+
+        /**
+         * Number of pixels that we should fill, in the layout direction.
+         */
+        int mAvailable;
+
+        /**
+         * Current position on the adapter to get the next item.
+         */
+        int mCurrentPosition;
+
+        /**
+         * Defines the direction in which the data adapter is traversed.
+         * Should be {@link #ITEM_DIRECTION_HEAD} or {@link #ITEM_DIRECTION_TAIL}
+         */
+        int mItemDirection;
+
+        /**
+         * Defines the direction in which the layout is filled.
+         * Should be {@link #LAYOUT_START} or {@link #LAYOUT_END}
+         */
+        int mLayoutDirection;
+
+        /**
+         * Used when LayoutState is constructed in a scrolling state.
+         * It should be set the amount of scrolling we can make without creating a new view.
+         * Settings this is required for efficient view recycling.
+         */
+        int mScrollingOffset;
+
+        /**
+         * Used if you want to pre-layout items that are not yet visible.
+         * The difference with {@link #mAvailable} is that, when recycling, distance laid out for
+         * {@link #mExtraFillSpace} is not considered to avoid recycling visible children.
+         */
+        int mExtraFillSpace = 0;
+
+        /**
+         * Contains the {@link #calculateExtraLayoutSpace(RecyclerView.State, int[])}  extra layout
+         * space} that should be excluded for recycling when cleaning up the tail of the list during
+         * a smooth scroll.
+         */
+        int mNoRecycleSpace = 0;
+
+        /**
+         * Equal to {@link RecyclerView.State#isPreLayout()}. When consuming scrap, if this value
+         * is set to true, we skip removed views since they should not be laid out in post layout
+         * step.
+         */
+        boolean mIsPreLayout = false;
+
+        /**
+         * The most recent {@link #scrollBy(int, RecyclerView.Recycler, RecyclerView.State)}
+         * amount.
+         */
+        int mLastScrollDelta;
+
+        /**
+         * When LLM needs to layout particular views, it sets this list in which case, LayoutState
+         * will only return views from this list and return null if it cannot find an item.
+         */
+        List<RecyclerView.ViewHolder> mScrapList = null;
+
+        /**
+         * Used when there is no limit in how many views can be laid out.
+         */
+        boolean mInfinite;
+
+        /**
+         * @return true if there are more items in the data adapter
+         */
+        boolean hasMore(RecyclerView.State state) {
+            return mCurrentPosition >= 0 && mCurrentPosition < state.getItemCount();
+        }
+
+        /**
+         * Gets the view for the next element that we should layout.
+         * Also updates current item index to the next item, based on {@link #mItemDirection}
+         *
+         * @return The next element that we should layout.
+         */
+        View next(RecyclerView.Recycler recycler) {
+            if (mScrapList != null) {
+                return nextViewFromScrapList();
+            }
+            final View view = recycler.getViewForPosition(mCurrentPosition);
+            mCurrentPosition += mItemDirection;
+            return view;
+        }
+
+        /**
+         * Returns the next item from the scrap list.
+         * <p>
+         * Upon finding a valid VH, sets current item position to VH.itemPosition + mItemDirection
+         *
+         * @return View if an item in the current position or direction exists if not null.
+         */
+        private View nextViewFromScrapList() {
+            final int size = mScrapList.size();
+            for (int i = 0; i < size; i++) {
+                final View view = mScrapList.get(i).itemView;
+                final RecyclerView.LayoutParams lp =
+                        (RecyclerView.LayoutParams) view.getLayoutParams();
+                if (lp.isItemRemoved()) {
+                    continue;
+                }
+                if (mCurrentPosition == lp.getViewLayoutPosition()) {
+                    assignPositionFromScrapList(view);
+                    return view;
+                }
+            }
+            return null;
+        }
+
+        public void assignPositionFromScrapList() {
+            assignPositionFromScrapList(null);
+        }
+
+        public void assignPositionFromScrapList(View ignore) {
+            final View closest = nextViewInLimitedList(ignore);
+            if (closest == null) {
+                mCurrentPosition = RecyclerView.NO_POSITION;
+            } else {
+                mCurrentPosition = ((RecyclerView.LayoutParams) closest.getLayoutParams())
+                        .getViewLayoutPosition();
+            }
+        }
+
+        public View nextViewInLimitedList(View ignore) {
+            int size = mScrapList.size();
+            View closest = null;
+            int closestDistance = Integer.MAX_VALUE;
+            if (DEBUG && mIsPreLayout) {
+                throw new IllegalStateException("Scrap list cannot be used in pre layout");
+            }
+            for (int i = 0; i < size; i++) {
+                View view = mScrapList.get(i).itemView;
+                final RecyclerView.LayoutParams lp =
+                        (RecyclerView.LayoutParams) view.getLayoutParams();
+                if (view == ignore || lp.isItemRemoved()) {
+                    continue;
+                }
+                final int distance = (lp.getViewLayoutPosition() - mCurrentPosition)
+                        * mItemDirection;
+                if (distance < 0) {
+                    continue; // item is not in current direction
+                }
+                if (distance < closestDistance) {
+                    closest = view;
+                    closestDistance = distance;
+                    if (distance == 0) {
+                        break;
+                    }
+                }
+            }
+            return closest;
+        }
+
+        void log() {
+            Log.d(TAG, "avail:" + mAvailable + ", ind:" + mCurrentPosition + ", dir:"
+                    + mItemDirection + ", offset:" + mOffset + ", layoutDir:" + mLayoutDirection);
+        }
+    }
+
+    /**
+     * @hide
+     */
+    @RestrictTo(LIBRARY)
+    @SuppressLint("BanParcelableUsage")
+    public static class SavedState implements Parcelable {
+
+        int mAnchorPosition;
+
+        int mAnchorOffset;
+
+        boolean mAnchorLayoutFromEnd;
+
+        public SavedState() {
+
+        }
+
+        SavedState(Parcel in) {
+            mAnchorPosition = in.readInt();
+            mAnchorOffset = in.readInt();
+            mAnchorLayoutFromEnd = in.readInt() == 1;
+        }
+
+        public SavedState(SavedState other) {
+            mAnchorPosition = other.mAnchorPosition;
+            mAnchorOffset = other.mAnchorOffset;
+            mAnchorLayoutFromEnd = other.mAnchorLayoutFromEnd;
+        }
+
+        boolean hasValidAnchor() {
+            return mAnchorPosition >= 0;
+        }
+
+        void invalidateAnchor() {
+            mAnchorPosition = RecyclerView.NO_POSITION;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(mAnchorPosition);
+            dest.writeInt(mAnchorOffset);
+            dest.writeInt(mAnchorLayoutFromEnd ? 1 : 0);
+        }
+
+        public static final Parcelable.Creator<SavedState> CREATOR =
+                new Parcelable.Creator<SavedState>() {
+                    @Override
+                    public SavedState createFromParcel(Parcel in) {
+                        return new SavedState(in);
+                    }
+
+                    @Override
+                    public SavedState[] newArray(int size) {
+                        return new SavedState[size];
+                    }
+                };
+    }
+
+    /**
+     * Simple data class to keep Anchor information
+     */
+    static class AnchorInfo {
+        OrientationHelper mOrientationHelper;
+        int mPosition;
+        int mCoordinate;
+        boolean mLayoutFromEnd;
+        boolean mValid;
+
+        AnchorInfo() {
+            reset();
+        }
+
+        void reset() {
+            mPosition = RecyclerView.NO_POSITION;
+            mCoordinate = INVALID_OFFSET;
+            mLayoutFromEnd = false;
+            mValid = false;
+        }
+
+        /**
+         * assigns anchor coordinate from the RecyclerView's padding depending on current
+         * layoutFromEnd value
+         */
+        void assignCoordinateFromPadding() {
+            mCoordinate = mLayoutFromEnd
+                    ? mOrientationHelper.getEndAfterPadding()
+                    : mOrientationHelper.getStartAfterPadding();
+        }
+
+        @Override
+        public String toString() {
+            return "AnchorInfo{"
+                    + "mPosition=" + mPosition
+                    + ", mCoordinate=" + mCoordinate
+                    + ", mLayoutFromEnd=" + mLayoutFromEnd
+                    + ", mValid=" + mValid
+                    + '}';
+        }
+
+        boolean isViewValidAsAnchor(View child, RecyclerView.State state) {
+            RecyclerView.LayoutParams lp = (RecyclerView.LayoutParams) child.getLayoutParams();
+            return !lp.isItemRemoved() && lp.getViewLayoutPosition() >= 0
+                    && lp.getViewLayoutPosition() < state.getItemCount();
+        }
+
+        public void assignFromViewAndKeepVisibleRect(View child, int position) {
+            final int spaceChange = mOrientationHelper.getTotalSpaceChange();
+            if (spaceChange >= 0) {
+                assignFromView(child, position);
+                return;
+            }
+            mPosition = position;
+            if (mLayoutFromEnd) {
+                final int prevLayoutEnd = mOrientationHelper.getEndAfterPadding() - spaceChange;
+                final int childEnd = mOrientationHelper.getDecoratedEnd(child);
+                final int previousEndMargin = prevLayoutEnd - childEnd;
+                mCoordinate = mOrientationHelper.getEndAfterPadding() - previousEndMargin;
+                // ensure we did not push child's top out of bounds because of this
+                if (previousEndMargin > 0) { // we have room to shift bottom if necessary
+                    final int childSize = mOrientationHelper.getDecoratedMeasurement(child);
+                    final int estimatedChildStart = mCoordinate - childSize;
+                    final int layoutStart = mOrientationHelper.getStartAfterPadding();
+                    final int previousStartMargin = mOrientationHelper.getDecoratedStart(child)
+                            - layoutStart;
+                    final int startReference = layoutStart + Math.min(previousStartMargin, 0);
+                    final int startMargin = estimatedChildStart - startReference;
+                    if (startMargin < 0) {
+                        // offset to make top visible but not too much
+                        mCoordinate += Math.min(previousEndMargin, -startMargin);
+                    }
+                }
+            } else {
+                final int childStart = mOrientationHelper.getDecoratedStart(child);
+                final int startMargin = childStart - mOrientationHelper.getStartAfterPadding();
+                mCoordinate = childStart;
+                if (startMargin > 0) { // we have room to fix end as well
+                    final int estimatedEnd = childStart
+                            + mOrientationHelper.getDecoratedMeasurement(child);
+                    final int previousLayoutEnd = mOrientationHelper.getEndAfterPadding()
+                            - spaceChange;
+                    final int previousEndMargin = previousLayoutEnd
+                            - mOrientationHelper.getDecoratedEnd(child);
+                    final int endReference = mOrientationHelper.getEndAfterPadding()
+                            - Math.min(0, previousEndMargin);
+                    final int endMargin = endReference - estimatedEnd;
+                    if (endMargin < 0) {
+                        mCoordinate -= Math.min(startMargin, -endMargin);
+                    }
+                }
+            }
+        }
+
+        public void assignFromView(View child, int position) {
+            if (mLayoutFromEnd) {
+                mCoordinate = mOrientationHelper.getDecoratedEnd(child)
+                        + mOrientationHelper.getTotalSpaceChange();
+            } else {
+                mCoordinate = mOrientationHelper.getDecoratedStart(child);
+            }
+
+            mPosition = position;
+        }
+    }
+
+    protected static class LayoutChunkResult {
+        public int mConsumed;
+        public boolean mFinished;
+        public boolean mIgnoreConsumed;
+        public boolean mFocusable;
+
+        void resetInternal() {
+            mConsumed = 0;
+            mFinished = false;
+            mIgnoreConsumed = false;
+            mFocusable = false;
+        }
+    }
+}
diff --git a/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ScrollbarHelper.java b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ScrollbarHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..e785e960d4ee412c2e21e6e1673129d9b9e48e19
--- /dev/null
+++ b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ScrollbarHelper.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package app.k9mail.ui.utils.linearlayoutmanager;
+
+import android.view.View;
+
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+
+/**
+ * A helper class to do scroll offset calculations.
+ */
+class ScrollbarHelper {
+
+    /**
+     * @param startChild View closest to start of the list. (top or left)
+     * @param endChild   View closest to end of the list (bottom or right)
+     */
+    static int computeScrollOffset(RecyclerView.State state, OrientationHelper orientation,
+            View startChild, View endChild, RecyclerView.LayoutManager lm,
+            boolean smoothScrollbarEnabled, boolean reverseLayout) {
+        if (lm.getChildCount() == 0 || state.getItemCount() == 0 || startChild == null
+                || endChild == null) {
+            return 0;
+        }
+        final int minPosition = Math.min(lm.getPosition(startChild),
+                lm.getPosition(endChild));
+        final int maxPosition = Math.max(lm.getPosition(startChild),
+                lm.getPosition(endChild));
+        final int itemsBefore = reverseLayout
+                ? Math.max(0, state.getItemCount() - maxPosition - 1)
+                : Math.max(0, minPosition);
+        if (!smoothScrollbarEnabled) {
+            return itemsBefore;
+        }
+        final int laidOutArea = Math.abs(orientation.getDecoratedEnd(endChild)
+                - orientation.getDecoratedStart(startChild));
+        final int itemRange = Math.abs(lm.getPosition(startChild)
+                - lm.getPosition(endChild)) + 1;
+        final float avgSizePerRow = (float) laidOutArea / itemRange;
+
+        return Math.round(itemsBefore * avgSizePerRow + (orientation.getStartAfterPadding()
+                - orientation.getDecoratedStart(startChild)));
+    }
+
+    /**
+     * @param startChild View closest to start of the list. (top or left)
+     * @param endChild   View closest to end of the list (bottom or right)
+     */
+    static int computeScrollExtent(RecyclerView.State state, OrientationHelper orientation,
+            View startChild, View endChild, RecyclerView.LayoutManager lm,
+            boolean smoothScrollbarEnabled) {
+        if (lm.getChildCount() == 0 || state.getItemCount() == 0 || startChild == null
+                || endChild == null) {
+            return 0;
+        }
+        if (!smoothScrollbarEnabled) {
+            return Math.abs(lm.getPosition(startChild) - lm.getPosition(endChild)) + 1;
+        }
+        final int extend = orientation.getDecoratedEnd(endChild)
+                - orientation.getDecoratedStart(startChild);
+        return Math.min(orientation.getTotalSpace(), extend);
+    }
+
+    /**
+     * @param startChild View closest to start of the list. (top or left)
+     * @param endChild   View closest to end of the list (bottom or right)
+     */
+    static int computeScrollRange(RecyclerView.State state, OrientationHelper orientation,
+            View startChild, View endChild, RecyclerView.LayoutManager lm,
+            boolean smoothScrollbarEnabled) {
+        if (lm.getChildCount() == 0 || state.getItemCount() == 0 || startChild == null
+                || endChild == null) {
+            return 0;
+        }
+        if (!smoothScrollbarEnabled) {
+            return state.getItemCount();
+        }
+        // smooth scrollbar enabled. try to estimate better.
+        final int laidOutArea = orientation.getDecoratedEnd(endChild)
+                - orientation.getDecoratedStart(startChild);
+        final int laidOutRange = Math.abs(lm.getPosition(startChild)
+                - lm.getPosition(endChild))
+                + 1;
+        // estimate a size for full list.
+        return (int) ((float) laidOutArea / laidOutRange * state.getItemCount());
+    }
+
+    private ScrollbarHelper() {
+    }
+}
diff --git a/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ViewBoundsCheck.java b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ViewBoundsCheck.java
new file mode 100644
index 0000000000000000000000000000000000000000..63bdcf06a9bb730cb3c6c47694a3829e6684eefd
--- /dev/null
+++ b/ui-utils/LinearLayoutManager/src/main/java/app/k9mail/ui/utils/linearlayoutmanager/ViewBoundsCheck.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2018 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package app.k9mail.ui.utils.linearlayoutmanager;
+
+import android.view.View;
+
+import androidx.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+/**
+ * A utility class used to check the boundaries of a given view within its parent view based on
+ * a set of boundary flags.
+ */
+class ViewBoundsCheck {
+
+    static final int GT = 1 << 0;
+    static final int EQ = 1 << 1;
+    static final int LT = 1 << 2;
+
+
+    static final int CVS_PVS_POS = 0;
+    /**
+     * The child view's start should be strictly greater than parent view's start.
+     */
+    static final int FLAG_CVS_GT_PVS = GT << CVS_PVS_POS;
+
+    /**
+     * The child view's start can be equal to its parent view's start. This flag follows with GT
+     * or LT indicating greater (less) than or equal relation.
+     */
+    static final int FLAG_CVS_EQ_PVS = EQ << CVS_PVS_POS;
+
+    /**
+     * The child view's start should be strictly less than parent view's start.
+     */
+    static final int FLAG_CVS_LT_PVS = LT << CVS_PVS_POS;
+
+
+    static final int CVS_PVE_POS = 4;
+    /**
+     * The child view's start should be strictly greater than parent view's end.
+     */
+    static final int FLAG_CVS_GT_PVE = GT << CVS_PVE_POS;
+
+    /**
+     * The child view's start can be equal to its parent view's end. This flag follows with GT
+     * or LT indicating greater (less) than or equal relation.
+     */
+    static final int FLAG_CVS_EQ_PVE = EQ << CVS_PVE_POS;
+
+    /**
+     * The child view's start should be strictly less than parent view's end.
+     */
+    static final int FLAG_CVS_LT_PVE = LT << CVS_PVE_POS;
+
+
+    static final int CVE_PVS_POS = 8;
+    /**
+     * The child view's end should be strictly greater than parent view's start.
+     */
+    static final int FLAG_CVE_GT_PVS = GT << CVE_PVS_POS;
+
+    /**
+     * The child view's end can be equal to its parent view's start. This flag follows with GT
+     * or LT indicating greater (less) than or equal relation.
+     */
+    static final int FLAG_CVE_EQ_PVS = EQ << CVE_PVS_POS;
+
+    /**
+     * The child view's end should be strictly less than parent view's start.
+     */
+    static final int FLAG_CVE_LT_PVS = LT << CVE_PVS_POS;
+
+
+    static final int CVE_PVE_POS = 12;
+    /**
+     * The child view's end should be strictly greater than parent view's end.
+     */
+    static final int FLAG_CVE_GT_PVE = GT << CVE_PVE_POS;
+
+    /**
+     * The child view's end can be equal to its parent view's end. This flag follows with GT
+     * or LT indicating greater (less) than or equal relation.
+     */
+    static final int FLAG_CVE_EQ_PVE = EQ << CVE_PVE_POS;
+
+    /**
+     * The child view's end should be strictly less than parent view's end.
+     */
+    static final int FLAG_CVE_LT_PVE = LT << CVE_PVE_POS;
+
+    static final int MASK = GT | EQ | LT;
+
+    final Callback mCallback;
+    BoundFlags mBoundFlags;
+    /**
+     * The set of flags that can be passed for checking the view boundary conditions.
+     * CVS in the flag name indicates the child view, and PV indicates the parent view.\
+     * The following S, E indicate a view's start and end points, respectively.
+     * GT and LT indicate a strictly greater and less than relationship.
+     * Greater than or equal (or less than or equal) can be specified by setting both GT and EQ (or
+     * LT and EQ) flags.
+     * For instance, setting both {@link #FLAG_CVS_GT_PVS} and {@link #FLAG_CVS_EQ_PVS} indicate the
+     * child view's start should be greater than or equal to its parent start.
+     */
+    @IntDef(flag = true, value = {
+            FLAG_CVS_GT_PVS, FLAG_CVS_EQ_PVS, FLAG_CVS_LT_PVS,
+            FLAG_CVS_GT_PVE, FLAG_CVS_EQ_PVE, FLAG_CVS_LT_PVE,
+            FLAG_CVE_GT_PVS, FLAG_CVE_EQ_PVS, FLAG_CVE_LT_PVS,
+            FLAG_CVE_GT_PVE, FLAG_CVE_EQ_PVE, FLAG_CVE_LT_PVE
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface ViewBounds {}
+
+    ViewBoundsCheck(Callback callback) {
+        mCallback = callback;
+        mBoundFlags = new BoundFlags();
+    }
+
+    static class BoundFlags {
+        int mBoundFlags = 0;
+        int mRvStart, mRvEnd, mChildStart, mChildEnd;
+
+        void setBounds(int rvStart, int rvEnd, int childStart, int childEnd) {
+            mRvStart = rvStart;
+            mRvEnd = rvEnd;
+            mChildStart = childStart;
+            mChildEnd = childEnd;
+        }
+
+        void addFlags(@ViewBounds int flags) {
+            mBoundFlags |= flags;
+        }
+
+        void resetFlags() {
+            mBoundFlags = 0;
+        }
+
+        int compare(int x, int y) {
+            if (x > y) {
+                return GT;
+            }
+            if (x == y) {
+                return EQ;
+            }
+            return LT;
+        }
+
+        boolean boundsMatch() {
+            if ((mBoundFlags & (MASK << CVS_PVS_POS)) != 0) {
+                if ((mBoundFlags & (compare(mChildStart, mRvStart) << CVS_PVS_POS)) == 0) {
+                    return false;
+                }
+            }
+
+            if ((mBoundFlags & (MASK << CVS_PVE_POS)) != 0) {
+                if ((mBoundFlags & (compare(mChildStart, mRvEnd) << CVS_PVE_POS)) == 0) {
+                    return false;
+                }
+            }
+
+            if ((mBoundFlags & (MASK << CVE_PVS_POS)) != 0) {
+                if ((mBoundFlags & (compare(mChildEnd, mRvStart) << CVE_PVS_POS)) == 0) {
+                    return false;
+                }
+            }
+
+            if ((mBoundFlags & (MASK << CVE_PVE_POS)) != 0) {
+                if ((mBoundFlags & (compare(mChildEnd, mRvEnd) << CVE_PVE_POS)) == 0) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    };
+
+    /**
+     * Returns the first view starting from fromIndex to toIndex in views whose bounds lie within
+     * its parent bounds based on the provided preferredBoundFlags. If no match is found based on
+     * the preferred flags, and a nonzero acceptableBoundFlags is specified, the last view whose
+     * bounds lie within its parent view based on the acceptableBoundFlags is returned. If no such
+     * view is found based on either of these two flags, null is returned.
+     * @param fromIndex The view position index to start the search from.
+     * @param toIndex The view position index to end the search at.
+     * @param preferredBoundFlags The flags indicating the preferred match. Once a match is found
+     *                            based on this flag, that view is returned instantly.
+     * @param acceptableBoundFlags The flags indicating the acceptable match if no preferred match
+     *                             is found. If so, and if acceptableBoundFlags is non-zero, the
+     *                             last matching acceptable view is returned. Otherwise, null is
+     *                             returned.
+     * @return The first view that satisfies acceptableBoundFlags or the last view satisfying
+     * acceptableBoundFlags boundary conditions.
+     */
+    View findOneViewWithinBoundFlags(int fromIndex, int toIndex,
+            @ViewBounds int preferredBoundFlags,
+            @ViewBounds int acceptableBoundFlags) {
+        final int start = mCallback.getParentStart();
+        final int end = mCallback.getParentEnd();
+        final int next = toIndex > fromIndex ? 1 : -1;
+        View acceptableMatch = null;
+        for (int i = fromIndex; i != toIndex; i += next) {
+            final View child = mCallback.getChildAt(i);
+            final int childStart = mCallback.getChildStart(child);
+            final int childEnd = mCallback.getChildEnd(child);
+            mBoundFlags.setBounds(start, end, childStart, childEnd);
+            if (preferredBoundFlags != 0) {
+                mBoundFlags.resetFlags();
+                mBoundFlags.addFlags(preferredBoundFlags);
+                if (mBoundFlags.boundsMatch()) {
+                    // found a perfect match
+                    return child;
+                }
+            }
+            if (acceptableBoundFlags != 0) {
+                mBoundFlags.resetFlags();
+                mBoundFlags.addFlags(acceptableBoundFlags);
+                if (mBoundFlags.boundsMatch()) {
+                    acceptableMatch = child;
+                }
+            }
+        }
+        return acceptableMatch;
+    }
+
+    /**
+     * Returns whether the specified view lies within the boundary condition of its parent view.
+     * @param child The child view to be checked.
+     * @param boundsFlags The flag against which the child view and parent view are matched.
+     * @return True if the view meets the boundsFlag, false otherwise.
+     */
+    boolean isViewWithinBoundFlags(View child, @ViewBounds int boundsFlags) {
+        mBoundFlags.setBounds(mCallback.getParentStart(), mCallback.getParentEnd(),
+                mCallback.getChildStart(child), mCallback.getChildEnd(child));
+        if (boundsFlags != 0) {
+            mBoundFlags.resetFlags();
+            mBoundFlags.addFlags(boundsFlags);
+            return mBoundFlags.boundsMatch();
+        }
+        return false;
+    }
+
+    /**
+     * Callback provided by the user of this class in order to retrieve information about child and
+     * parent boundaries.
+     */
+    interface Callback {
+        View getChildAt(int index);
+        int getParentStart();
+        int getParentEnd();
+        int getChildStart(View view);
+        int getChildEnd(View view);
+    }
+}