diff --git a/.editorconfig b/.editorconfig
index 98538ba0f8a..0873c683701 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -8,6 +8,8 @@ insert_final_newline = true
 
 [*.{kt,kts}]
 ij_kotlin_imports_layout = *,^*
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
 
 [*.{yml,yaml,json,toml}]
 indent_size = 2
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0ade425ea80..cf554d38666 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -33,6 +33,7 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="99" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="99" />
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
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 4ef3af58005..8f59788a54e 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
@@ -15,5 +15,5 @@ data class DiscoveredServerSettings(
     val port: Int,
     val security: ConnectionSecurity,
     val authType: AuthType?,
-    val username: String?
+    val username: String?,
 )
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 fa8aff880a8..6c4453078ee 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
@@ -15,7 +15,7 @@ import timber.log.Timber
 
 class ProvidersXmlDiscovery(
     private val xmlProvider: ProvidersXmlProvider,
-    private val oAuthConfigurationProvider: OAuthConfigurationProvider
+    private val oAuthConfigurationProvider: OAuthConfigurationProvider,
 ) : ConnectionSettingsDiscovery {
 
     override fun discover(email: String): DiscoveryResults? {
@@ -151,6 +151,6 @@ class ProvidersXmlDiscovery(
         val incomingUriTemplate: String,
         val incomingUsernameTemplate: String,
         val outgoingUriTemplate: String,
-        val outgoingUsernameTemplate: String
+        val outgoingUsernameTemplate: String,
     )
 }
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 d37fae5611d..a0fab7042e5 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
@@ -36,7 +36,7 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
     @Test
     fun discover_withUnknownDomain_shouldReturnNull() {
         val connectionSettings = providersXmlDiscovery.discover(
-            "user@not.present.in.providers.xml.example"
+            "user@not.present.in.providers.xml.example",
         )
 
         assertThat(connectionSettings).isNull()
@@ -48,14 +48,14 @@ class ProvidersXmlDiscoveryTest : RobolectricTest() {
             scopes = listOf("irrelevant"),
             authorizationEndpoint = "irrelevant",
             tokenEndpoint = "irrelevant",
-            redirectUri = "irrelevant"
+            redirectUri = "irrelevant",
         )
 
         return OAuthConfigurationProvider(
             configurations = mapOf(
-                listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig
+                listOf("imap.gmail.com", "smtp.gmail.com") to googleConfig,
             ),
-            googleConfiguration = googleConfig
+            googleConfiguration = googleConfig,
         )
     }
 }
diff --git a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt
index 46bc65aa468..d91a28e8fcc 100644
--- a/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt
+++ b/app/autodiscovery/srvrecords/src/main/java/com/fsck/k9/autodiscovery/srvrecords/MiniDnsSrvResolver.kt
@@ -12,7 +12,7 @@ class MiniDnsSrvResolver : SrvResolver {
         val result = ResolverApi.INSTANCE.resolveSrv(
             DnsLabel.from(type.label),
             SrvProto.tcp.dnsLabel,
-            DnsName.from(domain)
+            DnsName.from(domain),
         )
 
         val security = if (type.assumeTls) SSL_TLS_REQUIRED else STARTTLS_REQUIRED
@@ -22,7 +22,7 @@ class MiniDnsSrvResolver : SrvResolver {
                 host = it.target.toString(),
                 port = it.port,
                 priority = it.priority,
-                security = security
+                security = security,
             )
         }
     }
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 9dbbfdbd76d..d698507fdb2 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
@@ -8,7 +8,7 @@ import com.fsck.k9.mail.AuthType
 import com.fsck.k9.mail.ConnectionSecurity
 
 class SrvServiceDiscovery(
-    private val srvResolver: MiniDnsSrvResolver
+    private val srvResolver: MiniDnsSrvResolver,
 ) : ConnectionSettingsDiscovery {
 
     override fun discover(email: String): DiscoveryResults? {
@@ -36,7 +36,7 @@ fun newServerSettings(service: MailService, email: String): DiscoveredServerSett
         service.port,
         service.security,
         AuthType.PLAIN,
-        email
+        email,
     )
 }
 
@@ -44,7 +44,7 @@ enum class SrvType(val label: String, val protocol: String, val assumeTls: Boole
     SUBMISSIONS("_submissions", "smtp", true),
     SUBMISSION("_submission", "smtp", false),
     IMAPS("_imaps", "imap", true),
-    IMAP("_imap", "imap", false)
+    IMAP("_imap", "imap", false),
 }
 
 data class MailService(
@@ -52,5 +52,5 @@ data class MailService(
     val host: String,
     val port: Int,
     val priority: Int,
-    val security: ConnectionSecurity
+    val security: ConnectionSecurity,
 )
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 73425a50fff..5e7238104c7 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
@@ -24,8 +24,8 @@ class SrvServiceDiscoveryTest {
         val srvResolver = newMockSrvResolver(
             imapServices = listOf(newMailService(port = 143, srvType = SrvType.IMAP)),
             imapsServices = listOf(
-                newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED)
-            )
+                newMailService(port = 993, srvType = SrvType.IMAPS, security = ConnectionSecurity.SSL_TLS_REQUIRED),
+            ),
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -42,14 +42,14 @@ class SrvServiceDiscoveryTest {
                 newMailService(
                     port = 25,
                     srvType = SrvType.SUBMISSION,
-                    security = ConnectionSecurity.STARTTLS_REQUIRED
+                    security = ConnectionSecurity.STARTTLS_REQUIRED,
                 ),
                 newMailService(
                     port = 465,
                     srvType = SrvType.SUBMISSIONS,
-                    security = ConnectionSecurity.SSL_TLS_REQUIRED
-                )
-            )
+                    security = ConnectionSecurity.SSL_TLS_REQUIRED,
+                ),
+            ),
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -68,15 +68,15 @@ class SrvServiceDiscoveryTest {
                     port = 25,
                     srvType = SrvType.SUBMISSION,
                     security = ConnectionSecurity.STARTTLS_REQUIRED,
-                    priority = 0
+                    priority = 0,
                 ),
                 newMailService(
                     host = "smtp2.example.com",
                     port = 25,
                     srvType = SrvType.SUBMISSION,
                     security = ConnectionSecurity.STARTTLS_REQUIRED,
-                    priority = 1
-                )
+                    priority = 1,
+                ),
             ),
             submissionsServices = listOf(
                 newMailService(
@@ -84,15 +84,15 @@ class SrvServiceDiscoveryTest {
                     port = 465,
                     srvType = SrvType.SUBMISSIONS,
                     security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 0
+                    priority = 0,
                 ),
                 newMailService(
                     host = "smtp4.example.com",
                     port = 465,
                     srvType = SrvType.SUBMISSIONS,
                     security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 1
-                )
+                    priority = 1,
+                ),
             ),
             imapServices = listOf(
                 newMailService(
@@ -100,15 +100,15 @@ class SrvServiceDiscoveryTest {
                     port = 143,
                     srvType = SrvType.IMAP,
                     security = ConnectionSecurity.STARTTLS_REQUIRED,
-                    priority = 0
+                    priority = 0,
                 ),
                 newMailService(
                     host = "imap2.example.com",
                     port = 143,
                     srvType = SrvType.IMAP,
                     security = ConnectionSecurity.STARTTLS_REQUIRED,
-                    priority = 1
-                )
+                    priority = 1,
+                ),
             ),
             imapsServices = listOf(
                 newMailService(
@@ -116,16 +116,16 @@ class SrvServiceDiscoveryTest {
                     port = 993,
                     srvType = SrvType.IMAPS,
                     security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 0
+                    priority = 0,
                 ),
                 newMailService(
                     host = "imaps2.example.com",
                     port = 993,
                     srvType = SrvType.IMAPS,
                     security = ConnectionSecurity.SSL_TLS_REQUIRED,
-                    priority = 1
-                )
-            )
+                    priority = 1,
+                ),
+            ),
         )
 
         val srvServiceDiscovery = SrvServiceDiscovery(srvResolver)
@@ -136,18 +136,18 @@ class SrvServiceDiscoveryTest {
                 "smtp3.example.com",
                 "smtp1.example.com",
                 "smtp4.example.com",
-                "smtp2.example.com"
+                "smtp2.example.com",
             ),
-            result?.outgoing?.map { it.host }
+            result?.outgoing?.map { it.host },
         )
         assertEquals(
             listOf(
                 "imaps1.example.com",
                 "imap1.example.com",
                 "imaps2.example.com",
-                "imap2.example.com"
+                "imap2.example.com",
             ),
-            result?.incoming?.map { it.host }
+            result?.incoming?.map { it.host },
         )
     }
 
@@ -156,7 +156,7 @@ class SrvServiceDiscoveryTest {
         priority: Int = 0,
         security: ConnectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
         srvType: SrvType,
-        port: Int
+        port: Int,
     ): MailService {
         return MailService(srvType, host, port, priority, security)
     }
@@ -166,7 +166,7 @@ class SrvServiceDiscoveryTest {
         submissionServices: List<MailService> = listOf(),
         submissionsServices: List<MailService> = listOf(),
         imapServices: List<MailService> = listOf(),
-        imapsServices: List<MailService> = listOf()
+        imapsServices: List<MailService> = listOf(),
     ): MiniDnsSrvResolver {
         return mock {
             on { lookup(host, SrvType.SUBMISSION) } doReturn submissionServices
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
index bffb1e20f3f..33f3e41f2ef 100644
--- 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
@@ -13,7 +13,7 @@ class ThunderbirdAutoconfigUrlProvider {
             createProviderUrl(domain, email),
             createDomainUrl(scheme = "https", domain),
             createDomainUrl(scheme = "http", domain),
-            createIspDbUrl(domain)
+            createIspDbUrl(domain),
         )
     }
 
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 23d16819ad7..87a3495f165 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
@@ -6,7 +6,7 @@ import com.fsck.k9.autodiscovery.api.DiscoveryResults
 class ThunderbirdDiscovery(
     private val urlProvider: ThunderbirdAutoconfigUrlProvider,
     private val fetcher: ThunderbirdAutoconfigFetcher,
-    private val parser: ThunderbirdAutoconfigParser
+    private val parser: ThunderbirdAutoconfigParser,
 ) : ConnectionSettingsDiscovery {
 
     override fun discover(email: String): DiscoveryResults? {
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 ca7dc0f1c2d..85cf04a52d5 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
@@ -162,11 +162,11 @@ class ThunderbirdAutoconfigTest {
                         port = 993,
                         security = ConnectionSecurity.SSL_TLS_REQUIRED,
                         authType = AuthType.PLAIN,
-                        username = "test@metacode.biz"
-                    )
+                        username = "test@metacode.biz",
+                    ),
                 ),
-                listOf()
-            )
+                listOf(),
+            ),
         )
     }
 }
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
index d285a3ac02f..30f88aee551 100644
--- 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
@@ -14,7 +14,7 @@ class ThunderbirdAutoconfigUrlProviderTest {
             "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"
+            "https://autoconfig.thunderbird.net/v1.1/domain.example",
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/Account.kt b/app/core/src/main/java/com/fsck/k9/Account.kt
index 9dc569a0b8e..b5ad45f9c8d 100644
--- a/app/core/src/main/java/com/fsck/k9/Account.kt
+++ b/app/core/src/main/java/com/fsck/k9/Account.kt
@@ -613,41 +613,42 @@ class Account(override val uuid: String) : BaseAccount {
         ALL,
         FIRST_CLASS,
         FIRST_AND_SECOND_CLASS,
-        NOT_SECOND_CLASS
+        NOT_SECOND_CLASS,
     }
 
     enum class SpecialFolderSelection {
         AUTOMATIC,
-        MANUAL
+        MANUAL,
     }
 
     enum class ShowPictures {
         NEVER,
         ALWAYS,
-        ONLY_FROM_CONTACTS
+        ONLY_FROM_CONTACTS,
     }
 
     enum class Searchable {
         ALL,
         DISPLAYABLE,
-        NONE
+        NONE,
     }
 
     enum class QuoteStyle {
         PREFIX,
-        HEADER
+        HEADER,
     }
 
     enum class MessageFormat {
         TEXT,
         HTML,
-        AUTO
+        AUTO,
     }
 
     enum class Expunge {
         EXPUNGE_IMMEDIATELY,
         EXPUNGE_MANUALLY,
-        EXPUNGE_ON_POLL;
+        EXPUNGE_ON_POLL,
+        ;
 
         fun toBackendExpungePolicy(): ExpungePolicy = when (this) {
             EXPUNGE_IMMEDIATELY -> ExpungePolicy.IMMEDIATELY
@@ -660,7 +661,8 @@ class Account(override val uuid: String) : BaseAccount {
         NEVER(0),
         SEVEN_DAYS(1),
         ON_DELETE(2),
-        MARK_AS_READ(3);
+        MARK_AS_READ(3),
+        ;
 
         companion object {
             fun fromInt(initialSetting: Int): DeletePolicy {
@@ -676,7 +678,7 @@ class Account(override val uuid: String) : BaseAccount {
         SORT_SENDER(true),
         SORT_UNREAD(true),
         SORT_FLAGGED(true),
-        SORT_ATTACHMENT(true);
+        SORT_ATTACHMENT(true),
     }
 
     companion object {
diff --git a/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt b/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
index 851bf8d9e34..e78a2ca2ea1 100644
--- a/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
+++ b/app/core/src/main/java/com/fsck/k9/AccountPreferenceSerializer.kt
@@ -23,7 +23,7 @@ import timber.log.Timber
 class AccountPreferenceSerializer(
     private val storageManager: StorageManager,
     private val resourceProvider: CoreResourceProvider,
-    private val serverSettingsSerializer: ServerSettingsSerializer
+    private val serverSettingsSerializer: ServerSettingsSerializer,
 ) {
 
     @Synchronized
@@ -31,16 +31,23 @@ class AccountPreferenceSerializer(
         val accountUuid = account.uuid
         with(account) {
             incomingServerSettings = serverSettingsSerializer.deserialize(
-                storage.getString("$accountUuid.$INCOMING_SERVER_SETTINGS_KEY", "")
+                storage.getString("$accountUuid.$INCOMING_SERVER_SETTINGS_KEY", ""),
             )
             outgoingServerSettings = serverSettingsSerializer.deserialize(
-                storage.getString("$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY", "")
+                storage.getString("$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY", ""),
             )
             oAuthState = storage.getString("$accountUuid.oAuthState", null)
-            localStorageProviderId = storage.getString("$accountUuid.localStorageProvider", storageManager.defaultProviderId)
+            localStorageProviderId = storage.getString(
+                "$accountUuid.localStorageProvider",
+                storageManager.defaultProviderId,
+            )
             name = storage.getString("$accountUuid.description", null)
             alwaysBcc = storage.getString("$accountUuid.alwaysBcc", alwaysBcc)
-            automaticCheckIntervalMinutes = storage.getInt("$accountUuid.automaticCheckIntervalMinutes", DEFAULT_SYNC_INTERVAL)
+            automaticCheckIntervalMinutes = storage.getInt(
+                "" +
+                    "$accountUuid.automaticCheckIntervalMinutes",
+                DEFAULT_SYNC_INTERVAL,
+            )
             idleRefreshMinutes = storage.getInt("$accountUuid.idleRefreshMinutes", 24)
             displayCount = storage.getInt("$accountUuid.displayCount", K9.DEFAULT_VISIBLE_LIMIT)
             if (displayCount < 0) {
@@ -48,7 +55,11 @@ class AccountPreferenceSerializer(
             }
             isNotifyNewMail = storage.getBoolean("$accountUuid.notifyNewMail", false)
 
-            folderNotifyNewMailMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderNotifyNewMailMode", FolderMode.ALL)
+            folderNotifyNewMailMode = getEnumStringPref<FolderMode>(
+                storage,
+                "$accountUuid.folderNotifyNewMailMode",
+                FolderMode.ALL,
+            )
             isNotifySelfNewMail = storage.getBoolean("$accountUuid.notifySelfNewMail", true)
             isNotifyContactsMailOnly = storage.getBoolean("$accountUuid.notifyContactsMailOnly", false)
             isIgnoreChatMessages = storage.getBoolean("$accountUuid.ignoreChatMessages", false)
@@ -69,7 +80,7 @@ class AccountPreferenceSerializer(
             val draftsFolderSelection = getEnumStringPref<SpecialFolderSelection>(
                 storage,
                 "$accountUuid.draftsFolderSelection",
-                SpecialFolderSelection.AUTOMATIC
+                SpecialFolderSelection.AUTOMATIC,
             )
             setDraftsFolderId(draftsFolderId, draftsFolderSelection)
 
@@ -77,7 +88,7 @@ class AccountPreferenceSerializer(
             val sentFolderSelection = getEnumStringPref<SpecialFolderSelection>(
                 storage,
                 "$accountUuid.sentFolderSelection",
-                SpecialFolderSelection.AUTOMATIC
+                SpecialFolderSelection.AUTOMATIC,
             )
             setSentFolderId(sentFolderId, sentFolderSelection)
 
@@ -85,7 +96,7 @@ class AccountPreferenceSerializer(
             val trashFolderSelection = getEnumStringPref<SpecialFolderSelection>(
                 storage,
                 "$accountUuid.trashFolderSelection",
-                SpecialFolderSelection.AUTOMATIC
+                SpecialFolderSelection.AUTOMATIC,
             )
             setTrashFolderId(trashFolderId, trashFolderSelection)
 
@@ -93,7 +104,7 @@ class AccountPreferenceSerializer(
             val archiveFolderSelection = getEnumStringPref<SpecialFolderSelection>(
                 storage,
                 "$accountUuid.archiveFolderSelection",
-                SpecialFolderSelection.AUTOMATIC
+                SpecialFolderSelection.AUTOMATIC,
             )
             setArchiveFolderId(archiveFolderId, archiveFolderSelection)
 
@@ -101,20 +112,20 @@ class AccountPreferenceSerializer(
             val spamFolderSelection = getEnumStringPref<SpecialFolderSelection>(
                 storage,
                 "$accountUuid.spamFolderSelection",
-                SpecialFolderSelection.AUTOMATIC
+                SpecialFolderSelection.AUTOMATIC,
             )
             setSpamFolderId(spamFolderId, spamFolderSelection)
 
             autoExpandFolderId = storage.getString("$accountUuid.autoExpandFolderId", null)?.toLongOrNull()
 
-            expungePolicy = getEnumStringPref<Expunge>(storage, "$accountUuid.expungePolicy", Expunge.EXPUNGE_IMMEDIATELY)
+            expungePolicy = getEnumStringPref(storage, "$accountUuid.expungePolicy", Expunge.EXPUNGE_IMMEDIATELY)
             isSyncRemoteDeletions = storage.getBoolean("$accountUuid.syncRemoteDeletions", true)
 
             maxPushFolders = storage.getInt("$accountUuid.maxPushFolders", 10)
             isSubscribedFoldersOnly = storage.getBoolean("$accountUuid.subscribedFoldersOnly", false)
             maximumPolledMessageAge = storage.getInt("$accountUuid.maximumPolledMessageAge", -1)
             maximumAutoDownloadMessageSize = storage.getInt("$accountUuid.maximumAutoDownloadMessageSize", 32768)
-            messageFormat = getEnumStringPref<MessageFormat>(storage, "$accountUuid.messageFormat", DEFAULT_MESSAGE_FORMAT)
+            messageFormat = getEnumStringPref(storage, "$accountUuid.messageFormat", DEFAULT_MESSAGE_FORMAT)
             val messageFormatAuto = storage.getBoolean("$accountUuid.messageFormatAuto", DEFAULT_MESSAGE_FORMAT_AUTO)
             if (messageFormatAuto && messageFormat == MessageFormat.TEXT) {
                 messageFormat = MessageFormat.AUTO
@@ -122,7 +133,10 @@ class AccountPreferenceSerializer(
             isMessageReadReceipt = storage.getBoolean("$accountUuid.messageReadReceipt", DEFAULT_MESSAGE_READ_RECEIPT)
             quoteStyle = getEnumStringPref<QuoteStyle>(storage, "$accountUuid.quoteStyle", DEFAULT_QUOTE_STYLE)
             quotePrefix = storage.getString("$accountUuid.quotePrefix", DEFAULT_QUOTE_PREFIX)
-            isDefaultQuotedTextShown = storage.getBoolean("$accountUuid.defaultQuotedTextShown", DEFAULT_QUOTED_TEXT_SHOWN)
+            isDefaultQuotedTextShown = storage.getBoolean(
+                "$accountUuid.defaultQuotedTextShown",
+                DEFAULT_QUOTED_TEXT_SHOWN,
+            )
             isReplyAfterQuote = storage.getBoolean("$accountUuid.replyAfterQuote", DEFAULT_REPLY_AFTER_QUOTE)
             isStripSignature = storage.getBoolean("$accountUuid.stripSignature", DEFAULT_STRIP_SIGNATURE)
             useCompression = storage.getBoolean("$accountUuid.useCompression", true)
@@ -147,18 +161,21 @@ class AccountPreferenceSerializer(
                     vibration = NotificationVibration(
                         isEnabled = storage.getBoolean("$accountUuid.vibrate", false),
                         pattern = VibratePattern.deserialize(storage.getInt("$accountUuid.vibratePattern", 0)),
-                        repeatCount = storage.getInt("$accountUuid.vibrateTimes", 5)
-                    )
+                        repeatCount = storage.getInt("$accountUuid.vibrateTimes", 5),
+                    ),
                 )
             }
 
-            folderDisplayMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderDisplayMode", FolderMode.NOT_SECOND_CLASS)
+            folderDisplayMode =
+                getEnumStringPref<FolderMode>(storage, "$accountUuid.folderDisplayMode", FolderMode.NOT_SECOND_CLASS)
 
-            folderSyncMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderSyncMode", FolderMode.FIRST_CLASS)
+            folderSyncMode =
+                getEnumStringPref<FolderMode>(storage, "$accountUuid.folderSyncMode", FolderMode.FIRST_CLASS)
 
             folderPushMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderPushMode", FolderMode.NONE)
 
-            folderTargetMode = getEnumStringPref<FolderMode>(storage, "$accountUuid.folderTargetMode", FolderMode.NOT_SECOND_CLASS)
+            folderTargetMode =
+                getEnumStringPref<FolderMode>(storage, "$accountUuid.folderTargetMode", FolderMode.NOT_SECOND_CLASS)
 
             searchableFolders = getEnumStringPref<Searchable>(storage, "$accountUuid.searchableFolders", Searchable.ALL)
 
@@ -172,7 +189,8 @@ class AccountPreferenceSerializer(
             isOpenPgpEncryptAllDrafts = storage.getBoolean("$accountUuid.openPgpEncryptAllDrafts", true)
             autocryptPreferEncryptMutual = storage.getBoolean("$accountUuid.autocryptMutualMode", false)
             isRemoteSearchFullText = storage.getBoolean("$accountUuid.remoteSearchFullText", false)
-            remoteSearchNumResults = storage.getInt("$accountUuid.remoteSearchNumResults", DEFAULT_REMOTE_SEARCH_NUM_RESULTS)
+            remoteSearchNumResults =
+                storage.getInt("$accountUuid.remoteSearchNumResults", DEFAULT_REMOTE_SEARCH_NUM_RESULTS)
             isUploadSentMessages = storage.getBoolean("$accountUuid.uploadSentMessages", true)
 
             isMarkMessageAsReadOnView = storage.getBoolean("$accountUuid.markMessageAsReadOnView", true)
@@ -210,7 +228,7 @@ class AccountPreferenceSerializer(
                     signatureUse = signatureUse,
                     signature = signature,
                     description = description,
-                    replyTo = replyTo
+                    replyTo = replyTo,
                 )
                 newIdentities.add(identity)
                 gotOne = true
@@ -228,7 +246,7 @@ class AccountPreferenceSerializer(
                 email = email,
                 signatureUse = signatureUse,
                 signature = signature,
-                description = email
+                description = email,
             )
             newIdentities.add(identity)
         }
@@ -247,8 +265,14 @@ class AccountPreferenceSerializer(
         }
 
         with(account) {
-            editor.putString("$accountUuid.$INCOMING_SERVER_SETTINGS_KEY", serverSettingsSerializer.serialize(incomingServerSettings))
-            editor.putString("$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY", serverSettingsSerializer.serialize(outgoingServerSettings))
+            editor.putString(
+                "$accountUuid.$INCOMING_SERVER_SETTINGS_KEY",
+                serverSettingsSerializer.serialize(incomingServerSettings),
+            )
+            editor.putString(
+                "$accountUuid.$OUTGOING_SERVER_SETTINGS_KEY",
+                serverSettingsSerializer.serialize(outgoingServerSettings),
+            )
             editor.putString("$accountUuid.oAuthState", oAuthState)
             editor.putString("$accountUuid.localStorageProvider", localStorageProviderId)
             editor.putString("$accountUuid.description", name)
@@ -351,7 +375,8 @@ class AccountPreferenceSerializer(
         val accountUuid = account.uuid
 
         // Get the list of account UUIDs
-        val uuids = storage.getString("accountUuids", "").split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+        val uuids =
+            storage.getString("accountUuids", "").split(",".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
 
         // Create a list of all account UUIDs excluding this account
         val newUuids = ArrayList<String>(uuids.size)
@@ -533,7 +558,7 @@ class AccountPreferenceSerializer(
                     "Unable to convert preference key [%s] value [%s] to enum of type %s",
                     key,
                     stringPref,
-                    defaultEnum.declaringJavaClass
+                    defaultEnum.declaringJavaClass,
                 )
 
                 defaultEnum
@@ -603,7 +628,7 @@ class AccountPreferenceSerializer(
             val identity = Identity(
                 signatureUse = false,
                 signature = resourceProvider.defaultSignature(),
-                description = resourceProvider.defaultIdentityDescription()
+                description = resourceProvider.defaultIdentityDescription(),
             )
             identities.add(identity)
 
@@ -612,7 +637,7 @@ class AccountPreferenceSerializer(
                     isRingEnabled = true,
                     ringtone = DEFAULT_RINGTONE_URI,
                     light = NotificationLight.Disabled,
-                    vibration = NotificationVibration.DEFAULT
+                    vibration = NotificationVibration.DEFAULT,
                 )
             }
 
diff --git a/app/core/src/main/java/com/fsck/k9/AppConfig.kt b/app/core/src/main/java/com/fsck/k9/AppConfig.kt
index 5609db88da0..4d3e0e9bf9c 100644
--- a/app/core/src/main/java/com/fsck/k9/AppConfig.kt
+++ b/app/core/src/main/java/com/fsck/k9/AppConfig.kt
@@ -1,5 +1,5 @@
 package com.fsck.k9
 
 data class AppConfig(
-    val componentsToDisable: List<Class<*>>
+    val componentsToDisable: List<Class<*>>,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/Core.kt b/app/core/src/main/java/com/fsck/k9/Core.kt
index ea140fe371d..0128027449b 100644
--- a/app/core/src/main/java/com/fsck/k9/Core.kt
+++ b/app/core/src/main/java/com/fsck/k9/Core.kt
@@ -70,7 +70,7 @@ object Core : EarlyInit {
                     } else {
                         PackageManager.COMPONENT_ENABLED_STATE_DISABLED
                     },
-                    PackageManager.DONT_KILL_APP
+                    PackageManager.DONT_KILL_APP,
                 )
             }
         }
diff --git a/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt b/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt
index 38991fcf018..276941edb51 100644
--- a/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt
+++ b/app/core/src/main/java/com/fsck/k9/CoreKoinModules.kt
@@ -32,5 +32,5 @@ val coreModules = listOf(
     preferencesModule,
     connectivityModule,
     powerModule,
-    loggingModule
+    loggingModule,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/DI.kt b/app/core/src/main/java/com/fsck/k9/DI.kt
index 00adb26ba18..0b369274528 100644
--- a/app/core/src/main/java/com/fsck/k9/DI.kt
+++ b/app/core/src/main/java/com/fsck/k9/DI.kt
@@ -14,7 +14,8 @@ import org.koin.java.KoinJavaComponent.get as koinGet
 object DI {
     private const val DEBUG = false
 
-    @JvmStatic fun start(application: Application, modules: List<Module>) {
+    @JvmStatic
+    fun start(application: Application, modules: List<Module>) {
         startKoin {
             if (BuildConfig.DEBUG && DEBUG) {
                 androidLogger()
@@ -40,5 +41,5 @@ interface EarlyInit
 // Copied from ComponentCallbacks.inject()
 inline fun <reified T : Any> EarlyInit.inject(
     qualifier: Qualifier? = null,
-    noinline parameters: ParametersDefinition? = null
+    noinline parameters: ParametersDefinition? = null,
 ) = lazy { getKoin().get<T>(qualifier, parameters) }
diff --git a/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt b/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt
index bc85dbbd920..6ba2f1f27ea 100644
--- a/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt
+++ b/app/core/src/main/java/com/fsck/k9/EmailAddressValidator.kt
@@ -21,7 +21,7 @@ class EmailAddressValidator {
 
         private val EMAIL_ADDRESS_PATTERN = Pattern.compile(
             "^($ATEXT+(\\.$ATEXT+)*|\"$QCONTENT+\")" +
-                "\\@$HOST_NAME"
+                "\\@$HOST_NAME",
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/Identity.kt b/app/core/src/main/java/com/fsck/k9/Identity.kt
index 6549f108558..c0c2f35c002 100644
--- a/app/core/src/main/java/com/fsck/k9/Identity.kt
+++ b/app/core/src/main/java/com/fsck/k9/Identity.kt
@@ -10,7 +10,7 @@ data class Identity(
     val email: String? = null,
     val signature: String? = null,
     val signatureUse: Boolean = false,
-    val replyTo: String? = null
+    val replyTo: String? = null,
 ) : Parcelable {
     // TODO remove when callers are converted to Kotlin
     fun withName(name: String?) = copy(name = name)
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 08cbf947ba5..ed634d2bc89 100644
--- a/app/core/src/main/java/com/fsck/k9/K9.kt
+++ b/app/core/src/main/java/com/fsck/k9/K9.kt
@@ -287,11 +287,13 @@ object K9 : EarlyInit {
     }
 
     fun init(context: Context) {
-        K9MailLib.setDebugStatus(object : K9MailLib.DebugStatus {
-            override fun enabled(): Boolean = isDebugLoggingEnabled
+        K9MailLib.setDebugStatus(
+            object : K9MailLib.DebugStatus {
+                override fun enabled(): Boolean = isDebugLoggingEnabled
 
-            override fun debugSensitive(): Boolean = isSensitiveDebugLoggingEnabled
-        })
+                override fun debugSensitive(): Boolean = isSensitiveDebugLoggingEnabled
+            },
+        )
         com.fsck.k9.logging.Timber.logger = TimberLogger()
 
         checkCachedDatabaseVersion(context)
@@ -345,7 +347,7 @@ object K9 : EarlyInit {
 
         lockScreenNotificationVisibility = storage.getEnum(
             "lockScreenNotificationVisibility",
-            LockScreenNotificationVisibility.MESSAGE_COUNT
+            LockScreenNotificationVisibility.MESSAGE_COUNT,
         )
 
         splitViewMode = storage.getEnum("splitViewMode", SplitViewMode.NEVER)
@@ -507,7 +509,7 @@ object K9 : EarlyInit {
     enum class NotificationQuickDelete {
         ALWAYS,
         FOR_SINGLE_MSG,
-        NEVER
+        NEVER,
     }
 
     enum class LockScreenNotificationVisibility {
@@ -515,7 +517,7 @@ object K9 : EarlyInit {
         SENDERS,
         MESSAGE_COUNT,
         APP_NAME,
-        NOTHING
+        NOTHING,
     }
 
     /**
@@ -524,6 +526,6 @@ object K9 : EarlyInit {
     enum class SplitViewMode {
         ALWAYS,
         NEVER,
-        WHEN_IN_LANDSCAPE
+        WHEN_IN_LANDSCAPE,
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/KoinModule.kt
index 85cacac5b97..a9a5267ed98 100644
--- a/app/core/src/main/java/com/fsck/k9/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/KoinModule.kt
@@ -19,7 +19,7 @@ val mainModule = module {
         Preferences(
             storagePersister = get(),
             localStoreProvider = get(),
-            accountPreferenceSerializer = get()
+            accountPreferenceSerializer = get(),
         )
     }
     single { get<Context>().resources }
diff --git a/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt b/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt
index 4933879bdaa..b2d31013fc3 100644
--- a/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/LocalKeyStoreManager.kt
@@ -6,7 +6,7 @@ import java.security.cert.CertificateException
 import java.security.cert.X509Certificate
 
 class LocalKeyStoreManager(
-    private val localKeyStore: LocalKeyStore
+    private val localKeyStore: LocalKeyStore,
 ) {
     /**
      * Add a new certificate for the incoming or outgoing server to the local key store.
diff --git a/app/core/src/main/java/com/fsck/k9/NotificationLight.kt b/app/core/src/main/java/com/fsck/k9/NotificationLight.kt
index 4a6f36790eb..aa003f23a06 100644
--- a/app/core/src/main/java/com/fsck/k9/NotificationLight.kt
+++ b/app/core/src/main/java/com/fsck/k9/NotificationLight.kt
@@ -12,7 +12,8 @@ enum class NotificationLight {
     Blue,
     Yellow,
     Cyan,
-    Magenta;
+    Magenta,
+    ;
 
     fun toColor(account: Account): Int? {
         return when (this) {
diff --git a/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt b/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt
index 5852e4b14d0..cafac16b011 100644
--- a/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/NotificationSettings.kt
@@ -7,5 +7,5 @@ data class NotificationSettings(
     val isRingEnabled: Boolean = false,
     val ringtone: String? = null,
     val light: NotificationLight = NotificationLight.Disabled,
-    val vibration: NotificationVibration = NotificationVibration.DEFAULT
+    val vibration: NotificationVibration = NotificationVibration.DEFAULT,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt b/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt
index 0986baeff3c..744e701685b 100644
--- a/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt
+++ b/app/core/src/main/java/com/fsck/k9/NotificationVibration.kt
@@ -3,7 +3,7 @@ package com.fsck.k9
 data class NotificationVibration(
     val isEnabled: Boolean,
     val pattern: VibratePattern,
-    val repeatCount: Int
+    val repeatCount: Int,
 ) {
     val systemPattern: LongArray
         get() = getSystemPattern(pattern, repeatCount)
@@ -30,14 +30,15 @@ enum class VibratePattern(
     /**
      * These are "off, on" patterns, specified in milliseconds.
      */
-    val vibrationPattern: LongArray
+    val vibrationPattern: LongArray,
 ) {
     Default(vibrationPattern = longArrayOf(300, 200)),
     Pattern1(vibrationPattern = longArrayOf(100, 200)),
     Pattern2(vibrationPattern = longArrayOf(100, 500)),
     Pattern3(vibrationPattern = longArrayOf(200, 200)),
     Pattern4(vibrationPattern = longArrayOf(200, 500)),
-    Pattern5(vibrationPattern = longArrayOf(500, 500));
+    Pattern5(vibrationPattern = longArrayOf(500, 500)),
+    ;
 
     fun serialize(): Int = when (this) {
         Default -> 0
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 84517c4cf03..5b20a58fc60 100644
--- a/app/core/src/main/java/com/fsck/k9/Preferences.kt
+++ b/app/core/src/main/java/com/fsck/k9/Preferences.kt
@@ -8,7 +8,6 @@ import com.fsck.k9.preferences.AccountManager
 import com.fsck.k9.preferences.Storage
 import com.fsck.k9.preferences.StorageEditor
 import com.fsck.k9.preferences.StoragePersister
-import java.util.HashMap
 import java.util.LinkedList
 import java.util.UUID
 import java.util.concurrent.CopyOnWriteArraySet
@@ -28,7 +27,7 @@ class Preferences internal constructor(
     private val storagePersister: StoragePersister,
     private val localStoreProvider: LocalStoreProvider,
     private val accountPreferenceSerializer: AccountPreferenceSerializer,
-    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : AccountManager {
     private val accountLock = Any()
     private val storageLock = Any()
diff --git a/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt b/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt
index 3a9af0e271b..8724389449c 100644
--- a/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt
+++ b/app/core/src/main/java/com/fsck/k9/ServerSettingsSerializer.kt
@@ -37,7 +37,7 @@ private val JSON_KEYS = JsonReader.Options.of(
     KEY_AUTHENTICATION_TYPE,
     KEY_USERNAME,
     KEY_PASSWORD,
-    KEY_CLIENT_CERTIFICATE_ALIAS
+    KEY_CLIENT_CERTIFICATE_ALIAS,
 )
 
 private class ServerSettingsAdapter : JsonAdapter<ServerSettings>() {
@@ -90,7 +90,7 @@ private class ServerSettingsAdapter : JsonAdapter<ServerSettings>() {
             username,
             password,
             clientCertificateAlias,
-            extra
+            extra,
         )
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt
index 8079a876615..6a02a1fd83f 100644
--- a/app/core/src/main/java/com/fsck/k9/SwipeAction.kt
+++ b/app/core/src/main/java/com/fsck/k9/SwipeAction.kt
@@ -8,5 +8,5 @@ enum class SwipeAction(val removesItem: Boolean) {
     Archive(removesItem = true),
     Delete(removesItem = true),
     Spam(removesItem = true),
-    Move(removesItem = true)
+    Move(removesItem = true),
 }
diff --git a/app/core/src/main/java/com/fsck/k9/TimberLogger.kt b/app/core/src/main/java/com/fsck/k9/TimberLogger.kt
index 80c1af8c50d..aa183dec476 100644
--- a/app/core/src/main/java/com/fsck/k9/TimberLogger.kt
+++ b/app/core/src/main/java/com/fsck/k9/TimberLogger.kt
@@ -115,7 +115,7 @@ class TimberLogger : Logger {
             Timber.Tree::class.java.name,
             Timber.DebugTree::class.java.name,
             TimberLogger::class.java.name,
-            com.fsck.k9.logging.Timber::class.java.name
+            com.fsck.k9.logging.Timber::class.java.name,
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt
index bcb3f09d465..dcbe2d35e13 100644
--- a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt
+++ b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeader.kt
@@ -8,7 +8,7 @@ data class AutocryptDraftStateHeader(
     val isReply: Boolean,
     val isByChoice: Boolean,
     val isPgpInline: Boolean,
-    val parameters: Map<String, String> = mapOf()
+    val parameters: Map<String, String> = mapOf(),
 ) {
 
     fun toHeaderValue(): String {
@@ -54,7 +54,7 @@ data class AutocryptDraftStateHeader(
                     cryptoStatus.isReplyToEncrypted,
                     cryptoStatus.isUserChoice(),
                     cryptoStatus.isPgpInlineModeEnabled,
-                    mapOf()
+                    mapOf(),
                 )
             }
             return AutocryptDraftStateHeader(
@@ -63,7 +63,7 @@ data class AutocryptDraftStateHeader(
                 cryptoStatus.isReplyToEncrypted,
                 cryptoStatus.isUserChoice(),
                 cryptoStatus.isPgpInlineModeEnabled,
-                mapOf()
+                mapOf(),
             )
         }
     }
diff --git a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt
index 2228ab2511c..fccdca46cd6 100644
--- a/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/autocrypt/AutocryptTransferMessageCreator.kt
@@ -23,7 +23,10 @@ class AutocryptTransferMessageCreator(private val stringProvider: AutocryptStrin
             val textBodyPart = MimeBodyPart.create(TextBody(messageText))
             val dataBodyPart = MimeBodyPart.create(BinaryMemoryBody(data, "7bit"))
             dataBodyPart.setHeader(MimeHeader.HEADER_CONTENT_TYPE, "application/autocrypt-setup")
-            dataBodyPart.setHeader(MimeHeader.HEADER_CONTENT_DISPOSITION, "attachment; filename=\"autocrypt-setup-message\"")
+            dataBodyPart.setHeader(
+                MimeHeader.HEADER_CONTENT_DISPOSITION,
+                "attachment; filename=\"autocrypt-setup-message\"",
+            )
 
             val messageBody = MimeMultipart.newInstance()
             messageBody.addBodyPart(textBodyPart)
diff --git a/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt b/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt
index 061084c591c..71ef4d0fe56 100644
--- a/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/backend/BackendManager.kt
@@ -20,7 +20,7 @@ class BackendManager(private val backendFactories: Map<String, BackendFactory>)
                 backendCache[account.uuid] = BackendContainer(
                     backend,
                     account.incomingServerSettings,
-                    account.outgoingServerSettings
+                    account.outgoingServerSettings,
                 )
             }
         }
@@ -67,7 +67,7 @@ class BackendManager(private val backendFactories: Map<String, BackendFactory>)
 private data class BackendContainer(
     val backend: Backend,
     val incomingServerSettings: ServerSettings,
-    val outgoingServerSettings: ServerSettings
+    val outgoingServerSettings: ServerSettings,
 )
 
 fun interface BackendChangedListener {
diff --git a/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt b/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt
index 8340420856e..2c45f12dc08 100644
--- a/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt
+++ b/app/core/src/main/java/com/fsck/k9/cache/ExpiringCache.kt
@@ -6,7 +6,7 @@ internal class ExpiringCache<KEY : Any, VALUE : Any>(
     private val clock: Clock,
     private val delegateCache: Cache<KEY, VALUE> = InMemoryCache(),
     private var lastClearTime: Long = clock.time,
-    private val cacheTimeValidity: Long = CACHE_TIME_VALIDITY_IN_MILLIS
+    private val cacheTimeValidity: Long = CACHE_TIME_VALIDITY_IN_MILLIS,
 ) : Cache<KEY, VALUE> {
 
     override fun get(key: KEY): VALUE? {
diff --git a/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt b/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt
index 835f0a91edd..092a2771fb3 100644
--- a/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt
+++ b/app/core/src/main/java/com/fsck/k9/cache/InMemoryCache.kt
@@ -1,7 +1,7 @@
 package com.fsck.k9.cache
 
 internal class InMemoryCache<KEY : Any, VALUE : Any>(
-    private val cache: MutableMap<KEY, VALUE> = mutableMapOf()
+    private val cache: MutableMap<KEY, VALUE> = mutableMapOf(),
 ) : Cache<KEY, VALUE> {
     override fun get(key: KEY): VALUE? {
         return cache[key]
diff --git a/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt b/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt
index 518f4716de4..ed3a35cc7c9 100644
--- a/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt
+++ b/app/core/src/main/java/com/fsck/k9/cache/SynchronizedCache.kt
@@ -1,7 +1,7 @@
 package com.fsck.k9.cache
 
 internal class SynchronizedCache<KEY : Any, VALUE : Any>(
-    private val delegateCache: Cache<KEY, VALUE>
+    private val delegateCache: Cache<KEY, VALUE>,
 ) : Cache<KEY, VALUE> {
 
     override fun get(key: KEY): VALUE? {
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 83963f052d2..6437ce10b8e 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
@@ -21,14 +21,14 @@ import timber.log.Timber
 internal class DraftOperations(
     private val messagingController: @NotNull MessagingController,
     private val messageStoreManager: @NotNull MessageStoreManager,
-    private val saveMessageDataCreator: SaveMessageDataCreator
+    private val saveMessageDataCreator: SaveMessageDataCreator,
 ) {
 
     fun saveDraft(
         account: Account,
         message: Message,
         existingDraftId: Long?,
-        plaintextSubject: String?
+        plaintextSubject: String?,
     ): Long? {
         return try {
             val draftsFolderId = account.draftsFolderId ?: error("No Drafts folder configured")
@@ -51,7 +51,7 @@ internal class DraftOperations(
         message: Message,
         folderId: Long,
         existingDraftId: Long?,
-        subject: String?
+        subject: String?,
     ): Long {
         val messageStore = messageStoreManager.getMessageStore(account)
 
@@ -91,7 +91,7 @@ internal class DraftOperations(
         message: Message,
         folderId: Long,
         existingDraftId: Long?,
-        plaintextSubject: String?
+        plaintextSubject: String?,
     ): Long {
         val messageStore = messageStoreManager.getMessageStore(account)
         val messageData = message.toSaveMessageData(plaintextSubject)
@@ -124,7 +124,7 @@ internal class DraftOperations(
         backend: Backend,
         account: Account,
         localFolder: LocalFolder,
-        localMessage: LocalMessage
+        localMessage: LocalMessage,
     ) {
         val folderServerId = localFolder.serverId
         Timber.d("Uploading message [ID: %d] to remote folder '%s'", localMessage.databaseId, folderServerId)
@@ -139,7 +139,7 @@ internal class DraftOperations(
         if (messageServerId == null) {
             Timber.w(
                 "Failed to get a server ID for the uploaded message. Removing local copy [ID: %d]",
-                localMessage.databaseId
+                localMessage.databaseId,
             )
             localMessage.destroy()
         } else {
diff --git a/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt
index b62e67ebf14..6af24ab6724 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/KoinModule.kt
@@ -24,13 +24,13 @@ val controllerModule = module {
             get<MessageStoreManager>(),
             get<SaveMessageDataCreator>(),
             get<SpecialLocalFoldersCreator>(),
-            get(named("controllerExtensions"))
+            get(named("controllerExtensions")),
         )
     }
     single<MessageCountsProvider> {
         DefaultMessageCountsProvider(
             preferences = get(),
-            messageStoreManager = get()
+            messageStoreManager = get(),
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt b/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt
index 1d7e5f27c03..242808ec460 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/MessageCountsProvider.kt
@@ -21,7 +21,7 @@ data class MessageCounts(val unread: Int, val starred: Int)
 
 internal class DefaultMessageCountsProvider(
     private val preferences: Preferences,
-    private val messageStoreManager: MessageStoreManager
+    private val messageStoreManager: MessageStoreManager,
 ) : MessageCountsProvider {
     override fun getMessageCounts(account: Account): MessageCounts {
         val search = LocalSearch().apply {
@@ -66,7 +66,7 @@ internal class DefaultMessageCountsProvider(
             val messageStore = messageStoreManager.getMessageStore(account)
             return MessageCounts(
                 unread = messageStore.getUnreadMessageCount(conditions),
-                starred = messageStore.getStarredMessageCount(conditions)
+                starred = messageStore.getStarredMessageCount(conditions),
             )
         } catch (e: Exception) {
             Timber.e(e, "Unable to getMessageCounts for account: %s", account)
diff --git a/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt b/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt
index 13ae584a8c8..a4f012279fa 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/MessageReference.kt
@@ -6,7 +6,7 @@ import java.util.StringTokenizer
 data class MessageReference(
     val accountUuid: String,
     val folderId: Long,
-    val uid: String
+    val uid: String,
 ) {
     fun toIdentityString(): String {
         return buildString {
diff --git a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt
index 8ab0a7f4485..ee3e77ea531 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/NotificationOperations.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.search.isUnifiedInbox
 internal class NotificationOperations(
     private val notificationController: NotificationController,
     private val preferences: Preferences,
-    private val messageStoreManager: MessageStoreManager
+    private val messageStoreManager: MessageStoreManager,
 ) {
     fun clearNotifications(search: LocalSearch) {
         if (search.isUnifiedInbox) {
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
index c735c20bc67..bdf0c12b721 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushController.kt
@@ -12,7 +12,6 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
-import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import timber.log.Timber
 
@@ -22,7 +21,7 @@ internal class AccountPushController(
     private val preferences: Preferences,
     private val folderRepository: FolderRepository,
     backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
-    private val account: Account
+    private val account: Account,
 ) {
     private val coroutineScope = CoroutineScope(backgroundDispatcher)
 
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
index 7091496d69a..3fedeb4fc6f 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/AccountPushControllerFactory.kt
@@ -10,7 +10,7 @@ internal class AccountPushControllerFactory(
     private val backendManager: BackendManager,
     private val messagingController: MessagingController,
     private val folderRepository: FolderRepository,
-    private val preferences: Preferences
+    private val preferences: Preferences,
 ) {
     fun create(account: Account): AccountPushController {
         return AccountPushController(
@@ -18,7 +18,7 @@ internal class AccountPushControllerFactory(
             messagingController,
             preferences,
             folderRepository,
-            account = account
+            account = account,
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt b/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
index 558b119d712..c2a0295157c 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/BootCompleteReceiver.kt
@@ -7,7 +7,6 @@ import android.content.Intent
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED
 import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
 import android.content.pm.PackageManager.DONT_KILL_APP
-import java.lang.Exception
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
 import timber.log.Timber
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
index b8046a970d1..dc3934fa6a3 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/KoinModule.kt
@@ -11,7 +11,7 @@ internal val controllerPushModule = module {
             backendManager = get(),
             messagingController = get(),
             folderRepository = get(),
-            preferences = get()
+            preferences = get(),
         )
     }
     single {
@@ -24,7 +24,7 @@ internal val controllerPushModule = module {
             autoSyncManager = get(),
             pushNotificationManager = get(),
             connectivityManager = get(),
-            accountPushControllerFactory = get()
+            accountPushControllerFactory = get(),
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
index 29179005761..e3b3412efe4 100644
--- a/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
+++ b/app/core/src/main/java/com/fsck/k9/controller/push/PushController.kt
@@ -39,7 +39,7 @@ class PushController internal constructor(
     private val connectivityManager: ConnectivityManager,
     private val accountPushControllerFactory: AccountPushControllerFactory,
     private val coroutineScope: CoroutineScope = GlobalScope,
-    private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+    private val coroutineDispatcher: CoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher(),
 ) {
     private val lock = Any()
     private var initializationStarted = false
@@ -214,6 +214,7 @@ class PushController internal constructor(
             account.folderPushMode != FolderMode.NONE && backendManager.getBackend(account).isPushCapable
         }
     }
+
     private fun setPushNotificationState(notificationState: PushNotificationState) {
         pushNotificationManager.notificationState = notificationState
     }
diff --git a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
index 52e0ed59fd3..97c5b472dac 100644
--- a/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
+++ b/app/core/src/main/java/com/fsck/k9/crypto/EncryptionExtractor.kt
@@ -13,5 +13,5 @@ data class EncryptionResult(
     val attachmentCount: Int,
     val previewResult: PreviewResult = PreviewResult.encrypted(),
     val textForSearchIndex: String? = null,
-    val extraContentValues: ContentValues? = null
+    val extraContentValues: ContentValues? = null,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
index b85683af4ed..26b0f1b65a6 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/IdentityHelper.kt
@@ -11,7 +11,7 @@ object IdentityHelper {
         RecipientType.CC,
         RecipientType.X_ORIGINAL_TO,
         RecipientType.DELIVERED_TO,
-        RecipientType.X_ENVELOPE_TO
+        RecipientType.X_ENVELOPE_TO,
     )
 
     /**
diff --git a/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt b/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
index 265ea4ccc72..8323dddb19f 100644
--- a/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/helper/NamedThreadFactory.kt
@@ -5,5 +5,5 @@ import java.util.concurrent.ThreadFactory
 class NamedThreadFactory(private val threadNamePrefix: String) : ThreadFactory {
     var counter: Int = 0
 
-    override fun newThread(runnable: Runnable) = Thread(runnable, "$threadNamePrefix-${ counter++ }")
+    override fun newThread(runnable: Runnable) = Thread(runnable, "$threadNamePrefix-${counter++}")
 }
diff --git a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
index 227909e9425..1328476521e 100644
--- a/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/K9JobManager.kt
@@ -8,7 +8,7 @@ import timber.log.Timber
 class K9JobManager(
     private val workManager: WorkManager,
     private val preferences: Preferences,
-    private val mailSyncWorkerManager: MailSyncWorkerManager
+    private val mailSyncWorkerManager: MailSyncWorkerManager,
 ) {
     fun scheduleAllMailJobs() {
         Timber.v("scheduling all jobs")
diff --git a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
index 9251fb4862a..155d9f27666 100644
--- a/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/K9WorkerFactory.kt
@@ -11,7 +11,7 @@ class K9WorkerFactory : WorkerFactory() {
     override fun createWorker(
         appContext: Context,
         workerClassName: String,
-        workerParameters: WorkerParameters
+        workerParameters: WorkerParameters,
     ): ListenableWorker? {
         val workerClass = Class.forName(workerClassName).kotlin
         return getKoin().getOrNull(workerClass) { parametersOf(workerParameters) }
diff --git a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
index d580c9da6ca..2e083637800 100644
--- a/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
+++ b/app/core/src/main/java/com/fsck/k9/job/MailSyncWorker.kt
@@ -15,7 +15,7 @@ class MailSyncWorker(
     private val messagingController: MessagingController,
     private val preferences: Preferences,
     context: Context,
-    parameters: WorkerParameters
+    parameters: WorkerParameters,
 ) : Worker(context, parameters) {
 
     override fun doWork(): Result {
diff --git a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
index 831637708c6..0797c006b71 100644
--- a/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
+++ b/app/core/src/main/java/com/fsck/k9/logging/LogFileWriter.kt
@@ -15,7 +15,7 @@ interface LogFileWriter {
 class LogcatLogFileWriter(
     private val contentResolver: ContentResolver,
     private val processExecutor: ProcessExecutor,
-    private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : LogFileWriter {
     override suspend fun writeLogTo(contentUri: Uri) {
         return withContext(coroutineDispatcher) {
diff --git a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
index 1a5597c58fa..4972f9073c1 100644
--- a/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
+++ b/app/core/src/main/java/com/fsck/k9/mail/MailServerDirection.kt
@@ -2,5 +2,5 @@ package com.fsck.k9.mail
 
 enum class MailServerDirection {
     INCOMING,
-    OUTGOING
+    OUTGOING,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
index f7097988769..e6a4e50ceef 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/AutoExpandFolderBackendFoldersRefreshListener.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Preferences
 class AutoExpandFolderBackendFoldersRefreshListener(
     private val preferences: Preferences,
     private val account: Account,
-    private val folderRepository: FolderRepository
+    private val folderRepository: FolderRepository,
 ) : BackendFoldersRefreshListener {
     private var isFirstSync = false
 
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
index 775effd710f..1baf99bc8af 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/CacheAwareMessageMapper.kt
@@ -4,7 +4,7 @@ import com.fsck.k9.mail.Flag
 
 internal class CacheAwareMessageMapper<T>(
     private val cache: MessageListCache,
-    private val messageMapper: MessageMapper<T>
+    private val messageMapper: MessageMapper<T>,
 ) : MessageMapper<T?> {
     override fun map(message: MessageDetailsAccessor): T? {
         val messageId = message.id
@@ -21,7 +21,7 @@ internal class CacheAwareMessageMapper<T>(
 
 private class CacheAwareMessageDetailsAccessor(
     private val cache: MessageListCache,
-    private val message: MessageDetailsAccessor
+    private val message: MessageDetailsAccessor,
 ) : MessageDetailsAccessor by message {
     override val isRead: Boolean
         get() {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
index c2a0b4774b1..82a26f0744e 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/CreateFolderInfo.kt
@@ -6,5 +6,5 @@ data class CreateFolderInfo(
     val serverId: String,
     val name: String,
     val type: FolderType,
-    val settings: FolderSettings
+    val settings: FolderSettings,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
index 3fcd8f1e3a3..47d037fa07c 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderRepository.kt
@@ -26,7 +26,7 @@ import com.fsck.k9.mail.FolderType as RemoteFolderType
 class FolderRepository(
     private val messageStoreManager: MessageStoreManager,
     private val accountManager: AccountManager,
-    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val ioDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) {
     private val sortForDisplay =
         compareByDescending<DisplayFolder> { it.folder.type == FolderType.INBOX }
@@ -39,18 +39,18 @@ class FolderRepository(
         val messageStore = messageStoreManager.getMessageStore(account)
         return messageStore.getDisplayFolders(
             displayMode = displayMode ?: account.folderDisplayMode,
-            outboxFolderId = account.outboxFolderId
+            outboxFolderId = account.outboxFolderId,
         ) { folder ->
             DisplayFolder(
                 folder = Folder(
                     id = folder.id,
                     name = folder.name,
                     type = folderTypeOf(account, folder.id),
-                    isLocalOnly = folder.isLocalOnly
+                    isLocalOnly = folder.isLocalOnly,
                 ),
                 isInTopGroup = folder.isInTopGroup,
                 unreadMessageCount = folder.unreadMessageCount,
-                starredMessageCount = folder.starredMessageCount
+                starredMessageCount = folder.starredMessageCount,
             )
         }.sortedWith(sortForDisplay)
     }
@@ -103,7 +103,7 @@ class FolderRepository(
                 id = folder.id,
                 name = folder.name,
                 type = folderTypeOf(account, folder.id),
-                isLocalOnly = folder.isLocalOnly
+                isLocalOnly = folder.isLocalOnly,
             )
         }
     }
@@ -116,14 +116,14 @@ class FolderRepository(
                     id = folder.id,
                     name = folder.name,
                     type = folderTypeOf(account, folder.id),
-                    isLocalOnly = folder.isLocalOnly
+                    isLocalOnly = folder.isLocalOnly,
                 ),
                 isInTopGroup = folder.isInTopGroup,
                 isIntegrate = folder.isIntegrate,
                 syncClass = folder.syncClass,
                 displayClass = folder.displayClass,
                 notifyClass = folder.notifyClass,
-                pushClass = folder.pushClass
+                pushClass = folder.pushClass,
             )
         }
     }
@@ -135,7 +135,7 @@ class FolderRepository(
                 id = folder.id,
                 serverId = folder.serverIdOrThrow(),
                 name = folder.name,
-                type = folder.type.toFolderType()
+                type = folder.type.toFolderType(),
             )
         }
     }
@@ -148,14 +148,14 @@ class FolderRepository(
                     id = folder.id,
                     serverId = folder.serverIdOrThrow(),
                     name = folder.name,
-                    type = folder.type.toFolderType()
+                    type = folder.type.toFolderType(),
                 ),
                 isInTopGroup = folder.isInTopGroup,
                 isIntegrate = folder.isIntegrate,
                 syncClass = folder.syncClass,
                 displayClass = folder.displayClass,
                 notifyClass = folder.notifyClass,
-                pushClass = folder.pushClass
+                pushClass = folder.pushClass,
             )
         }
     }
@@ -288,7 +288,7 @@ class FolderRepository(
 
 private data class AccountContainer(
     val account: Account,
-    val folderDisplayMode: FolderMode
+    val folderDisplayMode: FolderMode,
 )
 
 data class Folder(val id: Long, val name: String, val type: FolderType, val isLocalOnly: Boolean)
@@ -302,7 +302,7 @@ data class FolderDetails(
     val syncClass: FolderClass,
     val displayClass: FolderClass,
     val notifyClass: FolderClass,
-    val pushClass: FolderClass
+    val pushClass: FolderClass,
 )
 
 data class RemoteFolderDetails(
@@ -312,14 +312,14 @@ data class RemoteFolderDetails(
     val syncClass: FolderClass,
     val displayClass: FolderClass,
     val notifyClass: FolderClass,
-    val pushClass: FolderClass
+    val pushClass: FolderClass,
 )
 
 data class DisplayFolder(
     val folder: Folder,
     val isInTopGroup: Boolean,
     val unreadMessageCount: Int,
-    val starredMessageCount: Int
+    val starredMessageCount: Int,
 )
 
 enum class FolderType {
@@ -330,5 +330,5 @@ enum class FolderType {
     TRASH,
     DRAFTS,
     ARCHIVE,
-    SPAM
+    SPAM,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt
index 11d046e298d..0aa6ab7809b 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettings.kt
@@ -9,5 +9,5 @@ data class FolderSettings(
     val notifyClass: FolderClass,
     val pushClass: FolderClass,
     val inTopGroup: Boolean,
-    val integrate: Boolean
+    val integrate: Boolean,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt
index cc8125d2c73..ef5dd3363fc 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/FolderSettingsProvider.kt
@@ -19,7 +19,7 @@ class FolderSettingsProvider(val preferences: Preferences, val account: Account)
             notifyClass = storage.getString("$prefix.notifyMode", null).toFolderClass(FolderClass.INHERITED),
             pushClass = storage.getString("$prefix.pushMode", null).toFolderClass(FolderClass.SECOND_CLASS),
             inTopGroup = storage.getBoolean("$prefix.inTopGroup", false),
-            integrate = storage.getBoolean("$prefix.integrate", false)
+            integrate = storage.getBoolean("$prefix.integrate", false),
         ).also {
             removeImportedFolderSettings(prefix)
         }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
index c00daf0ea2c..7840816d32f 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendFolder.kt
@@ -11,7 +11,7 @@ import com.fsck.k9.mailstore.MoreMessages as StoreMoreMessages
 class K9BackendFolder(
     private val messageStore: MessageStore,
     private val saveMessageDataCreator: SaveMessageDataCreator,
-    folderServerId: String
+    folderServerId: String,
 ) : BackendFolder {
     private val databaseId: String
     private val folderId: Long
@@ -25,7 +25,7 @@ class K9BackendFolder(
             Init(
                 folderId = folder.id,
                 name = folder.name,
-                visibleLimit = folder.visibleLimit
+                visibleLimit = folder.visibleLimit,
             )
         } ?: error("Couldn't find folder $folderServerId")
 
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
index 566a13ca454..450c9059e94 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
@@ -10,7 +10,7 @@ class K9BackendStorage(
     private val messageStore: MessageStore,
     private val folderSettingsProvider: FolderSettingsProvider,
     private val saveMessageDataCreator: SaveMessageDataCreator,
-    private val listeners: List<BackendFoldersRefreshListener>
+    private val listeners: List<BackendFoldersRefreshListener>,
 ) : BackendStorage {
     override fun getFolder(folderServerId: String): BackendFolder {
         return K9BackendFolder(messageStore, saveMessageDataCreator, folderServerId)
@@ -53,7 +53,7 @@ class K9BackendStorage(
                     serverId = folderInfo.serverId,
                     name = folderInfo.name,
                     type = folderInfo.type,
-                    settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId)
+                    settings = folderSettingsProvider.getFolderSettings(folderInfo.serverId),
                 )
             }
             messageStore.createFolders(createFolderInfo)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
index 211c74a57cf..9edc7dfeb21 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorageFactory.kt
@@ -8,7 +8,7 @@ class K9BackendStorageFactory(
     private val folderRepository: FolderRepository,
     private val messageStoreManager: MessageStoreManager,
     private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
-    private val saveMessageDataCreator: SaveMessageDataCreator
+    private val saveMessageDataCreator: SaveMessageDataCreator,
 ) {
     fun createBackendStorage(account: Account): K9BackendStorage {
         val messageStore = messageStoreManager.getMessageStore(account)
@@ -17,10 +17,14 @@ class K9BackendStorageFactory(
             preferences,
             folderRepository,
             specialFolderSelectionStrategy,
-            account
+            account,
         )
         val specialFolderListener = SpecialFolderBackendFoldersRefreshListener(specialFolderUpdater)
-        val autoExpandFolderListener = AutoExpandFolderBackendFoldersRefreshListener(preferences, account, folderRepository)
+        val autoExpandFolderListener = AutoExpandFolderBackendFoldersRefreshListener(
+            preferences,
+            account,
+            folderRepository,
+        )
         val listeners = listOf(specialFolderListener, autoExpandFolderListener)
         return K9BackendStorage(messageStore, folderSettingsProvider, saveMessageDataCreator, listeners)
     }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
index 8575c3bf55f..b485d6911d0 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/KoinModule.kt
@@ -17,7 +17,7 @@ val mailStoreModule = module {
             folderRepository = get(),
             messageStoreManager = get(),
             specialFolderSelectionStrategy = get(),
-            saveMessageDataCreator = get()
+            saveMessageDataCreator = get(),
         )
     }
     factory { SpecialLocalFoldersCreator(preferences = get(), localStoreProvider = get()) }
@@ -31,7 +31,7 @@ val mailStoreModule = module {
             encryptionExtractor = get(),
             messagePreviewCreator = get(),
             messageFulltextCreator = get(),
-            attachmentCounter = get()
+            attachmentCounter = get(),
         )
     }
     single { MessageListRepository(messageStoreManager = get()) }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
index 19c14855f3e..aa681c89082 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageDetails.kt
@@ -10,7 +10,7 @@ data class MessageDetails(
     val replyTo: List<Address>,
     val to: List<Address>,
     val cc: List<Address>,
-    val bcc: List<Address>
+    val bcc: List<Address>,
 )
 
 sealed interface MessageDate {
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 2bea1c53407..c9c13d38257 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
@@ -3,7 +3,7 @@ package com.fsck.k9.mailstore
 import java.util.concurrent.CopyOnWriteArraySet
 
 class MessageListRepository(
-    private val messageStoreManager: MessageStoreManager
+    private val messageStoreManager: MessageStoreManager,
 ) {
     private val globalListeners = CopyOnWriteArraySet<MessageListChangedListener>()
     private val accountListeners = CopyOnWriteArraySet<Pair<String, MessageListChangedListener>>()
@@ -45,7 +45,7 @@ class MessageListRepository(
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<T>
+        messageMapper: MessageMapper<T>,
     ): List<T> {
         val messageStore = messageStoreManager.getMessageStore(accountUuid)
         val cache = MessageListCache.getCache(accountUuid)
@@ -62,7 +62,7 @@ class MessageListRepository(
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<T>
+        messageMapper: MessageMapper<T>,
     ): List<T> {
         val messageStore = messageStoreManager.getMessageStore(accountUuid)
         val cache = MessageListCache.getCache(accountUuid)
@@ -78,7 +78,7 @@ class MessageListRepository(
         accountUuid: String,
         threadId: Long,
         sortOrder: String,
-        messageMapper: MessageMapper<T>
+        messageMapper: MessageMapper<T>,
     ): List<T> {
         val messageStore = messageStoreManager.getMessageStore(accountUuid)
         val cache = MessageListCache.getCache(accountUuid)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
index a73c67010e3..a8f0271fbf6 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageRepository.kt
@@ -32,7 +32,7 @@ class MessageRepository(private val messageStoreManager: MessageStoreManager) {
             replyTo = replyToAddresses,
             to = toAddresses,
             cc = ccAddresses,
-            bcc = bccAddresses
+            bcc = bccAddresses,
         )
     }
 
@@ -63,7 +63,7 @@ class MessageRepository(private val messageStoreManager: MessageStoreManager) {
             "reply-to",
             "to",
             "cc",
-            "bcc"
+            "bcc",
         )
     }
 }
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 e72e1779341..05f7e2c7ab9 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
@@ -128,7 +128,7 @@ interface MessageStore {
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<out T?>
+        messageMapper: MessageMapper<out T?>,
     ): List<T>
 
     /**
@@ -138,7 +138,7 @@ interface MessageStore {
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<out T?>
+        messageMapper: MessageMapper<out T?>,
     ): List<T>
 
     /**
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
index efe6990860b..ea97029e938 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageStoreManager.kt
@@ -4,7 +4,10 @@ import com.fsck.k9.Account
 import com.fsck.k9.preferences.AccountManager
 import java.util.concurrent.ConcurrentHashMap
 
-class MessageStoreManager(private val accountManager: AccountManager, private val messageStoreFactory: MessageStoreFactory) {
+class MessageStoreManager(
+    private val accountManager: AccountManager,
+    private val messageStoreFactory: MessageStoreFactory,
+) {
     private val messageStores = ConcurrentHashMap<String, ListenableMessageStore>()
 
     init {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
index e72132c4aba..98194d8cf75 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractorFactory.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.message.html.HtmlSettings
 class MessageViewInfoExtractorFactory(
     private val attachmentInfoExtractor: AttachmentInfoExtractor,
     private val htmlProcessorFactory: HtmlProcessorFactory,
-    private val resourceProvider: CoreResourceProvider
+    private val resourceProvider: CoreResourceProvider,
 ) {
     fun create(settings: HtmlSettings): MessageViewInfoExtractor {
         val htmlProcessor = htmlProcessorFactory.create(settings)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
index dddb1073c8e..99b7375b4d6 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotificationMessage.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.mailstore
 data class NotificationMessage(
     val message: LocalMessage,
     val notificationId: Int?,
-    val timestamp: Long
+    val timestamp: Long,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
index 0a63f3076a5..94adaebb842 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/NotifierMessageStore.kt
@@ -7,7 +7,7 @@ import com.fsck.k9.mail.Flag
  */
 class NotifierMessageStore(
     private val messageStore: MessageStore,
-    private val localStore: LocalStore
+    private val localStore: LocalStore,
 ) : MessageStore by messageStore {
 
     override fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) {
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
index c024d01be9b..f6600883e3c 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxState.kt
@@ -4,5 +4,5 @@ data class OutboxState(
     val sendState: SendState,
     val numberOfSendAttempts: Int,
     val sendError: String?,
-    val sendErrorTimestamp: Long
+    val sendErrorTimestamp: Long,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
index 360b9a1b51e..792c3195af2 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/OutboxStateRepository.kt
@@ -18,7 +18,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
                 arrayOf(messageId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (!cursor.moveToFirst()) {
                     throw IllegalStateException("No outbox_state entry for message with id $messageId")
@@ -59,7 +59,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
                 "UPDATE $TABLE_NAME " +
                     "SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS + 1 " +
                     "WHERE $COLUMN_MESSAGE_ID = ?",
-                arrayOf(messageId.toString())
+                arrayOf(messageId.toString()),
             )
         }
     }
@@ -70,7 +70,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
                 "UPDATE $TABLE_NAME " +
                     "SET $COLUMN_NUMBER_OF_SEND_ATTEMPTS = $COLUMN_NUMBER_OF_SEND_ATTEMPTS - 1 " +
                     "WHERE $COLUMN_MESSAGE_ID = ?",
-                arrayOf(messageId.toString())
+                arrayOf(messageId.toString()),
             )
         }
     }
@@ -115,7 +115,7 @@ class OutboxStateRepository(private val database: LockableDatabase, private val
             COLUMN_SEND_STATE,
             COLUMN_NUMBER_OF_SEND_ATTEMPTS,
             COLUMN_ERROR_TIMESTAMP,
-            COLUMN_ERROR
+            COLUMN_ERROR,
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
index a180becb03b..a3822256110 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageData.kt
@@ -13,5 +13,5 @@ data class SaveMessageData(
     val attachmentCount: Int,
     val previewResult: PreviewResult,
     val textForSearchIndex: String? = null,
-    val encryptionType: String?
+    val encryptionType: String?,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
index 8d649b9464f..4d9cc9f99e5 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SaveMessageDataCreator.kt
@@ -11,12 +11,12 @@ class SaveMessageDataCreator(
     private val encryptionExtractor: EncryptionExtractor,
     private val messagePreviewCreator: MessagePreviewCreator,
     private val messageFulltextCreator: MessageFulltextCreator,
-    private val attachmentCounter: AttachmentCounter
+    private val attachmentCounter: AttachmentCounter,
 ) {
     fun createSaveMessageData(
         message: Message,
         downloadState: MessageDownloadState,
-        subject: String? = null
+        subject: String? = null,
     ): SaveMessageData {
         val now = System.currentTimeMillis()
         val date = message.sentDate?.time ?: now
@@ -34,7 +34,7 @@ class SaveMessageDataCreator(
                 attachmentCount = encryptionResult.attachmentCount,
                 previewResult = encryptionResult.previewResult,
                 textForSearchIndex = encryptionResult.textForSearchIndex,
-                encryptionType = encryptionResult.encryptionType
+                encryptionType = encryptionResult.encryptionType,
             )
         } else {
             SaveMessageData(
@@ -46,7 +46,7 @@ class SaveMessageDataCreator(
                 attachmentCount = attachmentCounter.getAttachmentCount(message),
                 previewResult = messagePreviewCreator.createPreview(message),
                 textForSearchIndex = messageFulltextCreator.createFulltext(message),
-                encryptionType = null
+                encryptionType = null,
             )
         }
     }
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
index ba0ac59e0de..cb411c02cf8 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SendState.kt
@@ -3,7 +3,8 @@ package com.fsck.k9.mailstore
 enum class SendState(val databaseName: String) {
     READY("ready"),
     RETRIES_EXCEEDED("retries_exceeded"),
-    ERROR("error");
+    ERROR("error"),
+    ;
 
     companion object {
         @JvmStatic
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
index 744407aeb14..15fb008fcdd 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderBackendFoldersRefreshListener.kt
@@ -4,7 +4,7 @@ package com.fsck.k9.mailstore
  * Update special folders when folders are added, removed, or changed.
  */
 class SpecialFolderBackendFoldersRefreshListener(
-    private val specialFolderUpdater: SpecialFolderUpdater
+    private val specialFolderUpdater: SpecialFolderUpdater,
 ) : BackendFoldersRefreshListener {
 
     override fun onBeforeFolderListRefresh() = Unit
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
index e25f08c7767..ec680c97587 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialFolderUpdater.kt
@@ -15,7 +15,7 @@ class SpecialFolderUpdater(
     private val preferences: Preferences,
     private val folderRepository: FolderRepository,
     private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
-    private val account: Account
+    private val account: Account,
 ) {
     fun updateSpecialFolders() {
         val folders = folderRepository.getRemoteFolders(account)
diff --git a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
index c2cd90f605e..2b5f5298fb3 100644
--- a/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/mailstore/SpecialLocalFoldersCreator.kt
@@ -9,7 +9,7 @@ import timber.log.Timber
 
 class SpecialLocalFoldersCreator(
     private val preferences: Preferences,
-    private val localStoreProvider: LocalStoreProvider
+    private val localStoreProvider: LocalStoreProvider,
 ) {
     // TODO: When rewriting the account setup code make sure this method is only called once. Until then this can be
     //  called multiple times and we have to make sure folders are only created once.
diff --git a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
index 98a16080fa3..a57bfb64977 100644
--- a/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/Attachment.kt
@@ -12,6 +12,6 @@ interface Attachment {
         URI_ONLY,
         METADATA,
         COMPLETE,
-        CANCELLED
+        CANCELLED,
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
index a208b982093..462d354deef 100644
--- a/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/ReplyActionStrategy.kt
@@ -27,10 +27,10 @@ class ReplyActionStrategy(private val replyRoParser: ReplyToParser) {
 
 data class ReplyActions(
     val defaultAction: ReplyAction?,
-    val additionalActions: List<ReplyAction> = emptyList()
+    val additionalActions: List<ReplyAction> = emptyList(),
 )
 
 enum class ReplyAction {
     REPLY,
-    REPLY_ALL
+    REPLY_ALL,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
index 9643a06f312..af499f08ff0 100644
--- a/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/extractors/BasicPartInfoExtractor.kt
@@ -16,7 +16,7 @@ class BasicPartInfoExtractor {
 
         return BasicPartInfo(
             displayName = part.getDisplayName(contentDisposition),
-            size = contentDisposition?.getParameter("size")?.toLongOrNull()
+            size = contentDisposition?.getParameter("size")?.toLongOrNull(),
         )
     }
 
@@ -47,5 +47,5 @@ class BasicPartInfoExtractor {
 
 data class BasicPartInfo(
     val displayName: String,
-    val size: Long?
+    val size: Long?,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
index e5067fe0cce..d7d7d800942 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/DividerReplacer.kt
@@ -10,7 +10,7 @@ internal object DividerReplacer : TextToHtml.HtmlModifier {
             "(?:" + SIMPLE_DIVIDER + "|" + ASCII_SCISSORS + ")" +
             "\\s*" +
             "(?:\\n|$)" +
-            ")+"
+            ")+",
     )
 
     override fun findModifications(text: CharSequence): List<HtmlModification> {
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
index fc487a75c23..81c4e2db35d 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/EmailTextToHtml.kt
@@ -39,7 +39,7 @@ class EmailTextToHtml private constructor(private val text: String) {
                 html.append(
                     "<blockquote " +
                         "class=\"gmail_quote\" " +
-                        "style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid "
+                        "style=\"margin: 0pt 0pt 1ex 0.8ex; border-left: 1px solid ",
                 )
                 html.append(quoteColor(depth))
                 html.append("; padding-left: 1ex;\">")
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
index 555bcbe0472..6ea3392421d 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlProcessorFactory.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.message.html
 import app.k9mail.html.cleaner.HtmlProcessor
 
 class HtmlProcessorFactory(
-    private val displayHtmlFactory: DisplayHtmlFactory
+    private val displayHtmlFactory: DisplayHtmlFactory,
 ) {
     fun create(settings: HtmlSettings): HtmlProcessor {
         val displayHtml = displayHtmlFactory.create(settings)
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
index 5d6a0592b18..0eb934e4bb9 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HtmlSettings.kt
@@ -2,5 +2,5 @@ package com.fsck.k9.message.html
 
 data class HtmlSettings(
     val useDarkMode: Boolean,
-    val useFixedWidthFont: Boolean
+    val useFixedWidthFont: Boolean,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
index 009e727ad2a..1ff4e101852 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/HttpUriParser.kt
@@ -221,7 +221,7 @@ internal class HttpUriParser : UriParser {
     private fun matchUnreservedPCTEncodedSubDelimClassesGreedy(
         text: CharSequence,
         startPos: Int,
-        additionalCharacters: String
+        additionalCharacters: String,
     ): Int {
         val allowedCharacters = SUB_DELIM + "-._~" + additionalCharacters
         var shouldBeHex = 0
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
index ad0b5e6f2e6..ab634fe6575 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/TextToHtml.kt
@@ -5,7 +5,7 @@ import java.util.ArrayDeque
 class TextToHtml private constructor(
     private val text: CharSequence,
     private val html: StringBuilder,
-    private val retainOriginalWhitespace: Boolean
+    private val retainOriginalWhitespace: Boolean,
 ) {
     fun appendAsHtmlFragment() {
         appendHtmlPrefix()
@@ -29,7 +29,7 @@ class TextToHtml private constructor(
             if (modification.endIndex > modificationStack.peek()?.endIndex ?: Int.MAX_VALUE) {
                 error(
                     "HtmlModification $modification must be fully contained within " +
-                        "outer HtmlModification ${modificationStack.peek()}"
+                        "outer HtmlModification ${modificationStack.peek()}",
                 )
             }
 
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
index 5e7b1b4cd68..3a488fac93f 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriLinkifier.kt
@@ -10,7 +10,7 @@ internal object UriLinkifier : TextToHtml.HtmlModifier {
     class LinkifyUri(
         startIndex: Int,
         endIndex: Int,
-        val uri: CharSequence
+        val uri: CharSequence,
     ) : HtmlModification.Wrap(startIndex, endIndex) {
 
         override fun appendPrefix(textToHtml: TextToHtml) {
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
index 6c611242310..3601895351c 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatch.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.message.html
 data class UriMatch(
     val startIndex: Int,
     val endIndex: Int,
-    val uri: CharSequence
+    val uri: CharSequence,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
index 2d29463e8aa..891bb58524f 100644
--- a/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/html/UriMatcher.kt
@@ -10,15 +10,15 @@ object UriMatcher {
             "mailto:" to genericUriParser,
             "matrix:" to genericUriParser,
             "rtsp:" to httpUriParser,
-            "xmpp:" to genericUriParser
+            "xmpp:" to genericUriParser,
         )
     }
 
     private const val SCHEME_SEPARATORS = "\\s(\\n<"
     private const val ALLOWED_SEPARATORS_PATTERN = "(?:^|[$SCHEME_SEPARATORS])"
     private val URI_SCHEME = Regex(
-        "$ALLOWED_SEPARATORS_PATTERN(${ SUPPORTED_URIS.keys.joinToString("|") })",
-        RegexOption.IGNORE_CASE
+        "$ALLOWED_SEPARATORS_PATTERN(${SUPPORTED_URIS.keys.joinToString("|")})",
+        RegexOption.IGNORE_CASE,
     )
 
     fun findUris(text: CharSequence): List<UriMatch> {
diff --git a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
index 4148660a211..7eff37912c8 100644
--- a/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/message/quote/TextQuoteCreator.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.mail.Message.RecipientType
 
 class TextQuoteCreator(
     private val quoteDateFormatter: QuoteDateFormatter,
-    private val resourceProvider: CoreResourceProvider
+    private val resourceProvider: CoreResourceProvider,
 ) {
     private val prefixInsertionRegex = Regex("(?m)^")
 
@@ -16,7 +16,7 @@ class TextQuoteCreator(
         originalMessage: Message,
         messageBody: String?,
         quoteStyle: QuoteStyle,
-        prefix: String
+        prefix: String,
     ): String {
         val body = messageBody ?: ""
         return when (quoteStyle) {
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
index 8832f30a86b..cc2af899139 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi21.kt
@@ -8,7 +8,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
 
 @Suppress("DEPRECATION")
 internal class ConnectivityManagerApi21(
-    private val systemConnectivityManager: SystemConnectivityManager
+    private val systemConnectivityManager: SystemConnectivityManager,
 ) : ConnectivityManagerBase() {
     private var isRunning = false
     private var lastNetworkType: Int? = null
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
index 17fb87f3a1d..615182f2d9b 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi23.kt
@@ -11,7 +11,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
 
 @RequiresApi(Build.VERSION_CODES.M)
 internal class ConnectivityManagerApi23(
-    private val systemConnectivityManager: SystemConnectivityManager
+    private val systemConnectivityManager: SystemConnectivityManager,
 ) : ConnectivityManagerBase() {
     private var isRunning = false
     private var lastActiveNetwork: Network? = null
diff --git a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
index b0a3dafed9c..09dd1951297 100644
--- a/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
+++ b/app/core/src/main/java/com/fsck/k9/network/ConnectivityManagerApi24.kt
@@ -10,7 +10,7 @@ import android.net.ConnectivityManager as SystemConnectivityManager
 
 @RequiresApi(Build.VERSION_CODES.N)
 internal class ConnectivityManagerApi24(
-    private val systemConnectivityManager: SystemConnectivityManager
+    private val systemConnectivityManager: SystemConnectivityManager,
 ) : ConnectivityManagerBase() {
     private var isRunning = false
     private var isNetworkAvailable: Boolean? = null
diff --git a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
index 662235eb2f9..bd2ec9913dd 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/AddNotificationResult.kt
@@ -4,7 +4,7 @@ internal class AddNotificationResult private constructor(
     val notificationData: NotificationData,
     val notificationStoreOperations: List<NotificationStoreOperation>,
     val notificationHolder: NotificationHolder,
-    val shouldCancelNotification: Boolean
+    val shouldCancelNotification: Boolean,
 ) {
     val cancelNotificationId: Int
         get() {
@@ -16,26 +16,26 @@ internal class AddNotificationResult private constructor(
         fun newNotification(
             notificationData: NotificationData,
             notificationStoreOperations: List<NotificationStoreOperation>,
-            notificationHolder: NotificationHolder
+            notificationHolder: NotificationHolder,
         ): AddNotificationResult {
             return AddNotificationResult(
                 notificationData,
                 notificationStoreOperations,
                 notificationHolder,
-                shouldCancelNotification = false
+                shouldCancelNotification = false,
             )
         }
 
         fun replaceNotification(
             notificationData: NotificationData,
             notificationStoreOperations: List<NotificationStoreOperation>,
-            notificationHolder: NotificationHolder
+            notificationHolder: NotificationHolder,
         ): AddNotificationResult {
             return AddNotificationResult(
                 notificationData,
                 notificationStoreOperations,
                 notificationHolder,
-                shouldCancelNotification = true
+                shouldCancelNotification = true,
             )
         }
     }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
index 332c7dbb426..9f931a07611 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/AuthenticationErrorNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Account
 internal open class AuthenticationErrorNotificationController(
     private val notificationHelper: NotificationHelper,
     private val actionCreator: NotificationActionCreator,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun showAuthenticationErrorNotification(account: Account, incoming: Boolean) {
         val notificationId = NotificationIds.getAuthenticationErrorNotificationId(account, incoming)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
index 9fe65d367ca..e43f5a0a47e 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/BaseNotificationDataCreator.kt
@@ -17,7 +17,7 @@ internal class BaseNotificationDataCreator {
             color = account.chipColor,
             newMessagesCount = notificationData.newMessagesCount,
             lockScreenNotificationData = createLockScreenNotificationData(notificationData),
-            appearance = createNotificationAppearance(account)
+            appearance = createNotificationAppearance(account),
         )
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
index bae4f7e45b6..1dd76bbe5b2 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/CertificateErrorNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.Account
 internal open class CertificateErrorNotificationController(
     private val notificationHelper: NotificationHelper,
     private val actionCreator: NotificationActionCreator,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun showCertificateErrorNotification(account: Account, incoming: Boolean) {
         val notificationId = NotificationIds.getCertificateErrorNotificationId(account, incoming)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
index 6b1ce148398..6646d3f8c03 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/CoreKoinModule.kt
@@ -14,12 +14,17 @@ val coreNotificationModule = module {
             authenticationErrorNotificationController = get(),
             syncNotificationController = get(),
             sendFailedNotificationController = get(),
-            newMailNotificationController = get()
+            newMailNotificationController = get(),
         )
     }
     single { NotificationManagerCompat.from(get()) }
     single {
-        NotificationHelper(context = get(), notificationManager = get(), notificationChannelManager = get(), resourceProvider = get())
+        NotificationHelper(
+            context = get(),
+            notificationManager = get(),
+            notificationChannelManager = get(),
+            resourceProvider = get(),
+        )
     }
     single {
         NotificationChannelManager(
@@ -27,28 +32,28 @@ val coreNotificationModule = module {
             backgroundExecutor = Executors.newSingleThreadExecutor(),
             notificationManager = get<Context>().getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager,
             resourceProvider = get(),
-            notificationLightDecoder = get()
+            notificationLightDecoder = get(),
         )
     }
     single {
         AccountPreferenceSerializer(
             storageManager = get(),
             resourceProvider = get(),
-            serverSettingsSerializer = get()
+            serverSettingsSerializer = get(),
         )
     }
     single {
         CertificateErrorNotificationController(
             notificationHelper = get(),
             actionCreator = get(),
-            resourceProvider = get()
+            resourceProvider = get(),
         )
     }
     single {
         AuthenticationErrorNotificationController(
             notificationHelper = get(),
             actionCreator = get(),
-            resourceProvider = get()
+            resourceProvider = get(),
         )
     }
     single {
@@ -62,7 +67,7 @@ val coreNotificationModule = module {
             notificationManager = get(),
             newMailNotificationManager = get(),
             summaryNotificationCreator = get(),
-            singleMessageNotificationCreator = get()
+            singleMessageNotificationCreator = get(),
         )
     }
     single {
@@ -72,7 +77,7 @@ val coreNotificationModule = module {
             baseNotificationDataCreator = get(),
             singleMessageNotificationDataCreator = get(),
             summaryNotificationDataCreator = get(),
-            clock = get()
+            clock = get(),
         )
     }
     factory { NotificationContentCreator(context = get(), resourceProvider = get()) }
@@ -84,7 +89,7 @@ val coreNotificationModule = module {
             notificationHelper = get(),
             actionCreator = get(),
             resourceProvider = get(),
-            lockScreenNotificationCreator = get()
+            lockScreenNotificationCreator = get(),
         )
     }
     factory {
@@ -93,7 +98,7 @@ val coreNotificationModule = module {
             actionCreator = get(),
             lockScreenNotificationCreator = get(),
             singleMessageNotificationCreator = get(),
-            resourceProvider = get()
+            resourceProvider = get(),
         )
     }
     factory { LockScreenNotificationCreator(notificationHelper = get(), resourceProvider = get()) }
@@ -102,7 +107,7 @@ val coreNotificationModule = module {
             context = get(),
             resourceProvider = get(),
             notificationChannelManager = get(),
-            notificationManager = get()
+            notificationManager = get(),
         )
     }
     single {
@@ -110,7 +115,7 @@ val coreNotificationModule = module {
             notificationStoreProvider = get(),
             localStoreProvider = get(),
             messageStoreManager = get(),
-            notificationContentCreator = get()
+            notificationContentCreator = get(),
         )
     }
     factory { NotificationLightDecoder() }
@@ -122,7 +127,7 @@ val coreNotificationModule = module {
         NotificationSettingsUpdater(
             preferences = get(),
             notificationChannelManager = get(),
-            notificationConfigurationConverter = get()
+            notificationConfigurationConverter = get(),
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
index e071201c0da..08d5d598357 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/LockScreenNotificationCreator.kt
@@ -5,11 +5,11 @@ import androidx.core.app.NotificationCompat
 
 internal class LockScreenNotificationCreator(
     private val notificationHelper: NotificationHelper,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun configureLockScreenNotification(
         builder: NotificationCompat.Builder,
-        baseNotificationData: BaseNotificationData
+        baseNotificationData: BaseNotificationData,
     ) {
         when (baseNotificationData.lockScreenNotificationData) {
             LockScreenNotificationData.None -> {
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
index 21c850da540..01e70c3d506 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationController.kt
@@ -12,7 +12,7 @@ internal class NewMailNotificationController(
     private val notificationManager: NotificationManagerCompat,
     private val newMailNotificationManager: NewMailNotificationManager,
     private val summaryNotificationCreator: SummaryNotificationCreator,
-    private val singleMessageNotificationCreator: SingleMessageNotificationCreator
+    private val singleMessageNotificationCreator: SingleMessageNotificationCreator,
 ) {
     @Synchronized
     fun restoreNewMailNotifications(accounts: List<Account>) {
@@ -38,12 +38,12 @@ internal class NewMailNotificationController(
     fun removeNewMailNotifications(
         account: Account,
         clearNewMessageState: Boolean,
-        selector: (List<MessageReference>) -> List<MessageReference>
+        selector: (List<MessageReference>) -> List<MessageReference>,
     ) {
         val notificationData = newMailNotificationManager.removeNewMailNotifications(
             account,
             clearNewMessageState,
-            selector
+            selector,
         )
 
         if (notificationData != null) {
@@ -78,14 +78,14 @@ internal class NewMailNotificationController(
 
     private fun createSingleNotification(
         baseNotificationData: BaseNotificationData,
-        singleNotificationData: SingleNotificationData
+        singleNotificationData: SingleNotificationData,
     ) {
         singleMessageNotificationCreator.createSingleNotification(baseNotificationData, singleNotificationData)
     }
 
     private fun createSummaryNotification(
         baseNotificationData: BaseNotificationData,
-        summaryNotificationData: SummaryNotificationData
+        summaryNotificationData: SummaryNotificationData,
     ) {
         summaryNotificationCreator.createSummaryNotification(baseNotificationData, summaryNotificationData)
     }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
index 9069b4f85ad..89c97ade5bd 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationData.kt
@@ -7,7 +7,7 @@ internal data class NewMailNotificationData(
     val cancelNotificationIds: List<Int>,
     val baseNotificationData: BaseNotificationData,
     val singleNotificationData: List<SingleNotificationData>,
-    val summaryNotificationData: SummaryNotificationData?
+    val summaryNotificationData: SummaryNotificationData?,
 )
 
 internal data class BaseNotificationData(
@@ -17,7 +17,7 @@ internal data class BaseNotificationData(
     val color: Int,
     val newMessagesCount: Int,
     val lockScreenNotificationData: LockScreenNotificationData,
-    val appearance: NotificationAppearance
+    val appearance: NotificationAppearance,
 )
 
 internal sealed interface LockScreenNotificationData {
@@ -31,7 +31,7 @@ internal sealed interface LockScreenNotificationData {
 internal data class NotificationAppearance(
     val ringtone: String?,
     val vibrationPattern: LongArray?,
-    val ledColor: Int?
+    val ledColor: Int?,
 )
 
 internal data class SingleNotificationData(
@@ -41,13 +41,13 @@ internal data class SingleNotificationData(
     val content: NotificationContent,
     val actions: List<NotificationAction>,
     val wearActions: List<WearNotificationAction>,
-    val addLockScreenNotification: Boolean
+    val addLockScreenNotification: Boolean,
 )
 
 internal sealed interface SummaryNotificationData
 
 internal data class SummarySingleNotificationData(
-    val singleNotificationData: SingleNotificationData
+    val singleNotificationData: SingleNotificationData,
 ) : SummaryNotificationData
 
 internal data class SummaryInboxNotificationData(
@@ -58,13 +58,13 @@ internal data class SummaryInboxNotificationData(
     val additionalMessagesCount: Int,
     val messageReferences: List<MessageReference>,
     val actions: List<SummaryNotificationAction>,
-    val wearActions: List<SummaryWearNotificationAction>
+    val wearActions: List<SummaryWearNotificationAction>,
 ) : SummaryNotificationData
 
 internal enum class NotificationAction {
     Reply,
     MarkAsRead,
-    Delete
+    Delete,
 }
 
 internal enum class WearNotificationAction {
@@ -72,16 +72,16 @@ internal enum class WearNotificationAction {
     MarkAsRead,
     Delete,
     Archive,
-    Spam
+    Spam,
 }
 
 internal enum class SummaryNotificationAction {
     MarkAsRead,
-    Delete
+    Delete,
 }
 
 internal enum class SummaryWearNotificationAction {
     MarkAsRead,
     Delete,
-    Archive
+    Archive,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
index 3edfdb6abb4..0a8e411a54c 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NewMailNotificationManager.kt
@@ -14,7 +14,7 @@ internal class NewMailNotificationManager(
     private val baseNotificationDataCreator: BaseNotificationDataCreator,
     private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator,
     private val summaryNotificationDataCreator: SummaryNotificationDataCreator,
-    private val clock: Clock
+    private val clock: Clock,
 ) {
     fun restoreNewMailNotifications(account: Account): NewMailNotificationData? {
         val notificationData = notificationRepository.restoreNotifications(account) ?: return null
@@ -26,7 +26,7 @@ internal class NewMailNotificationManager(
                 notificationId = notificationHolder.notificationId,
                 content = notificationHolder.content,
                 timestamp = notificationHolder.timestamp,
-                addLockScreenNotification = addLockScreenNotification
+                addLockScreenNotification = addLockScreenNotification,
             )
         }
 
@@ -34,7 +34,7 @@ internal class NewMailNotificationManager(
             cancelNotificationIds = emptyList(),
             baseNotificationData = createBaseNotificationData(notificationData),
             singleNotificationData = singleNotificationDataList,
-            summaryNotificationData = createSummaryNotificationData(notificationData, silent = true)
+            summaryNotificationData = createSummaryNotificationData(notificationData, silent = true),
         )
     }
 
@@ -48,7 +48,7 @@ internal class NewMailNotificationManager(
             notificationId = result.notificationHolder.notificationId,
             content = result.notificationHolder.content,
             timestamp = result.notificationHolder.timestamp,
-            addLockScreenNotification = result.notificationData.isSingleMessageNotification
+            addLockScreenNotification = result.notificationData.isSingleMessageNotification,
         )
 
         return NewMailNotificationData(
@@ -59,14 +59,14 @@ internal class NewMailNotificationManager(
             },
             baseNotificationData = createBaseNotificationData(result.notificationData),
             singleNotificationData = listOf(singleNotificationData),
-            summaryNotificationData = createSummaryNotificationData(result.notificationData, silent)
+            summaryNotificationData = createSummaryNotificationData(result.notificationData, silent),
         )
     }
 
     fun removeNewMailNotifications(
         account: Account,
         clearNewMessageState: Boolean,
-        selector: (List<MessageReference>) -> List<MessageReference>
+        selector: (List<MessageReference>) -> List<MessageReference>,
     ): NewMailNotificationData? {
         val result = notificationRepository.removeNotifications(account, clearNewMessageState, selector) ?: return null
 
@@ -85,7 +85,7 @@ internal class NewMailNotificationManager(
                 notificationId = notificationHolder.notificationId,
                 content = notificationHolder.content,
                 timestamp = notificationHolder.timestamp,
-                addLockScreenNotification = result.notificationData.isSingleMessageNotification
+                addLockScreenNotification = result.notificationData.isSingleMessageNotification,
             )
         }
 
@@ -93,7 +93,7 @@ internal class NewMailNotificationManager(
             cancelNotificationIds = cancelNotificationIds,
             baseNotificationData = createBaseNotificationData(result.notificationData),
             singleNotificationData = singleNotificationData,
-            summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true)
+            summaryNotificationData = createSummaryNotificationData(result.notificationData, silent = true),
         )
     }
 
@@ -111,14 +111,14 @@ internal class NewMailNotificationManager(
         notificationId: Int,
         content: NotificationContent,
         timestamp: Long,
-        addLockScreenNotification: Boolean
+        addLockScreenNotification: Boolean,
     ): SingleNotificationData {
         return singleMessageNotificationDataCreator.createSingleNotificationData(
             account,
             notificationId,
             content,
             timestamp,
-            addLockScreenNotification
+            addLockScreenNotification,
         )
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
index 5dfa9a8e30a..1c706f7b85a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.kt
@@ -174,14 +174,14 @@ class NotificationActionService : Service() {
         fun createMarkAllAsReadIntent(
             context: Context,
             accountUuid: String,
-            messageReferences: List<MessageReference>
+            messageReferences: List<MessageReference>,
         ): Intent {
             return Intent(context, NotificationActionService::class.java).apply {
                 action = ACTION_MARK_AS_READ
                 putExtra(EXTRA_ACCOUNT_UUID, accountUuid)
                 putExtra(
                     EXTRA_MESSAGE_REFERENCES,
-                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
                 )
             }
         }
@@ -212,14 +212,14 @@ class NotificationActionService : Service() {
         fun createDeleteAllMessagesIntent(
             context: Context,
             accountUuid: String,
-            messageReferences: List<MessageReference>
+            messageReferences: List<MessageReference>,
         ): Intent {
             return Intent(context, NotificationActionService::class.java).apply {
                 action = ACTION_DELETE
                 putExtra(EXTRA_ACCOUNT_UUID, accountUuid)
                 putExtra(
                     EXTRA_MESSAGE_REFERENCES,
-                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
                 )
             }
         }
@@ -235,14 +235,14 @@ class NotificationActionService : Service() {
         fun createArchiveAllIntent(
             context: Context,
             account: Account,
-            messageReferences: List<MessageReference>
+            messageReferences: List<MessageReference>,
         ): Intent {
             return Intent(context, NotificationActionService::class.java).apply {
                 action = ACTION_ARCHIVE
                 putExtra(EXTRA_ACCOUNT_UUID, account.uuid)
                 putExtra(
                     EXTRA_MESSAGE_REFERENCES,
-                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences)
+                    MessageReferenceHelper.toMessageReferenceStringList(messageReferences),
                 )
             }
         }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
index ad33d10d281..f2a7c998cd7 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationChannelManager.kt
@@ -20,7 +20,7 @@ class NotificationChannelManager(
     private val backgroundExecutor: Executor,
     private val notificationManager: NotificationManager,
     private val resourceProvider: NotificationResourceProvider,
-    private val notificationLightDecoder: NotificationLightDecoder
+    private val notificationLightDecoder: NotificationLightDecoder,
 ) {
     val pushChannelId = "push"
 
@@ -55,7 +55,7 @@ class NotificationChannelManager(
     @RequiresApi(api = Build.VERSION_CODES.O)
     private fun addChannelsForAccounts(
         notificationManager: NotificationManager,
-        accounts: List<Account>
+        accounts: List<Account>,
     ) {
         for (account in accounts) {
             val groupId = account.notificationChannelGroupId
@@ -73,7 +73,7 @@ class NotificationChannelManager(
     @RequiresApi(api = Build.VERSION_CODES.O)
     private fun removeChannelsForNonExistingOrChangedAccounts(
         notificationManager: NotificationManager,
-        accounts: List<Account>
+        accounts: List<Account>,
     ) {
         val accountUuids = accounts.map { it.uuid }.toSet()
 
@@ -152,7 +152,7 @@ class NotificationChannelManager(
             isBlinkLightsEnabled = notificationChannel.shouldShowLights(),
             lightColor = notificationChannel.lightColor,
             isVibrationEnabled = notificationChannel.shouldVibrate(),
-            vibrationPattern = notificationChannel.vibrationPattern?.toList()
+            vibrationPattern = notificationChannel.vibrationPattern?.toList(),
         )
     }
 
@@ -196,7 +196,7 @@ class NotificationChannelManager(
         val systemLight = notificationLightDecoder.decode(
             isBlinkLightsEnabled = shouldShowLights(),
             lightColor = lightColor,
-            accountColor = account.chipColor
+            accountColor = account.chipColor,
         )
         val notificationSettings = account.notificationSettings
         return sound == notificationSettings.ringtoneUri &&
@@ -253,5 +253,5 @@ data class NotificationConfiguration(
     val isBlinkLightsEnabled: Boolean,
     val lightColor: Int,
     val isVibrationEnabled: Boolean,
-    val vibrationPattern: List<Long>?
+    val vibrationPattern: List<Long>?,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
index 3f40015f9d6..36847ae5b3c 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationConfigurationConverter.kt
@@ -8,25 +8,25 @@ import com.fsck.k9.NotificationSettings
  */
 class NotificationConfigurationConverter(
     private val notificationLightDecoder: NotificationLightDecoder,
-    private val notificationVibrationDecoder: NotificationVibrationDecoder
+    private val notificationVibrationDecoder: NotificationVibrationDecoder,
 ) {
     fun convert(account: Account, notificationConfiguration: NotificationConfiguration): NotificationSettings {
         val light = notificationLightDecoder.decode(
             isBlinkLightsEnabled = notificationConfiguration.isBlinkLightsEnabled,
             lightColor = notificationConfiguration.lightColor,
-            accountColor = account.chipColor
+            accountColor = account.chipColor,
         )
 
         val vibration = notificationVibrationDecoder.decode(
             isVibrationEnabled = notificationConfiguration.isVibrationEnabled,
-            systemPattern = notificationConfiguration.vibrationPattern
+            systemPattern = notificationConfiguration.vibrationPattern,
         )
 
         return NotificationSettings(
             isRingEnabled = notificationConfiguration.sound != null,
             ringtone = notificationConfiguration.sound?.toString(),
             light = light,
-            vibration = vibration
+            vibration = vibration,
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
index 374979d2e10..2d50ced47e8 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContent.kt
@@ -7,5 +7,5 @@ internal data class NotificationContent(
     val sender: String,
     val subject: String,
     val preview: CharSequence,
-    val summary: CharSequence
+    val summary: CharSequence,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
index 86d85b8efa8..5639a2ec3ef 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationContentCreator.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.message.extractors.PreviewResult.PreviewType
 
 internal class NotificationContentCreator(
     private val context: Context,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun createFromMessage(account: Account, message: LocalMessage): NotificationContent {
         val sender = getMessageSender(account, message)
@@ -22,7 +22,7 @@ internal class NotificationContentCreator(
             sender = getMessageSenderForDisplay(sender),
             subject = getMessageSubject(message),
             preview = getMessagePreview(message),
-            summary = buildMessageSummary(sender, getMessageSubject(message))
+            summary = buildMessageSummary(sender, getMessageSubject(message)),
         )
     }
 
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 6d506852ee4..317a7afbae0 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
@@ -11,7 +11,7 @@ class NotificationController internal constructor(
     private val authenticationErrorNotificationController: AuthenticationErrorNotificationController,
     private val syncNotificationController: SyncNotificationController,
     private val sendFailedNotificationController: SendFailedNotificationController,
-    private val newMailNotificationController: NewMailNotificationController
+    private val newMailNotificationController: NewMailNotificationController,
 ) {
     fun showCertificateErrorNotification(account: Account, incoming: Boolean) {
         certificateErrorNotificationController.showCertificateErrorNotification(account, incoming)
@@ -66,7 +66,7 @@ class NotificationController internal constructor(
             "Creating notification for message %s:%s:%s",
             message.account.uuid,
             message.folder.databaseId,
-            message.uid
+            message.uid,
         )
 
         newMailNotificationController.addNewMailNotification(account, message, silent)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
index d3f8dcd21ac..544a24f2adc 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationData.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.controller.MessageReference
 internal data class NotificationData(
     val account: Account,
     val activeNotifications: List<NotificationHolder>,
-    val inactiveNotifications: List<InactiveNotificationHolder>
+    val inactiveNotifications: List<InactiveNotificationHolder>,
 ) {
     val newMessagesCount: Int
         get() = activeNotifications.size + inactiveNotifications.size
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
index 058f229e84f..b9f63f3bba4 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationDataStore.kt
@@ -24,7 +24,7 @@ internal class NotificationDataStore {
     fun initializeAccount(
         account: Account,
         activeNotifications: List<NotificationHolder>,
-        inactiveNotifications: List<InactiveNotificationHolder>
+        inactiveNotifications: List<InactiveNotificationHolder>,
     ): NotificationData {
         require(activeNotifications.size <= MAX_NUMBER_OF_NEW_MESSAGE_NOTIFICATIONS)
 
@@ -48,7 +48,7 @@ internal class NotificationDataStore {
         return if (activeNotification != null) {
             val newActiveNotification = activeNotification.copy(content = content)
             val notificationHolder = activeNotification.copy(
-                content = content
+                content = content,
             )
 
             val operations = emptyList<NotificationStoreOperation>()
@@ -56,7 +56,7 @@ internal class NotificationDataStore {
             val newActiveNotifications = notificationData.activeNotifications
                 .replace(activeNotification, newActiveNotification)
             val newNotificationData = notificationData.copy(
-                activeNotifications = newActiveNotifications
+                activeNotifications = newActiveNotifications,
             )
             notificationDataMap[account.uuid] = newNotificationData
 
@@ -67,7 +67,7 @@ internal class NotificationDataStore {
                 .replace(inactiveNotification, newInactiveNotification)
 
             val newNotificationData = notificationData.copy(
-                inactiveNotifications = newInactiveNotifications
+                inactiveNotifications = newInactiveNotifications,
             )
             notificationDataMap[account.uuid] = newNotificationData
 
@@ -81,12 +81,12 @@ internal class NotificationDataStore {
 
             val operations = listOf(
                 NotificationStoreOperation.ChangeToInactive(lastNotificationHolder.content.messageReference),
-                NotificationStoreOperation.Add(messageReference, notificationId, timestamp)
+                NotificationStoreOperation.Add(messageReference, notificationId, timestamp),
             )
 
             val newNotificationData = notificationData.copy(
                 activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications.dropLast(1),
-                inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications
+                inactiveNotifications = listOf(inactiveNotificationHolder) + notificationData.inactiveNotifications,
             )
             notificationDataMap[account.uuid] = newNotificationData
 
@@ -96,11 +96,11 @@ internal class NotificationDataStore {
             val notificationHolder = NotificationHolder(notificationId, timestamp, content)
 
             val operations = listOf(
-                NotificationStoreOperation.Add(messageReference, notificationId, timestamp)
+                NotificationStoreOperation.Add(messageReference, notificationId, timestamp),
             )
 
             val newNotificationData = notificationData.copy(
-                activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications
+                activeNotifications = listOf(notificationHolder) + notificationData.activeNotifications,
             )
             notificationDataMap[account.uuid] = newNotificationData
 
@@ -111,7 +111,7 @@ internal class NotificationDataStore {
     @Synchronized
     fun removeNotifications(
         account: Account,
-        selector: (List<MessageReference>) -> List<MessageReference>
+        selector: (List<MessageReference>) -> List<MessageReference>,
     ): RemoveNotificationsResult? {
         var notificationData = getNotificationData(account)
         if (notificationData.isEmpty()) return null
@@ -140,7 +140,7 @@ internal class NotificationDataStore {
             val removeMessageReferenceSet = removeInactiveMessageReferences.toSet()
             notificationData = notificationData.copy(
                 inactiveNotifications = notificationData.inactiveNotifications
-                    .filter { it.content.messageReference !in removeMessageReferenceSet }
+                    .filter { it.content.messageReference !in removeMessageReferenceSet },
             )
         }
 
@@ -160,14 +160,14 @@ internal class NotificationDataStore {
                 operations.add(
                     NotificationStoreOperation.ChangeToActive(
                         newNotificationHolder.content.messageReference,
-                        newNotificationHolder.notificationId
-                    )
+                        newNotificationHolder.notificationId,
+                    ),
                 )
 
                 notificationData = notificationData.copy(
                     activeNotifications = notificationData.activeNotifications - notificationHolder +
                         newNotificationHolder,
-                    inactiveNotifications = notificationData.inactiveNotifications.drop(1)
+                    inactiveNotifications = notificationData.inactiveNotifications.drop(1),
                 )
             } else {
                 cancelNotificationIds.add(notificationHolder.notificationId)
@@ -175,7 +175,7 @@ internal class NotificationDataStore {
                 operations.add(NotificationStoreOperation.Remove(messageReference))
 
                 notificationData = notificationData.copy(
-                    activeNotifications = notificationData.activeNotifications - notificationHolder
+                    activeNotifications = notificationData.activeNotifications - notificationHolder,
                 )
             }
         }
@@ -189,7 +189,7 @@ internal class NotificationDataStore {
                 notificationData = notificationData,
                 notificationStoreOperations = operations,
                 notificationHolders = newNotificationHolders,
-                cancelNotificationIds = cancelNotificationIds
+                cancelNotificationIds = cancelNotificationIds,
             )
         }
     }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
index eef470e8d9f..a6075a51c1a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHelper.kt
@@ -19,7 +19,7 @@ class NotificationHelper(
     private val context: Context,
     private val notificationManager: NotificationManagerCompat,
     private val notificationChannelManager: NotificationChannelManager,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun getContext(): Context {
         return context
@@ -101,14 +101,14 @@ internal fun NotificationCompat.Builder.setErrorAppearance(): NotificationCompat
         setLights(
             NotificationHelper.NOTIFICATION_LED_FAILURE_COLOR,
             NotificationHelper.NOTIFICATION_LED_FAST_ON_TIME,
-            NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME
+            NotificationHelper.NOTIFICATION_LED_FAST_OFF_TIME,
         )
     }
 }
 
 internal fun NotificationCompat.Builder.setAppearance(
     silent: Boolean,
-    appearance: NotificationAppearance
+    appearance: NotificationAppearance,
 ): NotificationCompat.Builder = apply {
     if (silent) {
         setSilent(true)
@@ -125,7 +125,7 @@ internal fun NotificationCompat.Builder.setAppearance(
             setLights(
                 appearance.ledColor,
                 NotificationHelper.NOTIFICATION_LED_ON_TIME,
-                NotificationHelper.NOTIFICATION_LED_OFF_TIME
+                NotificationHelper.NOTIFICATION_LED_OFF_TIME,
             )
         }
     }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
index 73a3647a18c..7a942241a73 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationHolder.kt
@@ -3,10 +3,10 @@ package com.fsck.k9.notification
 internal data class NotificationHolder(
     val notificationId: Int,
     val timestamp: Long,
-    val content: NotificationContent
+    val content: NotificationContent,
 )
 
 internal data class InactiveNotificationHolder(
     val timestamp: Long,
-    val content: NotificationContent
+    val content: NotificationContent,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
index 05d26a6a369..f95b0f41ec8 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationRepository.kt
@@ -9,7 +9,7 @@ internal class NotificationRepository(
     private val notificationStoreProvider: NotificationStoreProvider,
     private val localStoreProvider: LocalStoreProvider,
     private val messageStoreManager: MessageStoreManager,
-    private val notificationContentCreator: NotificationContentCreator
+    private val notificationContentCreator: NotificationContentCreator,
 ) {
     private val notificationDataStore = NotificationDataStore()
 
@@ -36,7 +36,7 @@ internal class NotificationRepository(
         val notificationData = notificationDataStore.initializeAccount(
             account,
             activeNotifications,
-            inactiveNotifications
+            inactiveNotifications,
         )
 
         return if (notificationData.activeNotifications.isNotEmpty()) notificationData else null
@@ -50,7 +50,7 @@ internal class NotificationRepository(
             persistNotificationDataStoreChanges(
                 account = account,
                 operations = result.notificationStoreOperations,
-                updateNewMessageState = true
+                updateNewMessageState = true,
             )
         }
     }
@@ -59,7 +59,7 @@ internal class NotificationRepository(
     fun removeNotifications(
         account: Account,
         clearNewMessageState: Boolean = true,
-        selector: (List<MessageReference>) -> List<MessageReference>
+        selector: (List<MessageReference>) -> List<MessageReference>,
     ): RemoveNotificationsResult? {
         restoreNotifications(account)
 
@@ -67,7 +67,7 @@ internal class NotificationRepository(
             persistNotificationDataStoreChanges(
                 account = account,
                 operations = result.notificationStoreOperations,
-                updateNewMessageState = clearNewMessageState
+                updateNewMessageState = clearNewMessageState,
             )
         }
     }
@@ -85,7 +85,7 @@ internal class NotificationRepository(
     private fun persistNotificationDataStoreChanges(
         account: Account,
         operations: List<NotificationStoreOperation>,
-        updateNewMessageState: Boolean
+        updateNewMessageState: Boolean,
     ) {
         val notificationStore = notificationStoreProvider.getNotificationStore(account)
         notificationStore.persistNotificationChanges(operations)
@@ -105,7 +105,7 @@ internal class NotificationRepository(
                     messageStore.setNewMessageState(
                         folderId = messageReference.folderId,
                         messageServerId = messageReference.uid,
-                        newMessage = true
+                        newMessage = true,
                     )
                 }
                 is NotificationStoreOperation.Remove -> {
@@ -113,7 +113,7 @@ internal class NotificationRepository(
                     messageStore.setNewMessageState(
                         folderId = messageReference.folderId,
                         messageServerId = messageReference.uid,
-                        newMessage = false
+                        newMessage = false,
                     )
                 }
                 else -> Unit
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
index 00ea6e8da52..6c4d34d3bd8 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationSettingsUpdater.kt
@@ -11,7 +11,7 @@ import com.fsck.k9.Preferences
 class NotificationSettingsUpdater(
     private val preferences: Preferences,
     private val notificationChannelManager: NotificationChannelManager,
-    private val notificationConfigurationConverter: NotificationConfigurationConverter
+    private val notificationConfigurationConverter: NotificationConfigurationConverter,
 ) {
     fun updateNotificationSettings(accountUuids: Collection<String>) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
index c03620fba3d..859187dafd6 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStoreOperation.kt
@@ -6,7 +6,7 @@ sealed interface NotificationStoreOperation {
     data class Add(
         val messageReference: MessageReference,
         val notificationId: Int,
-        val timestamp: Long
+        val timestamp: Long,
     ) : NotificationStoreOperation
 
     data class Remove(val messageReference: MessageReference) : NotificationStoreOperation
@@ -15,6 +15,6 @@ sealed interface NotificationStoreOperation {
 
     data class ChangeToActive(
         val messageReference: MessageReference,
-        val notificationId: Int
+        val notificationId: Int,
     ) : NotificationStoreOperation
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
index a6fb5ed6400..a124178a37c 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/NotificationStrategy.kt
@@ -10,6 +10,6 @@ interface NotificationStrategy {
         account: Account,
         localFolder: LocalFolder,
         message: LocalMessage,
-        isOldMessage: Boolean
+        isOldMessage: Boolean,
     ): Boolean
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
index 9b562b054cb..38e890f6017 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/PushNotificationManager.kt
@@ -15,7 +15,7 @@ internal class PushNotificationManager(
     private val context: Context,
     private val resourceProvider: CoreResourceProvider,
     private val notificationChannelManager: NotificationChannelManager,
-    private val notificationManager: NotificationManagerCompat
+    private val notificationManager: NotificationManagerCompat,
 ) {
     val notificationId = NotificationIds.PUSH_NOTIFICATION_ID
 
@@ -75,5 +75,5 @@ enum class PushNotificationState {
     INITIALIZING,
     LISTENING,
     WAIT_BACKGROUND_SYNC,
-    WAIT_NETWORK
+    WAIT_NETWORK,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
index f3c2d44bffa..fc5382c4280 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/RemoveNotificationsResult.kt
@@ -4,5 +4,5 @@ internal data class RemoveNotificationsResult(
     val notificationData: NotificationData,
     val notificationStoreOperations: List<NotificationStoreOperation>,
     val notificationHolders: List<NotificationHolder>,
-    val cancelNotificationIds: List<Int>
+    val cancelNotificationIds: List<Int>,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
index 2f82eabe116..fe3baa181d2 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SendFailedNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.helper.ExceptionHelper
 internal class SendFailedNotificationController(
     private val notificationHelper: NotificationHelper,
     private val actionBuilder: NotificationActionCreator,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun showSendFailedNotification(account: Account, exception: Exception) {
         val title = resourceProvider.sendFailedTitle()
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
index d6d5e3626a2..ecfe8831243 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationCreator.kt
@@ -10,12 +10,12 @@ internal class SingleMessageNotificationCreator(
     private val notificationHelper: NotificationHelper,
     private val actionCreator: NotificationActionCreator,
     private val resourceProvider: NotificationResourceProvider,
-    private val lockScreenNotificationCreator: LockScreenNotificationCreator
+    private val lockScreenNotificationCreator: LockScreenNotificationCreator,
 ) {
     fun createSingleNotification(
         baseNotificationData: BaseNotificationData,
         singleNotificationData: SingleNotificationData,
-        isGroupSummary: Boolean = false
+        isGroupSummary: Boolean = false,
     ) {
         val account = baseNotificationData.account
         val notificationId = singleNotificationData.notificationId
@@ -45,7 +45,7 @@ internal class SingleMessageNotificationCreator(
             Timber.v(
                 "Creating single summary notification (silent=%b): %s",
                 singleNotificationData.isSilent,
-                notification
+                notification,
             )
         }
         notificationHelper.notify(account, notificationId, notification)
@@ -164,7 +164,7 @@ internal class SingleMessageNotificationCreator(
 
     private fun NotificationBuilder.setLockScreenNotification(
         notificationData: BaseNotificationData,
-        addLockScreenNotification: Boolean
+        addLockScreenNotification: Boolean,
     ) = apply {
         if (addLockScreenNotification) {
             lockScreenNotificationCreator.configureLockScreenNotification(this, notificationData)
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
index f693ab39f10..d3bc822521a 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SingleMessageNotificationDataCreator.kt
@@ -10,7 +10,7 @@ internal class SingleMessageNotificationDataCreator {
         notificationId: Int,
         content: NotificationContent,
         timestamp: Long,
-        addLockScreenNotification: Boolean
+        addLockScreenNotification: Boolean,
     ): SingleNotificationData {
         return SingleNotificationData(
             notificationId = notificationId,
@@ -19,14 +19,14 @@ internal class SingleMessageNotificationDataCreator {
             content = content,
             actions = createSingleNotificationActions(),
             wearActions = createSingleNotificationWearActions(account),
-            addLockScreenNotification = addLockScreenNotification
+            addLockScreenNotification = addLockScreenNotification,
         )
     }
 
     fun createSummarySingleNotificationData(
         data: NotificationData,
         timestamp: Long,
-        silent: Boolean
+        silent: Boolean,
     ): SummarySingleNotificationData {
         return SummarySingleNotificationData(
             SingleNotificationData(
@@ -36,8 +36,8 @@ internal class SingleMessageNotificationDataCreator {
                 content = data.activeNotifications.first().content,
                 actions = createSingleNotificationActions(),
                 wearActions = createSingleNotificationWearActions(data.account),
-                addLockScreenNotification = false
-            )
+                addLockScreenNotification = false,
+            ),
         )
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
index c780415f115..4c8770d80bd 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationCreator.kt
@@ -13,11 +13,11 @@ internal class SummaryNotificationCreator(
     private val actionCreator: NotificationActionCreator,
     private val lockScreenNotificationCreator: LockScreenNotificationCreator,
     private val singleMessageNotificationCreator: SingleMessageNotificationCreator,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun createSummaryNotification(
         baseNotificationData: BaseNotificationData,
-        summaryNotificationData: SummaryNotificationData
+        summaryNotificationData: SummaryNotificationData,
     ) {
         when (summaryNotificationData) {
             is SummarySingleNotificationData -> {
@@ -31,18 +31,18 @@ internal class SummaryNotificationCreator(
 
     private fun createSingleMessageNotification(
         baseNotificationData: BaseNotificationData,
-        singleNotificationData: SingleNotificationData
+        singleNotificationData: SingleNotificationData,
     ) {
         singleMessageNotificationCreator.createSingleNotification(
             baseNotificationData,
             singleNotificationData,
-            isGroupSummary = true
+            isGroupSummary = true,
         )
     }
 
     private fun createInboxStyleSummaryNotification(
         baseNotificationData: BaseNotificationData,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) {
         val account = baseNotificationData.account
         val accountName = baseNotificationData.accountName
@@ -85,7 +85,7 @@ internal class SummaryNotificationCreator(
     private fun NotificationBuilder.setInboxStyle(
         title: String,
         summary: String,
-        contentLines: List<CharSequence>
+        contentLines: List<CharSequence>,
     ) = apply {
         val style = NotificationCompat.InboxStyle()
             .setBigContentTitle(title)
@@ -104,7 +104,7 @@ internal class SummaryNotificationCreator(
 
     private fun NotificationBuilder.setDeviceActions(
         account: Account,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) = apply {
         for (action in notificationData.actions) {
             when (action) {
@@ -116,7 +116,7 @@ internal class SummaryNotificationCreator(
 
     private fun NotificationBuilder.addMarkAllAsReadAction(
         account: Account,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) {
         val icon = resourceProvider.iconMarkAsRead
         val title = resourceProvider.actionMarkAsRead()
@@ -128,7 +128,7 @@ internal class SummaryNotificationCreator(
 
     private fun NotificationBuilder.addDeleteAllAction(
         account: Account,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) {
         val icon = resourceProvider.iconDelete
         val title = resourceProvider.actionDelete()
@@ -140,7 +140,7 @@ internal class SummaryNotificationCreator(
 
     private fun NotificationBuilder.setWearActions(
         account: Account,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) = apply {
         val wearableExtender = WearableExtender().apply {
             for (action in notificationData.wearActions) {
@@ -157,7 +157,7 @@ internal class SummaryNotificationCreator(
 
     private fun WearableExtender.addMarkAllAsReadAction(
         account: Account,
-        notificationData: SummaryInboxNotificationData
+        notificationData: SummaryInboxNotificationData,
     ) {
         val icon = resourceProvider.wearIconMarkAsRead
         val title = resourceProvider.actionMarkAllAsRead()
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
index 34d82efcf5d..ae637ef1906 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SummaryNotificationDataCreator.kt
@@ -6,7 +6,7 @@ import com.fsck.k9.K9
 private const val MAX_NUMBER_OF_MESSAGES_FOR_SUMMARY_NOTIFICATION = 5
 
 internal class SummaryNotificationDataCreator(
-    private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator
+    private val singleMessageNotificationDataCreator: SingleMessageNotificationDataCreator,
 ) {
     fun createSummaryNotificationData(data: NotificationData, silent: Boolean): SummaryNotificationData {
         val timestamp = data.latestTimestamp
@@ -21,7 +21,7 @@ internal class SummaryNotificationDataCreator(
     private fun createSummarySingleNotificationData(
         data: NotificationData,
         timestamp: Long,
-        silent: Boolean
+        silent: Boolean,
     ): SummaryNotificationData {
         return singleMessageNotificationDataCreator.createSummarySingleNotificationData(data, timestamp, silent)
     }
@@ -29,7 +29,7 @@ internal class SummaryNotificationDataCreator(
     private fun createSummaryInboxNotificationData(
         data: NotificationData,
         timestamp: Long,
-        silent: Boolean
+        silent: Boolean,
     ): SummaryNotificationData {
         return SummaryInboxNotificationData(
             notificationId = NotificationIds.getNewMailSummaryNotificationId(data.account),
@@ -39,7 +39,7 @@ internal class SummaryNotificationDataCreator(
             additionalMessagesCount = data.additionalMessagesCount,
             messageReferences = data.activeMessageReferences,
             actions = createSummaryNotificationActions(),
-            wearActions = createSummaryWearNotificationActions(data.account)
+            wearActions = createSummaryWearNotificationActions(data.account),
         )
     }
 
diff --git a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
index 441d5698337..94bb4e4b16f 100644
--- a/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
+++ b/app/core/src/main/java/com/fsck/k9/notification/SyncNotificationController.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.mailstore.LocalFolder
 internal class SyncNotificationController(
     private val notificationHelper: NotificationHelper,
     private val actionBuilder: NotificationActionCreator,
-    private val resourceProvider: NotificationResourceProvider
+    private val resourceProvider: NotificationResourceProvider,
 ) {
     fun showSendingNotification(account: Account) {
         val accountName = account.displayName
diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
index d3a11ed18c7..dd43a605738 100644
--- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
+++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfiguration.kt
@@ -5,5 +5,5 @@ data class OAuthConfiguration(
     val scopes: List<String>,
     val authorizationEndpoint: String,
     val tokenEndpoint: String,
-    val redirectUri: String
+    val redirectUri: String,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
index f2b8b31897e..b9cd706090d 100644
--- a/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/oauth/OAuthConfigurationProvider.kt
@@ -2,7 +2,7 @@ package com.fsck.k9.oauth
 
 class OAuthConfigurationProvider(
     private val configurations: Map<List<String>, OAuthConfiguration>,
-    private val googleConfiguration: OAuthConfiguration
+    private val googleConfiguration: OAuthConfiguration,
 ) {
     private val hostnameMapping: Map<String, OAuthConfiguration> = buildMap {
         for ((hostnames, configuration) in configurations) {
diff --git a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
index 51546280eeb..e802d52b3ab 100644
--- a/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
+++ b/app/core/src/main/java/com/fsck/k9/power/AndroidPowerManager.kt
@@ -73,7 +73,7 @@ internal class AndroidPowerManager(private val systemPowerManager: SystemPowerMa
                     tag,
                     id,
                     endTime - startTime,
-                    timeout
+                    timeout,
                 )
             } else {
                 Timber.v("AndroidWakeLock for tag %s / id %d, timeout = %d ms: releasing", tag, id, timeout)
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
index 559a4ceb064..a87043eff75 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/FolderSettingsProvider.kt
@@ -36,7 +36,7 @@ class FolderSettingsProvider(private val folderRepository: FolderRepository) {
             syncClass,
             displayClass,
             notifyClass,
-            pushClass
+            pushClass,
         )
     }
 }
@@ -48,5 +48,5 @@ data class FolderSettings(
     val syncClass: FolderClass,
     val displayClass: FolderClass,
     val notifyClass: FolderClass,
-    val pushClass: FolderClass
+    val pushClass: FolderClass,
 )
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
index 927f04afa9b..595d6b909ad 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/GeneralSettings.kt
@@ -16,23 +16,23 @@ data class GeneralSettings(
     val appTheme: AppTheme,
     val messageViewTheme: SubTheme,
     val messageComposeTheme: SubTheme,
-    val fixedMessageViewTheme: Boolean
+    val fixedMessageViewTheme: Boolean,
 )
 
 enum class BackgroundSync {
     ALWAYS,
     NEVER,
-    FOLLOW_SYSTEM_AUTO_SYNC
+    FOLLOW_SYSTEM_AUTO_SYNC,
 }
 
 enum class AppTheme {
     LIGHT,
     DARK,
-    FOLLOW_SYSTEM
+    FOLLOW_SYSTEM,
 }
 
 enum class SubTheme {
     LIGHT,
     DARK,
-    USE_GLOBAL
+    USE_GLOBAL,
 }
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
index 0d92a2ad2c2..344d288059b 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/KoinModule.kt
@@ -12,7 +12,7 @@ val preferencesModule = module {
             preferences = get(),
             folderSettingsProvider = get(),
             folderRepository = get(),
-            notificationSettingsUpdater = get()
+            notificationSettingsUpdater = get(),
         )
     }
     factory { FolderSettingsProvider(folderRepository = get()) }
@@ -20,7 +20,7 @@ val preferencesModule = module {
     single {
         RealGeneralSettingsManager(
             preferences = get(),
-            coroutineScope = get(named("AppCoroutineScope"))
+            coroutineScope = get(named("AppCoroutineScope")),
         )
     } bind GeneralSettingsManager::class
 }
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 adb2c53ff83..27a2ccf87d1 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
@@ -25,7 +25,7 @@ import timber.log.Timber
 internal class RealGeneralSettingsManager(
     private val preferences: Preferences,
     private val coroutineScope: CoroutineScope,
-    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : GeneralSettingsManager {
     private val settingsFlow = MutableSharedFlow<GeneralSettings>(replay = 1)
     private var generalSettings: GeneralSettings? = null
@@ -71,7 +71,7 @@ internal class RealGeneralSettingsManager(
     @Synchronized
     private fun updateGeneralSettingsWithStateFromK9(): GeneralSettings {
         return getSettings().copy(
-            backgroundSync = K9.backgroundOps.toBackgroundSync()
+            backgroundSync = K9.backgroundOps.toBackgroundSync(),
         ).also { generalSettings ->
             this.generalSettings = generalSettings
         }
@@ -140,7 +140,7 @@ internal class RealGeneralSettingsManager(
             appTheme = storage.getEnum("theme", AppTheme.FOLLOW_SYSTEM),
             messageViewTheme = storage.getEnum("messageViewTheme", SubTheme.USE_GLOBAL),
             messageComposeTheme = storage.getEnum("messageComposeTheme", SubTheme.USE_GLOBAL),
-            fixedMessageViewTheme = storage.getBoolean("fixedMessageViewTheme", true)
+            fixedMessageViewTheme = storage.getBoolean("fixedMessageViewTheme", true),
         )
 
         updateSettingsFlow(settings)
diff --git a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
index 0098813b3f1..2ea09cb8d0b 100644
--- a/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
+++ b/app/core/src/main/java/com/fsck/k9/preferences/SettingsExporter.kt
@@ -26,7 +26,7 @@ class SettingsExporter(
     private val preferences: Preferences,
     private val folderSettingsProvider: FolderSettingsProvider,
     private val folderRepository: FolderRepository,
-    private val notificationSettingsUpdater: NotificationSettingsUpdater
+    private val notificationSettingsUpdater: NotificationSettingsUpdater,
 ) {
     @Throws(SettingsImportExportException::class)
     fun exportToUri(includeGlobals: Boolean, accountUuids: Set<String>, uri: Uri) {
@@ -106,7 +106,7 @@ class SettingsExporter(
                     Timber.w(
                         "Global setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!",
                         key,
-                        valueString
+                        valueString,
                     )
                 }
             } else {
@@ -257,7 +257,7 @@ class SettingsExporter(
         serializer: XmlSerializer,
         keyPart: String,
         valueString: String,
-        account: Account
+        account: Account,
     ) {
         val versionedSetting = AccountSettingsDescriptions.SETTINGS[keyPart]
         if (versionedSetting != null) {
@@ -274,7 +274,7 @@ class SettingsExporter(
                             "This shouldn't happen!",
                         keyPart,
                         account,
-                        valueString
+                        valueString,
                     )
                 }
             }
@@ -284,13 +284,13 @@ class SettingsExporter(
     private fun writeFolderNameSettings(
         account: Account,
         folderRepository: FolderRepository,
-        serializer: XmlSerializer
+        serializer: XmlSerializer,
     ) {
         fun writeFolderNameSetting(
             key: String,
             folderId: Long?,
             importedFolderServerId: String?,
-            writeEmptyValue: Boolean = false
+            writeEmptyValue: Boolean = false,
         ) {
             val folderServerId = folderId?.let {
                 folderRepository.getFolderServerId(account, folderId)
@@ -307,7 +307,7 @@ class SettingsExporter(
             "autoExpandFolderName",
             account.autoExpandFolderId,
             account.importedAutoExpandFolder,
-            writeEmptyValue = true
+            writeEmptyValue = true,
         )
         writeFolderNameSetting("archiveFolderName", account.archiveFolderId, account.importedArchiveFolder)
         writeFolderNameSetting("draftsFolderName", account.draftsFolderId, account.importedDraftsFolder)
@@ -320,7 +320,7 @@ class SettingsExporter(
         serializer: XmlSerializer,
         accountUuid: String,
         identity: String,
-        prefs: Map<String, Any>
+        prefs: Map<String, Any>,
     ) {
         serializer.startTag(null, IDENTITY_ELEMENT)
 
@@ -379,7 +379,7 @@ class SettingsExporter(
                             "Identity setting \"%s\" has invalid value \"%s\" in preference storage. " +
                                 "This shouldn't happen!",
                             identityKey,
-                            valueString
+                            valueString,
                         )
                     }
                 }
@@ -418,7 +418,7 @@ class SettingsExporter(
                     Timber.w(
                         "Folder setting \"%s\" has invalid value \"%s\" in preference storage. This shouldn't happen!",
                         key,
-                        value
+                        value,
                     )
                 }
             }
@@ -437,7 +437,7 @@ class SettingsExporter(
         serializer: XmlSerializer,
         key: String,
         setting: SettingsDescription<T>,
-        valueString: String
+        valueString: String,
     ) {
         val value = setting.fromString(valueString)
         val outputValue = setting.toPrettyString(value)
@@ -447,7 +447,7 @@ class SettingsExporter(
     private fun <T> writeKeyAndDefaultValueFromSetting(
         serializer: XmlSerializer,
         key: String,
-        setting: SettingsDescription<T>
+        setting: SettingsDescription<T>,
     ) {
         val value = setting.getDefaultValue()
         val outputValue = setting.toPrettyString(value)
@@ -518,7 +518,7 @@ class SettingsExporter(
             "draftsFolderName",
             "sentFolderName",
             "spamFolderName",
-            "trashFolderName"
+            "trashFolderName",
         )
     }
 }
diff --git a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
index 3a0beef26c5..599f5320a75 100644
--- a/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
+++ b/app/core/src/main/java/com/fsck/k9/search/AccountSearchConditions.kt
@@ -27,7 +27,7 @@ fun LocalSearch.limitToDisplayableFolders(account: Account) {
             val searchCondition = SearchCondition(
                 SearchField.DISPLAY_CLASS,
                 Attribute.EQUALS,
-                FolderClass.SECOND_CLASS.name
+                FolderClass.SECOND_CLASS.name,
             )
             val root = conditions
             if (root.mRight != null) {
diff --git a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
index 68a7abea6f4..b7ece5240b7 100644
--- a/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
+++ b/app/core/src/main/java/com/fsck/k9/search/SearchAccount.kt
@@ -14,7 +14,7 @@ class SearchAccount(
     val id: String,
     search: LocalSearch,
     override val name: String,
-    override val email: String
+    override val email: String,
 ) : BaseAccount {
     /**
      * Returns the ID of this `SearchAccount` instance.
@@ -46,7 +46,7 @@ class SearchAccount(
                 id = UNIFIED_INBOX,
                 search = tmpSearch,
                 name = resourceProvider.searchUnifiedInboxTitle(),
-                email = resourceProvider.searchUnifiedInboxDetail()
+                email = resourceProvider.searchUnifiedInboxDetail(),
             )
         }
     }
diff --git a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
index 6df0efcad38..c5f9470a480 100644
--- a/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/ServerSettingsSerializerTest.kt
@@ -22,7 +22,7 @@ class ServerSettingsSerializerTest {
             username = "user",
             password = null,
             clientCertificateAlias = "alias",
-            extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null)
+            extra = ImapStoreSettings.createExtra(autoDetectNamespace = true, pathPrefix = null),
         )
 
         val json = serverSettingsSerializer.serialize(serverSettings)
@@ -41,7 +41,7 @@ class ServerSettingsSerializerTest {
             authenticationType = AuthType.PLAIN,
             username = "user",
             password = "password",
-            clientCertificateAlias = null
+            clientCertificateAlias = null,
         )
 
         val json = serverSettingsSerializer.serialize(serverSettings)
diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
index 696547b2b51..78518e4df50 100644
--- a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptDraftStateHeaderParserTest.kt
@@ -18,7 +18,8 @@ class AutocryptDraftStateHeaderParserTest : RobolectricTest() {
 
     @Test
     fun testSignOnly() {
-        val parsedHeader = autocryptHeaderParser.parseAutocryptDraftStateHeader("encrypt=no; _by-choice=yes; _sign-only=yes")
+        val parsedHeader =
+            autocryptHeaderParser.parseAutocryptDraftStateHeader("encrypt=no; _by-choice=yes; _sign-only=yes")
 
         with(parsedHeader!!) {
             assertThat(isEncrypt).isFalse()
@@ -38,7 +39,8 @@ class AutocryptDraftStateHeaderParserTest : RobolectricTest() {
 
     @Test
     fun missingEncrypt() {
-        val parsedHeader = autocryptHeaderParser.parseAutocryptDraftStateHeader("encrpt-with-typo=no; _non_critical=value")
+        val parsedHeader =
+            autocryptHeaderParser.parseAutocryptDraftStateHeader("encrpt-with-typo=no; _non_critical=value")
 
         assertThat(parsedHeader).isNull()
     }
diff --git a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
index f047a9df286..40ccbf523bf 100644
--- a/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/autocrypt/AutocryptGossipHeaderParserTest.kt
@@ -15,7 +15,7 @@ class AutocryptGossipHeaderParserTest {
         mQGNBFoBt74BDAC8AMsjPY17kxodbfmHah38ZQipY0yfuo97WUBs2jeiFYlQdunPANi5VMgbAX+H
         Mq1XoBRs6qW+WpX8Uj11mu22c57BTUXJRbRr4TnTuuOQmT0egwFDe3x8vHSFmcf9OzG8iKR9ftUE
         +F2ewrzzmm3XY8hy7QeUgBfClZVA6A3rsX4gGawjDo6ZRBbYwckINgGX/vQk6rGs
-        """.trimIndent().toByteArray()
+        """.trimIndent().toByteArray(),
     )
 
     val GOSSIP_HEADER_BOB =
@@ -75,7 +75,7 @@ class AutocryptGossipHeaderParserTest {
     @Test
     fun parseHeader_missingKeydata() {
         val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
-            "addr=CDEF"
+            "addr=CDEF",
         )
 
         assertNull(gossipHeader)
@@ -84,7 +84,7 @@ class AutocryptGossipHeaderParserTest {
     @Test
     fun parseHeader_unknownCritical() {
         val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
-            "addr=bawb; somecritical=value; keydata=aGk"
+            "addr=bawb; somecritical=value; keydata=aGk",
         )
 
         assertNull(gossipHeader)
@@ -93,7 +93,7 @@ class AutocryptGossipHeaderParserTest {
     @Test
     fun parseHeader_unknownNonCritical() {
         val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
-            "addr=bawb; _somenoncritical=value; keydata=aGk"
+            "addr=bawb; _somenoncritical=value; keydata=aGk",
         )
 
         assertNotNull(gossipHeader)
@@ -102,7 +102,7 @@ class AutocryptGossipHeaderParserTest {
     @Test
     fun parseHeader_brokenBase64() {
         val gossipHeader = autocryptGossipHeaderParser.parseAutocryptGossipHeader(
-            "addr=bawb; _somenoncritical=value; keydata=X"
+            "addr=bawb; _somenoncritical=value; keydata=X",
         )
 
         assertNull(gossipHeader)
diff --git a/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt b/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt
index d07d82ac9ec..c4c83ffacbe 100644
--- a/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/cache/CacheTest.kt
@@ -8,7 +8,7 @@ import org.junit.runners.Parameterized
 
 data class CacheTestData<KEY : Any, VALUE : Any>(
     val name: String,
-    val createCache: () -> Cache<KEY, VALUE>
+    val createCache: () -> Cache<KEY, VALUE>,
 ) {
     override fun toString(): String = name
 }
@@ -25,7 +25,7 @@ class CacheTest(data: CacheTestData<Any, Any>) {
             return listOf(
                 CacheTestData("InMemoryCache") { InMemoryCache() },
                 CacheTestData("ExpiringCache") { ExpiringCache(TestClock(), InMemoryCache()) },
-                CacheTestData("SynchronizedCache") { SynchronizedCache(InMemoryCache()) }
+                CacheTestData("SynchronizedCache") { SynchronizedCache(InMemoryCache()) },
             )
         }
 
diff --git a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
index 20c4d2d77b8..b55959e849c 100644
--- a/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/crypto/OpenPgpApiHelperTest.kt
@@ -10,7 +10,7 @@ class OpenPgpApiHelperTest {
     fun buildUserId_withName_shouldCreateOpenPgpAccountName() {
         val identity = Identity(
             email = "user@domain.com",
-            name = "Name"
+            name = "Name",
         )
 
         val result = OpenPgpApiHelper.buildUserId(identity)
@@ -21,7 +21,7 @@ class OpenPgpApiHelperTest {
     @Test
     fun buildUserId_withoutName_shouldCreateOpenPgpAccountName() {
         val identity = Identity(
-            email = "user@domain.com"
+            email = "user@domain.com",
         )
 
         val result = OpenPgpApiHelper.buildUserId(identity)
diff --git a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
index cb2867043ca..1d3dfc6e97a 100644
--- a/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/helper/IdentityHelperTest.kt
@@ -22,7 +22,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to IDENTITY_2_ADDRESS,
             RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
             RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
-            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -37,7 +37,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to IDENTITY_2_ADDRESS,
             RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
             RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
-            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -52,7 +52,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to "unrelated2@example.org",
             RecipientType.X_ORIGINAL_TO to IDENTITY_3_ADDRESS,
             RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
-            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -67,7 +67,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to "unrelated2@example.org",
             RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
             RecipientType.DELIVERED_TO to IDENTITY_4_ADDRESS,
-            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -82,7 +82,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to "unrelated2@example.org",
             RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
             RecipientType.DELIVERED_TO to "unrelated4@example.org",
-            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS
+            RecipientType.X_ENVELOPE_TO to IDENTITY_5_ADDRESS,
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -97,7 +97,7 @@ class IdentityHelperTest : RobolectricTest() {
             RecipientType.CC to "unrelated2@example.org",
             RecipientType.X_ORIGINAL_TO to "unrelated3@example.org",
             RecipientType.DELIVERED_TO to "unrelated4@example.org",
-            RecipientType.X_ENVELOPE_TO to "unrelated5@example.org"
+            RecipientType.X_ENVELOPE_TO to "unrelated5@example.org",
         )
 
         val identity = IdentityHelper.getRecipientIdentityFromMessage(account, message)
@@ -122,14 +122,14 @@ class IdentityHelperTest : RobolectricTest() {
                 newIdentity("Identity 2", IDENTITY_2_ADDRESS),
                 newIdentity("Identity 3", IDENTITY_3_ADDRESS),
                 newIdentity("Identity 4", IDENTITY_4_ADDRESS),
-                newIdentity("Identity 5", IDENTITY_5_ADDRESS)
-            )
+                newIdentity("Identity 5", IDENTITY_5_ADDRESS),
+            ),
         )
     }
 
     private fun newIdentity(name: String, email: String) = Identity(
         name = name,
-        email = email
+        email = email,
     )
 
     private fun messageWithRecipients(vararg recipients: Pair<RecipientType, String>): Message {
diff --git a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
index 4c327aefe1a..feca0c75068 100644
--- a/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/helper/ListUnsubscribeHelperTest.kt
@@ -11,7 +11,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should accept mailto`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<mailto:unsubscribe@example.com>"
+            "<mailto:unsubscribe@example.com>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -20,7 +20,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should prefer mailto 1`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<mailto:unsubscribe@example.com>, <https://example.com/unsubscribe>"
+            "<mailto:unsubscribe@example.com>, <https://example.com/unsubscribe>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -29,7 +29,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should prefer mailto 2`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<https://example.com/unsubscribe>, <mailto:unsubscribe@example.com>"
+            "<https://example.com/unsubscribe>, <mailto:unsubscribe@example.com>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(MailtoUnsubscribeUri("mailto:unsubscribe@example.com".toUri()))
@@ -38,7 +38,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should allow https if no mailto`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<https://example.com/unsubscribe>"
+            "<https://example.com/unsubscribe>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri()))
@@ -47,7 +47,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should correctly parse uncommon urls`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<https://domain.example/one,two>"
+            "<https://domain.example/one,two>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://domain.example/one,two".toUri()))
@@ -56,7 +56,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should ignore unsafe entries 1`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<http://example.com/unsubscribe>"
+            "<http://example.com/unsubscribe>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertNull(result)
@@ -65,7 +65,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should ignore unsafe entries 2`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            "<http://example.com/unsubscribe>, <https://example.com/unsubscribe>"
+            "<http://example.com/unsubscribe>, <https://example.com/unsubscribe>",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertThat(result).isEqualTo(HttpsUnsubscribeUri("https://example.com/unsubscribe".toUri()))
@@ -74,7 +74,7 @@ class ListUnsubscribeHelperTest : RobolectricTest() {
     @Test
     fun `get list unsubscribe url - should ignore empty`() {
         val message = buildMimeMessageWithListUnsubscribeValue(
-            ""
+            "",
         )
         val result = ListUnsubscribeHelper.getPreferredListUnsubscribeUri(message)
         assertNull(result)
diff --git a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
index a4229bbb0d8..46dd150d278 100644
--- a/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/logging/LogcatLogFileWriterTest.kt
@@ -25,7 +25,7 @@ class LogcatLogFileWriterTest {
         val logFileWriter = LogcatLogFileWriter(
             contentResolver = createContentResolver(),
             processExecutor = createProcessExecutor(logData),
-            coroutineDispatcher = Dispatchers.Unconfined
+            coroutineDispatcher = Dispatchers.Unconfined,
         )
 
         logFileWriter.writeLogTo(contentUri)
@@ -38,7 +38,7 @@ class LogcatLogFileWriterTest {
         val logFileWriter = LogcatLogFileWriter(
             contentResolver = createThrowingContentResolver(FileNotFoundException()),
             processExecutor = createProcessExecutor("irrelevant"),
-            coroutineDispatcher = Dispatchers.Unconfined
+            coroutineDispatcher = Dispatchers.Unconfined,
         )
 
         logFileWriter.writeLogTo(contentUri)
@@ -49,7 +49,7 @@ class LogcatLogFileWriterTest {
         val logFileWriter = LogcatLogFileWriter(
             contentResolver = createContentResolver(),
             processExecutor = ThrowingProcessExecutor(IOException()),
-            coroutineDispatcher = Dispatchers.Unconfined
+            coroutineDispatcher = Dispatchers.Unconfined,
         )
 
         logFileWriter.writeLogTo(contentUri)
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
index ba1488fb017..081a53ac300 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendFolderTest.kt
@@ -104,7 +104,7 @@ class K9BackendFolderTest : K9RobolectricTest() {
             messageStore,
             createFolderSettingsProvider(),
             saveMessageDataCreator,
-            emptyList()
+            emptyList(),
         )
         backendStorage.updateFolders {
             createFolders(listOf(FolderInfo(FOLDER_SERVER_ID, FOLDER_NAME, FOLDER_TYPE)))
@@ -142,7 +142,7 @@ class K9BackendFolderTest : K9RobolectricTest() {
                 "messages",
                 contentValuesOf("flags" to null),
                 "uid = ?",
-                arrayOf(MESSAGE_SERVER_ID)
+                arrayOf(MESSAGE_SERVER_ID),
             )
             assertEquals(1, numberOfUpdatedRows)
         }
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt
index ccd2fee8cb8..ed0009a78eb 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/K9BackendStorageTest.kt
@@ -86,7 +86,7 @@ internal fun createFolderSettingsProvider(): FolderSettingsProvider {
                 notifyClass = FolderClass.INHERITED,
                 pushClass = FolderClass.SECOND_CLASS,
                 inTopGroup = false,
-                integrate = false
+                integrate = false,
             )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
index b23c4ff7e6d..9abd03ce3bd 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListCacheTest.kt
@@ -33,7 +33,7 @@ class MessageListCacheTest {
             modules(
                 module {
                     single { mock<MessageListRepository>() }
-                }
+                },
             )
         }
     }
diff --git a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
index f9284a768a7..0b06882b992 100644
--- a/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/mailstore/MessageListRepositoryTest.kt
@@ -46,7 +46,7 @@ class MessageListRepositoryTest {
             modules(
                 module {
                     single { messageListRepository }
-                }
+                },
             )
         }
     }
@@ -103,8 +103,8 @@ class MessageListRepositoryTest {
                 isRead = false,
                 isStarred = true,
                 isAnswered = false,
-                isForwarded = true
-            )
+                isForwarded = true,
+            ),
         )
         MessageListCache.getCache(accountUuid).apply {
             setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -119,7 +119,7 @@ class MessageListRepositoryTest {
                 isRead = message.isRead,
                 isStarred = message.isStarred,
                 isAnswered = message.isAnswered,
-                isForwarded = message.isForwarded
+                isForwarded = message.isForwarded,
             )
         }
 
@@ -131,8 +131,8 @@ class MessageListRepositoryTest {
                 isRead = true,
                 isStarred = false,
                 isAnswered = false,
-                isForwarded = true
-            )
+                isForwarded = true,
+            ),
         )
     }
 
@@ -140,7 +140,7 @@ class MessageListRepositoryTest {
     fun `getMessages() should skip messages marked as hidden in the cache`() {
         addMessages(
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID)
 
@@ -155,7 +155,7 @@ class MessageListRepositoryTest {
     fun `getMessages() should not skip message when marked as hidden in a different folder`() {
         addMessages(
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID_2)
 
@@ -176,8 +176,8 @@ class MessageListRepositoryTest {
                 isRead = false,
                 isStarred = true,
                 isAnswered = false,
-                isForwarded = true
-            )
+                isForwarded = true,
+            ),
         )
         MessageListCache.getCache(accountUuid).apply {
             setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -188,7 +188,7 @@ class MessageListRepositoryTest {
             accountUuid,
             SELECTION,
             SELECTION_ARGS,
-            SORT_ORDER
+            SORT_ORDER,
         ) { message ->
             MessageData(
                 messageId = message.id,
@@ -197,7 +197,7 @@ class MessageListRepositoryTest {
                 isRead = message.isRead,
                 isStarred = message.isStarred,
                 isAnswered = message.isAnswered,
-                isForwarded = message.isForwarded
+                isForwarded = message.isForwarded,
             )
         }
 
@@ -209,8 +209,8 @@ class MessageListRepositoryTest {
                 isRead = true,
                 isStarred = false,
                 isAnswered = false,
-                isForwarded = true
-            )
+                isForwarded = true,
+            ),
         )
     }
 
@@ -218,7 +218,7 @@ class MessageListRepositoryTest {
     fun `getThreadedMessages() should skip messages marked as hidden in the cache`() {
         addThreadedMessages(
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2)
+            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID)
 
@@ -226,7 +226,7 @@ class MessageListRepositoryTest {
             accountUuid,
             SELECTION,
             SELECTION_ARGS,
-            SORT_ORDER
+            SORT_ORDER,
         ) { message ->
             message.id
         }
@@ -238,7 +238,7 @@ class MessageListRepositoryTest {
     fun `getThreadedMessages() should not skip message when marked as hidden in a different folder`() {
         addThreadedMessages(
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2)
+            MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT_2),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID_2)
 
@@ -246,7 +246,7 @@ class MessageListRepositoryTest {
             accountUuid,
             SELECTION,
             SELECTION_ARGS,
-            SORT_ORDER
+            SORT_ORDER,
         ) { message ->
             message.id
         }
@@ -265,7 +265,7 @@ class MessageListRepositoryTest {
                 isRead = false,
                 isStarred = true,
                 isAnswered = false,
-                isForwarded = true
+                isForwarded = true,
             ),
             MessageData(
                 messageId = MESSAGE_ID_2,
@@ -274,8 +274,8 @@ class MessageListRepositoryTest {
                 isRead = false,
                 isStarred = true,
                 isAnswered = true,
-                isForwarded = false
-            )
+                isForwarded = false,
+            ),
         )
         MessageListCache.getCache(accountUuid).apply {
             setFlagForMessages(listOf(MESSAGE_ID), Flag.SEEN, true)
@@ -285,7 +285,7 @@ class MessageListRepositoryTest {
         val result = messageListRepository.getThread(
             accountUuid,
             THREAD_ROOT,
-            SORT_ORDER
+            SORT_ORDER,
         ) { message ->
             MessageData(
                 messageId = message.id,
@@ -294,7 +294,7 @@ class MessageListRepositoryTest {
                 isRead = message.isRead,
                 isStarred = message.isStarred,
                 isAnswered = message.isAnswered,
-                isForwarded = message.isForwarded
+                isForwarded = message.isForwarded,
             )
         }
 
@@ -306,7 +306,7 @@ class MessageListRepositoryTest {
                 isRead = true,
                 isStarred = false,
                 isAnswered = false,
-                isForwarded = true
+                isForwarded = true,
             ),
             MessageData(
                 messageId = MESSAGE_ID_2,
@@ -315,8 +315,8 @@ class MessageListRepositoryTest {
                 isRead = false,
                 isStarred = false,
                 isAnswered = true,
-                isForwarded = false
-            )
+                isForwarded = false,
+            ),
         )
     }
 
@@ -326,7 +326,7 @@ class MessageListRepositoryTest {
             THREAD_ROOT,
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
             MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+            MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID)
 
@@ -341,7 +341,7 @@ class MessageListRepositoryTest {
             THREAD_ROOT,
             MessageData(messageId = MESSAGE_ID, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
             MessageData(messageId = MESSAGE_ID_2, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
-            MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT)
+            MessageData(messageId = MESSAGE_ID_3, folderId = FOLDER_ID, threadRoot = THREAD_ROOT),
         )
         hideMessage(MESSAGE_ID, FOLDER_ID_2)
 
@@ -383,25 +383,27 @@ class MessageListRepositoryTest {
 
     private fun runMessageMapper(messages: Array<out MessageData>, mapper: MessageMapper<Any?>): List<Any> {
         return messages.mapNotNull { message ->
-            mapper.map(object : MessageDetailsAccessor {
-                override val id = message.messageId
-                override val messageServerId = "irrelevant"
-                override val folderId = message.folderId
-                override val fromAddresses = emptyList<Address>()
-                override val toAddresses = emptyList<Address>()
-                override val ccAddresses = emptyList<Address>()
-                override val messageDate = 0L
-                override val internalDate = 0L
-                override val subject = "irrelevant"
-                override val preview = PreviewResult.error()
-                override val isRead = message.isRead
-                override val isStarred = message.isStarred
-                override val isAnswered = message.isAnswered
-                override val isForwarded = message.isForwarded
-                override val hasAttachments = false
-                override val threadRoot = message.threadRoot
-                override val threadCount = 0
-            })
+            mapper.map(
+                object : MessageDetailsAccessor {
+                    override val id = message.messageId
+                    override val messageServerId = "irrelevant"
+                    override val folderId = message.folderId
+                    override val fromAddresses = emptyList<Address>()
+                    override val toAddresses = emptyList<Address>()
+                    override val ccAddresses = emptyList<Address>()
+                    override val messageDate = 0L
+                    override val internalDate = 0L
+                    override val subject = "irrelevant"
+                    override val preview = PreviewResult.error()
+                    override val isRead = message.isRead
+                    override val isStarred = message.isStarred
+                    override val isAnswered = message.isAnswered
+                    override val isForwarded = message.isForwarded
+                    override val hasAttachments = false
+                    override val threadRoot = message.threadRoot
+                    override val threadCount = 0
+                },
+            )
         }
     }
 
@@ -429,5 +431,5 @@ private data class MessageData(
     val isRead: Boolean = false,
     val isStarred: Boolean = false,
     val isAnswered: Boolean = false,
-    val isForwarded: Boolean = false
+    val isForwarded: Boolean = false,
 )
diff --git a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
index 2be6075663d..c3de28c2356 100644
--- a/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/IdentityHeaderBuilderTest.kt
@@ -49,7 +49,7 @@ class IdentityHeaderBuilderTest : RobolectricTest() {
         email: String? = null,
         signature: String? = null,
         signatureUse: Boolean = false,
-        replyTo: String? = null
+        replyTo: String? = null,
     ): Identity {
         return Identity(description, name, email, signature, signatureUse, replyTo)
     }
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 2178cb42838..fbd514e9899 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
@@ -33,7 +33,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT,
                     expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML +
-                        TextBodyBuilder.HTML_AND_BODY_END
+                        TextBodyBuilder.HTML_AND_BODY_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -43,7 +43,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
                     expectedHtmlTextMessage = TextBodyBuilder.HTML_AND_BODY_START + MESSAGE_TEXT_HTML +
-                        SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END
+                        SIGNATURE_TEXT_HTML + TextBodyBuilder.HTML_AND_BODY_END,
                 ),
                 TestData(
                     appendSignature = false,
@@ -53,7 +53,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY +
-                        QUOTED_HTML_TAGS_END
+                        QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = false,
@@ -63,7 +63,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "<br><br>" +
-                        QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
+                        QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = false,
@@ -73,7 +73,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML +
-                        QUOTED_HTML_TAGS_END
+                        QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = false,
@@ -83,7 +83,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "<br clear=\"all\">" +
-                        MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END
+                        MESSAGE_TEXT_HTML + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -93,7 +93,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + QUOTED_HTML_BODY +
-                        SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+                        SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -103,7 +103,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n\r\n" + QUOTED_TEXT + "\r\n" + SIGNATURE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + "<br><br>" +
-                        QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+                        QUOTED_HTML_BODY + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -113,7 +113,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + MESSAGE_TEXT_HTML +
-                        SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+                        SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -123,7 +123,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = false,
                     expectedPlainTextMessage = QUOTED_TEXT + "\r\n" + MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + "<br clear=\"all\">" +
-                        MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END
+                        MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -133,7 +133,7 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = true,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML +
-                        QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
+                        QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
                 ),
                 TestData(
                     appendSignature = true,
@@ -143,8 +143,8 @@ class TextBodyBuilderTest(val testData: TestData) {
                     signatureBeforeQuotedText = true,
                     expectedPlainTextMessage = MESSAGE_TEXT + "\r\n" + SIGNATURE_TEXT + "\r\n\r\n" + QUOTED_TEXT,
                     expectedHtmlTextMessage = QUOTED_HTML_TAGS_START + MESSAGE_TEXT_HTML + SIGNATURE_TEXT_HTML +
-                        "<br><br>" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END
-                )
+                        "<br><br>" + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END,
+                ),
             )
         }
     }
@@ -161,7 +161,7 @@ class TextBodyBuilderTest(val testData: TestData) {
         toTest.setQuotedText(QUOTED_TEXT)
         val quotedHtmlContent = InsertableHtmlContent()
         quotedHtmlContent.setQuotedContent(
-            StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END)
+            StringBuilder(QUOTED_HTML_TAGS_START + QUOTED_HTML_BODY + QUOTED_HTML_TAGS_END),
         )
         quotedHtmlContent.setHeaderInsertionPoint(QUOTED_HTML_TAGS_START.length)
         quotedHtmlContent.footerInsertionPoint =
@@ -209,7 +209,7 @@ class TextBodyBuilderTest(val testData: TestData) {
         val replyAfterQuote: Boolean,
         val signatureBeforeQuotedText: Boolean,
         val expectedPlainTextMessage: String,
-        val expectedHtmlTextMessage: String
+        val expectedHtmlTextMessage: String,
     ) {
         override fun toString(): String {
             return "appendSignature=$appendSignature," +
diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
index f50b99139ce..c218a9c5e40 100644
--- a/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/extractors/BasicPartInfoExtractorTest.kt
@@ -12,7 +12,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo with 'filename' parameter in Content-Disposition header`() {
         val part = createPart(
             contentType = "application/octet-stream",
-            contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23"
+            contentDisposition = "attachment; filename=\"attachment_name.txt\"; size=23",
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -25,7 +25,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo with 'name' parameter in Content-Type header`() {
         val part = createPart(
             contentType = "image/jpeg; name=\"attachment.jpeg\"",
-            contentDisposition = "attachment; size=42"
+            contentDisposition = "attachment; size=42",
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -58,7 +58,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo with missing Content-Disposition header`() {
         val part = createPart(
             contentType = "application/octet-stream; name=\"attachment.dat\"",
-            contentDisposition = null
+            contentDisposition = null,
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -71,7 +71,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo with missing Content-Disposition header and name`() {
         val part = createPart(
             contentType = "application/octet-stream",
-            contentDisposition = null
+            contentDisposition = null,
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -84,7 +84,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo without any relevant headers`() {
         val part = createPart(
             contentType = null,
-            contentDisposition = null
+            contentDisposition = null,
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
@@ -97,7 +97,7 @@ class BasicPartInfoExtractorTest {
     fun `extractPartInfo with invalid Content-Disposition header`() {
         val part = createPart(
             contentType = "application/octet-stream",
-            contentDisposition = "something; <invalid>"
+            contentDisposition = "something; <invalid>",
         )
 
         val partInfo = basicPartInfoExtractor.extractPartInfo(part)
diff --git a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
index 4f7f32c091a..82c24ae858c 100644
--- a/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/extractors/TextPartFinderTest.kt
@@ -43,7 +43,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/alternative",
             expected,
-            createTextPart("text/html")
+            createTextPart("text/html"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -57,7 +57,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/alternative",
             createTextPart("text/html"),
-            expected
+            expected,
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -72,7 +72,7 @@ class TextPartFinderTest {
             "multipart/alternative",
             createPart("image/gif"),
             expected,
-            createTextPart("text/html")
+            createTextPart("text/html"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -85,7 +85,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/alternative",
             createPart("image/gif"),
-            createPart("application/pdf")
+            createPart("application/pdf"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -101,9 +101,9 @@ class TextPartFinderTest {
             createMultipart(
                 "multipart/related",
                 expected,
-                createPart("image/jpeg")
+                createPart("image/jpeg"),
             ),
-            createTextPart("text/html")
+            createTextPart("text/html"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -119,9 +119,9 @@ class TextPartFinderTest {
             createMultipart(
                 "multipart/related",
                 createTextPart("text/html"),
-                createPart("image/jpeg")
+                createPart("image/jpeg"),
             ),
-            expected
+            expected,
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -135,7 +135,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/mixed",
             createPart("image/jpeg"),
-            expected
+            expected,
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -149,7 +149,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/mixed",
             expected,
-            createTextPart("text/plain")
+            createTextPart("text/plain"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -162,7 +162,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/mixed",
             createPart("image/jpeg"),
-            createPart("image/gif")
+            createPart("image/gif"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -179,9 +179,9 @@ class TextPartFinderTest {
             createMultipart(
                 "multipart/alternative",
                 expected,
-                createTextPart("text/html")
+                createTextPart("text/html"),
             ),
-            createTextPart("text/plain")
+            createTextPart("text/plain"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -197,8 +197,8 @@ class TextPartFinderTest {
             createMultipart(
                 "multipart/alternative",
                 createTextPart("text/html"),
-                expected
-            )
+                expected,
+            ),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -212,7 +212,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/alternative",
             expected,
-            createTextPart("text/html")
+            createTextPart("text/html"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -226,7 +226,7 @@ class TextPartFinderTest {
         val part = createMultipart(
             "multipart/mixed",
             expected,
-            createTextPart("text/plain")
+            createTextPart("text/plain"),
         )
 
         val result = textPartFinder.findFirstTextPart(part)
@@ -242,9 +242,9 @@ class TextPartFinderTest {
             createMultipart(
                 "multipart/alternative",
                 createPart("image/jpeg"),
-                createPart("image/png")
+                createPart("image/png"),
             ),
-            expected
+            expected,
         )
 
         val result = textPartFinder.findFirstTextPart(part)
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
index 080355a4dbf..6dcb06aa35b 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/DisplayHtmlTest.kt
@@ -52,7 +52,7 @@ class DisplayHtmlTest {
         assertEquals(
             "Expected to find '$cssQuery' $numberOfExpectedOccurrences time(s) in:\n$html",
             numberOfExpectedOccurrences,
-            numberOfFoundElements
+            numberOfFoundElements,
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
index b8caa01adb5..9f3ec5bc0be 100644
--- a/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/html/HtmlConverterTest.kt
@@ -60,7 +60,7 @@ class HtmlConverterTest {
             |</blockquote>
             |</blockquote>
             |</pre>
-            """.trimMargin().removeLineBreaks()
+            """.trimMargin().removeLineBreaks(),
         )
     }
 
@@ -98,7 +98,7 @@ class HtmlConverterTest {
             |</div>
             |</blockquote>
             |</pre>
-            """.trimMargin().removeLineBreaks()
+            """.trimMargin().removeLineBreaks(),
         )
     }
 
@@ -154,7 +154,7 @@ class HtmlConverterTest {
             |</blockquote>
             |</blockquote>
             |</pre>
-            """.trimMargin().removeLineBreaks()
+            """.trimMargin().removeLineBreaks(),
         )
     }
 
@@ -179,7 +179,7 @@ class HtmlConverterTest {
             |  baz<br>
             |</div>
             |</pre>
-            """.trimMargin().removeLineBreaks()
+            """.trimMargin().removeLineBreaks(),
         )
     }
 
@@ -212,7 +212,7 @@ class HtmlConverterTest {
             |</div>
             |</blockquote>
             |</pre>
-            """.trimMargin().removeLineBreaks()
+            """.trimMargin().removeLineBreaks(),
         )
     }
 
@@ -252,7 +252,7 @@ class HtmlConverterTest {
             end
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -276,7 +276,7 @@ class HtmlConverterTest {
             foo bar
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -301,7 +301,7 @@ class HtmlConverterTest {
             foo bar
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -319,7 +319,7 @@ class HtmlConverterTest {
             <br>
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -380,7 +380,7 @@ class HtmlConverterTest {
             foo bar
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -398,7 +398,7 @@ class HtmlConverterTest {
             <hr>
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -422,7 +422,7 @@ class HtmlConverterTest {
             world
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -448,7 +448,7 @@ class HtmlConverterTest {
             </div>
             </div>
             </pre>
-            """.trimIndent().removeLineBreaks()
+            """.trimIndent().removeLineBreaks(),
         )
     }
 
@@ -524,7 +524,7 @@ class HtmlConverterTest {
             Two
 
             Three
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 
@@ -550,7 +550,7 @@ class HtmlConverterTest {
             Three
             
             Four
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 
diff --git a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
index 97a39b26ea9..412c54f60b4 100644
--- a/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/quote/TextQuoteCreatorTest.kt
@@ -42,7 +42,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
             > Line 1
             > Line 2
             > Line 3
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -59,7 +59,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
             On January 18, 1970 7:53:41 PM UTC, Alice <alice@sender.example> wrote:
             $1\t Line 1
             $1\t Line 2
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -80,7 +80,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
             On January 18, 1970 7:53:41 PM UTC, Alice <alice@sender.example> wrote:
             > [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------] [-------]
             > [-------------------------------------------------------------------------------------------------]
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -103,7 +103,7 @@ class TextQuoteCreatorTest : RobolectricTest() {
             Line 1
             Line 2
             Line 3
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
diff --git a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
index f9ca1af7d4d..c212fa838a8 100644
--- a/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/message/signature/HtmlSignatureRemoverTest.kt
@@ -58,7 +58,7 @@ class HtmlSignatureRemoverTest {
         val withoutSignature = stripSignature(html)
 
         assertThat(withoutSignature).isEqualTo(
-            """<html><head></head><body><div>This is the body text</div></body></html>"""
+            """<html><head></head><body><div>This is the body text</div></body></html>""",
         )
     }
 
@@ -114,7 +114,7 @@ class HtmlSignatureRemoverTest {
             <div>This is the body text</div>
             </body>
             </html>
-            """.trimIndent().removeNewlines()
+            """.trimIndent().removeNewlines(),
         )
     }
 
@@ -145,7 +145,7 @@ class HtmlSignatureRemoverTest {
             <blockquote>Some quote</blockquote>
             </body>
             </html>
-            """.trimIndent().removeNewlines()
+            """.trimIndent().removeNewlines(),
         )
     }
 
@@ -178,7 +178,7 @@ class HtmlSignatureRemoverTest {
             <br>
             </body>
             </html>
-            """.trimIndent().removeNewlines()
+            """.trimIndent().removeNewlines(),
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt
index aed171f238d..c0665d0bd0a 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/AuthenticationErrorNotificationControllerTest.kt
@@ -30,7 +30,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {
     private val notificationHelper = createFakeNotificationHelper(
         notificationManager,
         builder,
-        lockScreenNotificationBuilder
+        lockScreenNotificationBuilder,
     )
     private val account = createFakeAccount()
     private val controller = TestAuthenticationErrorNotificationController()
@@ -95,7 +95,7 @@ class AuthenticationErrorNotificationControllerTest : RobolectricTest() {
     private fun createFakeNotificationHelper(
         notificationManager: NotificationManagerCompat,
         notificationBuilder: NotificationCompat.Builder,
-        lockScreenNotificationBuilder: NotificationCompat.Builder
+        lockScreenNotificationBuilder: NotificationCompat.Builder,
     ): NotificationHelper {
         return mock {
             on { getContext() } doReturn ApplicationProvider.getApplicationContext()
diff --git a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt
index 65dea9c1e26..3f28e7aadf2 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/BaseNotificationDataCreatorTest.kt
@@ -155,8 +155,8 @@ class BaseNotificationDataCreatorTest {
                 vibration = NotificationVibration(
                     isEnabled = true,
                     pattern = VibratePattern.Pattern3,
-                    repeatCount = 2
-                )
+                    repeatCount = 2,
+                ),
             )
         }
         val notificationData = createNotificationData()
@@ -164,7 +164,7 @@ class BaseNotificationDataCreatorTest {
         val result = notificationDataCreator.createBaseNotificationData(notificationData)
 
         assertThat(result.appearance.vibrationPattern).isEqualTo(
-            NotificationVibration.getSystemPattern(VibratePattern.Pattern3, 2)
+            NotificationVibration.getSystemPattern(VibratePattern.Pattern3, 2),
         )
     }
 
@@ -192,8 +192,8 @@ class BaseNotificationDataCreatorTest {
                     sender = sender,
                     preview = "irrelevant",
                     summary = "irrelevant",
-                    subject = "irrelevant"
-                )
+                    subject = "irrelevant",
+                ),
             )
         }
         return NotificationData(account, activeNotifications, inactiveNotifications = emptyList())
diff --git a/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt
index 3681ff4a001..7d74127f634 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/CertificateErrorNotificationControllerTest.kt
@@ -30,7 +30,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
     private val notificationHelper = createFakeNotificationHelper(
         notificationManager,
         builder,
-        lockScreenNotificationBuilder
+        lockScreenNotificationBuilder,
     )
     private val account = createFakeAccount()
     private val controller = TestCertificateErrorNotificationController()
@@ -95,7 +95,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
     private fun createFakeNotificationHelper(
         notificationManager: NotificationManagerCompat,
         notificationBuilder: NotificationCompat.Builder,
-        lockScreenNotificationBuilder: NotificationCompat.Builder
+        lockScreenNotificationBuilder: NotificationCompat.Builder,
     ): NotificationHelper {
         return mock {
             on { getContext() } doReturn ApplicationProvider.getApplicationContext()
@@ -115,7 +115,7 @@ class CertificateErrorNotificationControllerTest : RobolectricTest() {
     internal inner class TestCertificateErrorNotificationController : CertificateErrorNotificationController(
         notificationHelper,
         mock(),
-        resourceProvider
+        resourceProvider,
     ) {
         override fun createContentIntent(account: Account, incoming: Boolean): PendingIntent {
             return contentIntent
diff --git a/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt
index f92ec2a8662..1d999dfe974 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/LockScreenNotificationCreatorTest.kt
@@ -18,7 +18,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() {
     private val publicBuilder = createFakeNotificationBuilder()
     private var notificationCreator = LockScreenNotificationCreator(
         notificationHelper = createFakeNotificationHelper(publicBuilder),
-        resourceProvider = resourceProvider
+        resourceProvider = resourceProvider,
     )
 
     @Test
@@ -52,7 +52,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() {
     fun `list of sender names`() {
         val baseNotificationData = createBaseNotificationData(
             lockScreenNotificationData = LockScreenNotificationData.SenderNames("Alice, Bob"),
-            newMessagesCount = 2
+            newMessagesCount = 2,
         )
 
         notificationCreator.configureLockScreenNotification(builder, baseNotificationData)
@@ -69,7 +69,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() {
         val baseNotificationData = createBaseNotificationData(
             lockScreenNotificationData = LockScreenNotificationData.MessageCount,
             accountName = "Account name",
-            newMessagesCount = 23
+            newMessagesCount = 23,
         )
 
         notificationCreator.configureLockScreenNotification(builder, baseNotificationData)
@@ -97,7 +97,7 @@ class LockScreenNotificationCreatorTest : RobolectricTest() {
     private fun createBaseNotificationData(
         lockScreenNotificationData: LockScreenNotificationData,
         accountName: String = "irrelevant",
-        newMessagesCount: Int = 0
+        newMessagesCount: Int = 0,
     ): BaseNotificationData {
         return BaseNotificationData(
             account = account,
@@ -109,8 +109,8 @@ class LockScreenNotificationCreatorTest : RobolectricTest() {
             appearance = NotificationAppearance(
                 ringtone = null,
                 vibrationPattern = longArrayOf(),
-                ledColor = 0
-            )
+                ledColor = 0,
+            ),
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
index dda7ca6afc5..49ea41c2271 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/NewMailNotificationManagerTest.kt
@@ -34,7 +34,7 @@ class NewMailNotificationManagerTest {
         BaseNotificationDataCreator(),
         SingleMessageNotificationDataCreator(),
         SummaryNotificationDataCreator(SingleMessageNotificationDataCreator()),
-        clock
+        clock,
     )
 
     @Test
@@ -44,7 +44,7 @@ class NewMailNotificationManagerTest {
             subject = "subject",
             preview = "preview",
             summary = "summary",
-            messageUid = "msg-1"
+            messageUid = "msg-1",
         )
 
         val result = manager.addNewMailNotification(account, message, silent = false)
@@ -56,8 +56,8 @@ class NewMailNotificationManagerTest {
                 sender = "sender",
                 subject = "subject",
                 preview = "preview",
-                summary = "summary"
-            )
+                summary = "summary",
+            ),
         )
         assertThat(result.summaryNotificationData).isInstanceOf(SummarySingleNotificationData::class.java)
         val summaryNotificationData = result.summaryNotificationData as SummarySingleNotificationData
@@ -71,14 +71,14 @@ class NewMailNotificationManagerTest {
             subject = "Hi Bob",
             preview = "How are you?",
             summary = "Alice Hi Bob",
-            messageUid = "msg-1"
+            messageUid = "msg-1",
         )
         val messageTwo = addMessageToNotificationContentCreator(
             sender = "Zoe",
             subject = "Meeting",
             preview = "We need to talk",
             summary = "Zoe Meeting",
-            messageUid = "msg-2"
+            messageUid = "msg-2",
         )
         manager.addNewMailNotification(account, messageOne, silent = false)
         val timestamp = TIMESTAMP + 1000
@@ -93,8 +93,8 @@ class NewMailNotificationManagerTest {
                 sender = "Zoe",
                 subject = "Meeting",
                 preview = "We need to talk",
-                summary = "Zoe Meeting"
-            )
+                summary = "Zoe Meeting",
+            ),
         )
         assertThat(result.baseNotificationData.newMessagesCount).isEqualTo(2)
         assertThat(result.summaryNotificationData).isInstanceOf(SummaryInboxNotificationData::class.java)
@@ -103,8 +103,8 @@ class NewMailNotificationManagerTest {
         assertThat(summaryNotificationData.messageReferences).isEqualTo(
             listOf(
                 createMessageReference("msg-2"),
-                createMessageReference("msg-1")
-            )
+                createMessageReference("msg-1"),
+            ),
         )
         assertThat(summaryNotificationData.additionalMessagesCount).isEqualTo(0)
         assertThat(summaryNotificationData.isSilent).isFalse()
@@ -118,7 +118,7 @@ class NewMailNotificationManagerTest {
             subject = "Another one",
             preview = "Are you tired of me yet?",
             summary = "Alice Another one",
-            messageUid = "msg-x"
+            messageUid = "msg-x",
         )
 
         val result = manager.addNewMailNotification(account, message, silent = false)
@@ -145,7 +145,7 @@ class NewMailNotificationManagerTest {
             subject = "Another one",
             preview = "Are you tired of me yet?",
             summary = "Alice Another one",
-            messageUid = "msg-x"
+            messageUid = "msg-x",
         )
         manager.addNewMailNotification(account, message, silent = false)
 
@@ -163,7 +163,7 @@ class NewMailNotificationManagerTest {
             subject = "Hello",
             preview = "How are you?",
             summary = "Alice Hello",
-            messageUid = "msg-1"
+            messageUid = "msg-1",
         )
         manager.addNewMailNotification(account, message, silent = false)
 
@@ -174,7 +174,7 @@ class NewMailNotificationManagerTest {
         assertNotNull(result) { data ->
             assertThat(data.cancelNotificationIds).containsExactly(
                 NotificationIds.getNewMailSummaryNotificationId(account),
-                NotificationIds.getSingleMessageNotificationId(account, 0)
+                NotificationIds.getSingleMessageNotificationId(account, 0),
             )
             assertThat(data.singleNotificationData).isEmpty()
             assertThat(data.summaryNotificationData).isNull()
@@ -188,7 +188,7 @@ class NewMailNotificationManagerTest {
             subject = "One",
             preview = "preview",
             summary = "Alice One",
-            messageUid = "msg-1"
+            messageUid = "msg-1",
         )
         manager.addNewMailNotification(account, messageOne, silent = false)
         val messageTwo = addMessageToNotificationContentCreator(
@@ -196,7 +196,7 @@ class NewMailNotificationManagerTest {
             subject = "Two",
             preview = "preview",
             summary = "Alice Two",
-            messageUid = "msg-2"
+            messageUid = "msg-2",
         )
         val dataTwo = manager.addNewMailNotification(account, messageTwo, silent = true)
         assertNotNull(dataTwo)
@@ -206,7 +206,7 @@ class NewMailNotificationManagerTest {
             subject = "Three",
             preview = "preview",
             summary = "Alice Three",
-            messageUid = "msg-3"
+            messageUid = "msg-3",
         )
         manager.addNewMailNotification(account, messageThree, silent = true)
 
@@ -224,8 +224,8 @@ class NewMailNotificationManagerTest {
             assertThat(summaryNotificationData.messageReferences).isEqualTo(
                 listOf(
                     createMessageReference("msg-3"),
-                    createMessageReference("msg-1")
-                )
+                    createMessageReference("msg-1"),
+                ),
             )
         }
     }
@@ -237,7 +237,7 @@ class NewMailNotificationManagerTest {
             subject = "Another one",
             preview = "Are you tired of me yet?",
             summary = "Alice Another one",
-            messageUid = "msg-restore"
+            messageUid = "msg-restore",
         )
         manager.addNewMailNotification(account, message, silent = false)
         addMaximumNumberOfNotifications()
@@ -260,8 +260,8 @@ class NewMailNotificationManagerTest {
                     sender = "Alice",
                     subject = "Another one",
                     preview = "Are you tired of me yet?",
-                    summary = "Alice Another one"
-                )
+                    summary = "Alice Another one",
+                ),
             )
         }
     }
@@ -282,7 +282,7 @@ class NewMailNotificationManagerTest {
             subject = "Subject",
             summary = "Summary",
             preview = "Preview",
-            messageUid = "uid-1"
+            messageUid = "uid-1",
         )
 
         val result = manager.restoreNewMailNotifications(account)
@@ -302,8 +302,8 @@ class NewMailNotificationManagerTest {
                     sender = "Sender",
                     subject = "Subject",
                     preview = "Preview",
-                    summary = "Summary"
-                )
+                    summary = "Summary",
+                ),
             )
 
             assertThat(data.summaryNotificationData).isInstanceOf(SummarySingleNotificationData::class.java)
@@ -315,8 +315,8 @@ class NewMailNotificationManagerTest {
                     sender = "Sender",
                     subject = "Subject",
                     preview = "Preview",
-                    summary = "Summary"
-                )
+                    summary = "Summary",
+                ),
             )
         }
     }
@@ -331,7 +331,7 @@ class NewMailNotificationManagerTest {
             subject = "inactive",
             summary = "inactive",
             preview = "inactive",
-            messageUid = "uid-inactive"
+            messageUid = "uid-inactive",
         )
 
         val result = manager.restoreNewMailNotifications(account)
@@ -363,7 +363,7 @@ class NewMailNotificationManagerTest {
                 subject = "subject",
                 preview = "preview",
                 summary = "summary",
-                messageUid = "msg-$index"
+                messageUid = "msg-$index",
             )
             manager.addNewMailNotification(account, message, silent = true)
         }
@@ -374,7 +374,7 @@ class NewMailNotificationManagerTest {
         subject: String,
         preview: String,
         summary: String,
-        messageUid: String
+        messageUid: String,
     ): LocalMessage {
         val message = mock<LocalMessage>()
 
@@ -385,7 +385,7 @@ class NewMailNotificationManagerTest {
                     sender,
                     subject,
                     preview,
-                    summary
+                    summary,
                 )
         }
 
@@ -399,7 +399,7 @@ class NewMailNotificationManagerTest {
         subject: String,
         preview: String,
         summary: String,
-        messageUid: String
+        messageUid: String,
     ) {
         val message = mock<LocalMessage>()
 
@@ -413,7 +413,7 @@ class NewMailNotificationManagerTest {
                     sender,
                     subject,
                     preview,
-                    summary
+                    summary,
                 )
         }
     }
@@ -427,7 +427,7 @@ class NewMailNotificationManagerTest {
                 subject = "irrelevant",
                 preview = "irrelevant",
                 summary = "irrelevant",
-                messageUid = "uid-$index"
+                messageUid = "uid-$index",
             )
         }
     }
@@ -461,7 +461,7 @@ class NewMailNotificationManagerTest {
             notificationStoreProvider,
             localStoreProvider,
             messageStoreManager,
-            notificationContentCreator
+            notificationContentCreator,
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
index c3000f77111..f4c94bbda6e 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationDataStoreTest.kt
@@ -237,7 +237,7 @@ class NotificationDataStoreTest : RobolectricTest() {
             sender = "irrelevant",
             subject = "irrelevant",
             preview = "irrelevant",
-            summary = "irrelevant"
+            summary = "irrelevant",
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt b/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt
index dcc9a67c1a6..e850227c647 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/NotificationIdsTest.kt
@@ -88,7 +88,7 @@ class NotificationIdsTest {
         val notificationIds = NotificationIds.getAllMessageNotificationIds(account)
 
         assertThat(notificationIds).containsExactlyElementsIn(
-            getNewMessageNotificationIds(account) + NotificationIds.getNewMailSummaryNotificationId(account)
+            getNewMessageNotificationIds(account) + NotificationIds.getNewMailSummaryNotificationId(account),
         )
     }
 
@@ -104,7 +104,7 @@ class NotificationIdsTest {
             NotificationIds.getAuthenticationErrorNotificationId(account, true),
             NotificationIds.getAuthenticationErrorNotificationId(account, false),
             NotificationIds.getFetchingMailNotificationId(account),
-            NotificationIds.getNewMailSummaryNotificationId(account)
+            NotificationIds.getNewMailSummaryNotificationId(account),
         ) + getNewMessageNotificationIds(account)
     }
 
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
index e92089fc681..7c41e81fb18 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SendFailedNotificationControllerTest.kt
@@ -32,7 +32,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
     private val controller = SendFailedNotificationController(
         notificationHelper = createFakeNotificationHelper(notificationManager, builder, lockScreenNotificationBuilder),
         actionBuilder = createActionBuilder(contentIntent),
-        resourceProvider = resourceProvider
+        resourceProvider = resourceProvider,
     )
 
     @Test
@@ -69,7 +69,7 @@ class SendFailedNotificationControllerTest : RobolectricTest() {
     private fun createFakeNotificationHelper(
         notificationManager: NotificationManagerCompat,
         notificationBuilder: NotificationCompat.Builder,
-        lockScreenNotificationBuilder: NotificationCompat.Builder
+        lockScreenNotificationBuilder: NotificationCompat.Builder,
     ): NotificationHelper {
         return mock {
             on { getContext() } doReturn ApplicationProvider.getApplicationContext()
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt
index 2d9e92e95d3..a6376c95df4 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SingleMessageNotificationDataCreatorTest.kt
@@ -20,7 +20,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 23,
             content = content,
             timestamp = 9000,
-            addLockScreenNotification = true
+            addLockScreenNotification = true,
         )
 
         assertThat(result.notificationId).isEqualTo(23)
@@ -38,11 +38,11 @@ class SingleMessageNotificationDataCreatorTest {
         val result = notificationDataCreator.createSummarySingleNotificationData(
             timestamp = 9000,
             silent = false,
-            data = notificationData
+            data = notificationData,
         )
 
         assertThat(result.singleNotificationData.notificationId).isEqualTo(
-            NotificationIds.getNewMailSummaryNotificationId(account)
+            NotificationIds.getNewMailSummaryNotificationId(account),
         )
         assertThat(result.singleNotificationData.isSilent).isFalse()
         assertThat(result.singleNotificationData.timestamp).isEqualTo(9000)
@@ -59,7 +59,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).contains(NotificationAction.Reply)
@@ -79,7 +79,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).contains(NotificationAction.Delete)
@@ -97,7 +97,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).contains(NotificationAction.Delete)
@@ -115,7 +115,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).contains(NotificationAction.Delete)
@@ -133,7 +133,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).contains(NotificationAction.Delete)
@@ -150,7 +150,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.actions).doesNotContain(NotificationAction.Delete)
@@ -167,7 +167,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.wearActions).contains(WearNotificationAction.Archive)
@@ -183,7 +183,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.wearActions).doesNotContain(WearNotificationAction.Archive)
@@ -200,7 +200,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.wearActions).contains(WearNotificationAction.Spam)
@@ -217,7 +217,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.wearActions).doesNotContain(WearNotificationAction.Spam)
@@ -234,7 +234,7 @@ class SingleMessageNotificationDataCreatorTest {
             notificationId = 0,
             content = content,
             timestamp = 0,
-            addLockScreenNotification = false
+            addLockScreenNotification = false,
         )
 
         assertThat(result.wearActions).doesNotContain(WearNotificationAction.Spam)
@@ -263,7 +263,7 @@ class SingleMessageNotificationDataCreatorTest {
         sender = "irrelevant",
         subject = "irrelevant",
         preview = "irrelevant",
-        summary = "irrelevant"
+        summary = "irrelevant",
     )
 
     private fun createNotificationData(content: NotificationContent): NotificationData {
@@ -273,10 +273,10 @@ class SingleMessageNotificationDataCreatorTest {
                 NotificationHolder(
                     notificationId = 1,
                     timestamp = 0,
-                    content = content
-                )
+                    content = content,
+                ),
             ),
-            inactiveNotifications = emptyList()
+            inactiveNotifications = emptyList(),
         )
     }
 }
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
index 906e6a00980..2b5c64ceed9 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SummaryNotificationDataCreatorTest.kt
@@ -25,7 +25,7 @@ class SummaryNotificationDataCreatorTest {
             modules(
                 module {
                     single<Clock> { TestClock() }
-                }
+                },
             )
         }
     }
@@ -42,7 +42,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = false
+            silent = false,
         )
 
         assertThat(result).isInstanceOf(SummarySingleNotificationData::class.java)
@@ -55,7 +55,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = false
+            silent = false,
         )
 
         val summaryNotificationData = result as SummarySingleNotificationData
@@ -69,7 +69,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = false
+            silent = false,
         )
 
         val summaryNotificationData = result as SummarySingleNotificationData
@@ -83,7 +83,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = false
+            silent = false,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -97,7 +97,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = false
+            silent = false,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -110,12 +110,12 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
         assertThat(summaryNotificationData.notificationId).isEqualTo(
-            NotificationIds.getNewMailSummaryNotificationId(account)
+            NotificationIds.getNewMailSummaryNotificationId(account),
         )
         assertThat(summaryNotificationData.isSilent).isTrue()
         assertThat(summaryNotificationData.timestamp).isEqualTo(TIMESTAMP)
@@ -127,7 +127,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -143,7 +143,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -159,7 +159,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -175,7 +175,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -190,7 +190,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -205,7 +205,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -219,7 +219,7 @@ class SummaryNotificationDataCreatorTest {
 
         val result = notificationDataCreator.createSummaryNotificationData(
             notificationData,
-            silent = true
+            silent = true,
         )
 
         val summaryNotificationData = result as SummaryInboxNotificationData
@@ -253,11 +253,11 @@ class SummaryNotificationDataCreatorTest {
         sender = "irrelevant",
         subject = "irrelevant",
         preview = "irrelevant",
-        summary = "irrelevant"
+        summary = "irrelevant",
     )
 
     private fun createNotificationData(
-        contentList: List<NotificationContent> = listOf(createNotificationContent())
+        contentList: List<NotificationContent> = listOf(createNotificationContent()),
     ): NotificationData {
         val activeNotifications = contentList.mapIndexed { index, content ->
             NotificationHolder(notificationId = index, TIMESTAMP, content)
diff --git a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
index 18b5aa11cd1..156207dae92 100644
--- a/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/notification/SyncNotificationControllerTest.kt
@@ -36,7 +36,7 @@ class SyncNotificationControllerTest : RobolectricTest() {
     private val controller = SyncNotificationController(
         notificationHelper = createFakeNotificationHelper(notificationManager, builder, lockScreenNotificationBuilder),
         actionBuilder = createActionBuilder(contentIntent),
-        resourceProvider = resourceProvider
+        resourceProvider = resourceProvider,
     )
 
     @Test
@@ -119,7 +119,7 @@ class SyncNotificationControllerTest : RobolectricTest() {
     private fun createFakeNotificationHelper(
         notificationManager: NotificationManagerCompat,
         notificationBuilder: NotificationCompat.Builder,
-        lockScreenNotificationBuilder: NotificationCompat.Builder
+        lockScreenNotificationBuilder: NotificationCompat.Builder,
     ): NotificationHelper {
         return mock {
             on { getContext() } doReturn ApplicationProvider.getApplicationContext()
diff --git a/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt b/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt
index 5819c1ad892..79f24f2d09b 100644
--- a/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt
+++ b/app/core/src/test/java/com/fsck/k9/preferences/SettingsExporterTest.kt
@@ -24,7 +24,7 @@ class SettingsExporterTest : K9RobolectricTest() {
         preferences,
         folderSettingsProvider,
         folderRepository,
-        notificationSettingsUpdater = mock()
+        notificationSettingsUpdater = mock(),
     )
 
     @Test
diff --git a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt b/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt
index 079114e36de..c5d450f4faa 100644
--- a/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt
+++ b/app/crypto-openpgp/src/main/java/com/fsck/k9/crypto/openpgp/OpenPgpEncryptionExtractor.kt
@@ -6,7 +6,7 @@ import com.fsck.k9.mail.Message
 import com.fsck.k9.message.extractors.TextPartFinder
 
 class OpenPgpEncryptionExtractor internal constructor(
-    private val encryptionDetector: EncryptionDetector
+    private val encryptionDetector: EncryptionDetector,
 ) : EncryptionExtractor {
 
     override fun extractEncryption(message: Message): EncryptionResult? {
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 0f0e5cd7791..4fb58c28522 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
@@ -8,7 +8,7 @@ internal class BodyCleaner {
     private val cleaner: Cleaner
     private val allowedBodyAttributes = setOf(
         "id", "class", "dir", "lang", "style",
-        "alink", "background", "bgcolor", "link", "text", "vlink"
+        "alink", "background", "bgcolor", "link", "text", "vlink",
     )
 
     init {
@@ -25,18 +25,18 @@ internal class BodyCleaner {
                 "border",
                 "cellpadding",
                 "cellspacing",
-                "width"
+                "width",
             )
             .addAttributes("tr", "align", "background", "bgcolor", "valign")
             .addAttributes(
                 "th",
                 "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope",
-                "sorted", "valign", "width"
+                "sorted", "valign", "width",
             )
             .addAttributes(
                 "td",
                 "align", "background", "bgcolor", "colspan", "headers", "height", "nowrap", "rowspan", "scope",
-                "valign", "width"
+                "valign", "width",
             )
             .addAttributes("map", "name")
             .addAttributes("area", "shape", "coords", "href", "alt")
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt
index 1485291428d..c29c855af49 100644
--- a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt
+++ b/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt
@@ -24,7 +24,7 @@ internal class HeadCleaner {
 
 internal class CleaningVisitor(
     private val root: Element,
-    private var destination: Element
+    private var destination: Element,
 ) : NodeVisitor {
     private var elementToSkip: Element? = null
 
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 90250000671..239812ce4bb 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
@@ -149,7 +149,7 @@ class HtmlSanitizerTest {
             <head><meta http-equiv="content-type" content="text/html; charset=UTF-8"></head>
             <body>Message</body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -176,7 +176,7 @@ class HtmlSanitizerTest {
         val result = htmlSanitizer.sanitize(html)
 
         assertThat(result.toCompactString()).isEqualTo(
-            "<html><head></head><body><table><tbody><tr><td></td><td></td></tr></tbody></table></body></html>"
+            "<html><head></head><body><table><tbody><tr><td></td><td></td></tr></tbody></table></body></html>",
         )
     }
 
@@ -200,7 +200,7 @@ class HtmlSanitizerTest {
             <head></head>
             <body><table><tbody><tr><td>Hmailserver service shutdown:</td><td>Ok</td></tr></tbody></table></body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -297,7 +297,7 @@ class HtmlSanitizerTest {
             <head></head>
             <body><center><font face="Arial" color="red" size="12">A</font></center></body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -338,7 +338,7 @@ class HtmlSanitizerTest {
             <a href="rtsp://example.com/media.mp4">RTSP</a>
             </body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -374,7 +374,7 @@ class HtmlSanitizerTest {
             <head></head>
             <body style="color: #fff" class="body" id></body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -405,7 +405,7 @@ class HtmlSanitizerTest {
             """
             <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
             <html><head></head><body>text</body></html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -423,7 +423,7 @@ class HtmlSanitizerTest {
             <div align="center">text</div>
             </body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -441,7 +441,7 @@ class HtmlSanitizerTest {
             <a name="something"></a>
             </body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
@@ -497,7 +497,7 @@ class HtmlSanitizerTest {
             <$element>some text</$element>
             </body>
             </html>
-            """.trimIndent().trimLineBreaks()
+            """.trimIndent().trimLineBreaks(),
         )
     }
 
diff --git a/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt b/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt
index 6d4b73b16bd..c8380082cfd 100644
--- a/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt
+++ b/app/k9mail/src/debug/java/app/k9mail/dev/DebugConfig.kt
@@ -4,7 +4,7 @@ import org.koin.core.module.Module
 import org.koin.core.scope.Scope
 
 fun Scope.developmentBackends() = mapOf(
-    "demo" to get<DemoBackendFactory>()
+    "demo" to get<DemoBackendFactory>(),
 )
 
 fun Module.developmentModuleAdditions() {
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 c48017178d5..2ec6faa08c4 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/App.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/App.kt
@@ -138,8 +138,8 @@ class App : Application(), WorkManagerConfiguration.Provider {
                 MessageCompose::class.java,
                 LauncherShortcuts::class.java,
                 UnreadWidgetProvider::class.java,
-                MessageListWidgetProvider::class.java
-            )
+                MessageListWidgetProvider::class.java,
+            ),
         )
     }
 }
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 76936bbbc11..9d95615bb0b 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/Dependencies.kt
@@ -22,8 +22,8 @@ private val mainAppModule = module {
     single {
         MessagingListenerProvider(
             listOf(
-                get<UnreadWidgetUpdateListener>()
-            )
+                get<UnreadWidgetUpdateListener>(),
+            ),
         )
     }
     single(named("controllerExtensions")) { emptyList<ControllerExtension>() }
@@ -40,5 +40,5 @@ val appModules = listOf(
     notificationModule,
     resourcesModule,
     backendsModule,
-    storageModule
+    storageModule,
 )
diff --git a/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt b/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt
index 4f1b5f47b5d..78456bdf9eb 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/auth/OAuthConfigurations.kt
@@ -13,7 +13,7 @@ fun createOAuthConfigurationProvider(): OAuthConfigurationProvider {
         scopes = listOf("https://mail.google.com/"),
         authorizationEndpoint = "https://accounts.google.com/o/oauth2/v2/auth",
         tokenEndpoint = "https://oauth2.googleapis.com/token",
-        redirectUri = redirectUriSlash
+        redirectUri = redirectUriSlash,
     )
 
     return OAuthConfigurationProvider(
@@ -24,23 +24,27 @@ fun createOAuthConfigurationProvider(): OAuthConfigurationProvider {
                 scopes = listOf("mail-w"),
                 authorizationEndpoint = "https://api.login.yahoo.com/oauth2/request_auth",
                 tokenEndpoint = "https://api.login.yahoo.com/oauth2/get_token",
-                redirectUri = redirectUriDoubleSlash
+                redirectUri = redirectUriDoubleSlash,
             ),
             listOf("imap.aol.com", "smtp.aol.com") to OAuthConfiguration(
                 clientId = BuildConfig.OAUTH_AOL_CLIENT_ID,
                 scopes = listOf("mail-w"),
                 authorizationEndpoint = "https://api.login.aol.com/oauth2/request_auth",
                 tokenEndpoint = "https://api.login.aol.com/oauth2/get_token",
-                redirectUri = redirectUriDoubleSlash
+                redirectUri = redirectUriDoubleSlash,
             ),
             listOf("outlook.office365.com", "smtp.office365.com") to OAuthConfiguration(
                 clientId = BuildConfig.OAUTH_MICROSOFT_CLIENT_ID,
-                scopes = listOf("https://outlook.office.com/IMAP.AccessAsUser.All", "https://outlook.office.com/SMTP.Send", "offline_access"),
+                scopes = listOf(
+                    "https://outlook.office.com/IMAP.AccessAsUser.All",
+                    "https://outlook.office.com/SMTP.Send",
+                    "offline_access",
+                ),
                 authorizationEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/authorize",
                 tokenEndpoint = "https://login.microsoftonline.com/common/oauth2/v2.0/token",
-                redirectUri = BuildConfig.OAUTH_MICROSOFT_REDIRECT_URI
-            )
+                redirectUri = BuildConfig.OAUTH_MICROSOFT_REDIRECT_URI,
+            ),
         ),
-        googleConfiguration = googleConfig
+        googleConfiguration = googleConfig,
     )
 }
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt
index 0a09dfa0aa8..fc33fd54b5c 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/AndroidAlarmManager.kt
@@ -24,7 +24,7 @@ private typealias Callback = () -> Unit
 class AndroidAlarmManager(
     private val context: Context,
     private val alarmManager: AlarmManagerCompat,
-    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : SystemAlarmManager {
     private val coroutineScope = CoroutineScope(backgroundDispatcher)
 
@@ -53,7 +53,7 @@ class AndroidAlarmManager(
                     }
                 }
             },
-            intentFilter
+            intentFilter,
         )
     }
 
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt
index 2b14b1b0ffd..ebe668d940f 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/ImapBackendFactory.kt
@@ -25,7 +25,7 @@ class ImapBackendFactory(
     private val idleRefreshManager: IdleRefreshManager,
     private val backendStorageFactory: K9BackendStorageFactory,
     private val trustedSocketFactory: TrustedSocketFactory,
-    private val context: Context
+    private val context: Context,
 ) : BackendFactory {
     override fun createBackend(account: Account): Backend {
         val accountName = account.displayName
@@ -41,7 +41,7 @@ class ImapBackendFactory(
             powerManager,
             idleRefreshManager,
             pushConfigProvider,
-            smtpTransport
+            smtpTransport,
         )
     }
 
@@ -57,7 +57,7 @@ class ImapBackendFactory(
             account.incomingServerSettings,
             config,
             trustedSocketFactory,
-            oAuth2TokenProvider
+            oAuth2TokenProvider,
         )
     }
 
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt
index b23177632c1..790635874f8 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/KoinModule.kt
@@ -16,8 +16,8 @@ val backendsModule = module {
             mapOf(
                 "imap" to get<ImapBackendFactory>(),
                 "pop3" to get<Pop3BackendFactory>(),
-                "webdav" to get<WebDavBackendFactory>()
-            ) + developmentBackends()
+                "webdav" to get<WebDavBackendFactory>(),
+            ) + developmentBackends(),
         )
     }
     single {
@@ -27,7 +27,7 @@ val backendsModule = module {
             idleRefreshManager = get(),
             backendStorageFactory = get(),
             trustedSocketFactory = get(),
-            context = get()
+            context = get(),
         )
     }
     single<SystemAlarmManager> { AndroidAlarmManager(context = get(), alarmManager = get()) }
@@ -38,7 +38,7 @@ val backendsModule = module {
             backendStorageFactory = get(),
             trustManagerFactory = get(),
             sniHostSetter = get(),
-            folderRepository = get()
+            folderRepository = get(),
         )
     }
     single {
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt
index 4550f5f1759..6b6d2ccdf8a 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/Pop3BackendFactory.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.mailstore.K9BackendStorageFactory
 
 class Pop3BackendFactory(
     private val backendStorageFactory: K9BackendStorageFactory,
-    private val trustedSocketFactory: TrustedSocketFactory
+    private val trustedSocketFactory: TrustedSocketFactory,
 ) : BackendFactory {
     override fun createBackend(account: Account): Backend {
         val accountName = account.displayName
diff --git a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
index 48402de4269..524a376407d 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/backends/RealOAuth2TokenProvider.kt
@@ -17,7 +17,7 @@ import net.openid.appauth.AuthorizationService
 class RealOAuth2TokenProvider(
     context: Context,
     private val accountManager: AccountManager,
-    private val account: Account
+    private val account: Account,
 ) : OAuth2TokenProvider {
     private val authService = AuthorizationService(context)
     private var requestFreshToken = false
@@ -59,7 +59,7 @@ class RealOAuth2TokenProvider(
             throw AuthenticationFailedException(
                 message = "Failed to fetch an access token",
                 throwable = authException,
-                messageFromServer = authException.error
+                messageFromServer = authException.error,
             )
         } else if (token != oldAccessToken) {
             requestFreshToken = false
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 f8bf8f7bfcc..d35f96ce432 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
@@ -15,7 +15,7 @@ class WebDavBackendFactory(
     private val backendStorageFactory: K9BackendStorageFactory,
     private val trustManagerFactory: TrustManagerFactory,
     private val sniHostSetter: SniHostSetter,
-    private val folderRepository: FolderRepository
+    private val folderRepository: FolderRepository,
 ) : BackendFactory {
     override fun createBackend(account: Account): Backend {
         val accountName = account.displayName
diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
index b08374a516d..e81e91206fe 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationActionCreator.kt
@@ -34,7 +34,7 @@ import com.fsck.k9.ui.notification.DeleteConfirmationActivity
 internal class K9NotificationActionCreator(
     private val context: Context,
     private val defaultFolderProvider: DefaultFolderProvider,
-    private val messageStoreManager: MessageStoreManager
+    private val messageStoreManager: MessageStoreManager,
 ) : NotificationActionCreator {
 
     override fun createViewMessagePendingIntent(messageReference: MessageReference): PendingIntent {
@@ -51,7 +51,7 @@ internal class K9NotificationActionCreator(
 
     override fun createViewMessagesPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>
+        messageReferences: List<MessageReference>,
     ): PendingIntent {
         val folderIds = extractFolderIds(messageReferences)
 
@@ -101,12 +101,13 @@ internal class K9NotificationActionCreator(
 
     override fun createMarkAllAsReadPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>
+        messageReferences: List<MessageReference>,
     ): PendingIntent {
         val accountUuid = account.uuid
-        val intent = NotificationActionService.createMarkAllAsReadIntent(context, accountUuid, messageReferences).apply {
-            data = Uri.parse("data:,markAllAsRead/$accountUuid/${System.currentTimeMillis()}")
-        }
+        val intent =
+            NotificationActionService.createMarkAllAsReadIntent(context, accountUuid, messageReferences).apply {
+                data = Uri.parse("data:,markAllAsRead/$accountUuid/${System.currentTimeMillis()}")
+            }
         return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
@@ -144,7 +145,7 @@ internal class K9NotificationActionCreator(
 
     override fun createDeleteAllPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>
+        messageReferences: List<MessageReference>,
     ): PendingIntent {
         return if (K9.isConfirmDeleteFromNotification) {
             getDeleteAllConfirmationPendingIntent(messageReferences)
@@ -162,12 +163,13 @@ internal class K9NotificationActionCreator(
 
     private fun getDeleteAllServicePendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>
+        messageReferences: List<MessageReference>,
     ): PendingIntent {
         val accountUuid = account.uuid
-        val intent = NotificationActionService.createDeleteAllMessagesIntent(context, accountUuid, messageReferences).apply {
-            data = Uri.parse("data:,deleteAll/$accountUuid/${System.currentTimeMillis()}")
-        }
+        val intent =
+            NotificationActionService.createDeleteAllMessagesIntent(context, accountUuid, messageReferences).apply {
+                data = Uri.parse("data:,deleteAll/$accountUuid/${System.currentTimeMillis()}")
+            }
         return PendingIntent.getService(context, 0, intent, FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
     }
 
@@ -180,7 +182,7 @@ internal class K9NotificationActionCreator(
 
     override fun createArchiveAllPendingIntent(
         account: Account,
-        messageReferences: List<MessageReference>
+        messageReferences: List<MessageReference>,
     ): PendingIntent {
         val intent = NotificationActionService.createArchiveAllIntent(context, account, messageReferences).apply {
             data = Uri.parse("data:,archiveAll/${account.uuid}/${System.currentTimeMillis()}")
@@ -207,7 +209,7 @@ internal class K9NotificationActionCreator(
             search = search,
             noThreading = false,
             newTask = true,
-            clearTop = true
+            clearTop = true,
         ).apply {
             data = Uri.parse("data:,messageList/${account.uuid}/$folderId")
         }
@@ -224,7 +226,7 @@ internal class K9NotificationActionCreator(
             search = search,
             noThreading = false,
             newTask = true,
-            clearTop = true
+            clearTop = true,
         ).apply {
             data = Uri.parse("data:,messageList/${account.uuid}/$folderId")
         }
diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
index 2c1eea26032..55e1584d2a5 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationResourceProvider.kt
@@ -51,7 +51,7 @@ class K9NotificationResourceProvider(private val context: Context) : Notificatio
         context.resources.getQuantityString(
             R.plurals.notification_new_messages_title,
             newMessagesCount,
-            newMessagesCount
+            newMessagesCount,
         )
 
     override fun additionalMessages(overflowMessagesCount: Int, accountName: String): String =
diff --git a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt
index 2221cd0e6a9..a92c5b78f4b 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/notification/K9NotificationStrategy.kt
@@ -17,7 +17,7 @@ class K9NotificationStrategy(private val contacts: Contacts) : NotificationStrat
         account: Account,
         localFolder: LocalFolder,
         message: LocalMessage,
-        isOldMessage: Boolean
+        isOldMessage: Boolean,
     ): Boolean {
         if (!K9.isNotificationDuringQuietTimeEnabled && K9.isQuietTime) {
             Timber.v("No notification: Quiet time is active")
diff --git a/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt
index 99325bdb911..c2b4b404a38 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.kt
@@ -90,7 +90,7 @@ class UnreadWidgetProvider : AppWidgetProvider(), EarlyInit {
             context,
             appWidgetId,
             clickIntent,
-            FLAG_UPDATE_CURRENT or FLAG_MUTABLE
+            FLAG_UPDATE_CURRENT or FLAG_MUTABLE,
         )
         remoteViews.setOnClickPendingIntent(R.id.unread_widget_layout, pendingIntent)
 
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt
index 9eea5177257..87bc422e772 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/KoinModule.kt
@@ -11,7 +11,7 @@ val unreadWidgetModule = module {
             messageCountsProvider = get(),
             defaultFolderProvider = get(),
             folderRepository = get(),
-            folderNameFormatter = get()
+            folderNameFormatter = get(),
         )
     }
     single { UnreadWidgetUpdater(context = get()) }
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt
index 5c9a19f73bb..73878358729 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetConfigurationFragment.kt
@@ -61,7 +61,7 @@ class UnreadWidgetConfigurationFragment : PreferenceFragmentCompat() {
                 context = requireContext(),
                 action = ChooseFolderActivity.Action.CHOOSE,
                 accountUuid = selectedAccountUuid!!,
-                showDisplayableOnly = true
+                showDisplayableOnly = true,
             )
             startActivityForResult(intent, REQUEST_CHOOSE_FOLDER)
             false
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt
index bfcfeadb883..30a7a023012 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetData.kt
@@ -6,5 +6,5 @@ data class UnreadWidgetData(
     val configuration: UnreadWidgetConfiguration,
     val title: String,
     val unreadCount: Int,
-    val clickIntent: Intent
+    val clickIntent: Intent,
 )
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt
index 572887da82f..c8d225c86b8 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetDataProvider.kt
@@ -20,7 +20,7 @@ class UnreadWidgetDataProvider(
     private val messageCountsProvider: MessageCountsProvider,
     private val defaultFolderProvider: DefaultFolderProvider,
     private val folderRepository: FolderRepository,
-    private val folderNameFormatter: FolderNameFormatter
+    private val folderNameFormatter: FolderNameFormatter,
 ) {
     fun loadUnreadWidgetData(configuration: UnreadWidgetConfiguration): UnreadWidgetData? = with(configuration) {
         if (SearchAccount.UNIFIED_INBOX == accountUuid) {
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt
index 4221ccef743..0aaa05518d0 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetMigrations.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.widget.unread.UnreadWidgetRepository.Companion.PREF_VERSION_K
 
 internal class UnreadWidgetMigrations(
     private val accountRepository: Preferences,
-    private val folderRepository: FolderRepository
+    private val folderRepository: FolderRepository,
 ) {
     fun upgradePreferences(preferences: SharedPreferences, version: Int) {
         if (version < 2) rewriteFolderNameToFolderId(preferences)
diff --git a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt
index 07152b746f3..3fa7d71bc1b 100644
--- a/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt
+++ b/app/k9mail/src/main/java/com/fsck/k9/widget/unread/UnreadWidgetRepository.kt
@@ -6,7 +6,7 @@ import android.content.SharedPreferences
 internal class UnreadWidgetRepository(
     private val context: Context,
     private val dataRetriever: UnreadWidgetDataProvider,
-    private val migrations: UnreadWidgetMigrations
+    private val migrations: UnreadWidgetMigrations,
 ) {
 
     fun saveWidgetConfiguration(configuration: UnreadWidgetConfiguration) {
diff --git a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
index bd290e2dff0..9ea0d37bb8a 100644
--- a/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
+++ b/app/k9mail/src/test/java/com/fsck/k9/widget/unread/UnreadWidgetDataProviderTest.kt
@@ -32,7 +32,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() {
         messageCountsProvider,
         defaultFolderStrategy,
         folderRepository,
-        folderNameFormatter
+        folderNameFormatter,
     )
 
     @Test
@@ -40,7 +40,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() {
         val configuration = UnreadWidgetConfiguration(
             appWidgetId = 1,
             accountUuid = SearchAccount.UNIFIED_INBOX,
-            folderId = null
+            folderId = null,
         )
 
         val widgetData = provider.loadUnreadWidgetData(configuration)
@@ -56,7 +56,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() {
         val configuration = UnreadWidgetConfiguration(
             appWidgetId = 3,
             accountUuid = ACCOUNT_UUID,
-            folderId = null
+            folderId = null,
         )
 
         val widgetData = provider.loadUnreadWidgetData(configuration)
@@ -137,7 +137,7 @@ class UnreadWidgetDataProviderTest : AppRobolectricTest() {
             id = FOLDER_ID,
             name = "INBOX",
             type = FolderType.INBOX,
-            isLocalOnly = false
+            isLocalOnly = false,
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt
index aa7f134f7a7..6887ae7eb5e 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo10.kt
@@ -11,7 +11,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo10(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     private val folderKeyPattern = Regex("[^.]+\\..+\\.([^.]+)")
     private val folderSettingKeys = setOf(
@@ -20,7 +20,7 @@ class StorageMigrationTo10(
         "syncMode",
         "pushMode",
         "inTopGroup",
-        "integrate"
+        "integrate",
     )
 
     fun removeSavedFolderSettings() {
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt
index 94a232ac835..6492f3ba965 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo11.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.preferences.GeneralSettingsDescriptions
  */
 class StorageMigrationTo11(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun upgradeMessageViewContentFontSize() {
         val newFontSizeValue = migrationsHelper.readValue(db, "fontSizeMessageViewContentPercent")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt
index 3b5d9703762..7f48c45dd15 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo12.kt
@@ -13,7 +13,7 @@ import com.fsck.k9.preferences.migrations.migration12.WebDavStoreUriDecoder
  */
 class StorageMigrationTo12(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     private val serverSettingsSerializer = ServerSettingsSerializer()
 
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt
index 01b61f67493..916e33ee5e0 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo13.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo13(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun renameHideSpecialAccounts() {
         val hideSpecialAccounts = migrationsHelper.readValue(db, "hideSpecialAccounts")?.toBoolean() ?: false
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt
index c4f38c2e683..d82f4299327 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo14.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.preferences.Protocols
  */
 class StorageMigrationTo14(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     private val serverSettingsSerializer = ServerSettingsSerializer()
 
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt
index e3ab3f05f77..aadf0ca5162 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo15.kt
@@ -10,7 +10,7 @@ private const val MINIMUM_IDLE_REFRESH_MINUTES = 2
  */
 class StorageMigrationTo15(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteIdleRefreshInterval() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt
index c6418ba4bd0..9afe86c80fb 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo16.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo16(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun changeDefaultRegisteredNameColor() {
         val registeredNameColorValue = migrationsHelper.readValue(db, "registeredNameColor")?.toInt()
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt
index 2f4dc7de3f9..3d11dd17ffc 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo17.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo17(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteNotificationLightSettings() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt
index 15a98f95217..b69ff2fe30b 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo18.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo18(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteImapCompressionSettings() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt
index 5a35b835fc6..11c6e5dc78d 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo19.kt
@@ -16,7 +16,7 @@ import com.squareup.moshi.Types
  */
 class StorageMigrationTo19(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun markGmailAccounts() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
@@ -36,7 +36,7 @@ class StorageMigrationTo19(
 
         val moshi = Moshi.Builder().build()
         val adapter = moshi.adapter<Map<String, Any?>>(
-            Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java)
+            Types.newParameterizedType(Map::class.java, String::class.java, Any::class.java),
         )
 
         val incomingServerSettings = adapter.fromJson(incomingServerSettingsJson) ?: return
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt
index e0e3062e974..9155eabe8a2 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo3.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo3(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteFolderNone() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt
index 066306bb4ba..c7876eac29c 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo4.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo4(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun insertSpecialFolderSelectionValues() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt
index 318c54a5a80..5a3b6edf03b 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo5.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo5(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun fixMailCheckFrequencies() {
         val accountUuidsListValue = migrationsHelper.readValue(db, "accountUuids")
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt
index cbab8404783..38a8a86c070 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo6.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo6(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun performLegacyMigrations() {
         rewriteTheme()
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt
index 70c9675ddea..ce234c104fb 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo7.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo7(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteEnumOrdinalsToNames() {
         rewriteTheme()
diff --git a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt
index 7ac8e8ec2fc..7d5539ed407 100644
--- a/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt
+++ b/app/storage/src/main/java/com/fsck/k9/preferences/migrations/StorageMigrationTo8.kt
@@ -7,7 +7,7 @@ import android.database.sqlite.SQLiteDatabase
  */
 class StorageMigrationTo8(
     private val db: SQLiteDatabase,
-    private val migrationsHelper: StorageMigrationsHelper
+    private val migrationsHelper: StorageMigrationsHelper,
 ) {
     fun rewriteTheme() {
         val theme = migrationsHelper.readValue(db, "theme")
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt
index 5c68509090b..9123a6dc47c 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/AttachmentFileManager.kt
@@ -9,7 +9,7 @@ import timber.log.Timber
 
 internal class AttachmentFileManager(
     private val storageManager: StorageManager,
-    private val accountUuid: String
+    private val accountUuid: String,
 ) {
     fun deleteFile(messagePartId: Long) {
         val file = getAttachmentFile(messagePartId)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt
index 37e0a874525..043e18311ee 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/CheckFolderOperations.kt
@@ -9,12 +9,12 @@ internal class CheckFolderOperations(private val lockableDatabase: LockableDatab
 
             performChunkedOperation(
                 arguments = folderIds,
-                argumentTransformation = Long::toString
+                argumentTransformation = Long::toString,
             ) { selectionSet, selectionArguments ->
                 if (allIncludedInUnifiedInbox) {
                     database.rawQuery(
                         "SELECT COUNT(id) FROM folders WHERE integrate = 1 AND id $selectionSet",
-                        selectionArguments
+                        selectionArguments,
                     ).use { cursor ->
                         if (cursor.moveToFirst()) {
                             val count = cursor.getInt(0)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt
index 87303626df1..2d008140968 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperations.kt
@@ -4,7 +4,7 @@ internal fun <T> performChunkedOperation(
     arguments: Collection<T>,
     argumentTransformation: (T) -> String,
     chunkSize: Int = 500,
-    operation: (selectionSet: String, selectionArguments: Array<String>) -> Unit
+    operation: (selectionSet: String, selectionArguments: Array<String>) -> Unit,
 ) {
     require(arguments.isNotEmpty()) { "'arguments' must not be empty" }
     require(chunkSize in 1..1000) { "'chunkSize' needs to be in 1..1000" }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt
index a01b2a3d4d6..6a9257785fc 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/CopyMessageOperations.kt
@@ -13,7 +13,7 @@ import java.util.UUID
 internal class CopyMessageOperations(
     private val lockableDatabase: LockableDatabase,
     private val attachmentFileManager: AttachmentFileManager,
-    private val threadMessageOperations: ThreadMessageOperations
+    private val threadMessageOperations: ThreadMessageOperations,
 ) {
     fun copyMessage(messageId: Long, destinationFolderId: Long): Long {
         return lockableDatabase.execute(true) { database ->
@@ -28,14 +28,14 @@ internal class CopyMessageOperations(
     private fun copyMessage(
         database: SQLiteDatabase,
         messageId: Long,
-        destinationFolderId: Long
+        destinationFolderId: Long,
     ): Long {
         val rootMessagePart = copyMessageParts(database, messageId)
 
         val threadInfo = threadMessageOperations.doMessageThreading(
             database,
             folderId = destinationFolderId,
-            threadHeaders = threadMessageOperations.getMessageThreadHeaders(database, messageId)
+            threadHeaders = threadMessageOperations.getMessageThreadHeaders(database, messageId),
         )
 
         return if (threadInfo?.messageId != null) {
@@ -44,14 +44,14 @@ internal class CopyMessageOperations(
                 sourceMessageId = messageId,
                 destinationMessageId = threadInfo.messageId,
                 destinationFolderId,
-                rootMessagePart
+                rootMessagePart,
             )
         } else {
             val newMessageId = insertMessageRow(
                 database,
                 sourceMessageId = messageId,
                 destinationFolderId = destinationFolderId,
-                rootMessagePartId = rootMessagePart
+                rootMessagePartId = rootMessagePart,
             )
 
             if (threadInfo?.threadId == null) {
@@ -59,7 +59,7 @@ internal class CopyMessageOperations(
                     database,
                     newMessageId,
                     threadInfo?.rootId,
-                    threadInfo?.parentId
+                    threadInfo?.parentId,
                 )
             }
 
@@ -94,7 +94,7 @@ JOIN message_parts ON (message_parts.root = messages.message_part_id)
 WHERE messages.id = ? 
 ORDER BY message_parts.seq
             """,
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             if (!cursor.moveToNext()) error("No message part found for message with ID $messageId")
 
@@ -104,7 +104,7 @@ ORDER BY message_parts.seq
                 database = database,
                 databaseMessagePart = rootMessagePart,
                 newRootId = null,
-                newParentId = -1
+                newParentId = -1,
             )
 
             val messagePartIdMapping = mutableMapOf<Long, Long>()
@@ -117,7 +117,7 @@ ORDER BY message_parts.seq
                     database = database,
                     databaseMessagePart = messagePart,
                     newRootId = rootMessagePartId,
-                    newParentId = messagePartIdMapping[messagePart.parent] ?: error("parent ID not found")
+                    newParentId = messagePartIdMapping[messagePart.parent] ?: error("parent ID not found"),
                 )
             }
 
@@ -129,7 +129,7 @@ ORDER BY message_parts.seq
         database: SQLiteDatabase,
         databaseMessagePart: DatabaseMessagePart,
         newRootId: Long?,
-        newParentId: Long
+        newParentId: Long,
     ): Long {
         val values = ContentValues().apply {
             put("type", databaseMessagePart.type)
@@ -165,7 +165,7 @@ ORDER BY message_parts.seq
         sourceMessageId: Long,
         destinationMessageId: Long,
         destinationFolderId: Long,
-        rootMessagePartId: Long
+        rootMessagePartId: Long,
     ): Long {
         val values = readMessageToContentValues(database, sourceMessageId, destinationFolderId, rootMessagePartId)
 
@@ -177,7 +177,7 @@ ORDER BY message_parts.seq
         database: SQLiteDatabase,
         sourceMessageId: Long,
         destinationFolderId: Long,
-        rootMessagePartId: Long
+        rootMessagePartId: Long,
     ): Long {
         val values = readMessageToContentValues(database, sourceMessageId, destinationFolderId, rootMessagePartId)
 
@@ -188,7 +188,7 @@ ORDER BY message_parts.seq
         database: SQLiteDatabase,
         sourceMessageId: Long,
         destinationFolderId: Long,
-        rootMessagePartId: Long
+        rootMessagePartId: Long,
     ): ContentValues {
         val values = readMessageToContentValues(database, sourceMessageId)
 
@@ -203,7 +203,7 @@ ORDER BY message_parts.seq
         database.execSQL(
             "INSERT OR REPLACE INTO messages_fulltext (docid, fulltext) " +
                 "SELECT ?, fulltext FROM messages_fulltext WHERE docid = ?",
-            arrayOf(newMessageId.toString(), messageId.toString())
+            arrayOf(newMessageId.toString(), messageId.toString()),
         )
     }
 
@@ -232,13 +232,13 @@ ORDER BY message_parts.seq
                 "flagged",
                 "answered",
                 "forwarded",
-                "encryption_type"
+                "encryption_type",
             ),
             "id = ?",
             arrayOf(messageId.toString()),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             if (!cursor.moveToNext()) error("Message with ID $messageId not found")
 
@@ -288,7 +288,7 @@ ORDER BY message_parts.seq
             epilogue = getBlobOrNull(14),
             boundary = getStringOrNull(15),
             contentId = getStringOrNull(16),
-            serverExtra = getStringOrNull(17)
+            serverExtra = getStringOrNull(17),
         )
     }
 }
@@ -311,5 +311,5 @@ private class DatabaseMessagePart(
     val epilogue: ByteArray?,
     val boundary: String?,
     val contentId: String?,
-    val serverExtra: String?
+    val serverExtra: String?,
 )
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt
index 1558190c6b4..93debbab1d4 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DatabaseOperations.kt
@@ -7,7 +7,7 @@ import timber.log.Timber
 internal class DatabaseOperations(
     private val lockableDatabase: LockableDatabase,
     val storageManager: StorageManager,
-    val accountUuid: String
+    val accountUuid: String,
 ) {
     fun getSize(): Long {
         val storageProviderId = lockableDatabase.storageProviderId
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt
index c05c27fc3eb..223d825d57c 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteFolderOperations.kt
@@ -5,7 +5,7 @@ import com.fsck.k9.mailstore.LockableDatabase
 
 internal class DeleteFolderOperations(
     private val lockableDatabase: LockableDatabase,
-    private val attachmentFileManager: AttachmentFileManager
+    private val attachmentFileManager: AttachmentFileManager,
 ) {
     fun deleteFolders(folderServerIds: List<String>) {
         lockableDatabase.execute(true) { db ->
@@ -29,7 +29,7 @@ JOIN message_parts ON (
 ) 
 WHERE folders.server_id = ?
             """,
-            arrayOf(folderServerId)
+            arrayOf(folderServerId),
         ).use { cursor ->
             while (cursor.moveToNext()) {
                 val messagePartId = cursor.getLong(0)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt
index d39150e9925..989337fab4b 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/DeleteMessageOperations.kt
@@ -6,7 +6,7 @@ import com.fsck.k9.mailstore.LockableDatabase
 
 internal class DeleteMessageOperations(
     private val lockableDatabase: LockableDatabase,
-    private val attachmentFileManager: AttachmentFileManager
+    private val attachmentFileManager: AttachmentFileManager,
 ) {
     fun destroyMessages(folderId: Long, messageServerIds: Collection<String>) {
         for (messageServerId in messageServerIds) {
@@ -44,13 +44,13 @@ LEFT JOIN threads threads1 ON (threads1.message_id = messages.id)
 LEFT JOIN threads threads2 ON (threads2.parent = threads1.id) 
 WHERE folder_id = ? AND uid = ?
                 """,
-                arrayOf(folderId.toString(), messageServerId)
+                arrayOf(folderId.toString(), messageServerId),
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     MessageData(
                         messageId = cursor.getLong(0),
                         messagePartId = cursor.getLong(1),
-                        hasThreadChildren = !cursor.isNull(2) && cursor.getInt(2) > 0
+                        hasThreadChildren = !cursor.isNull(2) && cursor.getInt(2) > 0,
                     )
                 } else {
                     null
@@ -67,7 +67,7 @@ WHERE folder_id = ? AND uid = ?
             arrayOf(rootMessagePartId.toString()),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             while (cursor.moveToNext()) {
                 val messagePartId = cursor.getLong(0)
@@ -134,7 +134,7 @@ JOIN threads threads2 ON (threads1.parent = threads2.id)
 JOIN messages ON (threads2.message_id = messages.id AND messages.empty = 1) 
 WHERE threads1.message_id = ?
             """,
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             if (cursor.moveToFirst() && !cursor.isNull(0)) {
                 cursor.getLong(0)
@@ -156,7 +156,7 @@ FROM threads threads1
 JOIN threads threads2 ON (threads2.parent = threads1.id) 
 WHERE threads1.message_id = ?
             """,
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             cursor.moveToFirst() && !cursor.isNull(0) && cursor.getLong(0) > 0L
         }
@@ -166,5 +166,5 @@ WHERE threads1.message_id = ?
 private data class MessageData(
     val messageId: Long,
     val messagePartId: Long,
-    val hasThreadChildren: Boolean
+    val hasThreadChildren: Boolean,
 )
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt
index 3abb91d1778..a9e4473ef77 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/FlagMessageOperations.kt
@@ -47,7 +47,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab
         lockableDatabase.execute(true) { database ->
             performChunkedOperation(
                 arguments = messageIds,
-                argumentTransformation = Long::toString
+                argumentTransformation = Long::toString,
             ) { selectionSet, selectionArguments ->
                 database.update("messages", contentValues, "id $selectionSet", selectionArguments)
             }
@@ -69,7 +69,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab
                 "messages",
                 values,
                 "folder_id = ? AND uid = ?",
-                arrayOf(folderId.toString(), messageServerId)
+                arrayOf(folderId.toString(), messageServerId),
             )
         }
     }
@@ -82,7 +82,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab
             arrayOf(folderId.toString(), messageServerId),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             if (!cursor.moveToFirst()) error("Message not found $folderId:$messageServerId")
 
@@ -104,7 +104,7 @@ internal class FlagMessageOperations(private val lockableDatabase: LockableDatab
                 "messages",
                 values,
                 "folder_id = ? AND uid = ?",
-                arrayOf(folderId.toString(), messageServerId)
+                arrayOf(folderId.toString(), messageServerId),
             )
         }
     }
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 638d4771f23..3f168ab409e 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
@@ -22,7 +22,7 @@ class K9MessageStore(
     database: LockableDatabase,
     storageManager: StorageManager,
     basicPartInfoExtractor: BasicPartInfoExtractor,
-    accountUuid: String
+    accountUuid: String,
 ) : MessageStore {
     private val attachmentFileManager = AttachmentFileManager(storageManager, accountUuid)
     private val threadMessageOperations = ThreadMessageOperations()
@@ -30,7 +30,7 @@ class K9MessageStore(
         database,
         attachmentFileManager,
         basicPartInfoExtractor,
-        threadMessageOperations
+        threadMessageOperations,
     )
     private val copyMessageOperations = CopyMessageOperations(database, attachmentFileManager, threadMessageOperations)
     private val moveMessageOperations = MoveMessageOperations(database, threadMessageOperations)
@@ -107,7 +107,7 @@ class K9MessageStore(
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<out T?>
+        messageMapper: MessageMapper<out T?>,
     ): List<T> {
         return retrieveMessageListOperations.getMessages(selection, selectionArgs, sortOrder, messageMapper)
     }
@@ -116,7 +116,7 @@ class K9MessageStore(
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        messageMapper: MessageMapper<out T?>
+        messageMapper: MessageMapper<out T?>,
     ): List<T> {
         return retrieveMessageListOperations.getThreadedMessages(selection, selectionArgs, sortOrder, messageMapper)
     }
@@ -160,7 +160,7 @@ class K9MessageStore(
     override fun <T> getDisplayFolders(
         displayMode: FolderMode,
         outboxFolderId: Long?,
-        mapper: FolderMapper<T>
+        mapper: FolderMapper<T>,
     ): List<T> {
         return retrieveFolderOperations.getDisplayFolders(displayMode, outboxFolderId, mapper)
     }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt
index 02ebdde81ce..11cfa8f103b 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/K9MessageStoreFactory.kt
@@ -11,7 +11,7 @@ import com.fsck.k9.message.extractors.BasicPartInfoExtractor
 class K9MessageStoreFactory(
     private val localStoreProvider: LocalStoreProvider,
     private val storageManager: StorageManager,
-    private val basicPartInfoExtractor: BasicPartInfoExtractor
+    private val basicPartInfoExtractor: BasicPartInfoExtractor,
 ) : MessageStoreFactory {
     override fun create(account: Account): ListenableMessageStore {
         val localStore = localStoreProvider.getInstance(account)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt
index cb2e4e4fad6..2805aeccc27 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/KeyValueStoreOperations.kt
@@ -16,7 +16,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat
                 arrayOf(name),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     cursor.getStringOrNull(0)
@@ -46,7 +46,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat
                 arrayOf(name),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     cursor.getLongOrNull(0)
@@ -76,7 +76,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat
                 arrayOf(name, folderId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     cursor.getStringOrNull(0)
@@ -107,7 +107,7 @@ internal class KeyValueStoreOperations(private val lockableDatabase: LockableDat
                 arrayOf(name, folderId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     cursor.getLongOrNull(0)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt
index 10792153b6f..07536bb40fd 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/MoveMessageOperations.kt
@@ -12,13 +12,14 @@ import timber.log.Timber
 
 internal class MoveMessageOperations(
     private val database: LockableDatabase,
-    private val threadMessageOperations: ThreadMessageOperations
+    private val threadMessageOperations: ThreadMessageOperations,
 ) {
     fun moveMessage(messageId: Long, destinationFolderId: Long): Long {
         Timber.d("Moving message [ID: $messageId] to folder [ID: $destinationFolderId]")
 
         return database.execute(true) { database ->
-            val threadInfo = threadMessageOperations.createOrUpdateParentThreadEntries(database, messageId, destinationFolderId)
+            val threadInfo =
+                threadMessageOperations.createOrUpdateParentThreadEntries(database, messageId, destinationFolderId)
             val destinationMessageId = createMessageEntry(database, messageId, destinationFolderId, threadInfo)
             threadMessageOperations.createThreadEntryIfNecessary(database, destinationMessageId, threadInfo)
 
@@ -41,7 +42,7 @@ internal class MoveMessageOperations(
         database: SQLiteDatabase,
         messageId: Long,
         destinationFolderId: Long,
-        threadInfo: ThreadInfo?
+        threadInfo: ThreadInfo?,
     ): Long {
         val destinationUid = K9.LOCAL_UID_PREFIX + UUID.randomUUID().toString()
 
@@ -51,13 +52,13 @@ internal class MoveMessageOperations(
                 "subject", "date", "flags", "sender_list", "to_list", "cc_list", "bcc_list", "reply_to_list",
                 "attachment_count", "internal_date", "message_id", "preview_type", "preview", "mime_type",
                 "normalized_subject_hash", "read", "flagged", "answered", "forwarded", "message_part_id",
-                "encryption_type"
+                "encryption_type",
             ),
             "id = ?",
             arrayOf(messageId.toString()),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             if (!cursor.moveToFirst()) {
                 error("Couldn't find local message [ID: $messageId]")
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt
index cd18b675adb..5081d68a840 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveFolderOperations.kt
@@ -20,7 +20,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa
         return getFolder(
             selection = "id = ?",
             selectionArguments = arrayOf(folderId.toString()),
-            mapper = mapper
+            mapper = mapper,
         )
     }
 
@@ -28,7 +28,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa
         return getFolder(
             selection = "server_id = ?",
             selectionArguments = arrayOf(folderServerId),
-            mapper = mapper
+            mapper = mapper,
         )
     }
 
@@ -41,7 +41,7 @@ internal class RetrieveFolderOperations(private val lockableDatabase: LockableDa
                 selectionArguments,
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     val cursorFolderAccessor = CursorFolderAccessor(cursor)
@@ -127,7 +127,7 @@ $displayModeSelection
                 arrayOf(folderServerId),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) cursor.getLong(0) else null
             }
@@ -143,7 +143,7 @@ $displayModeSelection
                 arrayOf(folderId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) cursor.getString(0) else null
             }
@@ -154,7 +154,7 @@ $displayModeSelection
         return lockableDatabase.execute(false) { db ->
             db.rawQuery(
                 "SELECT COUNT(id) FROM messages WHERE empty = 0 AND deleted = 0 AND folder_id = ?",
-                arrayOf(folderId.toString())
+                arrayOf(folderId.toString()),
             ).use { cursor ->
                 if (cursor.moveToFirst()) cursor.getInt(0) else 0
             }
@@ -165,7 +165,7 @@ $displayModeSelection
         return lockableDatabase.execute(false) { db ->
             db.rawQuery(
                 "SELECT COUNT(id) FROM messages WHERE empty = 0 AND deleted = 0 AND read = 0 AND folder_id = ?",
-                arrayOf(folderId.toString())
+                arrayOf(folderId.toString()),
             ).use { cursor ->
                 if (cursor.moveToFirst()) cursor.getInt(0) else 0
             }
@@ -280,5 +280,5 @@ private val FOLDER_COLUMNS = arrayOf(
     "push_class",
     "visible_limit",
     "more_messages",
-    "last_updated"
+    "last_updated",
 )
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt
index 01b0d93e53f..cf5f353b719 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/RetrieveMessageListOperations.kt
@@ -15,7 +15,7 @@ internal class RetrieveMessageListOperations(private val lockableDatabase: Locka
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        mapper: MessageMapper<out T?>
+        mapper: MessageMapper<out T?>,
     ): List<T> {
         return lockableDatabase.execute(false) { database ->
             database.rawQuery(
@@ -46,7 +46,7 @@ WHERE
   AND empty = 0 AND deleted = 0
 ORDER BY $sortOrder
                 """,
-                selectionArgs
+                selectionArgs,
             ).use { cursor ->
                 val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = false)
                 buildList {
@@ -65,7 +65,7 @@ ORDER BY $sortOrder
         selection: String,
         selectionArgs: Array<String>,
         sortOrder: String,
-        mapper: MessageMapper<out T?>
+        mapper: MessageMapper<out T?>,
     ): List<T> {
         val orderBy = SqlQueryBuilder.addPrefixToSelection(AGGREGATED_MESSAGES_COLUMNS, "aggregated.", sortOrder)
 
@@ -126,7 +126,7 @@ JOIN folders ON (folders.id = messages.folder_id)
 GROUP BY threads.root
 ORDER BY $orderBy
                 """,
-                selectionArgs
+                selectionArgs,
             ).use { cursor ->
                 val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = true)
                 buildList {
@@ -171,7 +171,7 @@ WHERE
   AND empty = 0 AND deleted = 0
 ORDER BY $sortOrder
                 """,
-                arrayOf(threadId.toString())
+                arrayOf(threadId.toString()),
             ).use { cursor ->
                 val cursorMessageAccessor = CursorMessageAccessor(cursor, includesThreadCount = false)
                 buildList {
@@ -238,5 +238,5 @@ private val AGGREGATED_MESSAGES_COLUMNS = arrayOf(
     "read",
     "flagged",
     "answered",
-    "forwarded"
+    "forwarded",
 )
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 49e39e7ab81..1943551059d 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
@@ -22,7 +22,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                 arrayOf(messageId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     cursor.getString(0)
@@ -40,7 +40,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
             val databaseIdToServerIdMapping = mutableMapOf<Long, String>()
             performChunkedOperation(
                 arguments = messageIds,
-                argumentTransformation = Long::toString
+                argumentTransformation = Long::toString,
             ) { selectionSet, selectionArguments ->
                 database.query(
                     "messages",
@@ -49,7 +49,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                     selectionArguments,
                     null,
                     null,
-                    null
+                    null,
                 ).use { cursor ->
                     while (cursor.moveToNext()) {
                         val databaseId = cursor.getLong(0)
@@ -69,7 +69,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
             database.rawQuery(
                 "SELECT uid FROM messages" +
                     " WHERE empty = 0 AND deleted = 0 AND folder_id = ? AND uid NOT LIKE '${K9.LOCAL_UID_PREFIX}%'",
-                arrayOf(folderId.toString())
+                arrayOf(folderId.toString()),
             ).use { cursor ->
                 val result = mutableSetOf<String>()
                 while (cursor.moveToNext()) {
@@ -90,7 +90,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                 arrayOf(folderId.toString(), messageServerId),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 cursor.moveToFirst()
             }
@@ -106,7 +106,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                 arrayOf(folderId.toString(), messageServerId),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (!cursor.moveToFirst()) error("Couldn't read flags for $folderId:$messageServerId")
 
@@ -141,7 +141,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
             database.rawQuery(
                 "SELECT uid, date FROM messages" +
                     " WHERE empty = 0 AND deleted = 0 AND folder_id = ? AND uid NOT LIKE '${K9.LOCAL_UID_PREFIX}%'",
-                arrayOf(folderId.toString())
+                arrayOf(folderId.toString()),
             ).use { cursor ->
                 val result = mutableMapOf<String, Long?>()
                 while (cursor.moveToNext()) {
@@ -158,7 +158,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
         return lockableDatabase.execute(false) { database ->
             database.rawQuery(
                 "SELECT MIN(date) FROM messages WHERE folder_id = ?",
-                arrayOf(folderId.toString())
+                arrayOf(folderId.toString()),
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     val timestamp = cursor.getLong(0)
@@ -176,7 +176,7 @@ internal class RetrieveMessageOperations(private val lockableDatabase: LockableD
                 "SELECT message_parts.header FROM messages" +
                     " LEFT JOIN message_parts ON (messages.message_part_id = message_parts.id)" +
                     " WHERE messages.folder_id = ? AND messages.uid = ?",
-                arrayOf(folderId.toString(), messageServerId)
+                arrayOf(folderId.toString(), messageServerId),
             ).use { cursor ->
                 if (!cursor.moveToFirst()) throw MessageNotFoundException(folderId, messageServerId)
 
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt
index c6e95bc7b20..01f9ddcf826 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/SaveMessageOperations.kt
@@ -41,7 +41,7 @@ internal class SaveMessageOperations(
     private val lockableDatabase: LockableDatabase,
     private val attachmentFileManager: AttachmentFileManager,
     private val partInfoExtractor: BasicPartInfoExtractor,
-    private val threadMessageOperations: ThreadMessageOperations
+    private val threadMessageOperations: ThreadMessageOperations,
 ) {
     fun saveRemoteMessage(folderId: Long, messageServerId: String, messageData: SaveMessageData) {
         saveMessage(folderId, messageServerId, messageData)
@@ -70,7 +70,7 @@ internal class SaveMessageOperations(
                 messageServerId,
                 existingMessageId = messageId,
                 existingRootMessagePartId = rootMessagePartId,
-                messageData
+                messageData,
             )
 
             messageId
@@ -90,7 +90,7 @@ internal class SaveMessageOperations(
                     messageServerId,
                     existingMessageId,
                     existingRootMessagePartId,
-                    messageData
+                    messageData,
                 )
 
                 existingMessageId
@@ -105,7 +105,7 @@ internal class SaveMessageOperations(
         folderId: Long,
         messageServerId: String,
         message: Message,
-        messageData: SaveMessageData
+        messageData: SaveMessageData,
     ): Long {
         val threadInfo = threadMessageOperations.doMessageThreading(database, folderId, message.toThreadHeaders())
 
@@ -116,7 +116,7 @@ internal class SaveMessageOperations(
             messageServerId,
             rootMessagePartId,
             messageData,
-            replaceMessageId = threadInfo?.messageId
+            replaceMessageId = threadInfo?.messageId,
         )
 
         if (threadInfo?.threadId == null) {
@@ -134,7 +134,7 @@ internal class SaveMessageOperations(
         messageServerId: String,
         existingMessageId: Long,
         existingRootMessagePartId: Long?,
-        messageData: SaveMessageData
+        messageData: SaveMessageData,
     ) {
         if (existingRootMessagePartId != null) {
             deleteMessagePartsAndDataFromDisk(database, existingRootMessagePartId)
@@ -147,7 +147,7 @@ internal class SaveMessageOperations(
             messageServerId,
             rootMessagePartId,
             messageData,
-            replaceMessageId = existingMessageId
+            replaceMessageId = existingMessageId,
         )
 
         createOrReplaceFulltextEntry(database, messageId, messageData)
@@ -175,7 +175,7 @@ internal class SaveMessageOperations(
         database: SQLiteDatabase,
         partContainer: PartContainer,
         rootId: Long?,
-        order: Int
+        order: Int,
     ): Long {
         val part = partContainer.part
         val values = ContentValues().apply {
@@ -192,7 +192,7 @@ internal class SaveMessageOperations(
         database: SQLiteDatabase,
         values: ContentValues,
         part: Part,
-        existingMessagePartId: Long?
+        existingMessagePartId: Long?,
     ): Long {
         val headerBytes = getHeaderBytes(part)
         values.put("mime_type", part.mimeType)
@@ -378,7 +378,7 @@ internal class SaveMessageOperations(
         messageServerId: String,
         rootMessagePartId: Long,
         messageData: SaveMessageData,
-        replaceMessageId: Long?
+        replaceMessageId: Long?,
     ): Long {
         val message = messageData.message
 
@@ -450,7 +450,7 @@ internal class SaveMessageOperations(
                 arrayOf(folderId.toString(), messageServerId),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (cursor.moveToFirst()) {
                     val messageId = cursor.getLong(0)
@@ -472,7 +472,7 @@ internal class SaveMessageOperations(
                 arrayOf(folderId.toString(), messageId.toString()),
                 null,
                 null,
-                null
+                null,
             ).use { cursor ->
                 if (!cursor.moveToFirst()) error("Local message not found $folderId:$messageId")
 
@@ -496,7 +496,7 @@ internal class SaveMessageOperations(
             arrayOf(rootMessagePartId.toString()),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             while (cursor.moveToNext()) {
                 val messagePartId = cursor.getLong(0)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt
index e032756abcc..35435cbe0f9 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/ThreadMessageOperations.kt
@@ -11,7 +11,7 @@ internal class ThreadMessageOperations {
     fun createOrUpdateParentThreadEntries(
         database: SQLiteDatabase,
         messageId: Long,
-        destinationFolderId: Long
+        destinationFolderId: Long,
     ): ThreadInfo? {
         val threadHeaders = getMessageThreadHeaders(database, messageId)
         return doMessageThreading(database, destinationFolderId, threadHeaders)
@@ -25,7 +25,7 @@ FROM messages
 LEFT JOIN message_parts ON (messages.message_part_id = message_parts.id) 
 WHERE messages.id = ?
             """,
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             if (!cursor.moveToFirst()) error("Message not found: $messageId")
 
@@ -130,7 +130,7 @@ WHERE messages.id = ?
         folderId: Long,
         messageIdHeader: String,
         rootId: Long?,
-        parentId: Long?
+        parentId: Long?,
     ): Long {
         val messageValues = ContentValues().apply {
             put("message_id", messageIdHeader)
@@ -151,7 +151,7 @@ WHERE messages.id = ?
         db: SQLiteDatabase,
         folderId: Long,
         messageIdHeader: String?,
-        onlyEmpty: Boolean
+        onlyEmpty: Boolean,
     ): ThreadInfo? {
         if (messageIdHeader == null) return null
 
@@ -165,7 +165,7 @@ ${if (onlyEmpty) "AND m.empty = 1 " else ""}
 ORDER BY m.id 
 LIMIT 1
             """,
-            arrayOf(folderId.toString(), messageIdHeader)
+            arrayOf(folderId.toString(), messageIdHeader),
         ).use { cursor ->
             if (cursor.moveToFirst()) {
                 val threadId = cursor.getLong(0)
@@ -182,7 +182,7 @@ LIMIT 1
     private fun getThreadRoot(database: SQLiteDatabase, threadId: Long): Long {
         return database.rawQuery(
             "SELECT root FROM threads WHERE id = ?",
-            arrayOf(threadId.toString())
+            arrayOf(threadId.toString()),
         ).use { cursor ->
             if (cursor.moveToFirst()) {
                 cursor.getLong(0)
@@ -205,19 +205,19 @@ internal data class ThreadInfo(
     val threadId: Long?,
     val messageId: Long?,
     val rootId: Long,
-    val parentId: Long?
+    val parentId: Long?,
 )
 
 internal data class ThreadHeaders(
     val messageIdHeader: String?,
     val inReplyToHeader: String?,
-    val referencesHeader: String?
+    val referencesHeader: String?,
 )
 
 internal fun Message.toThreadHeaders(): ThreadHeaders {
     return ThreadHeaders(
         messageIdHeader = messageId,
         inReplyToHeader = getHeader("In-Reply-To").firstOrNull(),
-        referencesHeader = getHeader("References").firstOrNull()
+        referencesHeader = getHeader("References").firstOrNull(),
     )
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt b/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt
index 9c5891ee069..6889ef870ff 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/messages/UpdateMessageOperations.kt
@@ -15,7 +15,7 @@ internal class UpdateMessageOperations(private val lockableDatabase: LockableDat
                 "messages",
                 values,
                 "folder_id = ? AND uid = ?",
-                arrayOf(folderId.toString(), messageServerId)
+                arrayOf(folderId.toString(), messageServerId),
             )
         }
     }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt
index d79117aed00..9eb4c51105b 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo64.kt
@@ -10,7 +10,7 @@ internal object MigrationTo64 {
                 "name TEXT NOT NULL PRIMARY KEY, " +
                 "value_text TEXT, " +
                 "value_integer INTEGER " +
-                ")"
+                ")",
         )
 
         db.execSQL(
@@ -20,7 +20,7 @@ internal object MigrationTo64 {
                 "value_text TEXT, " +
                 "value_integer INTEGER, " +
                 "PRIMARY KEY (folder_id, name)" +
-                ")"
+                ")",
         )
 
         db.execSQL(
@@ -28,7 +28,7 @@ internal object MigrationTo64 {
                 "BEFORE DELETE ON folders " +
                 "BEGIN " +
                 "DELETE FROM folder_extra_values WHERE old.id = folder_id; " +
-                "END;"
+                "END;",
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt
index 1c3774c9b94..622476454c7 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo68.kt
@@ -16,7 +16,7 @@ internal object MigrationTo68 {
                 "send_state TEXT," +
                 "number_of_send_attempts INTEGER DEFAULT 0," +
                 "error_timestamp INTEGER DEFAULT 0," +
-                "error TEXT)"
+                "error TEXT)",
         )
     }
 
@@ -27,7 +27,7 @@ internal object MigrationTo68 {
               SELECT messages.id, 'ready' FROM folders
                 JOIN messages ON (folders.id = messages.folder_id)
                 WHERE folders.server_id = 'K9MAIL_INTERNAL_OUTBOX'
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt
index 8c041a2d45a..4fbb0074e02 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo70.kt
@@ -37,7 +37,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) {
                 "server_id TEXT, " +
                 "local_only INTEGER, " +
                 "type TEXT DEFAULT \"regular\"" +
-                ")"
+                ")",
         )
     }
 
@@ -64,7 +64,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) {
                 local_only,
                 type
             FROM folders_old 
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 
@@ -87,7 +87,7 @@ internal class MigrationTo70(private val db: SQLiteDatabase) {
                 "BEFORE DELETE ON folders " +
                 "BEGIN " +
                 "DELETE FROM folder_extra_values WHERE old.id = folder_id; " +
-                "END;"
+                "END;",
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt
index df01e946873..966175fc97b 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo71.kt
@@ -6,19 +6,19 @@ internal class MigrationTo71(private val db: SQLiteDatabase) {
     fun cleanUpFolderClass() {
         db.execSQL(
             "UPDATE folders SET poll_class = 'NO_CLASS' " +
-                "WHERE poll_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')"
+                "WHERE poll_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')",
         )
         db.execSQL(
             "UPDATE folders SET push_class = 'NO_CLASS' " +
-                "WHERE push_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')"
+                "WHERE push_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')",
         )
         db.execSQL(
             "UPDATE folders SET display_class = 'NO_CLASS' " +
-                "WHERE display_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')"
+                "WHERE display_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')",
         )
         db.execSQL(
             "UPDATE folders SET notify_class = 'NO_CLASS' " +
-                "WHERE notify_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')"
+                "WHERE notify_class NOT IN ('NO_CLASS', 'INHERITED', 'FIRST_CLASS', 'SECOND_CLASS')",
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt
index 896b67525a8..dff2c904998 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo73.kt
@@ -25,7 +25,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
         "delete" to moshi.adapter(LegacyPendingDelete::class.java),
         "expunge" to moshi.adapter(LegacyPendingExpunge::class.java),
         "move_or_copy" to moshi.adapter(LegacyPendingMoveOrCopy::class.java),
-        "move_and_mark_as_read" to moshi.adapter(LegacyPendingMoveAndMarkAsRead::class.java)
+        "move_and_mark_as_read" to moshi.adapter(LegacyPendingMoveAndMarkAsRead::class.java),
     ).toMap()
 
     fun rewritePendingCommandsToUseFolderIds() {
@@ -36,7 +36,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
     private fun loadPendingCommands(): Map<Long, LegacyPendingCommand> {
         return db.rawQuery(
             "SELECT id, command, data FROM pending_commands WHERE command != 'empty_trash'",
-            null
+            null,
         ).use { cursor ->
             cursor.map {
                 val commandId = cursor.getLong(0)
@@ -81,7 +81,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
                 folderId,
                 legacyPendingCommand.newState,
                 legacyPendingCommand.flag,
-                legacyPendingCommand.uids
+                legacyPendingCommand.uids,
             )
         }
     }
@@ -102,13 +102,13 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
         rewriteOrRemovePendingCommand(
             commandId,
             legacyPendingCommand.srcFolder,
-            legacyPendingCommand.destFolder
+            legacyPendingCommand.destFolder,
         ) { (srcFolderId, destFolderId) ->
             PendingMoveOrCopy.create(
                 srcFolderId,
                 destFolderId,
                 legacyPendingCommand.isCopy,
-                legacyPendingCommand.newUidMap
+                legacyPendingCommand.newUidMap,
             )
         }
     }
@@ -117,7 +117,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
         rewriteOrRemovePendingCommand(
             commandId,
             legacyPendingCommand.srcFolder,
-            legacyPendingCommand.destFolder
+            legacyPendingCommand.destFolder,
         ) { (srcFolderId, destFolderId) ->
             PendingMoveAndMarkAsRead.create(srcFolderId, destFolderId, legacyPendingCommand.newUidMap)
         }
@@ -126,7 +126,7 @@ internal class MigrationTo73(private val db: SQLiteDatabase) {
     private fun rewriteOrRemovePendingCommand(
         commandId: Long,
         vararg folderServerIds: String,
-        convertPendingCommand: (folderIds: List<Long>) -> PendingCommand
+        convertPendingCommand: (folderIds: List<Long>) -> PendingCommand,
     ) {
         val folderIds = folderServerIds.map {
             loadFolderId(it)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt
index 6d45d37eab5..e99b3429dbb 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo74.kt
@@ -95,7 +95,7 @@ internal class MigrationTo74(private val db: SQLiteDatabase, private val account
                 "FROM threads t1 " +
                 "JOIN threads t2 ON (t2.parent = t1.id) " +
                 "WHERE t1.message_id = ?",
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             cursor.moveToFirst() && !cursor.isNull(0) && cursor.getLong(0) > 0L
         }
@@ -108,7 +108,7 @@ internal class MigrationTo74(private val db: SQLiteDatabase, private val account
                 "JOIN threads t2 ON (t1.parent = t2.id) " +
                 "LEFT JOIN messages m ON (t2.message_id = m.id) " +
                 "WHERE t1.message_id = ? AND m.empty = 1",
-            arrayOf(messageId.toString())
+            arrayOf(messageId.toString()),
         ).use { cursor ->
             if (cursor.moveToFirst() && !cursor.isNull(0)) cursor.getLong(0) else -1
         }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt
index e35f5652670..e61d072bd26 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo76.kt
@@ -30,7 +30,8 @@ internal class MigrationTo76(private val db: SQLiteDatabase, private val migrati
         val account = migrationsHelper.account
 
         Timber.v("Cleaning up Outbox folder")
-        val outboxFolderId = account.outboxFolderId ?: createFolder("Outbox", "K9MAIL_INTERNAL_OUTBOX", OUTBOX_FOLDER_TYPE)
+        val outboxFolderId =
+            account.outboxFolderId ?: createFolder("Outbox", "K9MAIL_INTERNAL_OUTBOX", OUTBOX_FOLDER_TYPE)
         deleteOtherOutboxFolders(outboxFolderId)
         account.outboxFolderId = outboxFolderId
 
@@ -90,7 +91,7 @@ internal class MigrationTo76(private val db: SQLiteDatabase, private val migrati
             arrayOf(folderType, excludeFolderId.toString()),
             null,
             null,
-            null
+            null,
         ).use { cursor ->
             cursor.map { cursor.getLong(0) }
         }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt
index 47af752844b..6c8952c84e8 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo79.kt
@@ -15,7 +15,7 @@ internal class MigrationTo79(private val db: SQLiteDatabase) {
                 "DELETE FROM message_parts WHERE root = OLD.message_part_id; " +
                 "DELETE FROM messages_fulltext WHERE docid = OLD.id; " +
                 "DELETE FROM threads WHERE message_id = OLD.id; " +
-                "END"
+                "END",
         )
     }
 }
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt
index 60e67c7cf38..d8b05c52c95 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo81.kt
@@ -13,7 +13,7 @@ internal class MigrationTo81(private val db: SQLiteDatabase) {
                 "message_id INTEGER PRIMARY KEY NOT NULL REFERENCES messages(id) ON DELETE CASCADE," +
                 "notification_id INTEGER UNIQUE," +
                 "timestamp INTEGER NOT NULL" +
-                ")"
+                ")",
         )
 
         db.execSQL("DROP INDEX IF EXISTS notifications_timestamp")
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt
index 8d84acd03c1..b74471cc158 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo82.kt
@@ -18,7 +18,7 @@ internal class MigrationTo82(private val db: SQLiteDatabase) {
                 "FOR EACH ROW WHEN NEW.read = 1 AND NEW.new_message = 1 " +
                 "BEGIN " +
                 "UPDATE messages SET new_message = 0 WHERE ROWID = NEW.ROWID; " +
-                "END"
+                "END",
         )
 
         // Mark messages with existing notifications as "new"
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt
index 47952939d14..42e2ba5f7ac 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo83.kt
@@ -17,7 +17,7 @@ internal class MigrationTo83(private val db: SQLiteDatabase, private val migrati
 
         val highestKnownUids = db.rawQuery(
             "SELECT folder_id, MAX(CAST(uid AS INTEGER)) FROM messages GROUP BY folder_id",
-            null
+            null,
         ).use { cursor ->
             cursor.map {
                 it.getLong(0) to it.getLongOrNull(1)
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt
index c1b2326a4df..d46175e3268 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/migrations/MigrationTo84.kt
@@ -14,7 +14,7 @@ internal class MigrationTo84(private val db: SQLiteDatabase) {
     fun rewriteAddresses() {
         val addressSets = db.rawQuery(
             "SELECT id, to_list, cc_list, bcc_list, reply_to_list, sender_list FROM messages WHERE empty = 0 AND deleted = 0",
-            null
+            null,
         ).use { cursor ->
             cursor.map {
                 val messageId = it.getLong(0)
@@ -24,7 +24,7 @@ internal class MigrationTo84(private val db: SQLiteDatabase) {
                     ccList = it.getStringOrNull(2),
                     bccList = it.getStringOrNull(3),
                     replyToList = it.getStringOrNull(4),
-                    senderList = it.getStringOrNull(5)
+                    senderList = it.getStringOrNull(5),
                 )
             }.toMap()
         }
@@ -55,5 +55,5 @@ private data class AddressSet(
     val ccList: String?,
     val bccList: String?,
     val replyToList: String?,
-    val senderList: String?
+    val senderList: String?,
 )
diff --git a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt b/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt
index 4f3527efa7e..52a38358227 100644
--- a/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt
+++ b/app/storage/src/main/java/com/fsck/k9/storage/notifications/K9NotificationStore.kt
@@ -38,12 +38,12 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti
         database: SQLiteDatabase,
         messageReference: MessageReference,
         notificationId: Int,
-        timestamp: Long
+        timestamp: Long,
     ) {
         database.execSQL(
             "INSERT INTO notifications(message_id, notification_id, timestamp) " +
                 "SELECT id, ?, ? FROM messages WHERE folder_id = ? AND uid = ?",
-            arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid)
+            arrayOf(notificationId, timestamp, messageReference.folderId, messageReference.uid),
         )
     }
 
@@ -51,7 +51,7 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti
         database.execSQL(
             "UPDATE notifications SET notification_id = ? WHERE message_id IN " +
                 "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf(notificationId, messageReference.folderId, messageReference.uid)
+            arrayOf(notificationId, messageReference.folderId, messageReference.uid),
         )
     }
 
@@ -59,14 +59,14 @@ class K9NotificationStore(private val lockableDatabase: LockableDatabase) : Noti
         database.execSQL(
             "UPDATE notifications SET notification_id = NULL WHERE message_id IN " +
                 "(SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf(messageReference.folderId, messageReference.uid)
+            arrayOf(messageReference.folderId, messageReference.uid),
         )
     }
 
     private fun removeNotification(database: SQLiteDatabase, messageReference: MessageReference) {
         database.execSQL(
             "DELETE FROM notifications WHERE message_id IN (SELECT id FROM messages WHERE folder_id = ? AND uid = ?)",
-            arrayOf(messageReference.folderId, messageReference.uid)
+            arrayOf(messageReference.folderId, messageReference.uid),
         )
     }
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt b/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt
index 95898e16dcc..d54347151e6 100644
--- a/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/preferences/StoragePersisterTest.kt
@@ -41,7 +41,7 @@ class StoragePersisterTest : K9RobolectricTest() {
             onSuccess = { map ->
                 assertEquals(1, map.size)
                 assertEquals("y", map["x"])
-            }
+            },
         )
 
         storagePersister.doInTransaction(operationCallback)
@@ -58,7 +58,7 @@ class StoragePersisterTest : K9RobolectricTest() {
             persistOp = { ops ->
                 ops.put("x", "y")
                 throw exception
-            }
+            },
         )
 
         try {
@@ -78,7 +78,7 @@ class StoragePersisterTest : K9RobolectricTest() {
         val operationCallback = prepareCallback(
             before = { map -> map["x"] = "y" },
             persistOp = { ops -> ops.remove("x") },
-            onSuccess = { map -> assertTrue(map.isEmpty()) }
+            onSuccess = { map -> assertTrue(map.isEmpty()) },
         )
 
         storagePersister.doInTransaction(operationCallback)
@@ -91,7 +91,7 @@ class StoragePersisterTest : K9RobolectricTest() {
     fun doInTransaction_before_preserveButNotPersist() {
         val operationCallback = prepareCallback(
             before = { map -> map["x"] = "y" },
-            onSuccess = { map -> assertEquals("y", map["x"]) }
+            onSuccess = { map -> assertEquals("y", map["x"]) },
         )
 
         storagePersister.doInTransaction(operationCallback)
@@ -103,18 +103,20 @@ class StoragePersisterTest : K9RobolectricTest() {
     private fun prepareCallback(
         persistOp: ((StoragePersistOperations) -> Unit)? = null,
         before: ((MutableMap<String, String>) -> Unit)? = null,
-        onSuccess: ((Map<String, String>) -> Unit)? = null
-    ): StoragePersistOperationCallback = spy(object : StoragePersistOperationCallback {
-        override fun beforePersistTransaction(workingStorage: MutableMap<String, String>) {
-            before?.invoke(workingStorage)
-        }
+        onSuccess: ((Map<String, String>) -> Unit)? = null,
+    ): StoragePersistOperationCallback = spy(
+        object : StoragePersistOperationCallback {
+            override fun beforePersistTransaction(workingStorage: MutableMap<String, String>) {
+                before?.invoke(workingStorage)
+            }
 
-        override fun persist(ops: StoragePersistOperations) {
-            persistOp?.invoke(ops)
-        }
+            override fun persist(ops: StoragePersistOperations) {
+                persistOp?.invoke(ops)
+            }
 
-        override fun onPersistTransactionSuccess(workingStorage: Map<String, String>) {
-            onSuccess?.invoke(workingStorage)
-        }
-    })
+            override fun onPersistTransactionSuccess(workingStorage: Map<String, String>) {
+                onSuccess?.invoke(workingStorage)
+            }
+        },
+    )
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
index 5a16c6b8ebb..076a6d17f97 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CheckFolderOperationsTest.kt
@@ -31,7 +31,7 @@ class CheckFolderOperationsTest : RobolectricTest() {
     fun `not all folders included in Unified Inbox`() {
         val folderIds = listOf(
             sqliteDatabase.createFolder(integrate = true),
-            sqliteDatabase.createFolder(integrate = false)
+            sqliteDatabase.createFolder(integrate = false),
         )
 
         val result = checkFolderOperations.areAllIncludedInUnifiedInbox(folderIds)
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt
index f7e08eef09a..f8e90ed1d10 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ChunkedDatabaseOperationsTest.kt
@@ -10,7 +10,7 @@ class ChunkedDatabaseOperationsTest {
         performChunkedOperation(
             arguments = emptyList(),
             argumentTransformation = Int::toString,
-            operation = ::failCallback
+            operation = ::failCallback,
         )
     }
 
@@ -20,7 +20,7 @@ class ChunkedDatabaseOperationsTest {
             arguments = listOf(1),
             argumentTransformation = Int::toString,
             chunkSize = 0,
-            operation = ::failCallback
+            operation = ::failCallback,
         )
     }
 
@@ -30,7 +30,7 @@ class ChunkedDatabaseOperationsTest {
             arguments = listOf(1),
             argumentTransformation = Int::toString,
             chunkSize = 1001,
-            operation = ::failCallback
+            operation = ::failCallback,
         )
     }
 
@@ -40,7 +40,7 @@ class ChunkedDatabaseOperationsTest {
 
         performChunkedOperation(
             arguments = listOf(1),
-            argumentTransformation = Int::toString
+            argumentTransformation = Int::toString,
         ) { selectionSet, selectionArguments ->
             chunks.add(selectionSet to selectionArguments)
             Unit
@@ -60,7 +60,7 @@ class ChunkedDatabaseOperationsTest {
         performChunkedOperation(
             arguments = listOf(1, 2),
             argumentTransformation = Int::toString,
-            chunkSize = 1
+            chunkSize = 1,
         ) { selectionSet, selectionArguments ->
             chunks.add(selectionSet to selectionArguments)
             Unit
@@ -84,7 +84,7 @@ class ChunkedDatabaseOperationsTest {
         performChunkedOperation(
             arguments = (1..14).toList(),
             argumentTransformation = Int::toString,
-            chunkSize = 5
+            chunkSize = 5,
         ) { selectionSet, selectionArguments ->
             chunks.add(selectionSet to selectionArguments)
             Unit
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt
index 2bc018f2989..49268b29f72 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CopyMessageOperationsTest.kt
@@ -28,7 +28,7 @@ class CopyMessageOperationsTest : RobolectricTest() {
     private val copyMessageOperations = CopyMessageOperations(
         lockableDatabase,
         attachmentFileManager,
-        threadMessageOperations
+        threadMessageOperations,
     )
 
     @After
@@ -43,7 +43,7 @@ class CopyMessageOperationsTest : RobolectricTest() {
             dataLocation = DataLocation.CHILD_PART_CONTAINS_DATA,
             mimeType = "multipart/mixed",
             boundary = "--boundary",
-            header = "Message-ID: <msg0002@domain.example>\nIn-Reply-To: <msg0001@domain.example>\n".crlf()
+            header = "Message-ID: <msg0002@domain.example>\nIn-Reply-To: <msg0001@domain.example>\n".crlf(),
         )
         val sourceMessagePartId2 = sqliteDatabase.createMessagePart(
             seq = 1,
@@ -51,14 +51,14 @@ class CopyMessageOperationsTest : RobolectricTest() {
             parent = sourceMessagePartId1,
             mimeType = "text/plain",
             dataLocation = DataLocation.IN_DATABASE,
-            data = "Text part".toByteArray()
+            data = "Text part".toByteArray(),
         )
         val sourceMessagePartId3 = sqliteDatabase.createMessagePart(
             seq = 2,
             root = sourceMessagePartId1,
             parent = sourceMessagePartId1,
             mimeType = "application/octet-stream",
-            dataLocation = DataLocation.ON_DISK
+            dataLocation = DataLocation.ON_DISK,
         )
         attachmentFileManager.getAttachmentFile(sourceMessagePartId3).sink().buffer().use { sink ->
             sink.writeUtf8("Part contents")
@@ -67,18 +67,18 @@ class CopyMessageOperationsTest : RobolectricTest() {
         val messageId1 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = true,
-            messageIdHeader = "<msg0001@domain.example>"
+            messageIdHeader = "<msg0001@domain.example>",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = false,
             messageIdHeader = "<msg0002@domain.example>",
-            messagePartId = sourceMessagePartId1
+            messagePartId = sourceMessagePartId1,
         )
         val messageId3 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = false,
-            messageIdHeader = "<msg0003@domain.example>"
+            messageIdHeader = "<msg0003@domain.example>",
         )
         val threadId1 = sqliteDatabase.createThread(messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1)
@@ -113,8 +113,8 @@ class CopyMessageOperationsTest : RobolectricTest() {
                 id = destinationMessageId,
                 uid = destinationMessage.uid,
                 folderId = 2,
-                messagePartId = destinationMessage.messagePartId
-            )
+                messagePartId = destinationMessage.messagePartId,
+            ),
         )
 
         val messageParts = sqliteDatabase.readMessageParts()
@@ -131,24 +131,24 @@ class CopyMessageOperationsTest : RobolectricTest() {
             sourceMessagePart1.copy(
                 id = destinationMessagePart1.id,
                 root = destinationMessagePart1.id,
-                parent = -1
-            )
+                parent = -1,
+            ),
         )
         assertThat(destinationMessagePart2).isNotIn(setOf(sourceMessagePart1, sourceMessagePart2, sourceMessagePart3))
         assertThat(destinationMessagePart2).isEqualTo(
             sourceMessagePart2.copy(
                 id = destinationMessagePart2.id,
                 root = destinationMessagePart1.id,
-                parent = destinationMessagePart1.id
-            )
+                parent = destinationMessagePart1.id,
+            ),
         )
         assertThat(destinationMessagePart3).isNotIn(setOf(sourceMessagePart1, sourceMessagePart2, sourceMessagePart3))
         assertThat(destinationMessagePart3).isEqualTo(
             sourceMessagePart3.copy(
                 id = destinationMessagePart3.id,
                 root = destinationMessagePart1.id,
-                parent = destinationMessagePart1.id
-            )
+                parent = destinationMessagePart1.id,
+            ),
         )
 
         val files = messagePartDirectory.list()?.toList() ?: emptyList()
@@ -165,7 +165,7 @@ class CopyMessageOperationsTest : RobolectricTest() {
             header = "Message-ID: <msg0002@domain.example>\nIn-Reply-To: <msg0001@domain.example>\n".crlf(),
             mimeType = "text/plain",
             dataLocation = DataLocation.IN_DATABASE,
-            data = "Text part".toByteArray()
+            data = "Text part".toByteArray(),
         )
         attachmentFileManager.getAttachmentFile(sourceMessagePartId).sink().buffer().use { sink ->
             sink.writeUtf8("Part contents")
@@ -175,23 +175,23 @@ class CopyMessageOperationsTest : RobolectricTest() {
             folderId = 1,
             empty = false,
             messageIdHeader = "<msg0002@domain.example>",
-            messagePartId = sourceMessagePartId
+            messagePartId = sourceMessagePartId,
         )
         val destinationMessageId = sqliteDatabase.createMessage(
             folderId = 2,
             empty = true,
-            messageIdHeader = "<msg0002@domain.example>"
+            messageIdHeader = "<msg0002@domain.example>",
         )
         val otherDestinationMessageId = sqliteDatabase.createMessage(
             folderId = 2,
             empty = false,
-            messageIdHeader = "<msg0003@domain.example>"
+            messageIdHeader = "<msg0003@domain.example>",
         )
         val destinationThreadId = sqliteDatabase.createThread(destinationMessageId)
         val otherDestinationThreadId = sqliteDatabase.createThread(
             otherDestinationMessageId,
             root = destinationThreadId,
-            parent = destinationThreadId
+            parent = destinationThreadId,
         )
 
         val resultMessageId = copyMessageOperations.copyMessage(messageId = sourceMessageId, destinationFolderId = 2)
@@ -228,8 +228,8 @@ class CopyMessageOperationsTest : RobolectricTest() {
                 id = destinationMessageId,
                 uid = destinationMessage.uid,
                 folderId = 2,
-                messagePartId = destinationMessage.messagePartId
-            )
+                messagePartId = destinationMessage.messagePartId,
+            ),
         )
 
         val messageParts = sqliteDatabase.readMessageParts()
@@ -241,8 +241,8 @@ class CopyMessageOperationsTest : RobolectricTest() {
             sourceMessagePart.copy(
                 id = destinationMessagePart.id,
                 root = destinationMessagePart.id,
-                parent = -1
-            )
+                parent = -1,
+            ),
         )
     }
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt
index eae3a8e2e26..92c483e85d8 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/CreateFolderOperationsTest.kt
@@ -28,10 +28,10 @@ class CreateFolderOperationsTest : RobolectricTest() {
                         notifyClass = FolderClass.NO_CLASS,
                         pushClass = FolderClass.NO_CLASS,
                         inTopGroup = true,
-                        integrate = false
-                    )
-                )
-            )
+                        integrate = false,
+                    ),
+                ),
+            ),
         )
 
         val folders = sqliteDatabase.readFolders()
@@ -55,8 +55,8 @@ class CreateFolderOperationsTest : RobolectricTest() {
             listOf(
                 createCreateFolderInfo(serverId = "folder1", name = "Inbox"),
                 createCreateFolderInfo(serverId = "folder2", name = "Sent"),
-                createCreateFolderInfo(serverId = "folder3", name = "Trash")
-            )
+                createCreateFolderInfo(serverId = "folder3", name = "Trash"),
+            ),
         )
 
         val folders = sqliteDatabase.readFolders()
@@ -65,8 +65,8 @@ class CreateFolderOperationsTest : RobolectricTest() {
             setOf(
                 "folder1" to "Inbox",
                 "folder2" to "Sent",
-                "folder3" to "Trash"
-            )
+                "folder3" to "Trash",
+            ),
         )
     }
 
@@ -82,8 +82,8 @@ class CreateFolderOperationsTest : RobolectricTest() {
                 notifyClass = FolderClass.INHERITED,
                 pushClass = FolderClass.NO_CLASS,
                 inTopGroup = false,
-                integrate = false
-            )
+                integrate = false,
+            ),
         )
     }
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt
index 2657d1ea5b4..239f357e465 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/DeleteMessageOperationsTest.kt
@@ -34,19 +34,19 @@ class DeleteMessageOperationsTest : RobolectricTest() {
             folderId = folderId,
             uid = "empty1",
             empty = true,
-            messageIdHeader = "msg001@domain.example"
+            messageIdHeader = "msg001@domain.example",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "empty2",
             empty = true,
-            messageIdHeader = "msg002@domain.example"
+            messageIdHeader = "msg002@domain.example",
         )
         val messageId3 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "delete",
             empty = false,
-            messageIdHeader = "msg003@domain.example"
+            messageIdHeader = "msg003@domain.example",
         )
         val threadId1 = sqliteDatabase.createThread(messageId = messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1)
@@ -65,19 +65,19 @@ class DeleteMessageOperationsTest : RobolectricTest() {
             folderId = folderId,
             uid = "empty",
             empty = true,
-            messageIdHeader = "msg001@domain.example"
+            messageIdHeader = "msg001@domain.example",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "child1",
             empty = false,
-            messageIdHeader = "msg002@domain.example"
+            messageIdHeader = "msg002@domain.example",
         )
         val messageId3 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "delete",
             empty = false,
-            messageIdHeader = "msg003@domain.example"
+            messageIdHeader = "msg003@domain.example",
         )
         val threadId1 = sqliteDatabase.createThread(messageId = messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1)
@@ -101,13 +101,13 @@ class DeleteMessageOperationsTest : RobolectricTest() {
             folderId = folderId,
             uid = "parent",
             empty = false,
-            messageIdHeader = "msg001@domain.example"
+            messageIdHeader = "msg001@domain.example",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "delete",
             empty = false,
-            messageIdHeader = "msg002@domain.example"
+            messageIdHeader = "msg002@domain.example",
         )
         val threadId1 = sqliteDatabase.createThread(messageId = messageId1)
         sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1)
@@ -130,7 +130,7 @@ class DeleteMessageOperationsTest : RobolectricTest() {
             folderId = folderId,
             uid = "delete",
             empty = false,
-            messageIdHeader = "msg001@domain.example"
+            messageIdHeader = "msg001@domain.example",
         )
         sqliteDatabase.createThread(messageId = messageId1)
 
@@ -147,13 +147,13 @@ class DeleteMessageOperationsTest : RobolectricTest() {
             folderId = folderId,
             uid = "delete",
             empty = false,
-            messageIdHeader = "msg001@domain.example"
+            messageIdHeader = "msg001@domain.example",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = folderId,
             uid = "child",
             empty = false,
-            messageIdHeader = "msg002@domain.example"
+            messageIdHeader = "msg002@domain.example",
         )
         val threadId1 = sqliteDatabase.createThread(messageId = messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId = messageId2, root = threadId1, parent = threadId1)
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt
index 56d6165496f..6e142bd2a15 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/FolderHelpers.kt
@@ -23,7 +23,7 @@ fun SQLiteDatabase.createFolder(
     visibleLimit: Int = 25,
     status: String? = null,
     flaggedCount: Int = 0,
-    moreMessages: String = "unknown"
+    moreMessages: String = "unknown",
 ): Long {
     val values = ContentValues().apply {
         put("name", name)
@@ -68,7 +68,7 @@ fun SQLiteDatabase.readFolders(): List<FolderEntry> {
                 visibleLimit = cursor.getIntOrNull("visible_limit"),
                 status = cursor.getStringOrNull("status"),
                 flaggedCount = cursor.getIntOrNull("flagged_count"),
-                moreMessages = cursor.getStringOrNull("more_messages")
+                moreMessages = cursor.getStringOrNull("more_messages"),
             )
         }
     }
@@ -91,5 +91,5 @@ data class FolderEntry(
     val visibleLimit: Int?,
     val status: String?,
     val flaggedCount: Int?,
-    val moreMessages: String?
+    val moreMessages: String?,
 )
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt
index e7755e31e20..64098cfd3cf 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueHelpers.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.helper.map
 fun SQLiteDatabase.createExtraValue(
     name: String = "irrelevant",
     text: String? = null,
-    number: Long? = null
+    number: Long? = null,
 ): Long {
     val values = ContentValues().apply {
         put("name", name)
@@ -27,7 +27,7 @@ fun SQLiteDatabase.readExtraValues(): List<ExtraValueEntry> {
             ExtraValueEntry(
                 name = cursor.getStringOrNull("name"),
                 text = cursor.getStringOrNull("value_text"),
-                number = cursor.getLongOrNull("value_integer")
+                number = cursor.getLongOrNull("value_integer"),
             )
         }
     }
@@ -36,14 +36,14 @@ fun SQLiteDatabase.readExtraValues(): List<ExtraValueEntry> {
 data class ExtraValueEntry(
     val name: String?,
     val text: String?,
-    val number: Long?
+    val number: Long?,
 )
 
 fun SQLiteDatabase.createFolderExtraValue(
     folderId: Long,
     name: String = "irrelevant",
     text: String? = null,
-    number: Long? = null
+    number: Long? = null,
 ): Long {
     val values = ContentValues().apply {
         put("folder_id", folderId)
@@ -63,7 +63,7 @@ fun SQLiteDatabase.readFolderExtraValues(): List<FolderExtraValueEntry> {
                 folderId = cursor.getLongOrNull("folder_id"),
                 name = cursor.getStringOrNull("name"),
                 text = cursor.getStringOrNull("value_text"),
-                number = cursor.getLongOrNull("value_integer")
+                number = cursor.getLongOrNull("value_integer"),
             )
         }
     }
@@ -73,5 +73,5 @@ data class FolderExtraValueEntry(
     val folderId: Long?,
     val name: String?,
     val text: String?,
-    val number: Long?
+    val number: Long?,
 )
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt
index 9d2980fd260..6bb144ec862 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/KeyValueStoreOperationsTest.kt
@@ -35,8 +35,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
             ExtraValueEntry(
                 name = "jmapState",
                 text = "ABC42",
-                number = null
-            )
+                number = null,
+            ),
         )
     }
 
@@ -52,8 +52,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
             ExtraValueEntry(
                 name = "jmapState",
                 text = "ABC42",
-                number = null
-            )
+                number = null,
+            ),
         )
     }
 
@@ -83,8 +83,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
             ExtraValueEntry(
                 name = "lastChanged",
                 text = null,
-                number = 123L
-            )
+                number = 123L,
+            ),
         )
     }
 
@@ -100,8 +100,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
             ExtraValueEntry(
                 name = "lastChanged",
                 text = null,
-                number = 42
-            )
+                number = 42,
+            ),
         )
     }
 
@@ -132,8 +132,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
                 folderId = 1,
                 name = "imapUidValidity",
                 text = "1",
-                number = null
-            )
+                number = null,
+            ),
         )
     }
 
@@ -150,8 +150,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
                 folderId = 1,
                 name = "imapUidValidity",
                 text = "42",
-                number = null
-            )
+                number = null,
+            ),
         )
     }
 
@@ -182,8 +182,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
                 folderId = 1,
                 name = "lastChanged",
                 text = null,
-                number = 123L
-            )
+                number = 123L,
+            ),
         )
     }
 
@@ -200,8 +200,8 @@ class KeyValueStoreOperationsTest : RobolectricTest() {
                 folderId = 1,
                 name = "lastChanged",
                 text = null,
-                number = 42
-            )
+                number = 42,
+            ),
         )
     }
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt
index 0c9bbf74a31..cf9c82f7cde 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessageDatabaseHelpers.kt
@@ -63,7 +63,7 @@ fun SQLiteDatabase.createMessage(
     forwarded: Boolean = false,
     messagePartId: Long = 0L,
     encryptionType: String? = null,
-    newMessage: Boolean = false
+    newMessage: Boolean = false,
 ): Long {
     val values = ContentValues().apply {
         put("deleted", if (deleted) 1 else 0)
@@ -128,7 +128,7 @@ fun SQLiteDatabase.readMessages(): List<MessageEntry> {
                 forwarded = cursor.getIntOrNull("forwarded"),
                 messagePartId = cursor.getLongOrNull("message_part_id"),
                 encryptionType = cursor.getStringOrNull("encryption_type"),
-                newMessage = cursor.getIntOrNull("new_message")
+                newMessage = cursor.getIntOrNull("new_message"),
             )
         }
     }
@@ -161,7 +161,7 @@ data class MessageEntry(
     val forwarded: Int?,
     val messagePartId: Long?,
     val encryptionType: String?,
-    val newMessage: Int?
+    val newMessage: Int?,
 )
 
 fun SQLiteDatabase.createMessagePart(
@@ -182,7 +182,7 @@ fun SQLiteDatabase.createMessagePart(
     boundary: String? = null,
     contentId: String? = null,
     serverExtra: String? = null,
-    directory: File? = null
+    directory: File? = null,
 ): Long {
     val values = ContentValues().apply {
         put("type", type)
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
index d155a0b4e8c..78e31c1c4dc 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MessagePartDatabaseHelpers.kt
@@ -25,7 +25,7 @@ fun SQLiteDatabase.createMessagePart(
     epilogue: String? = null,
     boundary: String? = null,
     contentId: String? = null,
-    serverExtra: String? = null
+    serverExtra: String? = null,
 ): Long {
     val values = ContentValues().apply {
         put("type", type)
@@ -71,7 +71,7 @@ fun SQLiteDatabase.readMessageParts(): List<MessagePartEntry> {
                 epilogue = cursor.getStringOrNull("epilogue"),
                 boundary = cursor.getStringOrNull("boundary"),
                 contentId = cursor.getStringOrNull("content_id"),
-                serverExtra = cursor.getStringOrNull("server_extra")
+                serverExtra = cursor.getStringOrNull("server_extra"),
             )
         }
     }
@@ -95,7 +95,7 @@ data class MessagePartEntry(
     val epilogue: String?,
     val boundary: String?,
     val contentId: String?,
-    val serverExtra: String?
+    val serverExtra: String?,
 ) {
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt
index aab8a9a6273..185884a4448 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/MoveMessageOperationsTest.kt
@@ -21,14 +21,14 @@ class MoveMessageOperationsTest : RobolectricTest() {
             folderId = SOURCE_FOLDER_ID,
             uid = "uid1",
             subject = "Move me",
-            messageIdHeader = MESSAGE_ID_HEADER
+            messageIdHeader = MESSAGE_ID_HEADER,
         )
         sqliteDatabase.createThread(messageId = originalMessageId)
         val originalMessage = sqliteDatabase.readMessages().first()
 
         val destinationMessageId = moveMessageOperations.moveMessage(
             messageId = originalMessageId,
-            destinationFolderId = DESTINATION_FOLDER_ID
+            destinationFolderId = DESTINATION_FOLDER_ID,
         )
 
         val messages = sqliteDatabase.readMessages()
@@ -48,8 +48,8 @@ class MoveMessageOperationsTest : RobolectricTest() {
                 folderId = DESTINATION_FOLDER_ID,
                 uid = destinationMessage.uid,
                 deleted = 0,
-                empty = 0
-            )
+                empty = 0,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -71,7 +71,7 @@ class MoveMessageOperationsTest : RobolectricTest() {
             uid = "uid1",
             subject = "Move me",
             messageIdHeader = MESSAGE_ID_HEADER,
-            read = false
+            read = false,
         )
         sqliteDatabase.createThread(messageId = originalMessageId)
         val originalMessage = sqliteDatabase.readMessages().first()
@@ -79,23 +79,23 @@ class MoveMessageOperationsTest : RobolectricTest() {
             empty = true,
             folderId = DESTINATION_FOLDER_ID,
             messageIdHeader = MESSAGE_ID_HEADER,
-            uid = ""
+            uid = "",
         )
         val placeholderThreadId = sqliteDatabase.createThread(messageId = placeholderMessageId)
         val childMessageId = sqliteDatabase.createMessage(
             folderId = DESTINATION_FOLDER_ID,
             messageIdHeader = "<msg02@domain.example>",
-            uid = "uid2"
+            uid = "uid2",
         )
         sqliteDatabase.createThread(
             messageId = childMessageId,
             root = placeholderThreadId,
-            parent = placeholderThreadId
+            parent = placeholderThreadId,
         )
 
         val destinationMessageId = moveMessageOperations.moveMessage(
             messageId = originalMessageId,
-            destinationFolderId = DESTINATION_FOLDER_ID
+            destinationFolderId = DESTINATION_FOLDER_ID,
         )
 
         val messages = sqliteDatabase.readMessages()
@@ -115,8 +115,8 @@ class MoveMessageOperationsTest : RobolectricTest() {
                 folderId = DESTINATION_FOLDER_ID,
                 uid = destinationMessage.uid,
                 deleted = 0,
-                empty = 0
-            )
+                empty = 0,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -141,14 +141,14 @@ class MoveMessageOperationsTest : RobolectricTest() {
             folderId = SOURCE_FOLDER_ID,
             uid = "uid1",
             subject = "Move me",
-            messageIdHeader = null
+            messageIdHeader = null,
         )
         sqliteDatabase.createThread(messageId = originalMessageId)
         val originalMessage = sqliteDatabase.readMessages().first()
 
         val destinationMessageId = moveMessageOperations.moveMessage(
             messageId = originalMessageId,
-            destinationFolderId = DESTINATION_FOLDER_ID
+            destinationFolderId = DESTINATION_FOLDER_ID,
         )
 
         val messages = sqliteDatabase.readMessages()
@@ -167,8 +167,8 @@ class MoveMessageOperationsTest : RobolectricTest() {
                 folderId = DESTINATION_FOLDER_ID,
                 uid = destinationMessage.uid,
                 deleted = 0,
-                empty = 0
-            )
+                empty = 0,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt
index 41d1e9006a4..04644b55c6b 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveFolderOperationsTest.kt
@@ -30,7 +30,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
             displayClass = "FIRST_CLASS",
             syncClass = "FIRST_CLASS",
             notifyClass = "NO_CLASS",
-            pushClass = "NO_CLASS"
+            pushClass = "NO_CLASS",
         )
 
         val result = retrieveFolderOperations.getFolder(folderId) { folder ->
@@ -64,7 +64,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
             displayClass = FolderClass.FIRST_CLASS.name,
             syncClass = null,
             notifyClass = null,
-            pushClass = null
+            pushClass = null,
         )
 
         val result = retrieveFolderOperations.getFolder(folderId) { folder ->
@@ -104,7 +104,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
             displayClass = "FIRST_CLASS",
             syncClass = "FIRST_CLASS",
             notifyClass = "NO_CLASS",
-            pushClass = "NO_CLASS"
+            pushClass = "NO_CLASS",
         )
 
         val result = retrieveFolderOperations.getFolder("folder1") { folder ->
@@ -144,7 +144,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
             displayClass = "FIRST_CLASS",
             syncClass = "FIRST_CLASS",
             notifyClass = "NO_CLASS",
-            pushClass = "NO_CLASS"
+            pushClass = "NO_CLASS",
         )
 
         val result = retrieveFolderOperations.getFolders { folder ->
@@ -170,7 +170,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         val (folderId1, _, folderId3) = listOf(
             sqliteDatabase.createFolder(name = "Folder 1", isLocalOnly = false),
             sqliteDatabase.createFolder(name = "Folder 2", isLocalOnly = true),
-            sqliteDatabase.createFolder(name = "Folder 3", isLocalOnly = false)
+            sqliteDatabase.createFolder(name = "Folder 3", isLocalOnly = false),
         )
 
         val result = retrieveFolderOperations.getFolders(excludeLocalOnly = true) { folder ->
@@ -180,8 +180,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         assertThat(result).isEqualTo(
             listOf(
                 folderId1 to "Folder 1",
-                folderId3 to "Folder 3"
-            )
+                folderId3 to "Folder 3",
+            ),
         )
     }
 
@@ -197,12 +197,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         val (folderId1, folderId2, _) = listOf(
             sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"),
             sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"),
-            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS")
+            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"),
         )
 
         val result = retrieveFolderOperations.getDisplayFolders(
             displayMode = FolderMode.FIRST_CLASS,
-            outboxFolderId = folderId2
+            outboxFolderId = folderId2,
         ) { folder ->
             folder.id to folder.name
         }
@@ -215,12 +215,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         val (folderId1, _, folderId3) = listOf(
             sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"),
             sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"),
-            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS")
+            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"),
         )
 
         val result = retrieveFolderOperations.getDisplayFolders(
             displayMode = FolderMode.NOT_SECOND_CLASS,
-            outboxFolderId = folderId1
+            outboxFolderId = folderId1,
         ) { folder ->
             folder.id to folder.name
         }
@@ -228,8 +228,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         assertThat(result).isEqualTo(
             listOf(
                 folderId1 to "Folder 1",
-                folderId3 to "Folder 3"
-            )
+                folderId3 to "Folder 3",
+            ),
         )
     }
 
@@ -238,12 +238,12 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         val (folderId1, folderId2, _) = listOf(
             sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"),
             sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"),
-            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS")
+            sqliteDatabase.createFolder(name = "Folder 3", displayClass = "NO_CLASS"),
         )
 
         val result = retrieveFolderOperations.getDisplayFolders(
             displayMode = FolderMode.FIRST_AND_SECOND_CLASS,
-            outboxFolderId = folderId1
+            outboxFolderId = folderId1,
         ) { folder ->
             folder.id to folder.name
         }
@@ -251,8 +251,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
         assertThat(result).isEqualTo(
             listOf(
                 folderId1 to "Folder 1",
-                folderId2 to "Folder 2"
-            )
+                folderId2 to "Folder 2",
+            ),
         )
     }
 
@@ -262,7 +262,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
             sqliteDatabase.createFolder(name = "Folder 1", displayClass = "FIRST_CLASS"),
             sqliteDatabase.createFolder(name = "Folder 2", displayClass = "SECOND_CLASS"),
             sqliteDatabase.createFolder(name = "Folder 3", displayClass = "FIRST_CLASS"),
-            sqliteDatabase.createFolder(name = "Folder 4", displayClass = "NO_CLASS")
+            sqliteDatabase.createFolder(name = "Folder 4", displayClass = "NO_CLASS"),
         )
         sqliteDatabase.createMessage(uid = "msg1", folderId = folderId1, read = true)
         sqliteDatabase.createMessage(uid = "msg2", folderId = folderId2, read = true)
@@ -272,7 +272,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
 
         val result = retrieveFolderOperations.getDisplayFolders(
             displayMode = FolderMode.ALL,
-            outboxFolderId = folderId2
+            outboxFolderId = folderId2,
         ) { folder ->
             Triple(folder.id, folder.name, folder.unreadMessageCount)
         }
@@ -283,8 +283,8 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
                 Triple(folderId1, "Folder 1", 0),
                 Triple(folderId2, "Folder 2", 1),
                 Triple(folderId3, "Folder 3", 2),
-                Triple(folderId4, "Folder 4", 0)
-            )
+                Triple(folderId4, "Folder 4", 0),
+            ),
         )
     }
 
@@ -292,7 +292,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
     fun `get folder id`() {
         val (_, folderId2) = listOf(
             sqliteDatabase.createFolder(serverId = "folder1"),
-            sqliteDatabase.createFolder(serverId = "folder2")
+            sqliteDatabase.createFolder(serverId = "folder2"),
         )
 
         val result = retrieveFolderOperations.getFolderId(folderServerId = "folder2")
@@ -311,7 +311,7 @@ class RetrieveFolderOperationsTest : RobolectricTest() {
     fun `get folder server id`() {
         val (_, folderId2) = listOf(
             sqliteDatabase.createFolder(serverId = "folder1"),
-            sqliteDatabase.createFolder(serverId = "folder2")
+            sqliteDatabase.createFolder(serverId = "folder2"),
         )
 
         val result = retrieveFolderOperations.getFolderServerId(folderId2)
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt
index 45b62c19d59..9249a2f8269 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/RetrieveMessageListOperationsTest.kt
@@ -51,7 +51,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             read = true,
             flagged = true,
             answered = true,
-            forwarded = true
+            forwarded = true,
         )
         val threadId = sqliteDatabase.createThread(messageId)
 
@@ -61,7 +61,10 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             assertThat(message.folderId).isEqualTo(folderId)
             assertThat(message.fromAddresses).containsExactly(Address("from@domain.example"))
             assertThat(message.toAddresses).containsExactly(Address("to@domain.example"))
-            assertThat(message.ccAddresses).containsExactly(Address("cc1@domain.example"), Address("cc2@domain.example"))
+            assertThat(message.ccAddresses).containsExactly(
+                Address("cc1@domain.example"),
+                Address("cc2@domain.example"),
+            )
             assertThat(message.messageDate).isEqualTo(123L)
             assertThat(message.internalDate).isEqualTo(456L)
             assertThat(message.subject).isEqualTo("subject")
@@ -119,7 +122,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
         val result = retrieveMessageListOperations.getThreadedMessages(
             selection = "folder_id = ? AND read = 0",
             selectionArgs = arrayOf(folderId.toString()),
-            sortOrder = "date DESC, id DESC"
+            sortOrder = "date DESC, id DESC",
         ) { message ->
             message.id
         }
@@ -165,7 +168,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             read = true,
             flagged = true,
             answered = true,
-            forwarded = true
+            forwarded = true,
         )
         val threadId = sqliteDatabase.createThread(messageId)
 
@@ -175,7 +178,10 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             assertThat(message.folderId).isEqualTo(folderId)
             assertThat(message.fromAddresses).containsExactly(Address("from@domain.example"))
             assertThat(message.toAddresses).containsExactly(Address("to@domain.example"))
-            assertThat(message.ccAddresses).containsExactly(Address("cc1@domain.example"), Address("cc2@domain.example"))
+            assertThat(message.ccAddresses).containsExactly(
+                Address("cc1@domain.example"),
+                Address("cc2@domain.example"),
+            )
             assertThat(message.messageDate).isEqualTo(123L)
             assertThat(message.internalDate).isEqualTo(456L)
             assertThat(message.subject).isEqualTo("subject")
@@ -219,14 +225,14 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             folderId,
             uid = "uid1",
             date = 1000L,
-            internalDate = 1001L
+            internalDate = 1001L,
         )
         val threadId1 = sqliteDatabase.createThread(messageId1)
         val messageId2 = sqliteDatabase.createMessage(
             folderId,
             uid = "uid2",
             date = 2000L,
-            internalDate = 2001L
+            internalDate = 2001L,
         )
         sqliteDatabase.createThread(messageId2, root = threadId1)
 
@@ -471,7 +477,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             selection = "folder_id = ?",
             selectionArgs = arrayOf(folderId.toString()),
             sortOrder = "date DESC, id DESC",
-            mapper
+            mapper,
         )
     }
 
@@ -480,7 +486,7 @@ class RetrieveMessageListOperationsTest : RobolectricTest() {
             selection = "folder_id = ?",
             selectionArgs = arrayOf(folderId.toString()),
             sortOrder = "date DESC, id DESC",
-            mapper
+            mapper,
         )
     }
 }
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 09246c3cb30..2b7f1ca9ca4 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
@@ -46,8 +46,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
                 messageId1 to "uid1",
                 messageId2 to "uid2",
                 messageId3 to "uid3",
-                messageId4 to "uid4"
-            )
+                messageId4 to "uid4",
+            ),
         )
     }
 
@@ -91,7 +91,7 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
             read = true,
             flagged = true,
             answered = true,
-            forwarded = true
+            forwarded = true,
         )
 
         val flags = retrieveMessageOperations.getMessageFlags(folderId = 1, messageServerId = "uid1")
@@ -113,8 +113,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
                 Flag.X_REMOTE_COPY_STARTED,
                 Flag.X_MIGRATED_FROM_V50,
                 Flag.X_DRAFT_OPENPGP_INLINE,
-                Flag.X_SUBJECT_DECRYPTED
-            )
+                Flag.X_SUBJECT_DECRYPTED,
+            ),
         )
     }
 
@@ -139,8 +139,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
         assertThat(result).isEqualTo(
             mapOf(
                 "uid1" to 23L,
-                "uid3" to 42L
-            )
+                "uid3" to 42L,
+            ),
         )
     }
 
@@ -153,7 +153,7 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
                 Date: Thu, 01 Apr 2021 01:23:45 +0200
                 Subject: Test
                 Message-Id: <20210401012345.123456789A@domain.example>
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
         sqliteDatabase.createMessage(folderId = 1, uid = "uid1", messagePartId = messagePartId)
 
@@ -165,8 +165,8 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
                 Header("To", "Bob <bob@domain.example>"),
                 Header("Date", "Thu, 01 Apr 2021 01:23:45 +0200"),
                 Header("Subject", "Test"),
-                Header("Message-Id", "<20210401012345.123456789A@domain.example>")
-            )
+                Header("Message-Id", "<20210401012345.123456789A@domain.example>"),
+            ),
         )
     }
 
@@ -179,22 +179,22 @@ class RetrieveMessageOperationsTest : RobolectricTest() {
                 Date: Thu, 01 Apr 2021 01:23:45 +0200
                 Subject: Test
                 Message-Id: <20210401012345.123456789A@domain.example>
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
         sqliteDatabase.createMessage(folderId = 1, uid = "uid1", messagePartId = messagePartId)
 
         val headers = retrieveMessageOperations.getHeaders(
             folderId = 1,
             messageServerId = "uid1",
-            headerNames = setOf("from", "to", "message-id")
+            headerNames = setOf("from", "to", "message-id"),
         )
 
         assertThat(headers).isEqualTo(
             listOf(
                 Header("From", "<alice@domain.example>"),
                 Header("To", "Bob <bob@domain.example>"),
-                Header("Message-Id", "<20210401012345.123456789A@domain.example>")
-            )
+                Header("Message-Id", "<20210401012345.123456789A@domain.example>"),
+            ),
         )
     }
 
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt
index 76c36728e88..765ba66a400 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/SaveMessageOperationsTest.kt
@@ -39,7 +39,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
         lockableDatabase,
         attachmentFileManager,
         basicPartInfoExtractor,
-        threadMessageOperations
+        threadMessageOperations,
     )
 
     @After
@@ -64,7 +64,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
             setFlag(Flag.ANSWERED, true)
             setFlag(Flag.FORWARDED, true)
         }.toSaveMessageData(
-            previewResult = PreviewResult.text("Preview")
+            previewResult = PreviewResult.text("Preview"),
         )
 
         saveMessageOperations.saveRemoteMessage(folderId = 1, messageServerId = "uid1", messageData)
@@ -218,17 +218,17 @@ class SaveMessageOperationsTest : RobolectricTest() {
         val messageId1 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = true,
-            messageIdHeader = "<msg0001@domain.example>"
+            messageIdHeader = "<msg0001@domain.example>",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = true,
-            messageIdHeader = "<msg0002@domain.example>"
+            messageIdHeader = "<msg0002@domain.example>",
         )
         val messageId3 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = false,
-            messageIdHeader = "<msg0003@domain.example>"
+            messageIdHeader = "<msg0003@domain.example>",
         )
         val threadId1 = sqliteDatabase.createThread(messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1)
@@ -250,8 +250,8 @@ class SaveMessageOperationsTest : RobolectricTest() {
                 id = threadId1,
                 messageId = messageId1,
                 root = threadId1,
-                parent = null
-            )
+                parent = null,
+            ),
         )
 
         assertThat(threads.first { it.id == threadId2 }).isEqualTo(
@@ -259,8 +259,8 @@ class SaveMessageOperationsTest : RobolectricTest() {
                 id = threadId2,
                 messageId = messageId2,
                 root = threadId1,
-                parent = threadId1
-            )
+                parent = threadId1,
+            ),
         )
 
         assertThat(threads.first { it.id == threadId3 }).isEqualTo(
@@ -268,8 +268,8 @@ class SaveMessageOperationsTest : RobolectricTest() {
                 id = threadId3,
                 messageId = messageId3,
                 root = threadId1,
-                parent = threadId2
-            )
+                parent = threadId2,
+            ),
         )
     }
 
@@ -368,7 +368,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
             subject = "Provided subject",
             date = 1618191720000L,
             internalDate = 1618191720000L,
-            previewResult = PreviewResult.text("Preview")
+            previewResult = PreviewResult.text("Preview"),
         )
 
         val newMessageId = saveMessageOperations.saveLocalMessage(folderId = 1, messageData, existingMessageId = null)
@@ -451,7 +451,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
         val existingMessageId = saveMessageOperations.saveLocalMessage(
             folderId = 1,
             existingMessageData,
-            existingMessageId = null
+            existingMessageId = null,
         )
         val messageData = buildMessage {
             textBody("new")
@@ -505,7 +505,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
         attachmentCount: Int = 0,
         previewResult: PreviewResult = PreviewResult.none(),
         textForSearchIndex: String? = null,
-        encryptionType: String? = null
+        encryptionType: String? = null,
     ): SaveMessageData {
         return SaveMessageData(
             message = this,
@@ -516,7 +516,7 @@ class SaveMessageOperationsTest : RobolectricTest() {
             attachmentCount,
             previewResult,
             textForSearchIndex,
-            encryptionType
+            encryptionType,
         )
     }
 
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt
index 2bde3213176..3b0f3868c0f 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadDatabaseHelpers.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.helper.map
 fun SQLiteDatabase.createThread(
     messageId: Long,
     root: Long? = null,
-    parent: Long? = null
+    parent: Long? = null,
 ): Long {
     val values = ContentValues().apply {
         put("message_id", messageId)
@@ -26,7 +26,7 @@ fun SQLiteDatabase.readThreads(): List<ThreadEntry> {
                 id = cursor.getLongOrNull("id"),
                 messageId = cursor.getLongOrNull("message_id"),
                 root = cursor.getLongOrNull("root"),
-                parent = cursor.getLongOrNull("parent")
+                parent = cursor.getLongOrNull("parent"),
             )
         }
     }
@@ -36,5 +36,5 @@ data class ThreadEntry(
     val id: Long?,
     val messageId: Long?,
     val root: Long?,
-    val parent: Long?
+    val parent: Long?,
 )
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt
index 24c5a89f038..820cb366a44 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/ThreadMessageOperationsTest.kt
@@ -13,7 +13,7 @@ class ThreadMessageOperationsTest : RobolectricTest() {
         val threadInfo = threadMessageOperations.doMessageThreading(
             sqliteDatabase,
             folderId = 1,
-            ThreadHeaders(messageIdHeader = "<msg001@domain.example>", inReplyToHeader = null, referencesHeader = null)
+            ThreadHeaders(messageIdHeader = "<msg001@domain.example>", inReplyToHeader = null, referencesHeader = null),
         )
 
         assertThat(threadInfo).isNull()
@@ -29,8 +29,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
             ThreadHeaders(
                 messageIdHeader = "<msg002@domain.example>",
                 inReplyToHeader = "<msg001@domain.example>",
-                referencesHeader = null
-            )
+                referencesHeader = null,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -52,8 +52,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
                 threadId = null,
                 messageId = null,
                 rootId = rootThread.id!!,
-                parentId = rootThread.id
-            )
+                parentId = rootThread.id,
+            ),
         )
     }
 
@@ -62,7 +62,7 @@ class ThreadMessageOperationsTest : RobolectricTest() {
         val messageId = sqliteDatabase.createMessage(
             folderId = 1,
             empty = false,
-            messageIdHeader = "<msg001@domain.example>"
+            messageIdHeader = "<msg001@domain.example>",
         )
         val threadId = sqliteDatabase.createThread(messageId)
 
@@ -72,8 +72,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
             ThreadHeaders(
                 messageIdHeader = "<msg002@domain.example>",
                 inReplyToHeader = "<msg001@domain.example>",
-                referencesHeader = null
-            )
+                referencesHeader = null,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -87,8 +87,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
                 threadId = null,
                 messageId = null,
                 rootId = threadId,
-                parentId = threadId
-            )
+                parentId = threadId,
+            ),
         )
     }
 
@@ -97,12 +97,12 @@ class ThreadMessageOperationsTest : RobolectricTest() {
         val messageId1 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = true,
-            messageIdHeader = "<msg001@domain.example>"
+            messageIdHeader = "<msg001@domain.example>",
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = 1,
             empty = false,
-            messageIdHeader = "<msg002@domain.example>"
+            messageIdHeader = "<msg002@domain.example>",
         )
         val threadId1 = sqliteDatabase.createThread(messageId1)
         sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1)
@@ -113,8 +113,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
             ThreadHeaders(
                 messageIdHeader = "<msg001@domain.example>",
                 inReplyToHeader = null,
-                referencesHeader = null
-            )
+                referencesHeader = null,
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -128,8 +128,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
                 threadId = threadId1,
                 messageId = messageId1,
                 rootId = threadId1,
-                parentId = null
-            )
+                parentId = null,
+            ),
         )
     }
 
@@ -138,17 +138,17 @@ class ThreadMessageOperationsTest : RobolectricTest() {
         val messageId1 = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msg001@domain.example>",
-            empty = true
+            empty = true,
         )
         val messageId2 = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msg002@domain.example>",
-            empty = true
+            empty = true,
         )
         val messageId3 = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msg003@domain.example>",
-            empty = false
+            empty = false,
         )
         val threadId1 = sqliteDatabase.createThread(messageId1)
         val threadId2 = sqliteDatabase.createThread(messageId2, root = threadId1, parent = threadId1)
@@ -160,8 +160,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
             ThreadHeaders(
                 messageIdHeader = "<msg002@domain.example>",
                 inReplyToHeader = "<msg001@domain.example>",
-                referencesHeader = "<msg000@domain.example> <msg001@domain.example>"
-            )
+                referencesHeader = "<msg000@domain.example> <msg001@domain.example>",
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -180,8 +180,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
                 threadId = threadId2,
                 messageId = messageId2,
                 rootId = newRootThread.id!!,
-                parentId = threadId1
-            )
+                parentId = threadId1,
+            ),
         )
     }
 
@@ -190,22 +190,22 @@ class ThreadMessageOperationsTest : RobolectricTest() {
         val messageIdB = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msgB@domain.example>",
-            empty = true
+            empty = true,
         )
         val messageIdC = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msgC@domain.example>",
-            empty = false
+            empty = false,
         )
         val messageIdD = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msgD@domain.example>",
-            empty = true
+            empty = true,
         )
         val messageIdE = sqliteDatabase.createMessage(
             folderId = 1,
             messageIdHeader = "<msgE@domain.example>",
-            empty = false
+            empty = false,
         )
         val threadIdB = sqliteDatabase.createThread(messageIdB)
         val threadIdC = sqliteDatabase.createThread(messageIdC, root = threadIdB, parent = threadIdB)
@@ -218,8 +218,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
             ThreadHeaders(
                 messageIdHeader = "<msgD@domain.example>",
                 inReplyToHeader = "<msgC@domain.example>",
-                referencesHeader = "<msgA@domain.example>"
-            )
+                referencesHeader = "<msgA@domain.example>",
+            ),
         )
 
         val threads = sqliteDatabase.readThreads()
@@ -255,8 +255,8 @@ class ThreadMessageOperationsTest : RobolectricTest() {
                 threadId = threadIdD,
                 messageId = messageIdD,
                 rootId = threadA.id!!,
-                parentId = threadIdC
-            )
+                parentId = threadIdC,
+            ),
         )
     }
 }
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt
index 0f6885977de..3e1a482fa97 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/messages/UpdateFolderOperationsTest.kt
@@ -35,7 +35,7 @@ class UpdateFolderOperationsTest : RobolectricTest() {
             displayClass = "NO_CLASS",
             syncClass = "NO_CLASS",
             notifyClass = "NO_CLASS",
-            pushClass = "NO_CLASS"
+            pushClass = "NO_CLASS",
         )
 
         updateFolderOperations.updateFolderSettings(
@@ -44,15 +44,15 @@ class UpdateFolderOperationsTest : RobolectricTest() {
                     id = folderId,
                     name = "irrelevant",
                     type = FolderType.REGULAR,
-                    isLocalOnly = false
+                    isLocalOnly = false,
                 ),
                 isInTopGroup = true,
                 isIntegrate = true,
                 displayClass = FolderClass.FIRST_CLASS,
                 syncClass = FolderClass.FIRST_CLASS,
                 notifyClass = FolderClass.FIRST_CLASS,
-                pushClass = FolderClass.FIRST_CLASS
-            )
+                pushClass = FolderClass.FIRST_CLASS,
+            ),
         )
 
         val folder = sqliteDatabase.readFolders().first()
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt b/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt
index aee0e76152c..4723dad1b8e 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/notifications/K9NotificationStoreTest.kt
@@ -24,8 +24,8 @@ class K9NotificationStoreTest : RobolectricTest() {
             NotificationStoreOperation.Add(
                 messageReference = createMessageReference("uid-1"),
                 notificationId = 42,
-                timestamp = 23L
-            )
+                timestamp = 23L,
+            ),
         )
 
         store.persistNotificationChanges(operations)
@@ -46,8 +46,8 @@ class K9NotificationStoreTest : RobolectricTest() {
             NotificationStoreOperation.Add(
                 messageReference = createMessageReference("uid-2"),
                 notificationId = 10,
-                timestamp = 30L
-            )
+                timestamp = 30L,
+            ),
         )
 
         store.persistNotificationChanges(operations)
@@ -66,7 +66,7 @@ class K9NotificationStoreTest : RobolectricTest() {
     fun `remove notification`() {
         sqliteDatabase.createNotification(messageId = messageIdOne, notificationId = 10, timestamp = 20L)
         val operations = listOf(
-            NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-1"))
+            NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-1")),
         )
 
         store.persistNotificationChanges(operations)
@@ -83,8 +83,8 @@ class K9NotificationStoreTest : RobolectricTest() {
             NotificationStoreOperation.Remove(messageReference = createMessageReference("uid-2")),
             NotificationStoreOperation.ChangeToActive(
                 messageReference = createMessageReference("uid-1"),
-                notificationId = 23
-            )
+                notificationId = 23,
+            ),
         )
 
         store.persistNotificationChanges(operations)
diff --git a/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt b/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt
index d31b531980b..9209a44f9cf 100644
--- a/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt
+++ b/app/storage/src/test/java/com/fsck/k9/storage/notifications/NotificationsTableHelpers.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.helper.map
 fun SQLiteDatabase.createNotification(
     messageId: Long,
     notificationId: Int? = null,
-    timestamp: Long = 0L
+    timestamp: Long = 0L,
 ): Long {
     val values = ContentValues().apply {
         put("message_id", messageId)
@@ -27,7 +27,7 @@ fun SQLiteDatabase.readNotifications(): List<NotificationEntry> {
             NotificationEntry(
                 messageId = cursor.getLongOrNull("message_id"),
                 notificationId = cursor.getIntOrNull("notification_id"),
-                timestamp = cursor.getLongOrNull("timestamp")
+                timestamp = cursor.getLongOrNull("timestamp"),
             )
         }
     }
@@ -36,5 +36,5 @@ fun SQLiteDatabase.readNotifications(): List<NotificationEntry> {
 data class NotificationEntry(
     val messageId: Long?,
     val notificationId: Int?,
-    val timestamp: Long?
+    val timestamp: Long?,
 )
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt
index dd306f09593..6b2382ba83f 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/AppLanguageManager.kt
@@ -22,7 +22,7 @@ import kotlinx.coroutines.plus
  */
 class AppLanguageManager(
     private val systemLocaleManager: SystemLocaleManager,
-    private val coroutineScope: CoroutineScope = GlobalScope + Dispatchers.Main
+    private val coroutineScope: CoroutineScope = GlobalScope + Dispatchers.Main,
 ) {
     private var currentOverrideLocale: Locale? = null
     private val _overrideLocale = MutableSharedFlow<Locale?>(replay = 1)
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt
index 94cbc703ba3..96f7fcfe39e 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/K9Activity.kt
@@ -83,5 +83,5 @@ abstract class K9Activity(private val themeType: ThemeType) : AppCompatActivity(
 
 enum class ThemeType {
     DEFAULT,
-    DIALOG
+    DIALOG,
 }
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt
index 7fc76c25287..68015016afc 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/KoinModule.kt
@@ -10,7 +10,7 @@ val uiBaseModule = module {
             context = get(),
             themeProvider = get(),
             generalSettingsManager = get(),
-            appCoroutineScope = get(named("AppCoroutineScope"))
+            appCoroutineScope = get(named("AppCoroutineScope")),
         )
     }
     single { AppLanguageManager(systemLocaleManager = get()) }
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 87d3a32229f..9d439387cd1 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
@@ -21,7 +21,7 @@ class ThemeManager(
     private val context: Context,
     private val themeProvider: ThemeProvider,
     private val generalSettingsManager: GeneralSettingsManager,
-    private val appCoroutineScope: CoroutineScope
+    private val appCoroutineScope: CoroutineScope,
 ) {
 
     private val generalSettings: GeneralSettings
@@ -113,5 +113,5 @@ class ThemeManager(
 
 enum class Theme {
     LIGHT,
-    DARK
+    DARK,
 }
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt
index a5d6577c319..47aa0c20254 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/extensions/TextInputLayoutExtensions.kt
@@ -32,7 +32,7 @@ fun TextInputLayout.configureAuthenticatedPasswordToggle(
     activity: FragmentActivity,
     title: String,
     subtitle: String,
-    needScreenLockMessage: String
+    needScreenLockMessage: String,
 ) {
     val viewModel = ViewModelProvider(activity).get<AuthenticatedPasswordToggleViewModel>()
     viewModel.textInputLayout = this
@@ -68,7 +68,7 @@ fun TextInputLayout.configureAuthenticatedPasswordToggle(
                 .setAllowedAuthenticators(BIOMETRIC_STRONG or BIOMETRIC_WEAK or DEVICE_CREDENTIAL)
                 .setTitle(title)
                 .setSubtitle(subtitle)
-                .build()
+                .build(),
         )
     }
 
@@ -124,11 +124,13 @@ class AuthenticatedPasswordToggleViewModel : ViewModel() {
         set(value) {
             field = value
 
-            value?.lifecycle?.addObserver(object : DefaultLifecycleObserver {
-                override fun onDestroy(owner: LifecycleOwner) {
-                    textInputLayout = null
-                    field = null
-                }
-            })
+            value?.lifecycle?.addObserver(
+                object : DefaultLifecycleObserver {
+                    override fun onDestroy(owner: LifecycleOwner) {
+                        textInputLayout = null
+                        field = null
+                    }
+                },
+            )
         }
 }
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt
index 5f06f130759..6e2f8e7b6c4 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/loader/LoaderStateObserver.kt
@@ -18,7 +18,7 @@ fun <T> LiveData<LoaderState<T>>.observeLoading(
     loadingView: View,
     errorView: View,
     dataView: View,
-    displayData: (T) -> Unit
+    displayData: (T) -> Unit,
 ) {
     observe(owner, LoaderStateObserver(loadingView, errorView, dataView, displayData))
 }
@@ -27,7 +27,7 @@ private class LoaderStateObserver<T>(
     private val loadingView: View,
     private val errorView: View,
     private val dataView: View,
-    private val displayData: (T) -> Unit
+    private val displayData: (T) -> Unit,
 ) : Observer<LoaderState<T>> {
     private val allViews = setOf(loadingView, errorView, dataView)
 
diff --git a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt b/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt
index f3d1674e293..d9d6db07651 100644
--- a/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt
+++ b/app/ui/base/src/main/java/com/fsck/k9/ui/base/locale/SystemLocaleManager.kt
@@ -42,7 +42,7 @@ class SystemLocaleManager(context: Context) {
             packageManager.setComponentEnabledSetting(
                 componentName,
                 PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
-                PackageManager.DONT_KILL_APP
+                PackageManager.DONT_KILL_APP,
             )
         } catch (e: Exception) {
             Timber.e(e, "Error enabling LocaleBroadcastReceiver")
@@ -55,7 +55,7 @@ class SystemLocaleManager(context: Context) {
             packageManager.setComponentEnabledSetting(
                 componentName,
                 PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
-                PackageManager.DONT_KILL_APP
+                PackageManager.DONT_KILL_APP,
             )
         } catch (e: Exception) {
             Timber.e(e, "Error disabling LocaleBroadcastReceiver")
diff --git a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt
index df09c4e2607..469bc63c1b7 100644
--- a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt
+++ b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/ExtraAccountDiscovery.kt
@@ -17,7 +17,7 @@ object ExtraAccountDiscovery {
                 authenticationType = AuthType.AUTOMATIC,
                 username = "irrelevant",
                 password = "irrelevant",
-                clientCertificateAlias = null
+                clientCertificateAlias = null,
             )
             ConnectionSettings(incoming = serverSettings, outgoing = serverSettings)
         } else {
diff --git a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt
index e853fdc7d21..06ebd2c8a5b 100644
--- a/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt
+++ b/app/ui/legacy/src/debug/java/com/fsck/k9/ui/settings/NewSetupUiHack.kt
@@ -9,7 +9,7 @@ internal object NewSetupUiHack {
         builder.addAction(
             "Add account (NEW)",
             R.id.action_settingsListScreen_to_newAddAccountScreen,
-            R.attr.iconSettingsAccountAdd
+            R.attr.iconSettingsAccountAdd,
         )
     }
 }
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 999c510ff23..b938168700d 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
@@ -37,5 +37,5 @@ val uiModules = listOf(
     messageSourceModule,
     accountUiModule,
     messageDetailsUiModule,
-    messageViewUiModule
+    messageViewUiModule,
 )
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 7d8ab451315..7366152e76c 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
@@ -17,7 +17,7 @@ class AccountRemover(
     private val messagingController: MessagingController,
     private val backendManager: BackendManager,
     private val localKeyStoreManager: LocalKeyStoreManager,
-    private val preferences: Preferences
+    private val preferences: Preferences,
 ) {
 
     fun removeAccount(accountUuid: String) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt
index 69540f65101..b25a3d8c208 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/account/KoinModule.kt
@@ -9,7 +9,7 @@ val accountModule = module {
             messagingController = get(),
             backendManager = get(),
             localKeyStoreManager = get(),
-            preferences = get()
+            preferences = get(),
         )
     }
     factory { BackgroundAccountRemover(get()) }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
index 149f9ebbfe3..b72d0f505b8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/EditIdentity.kt
@@ -80,7 +80,7 @@ class EditIdentity : K9Activity() {
             name = name.text.toString(),
             signatureUse = signatureUse.isChecked,
             signature = signature.text.toString(),
-            replyTo = if (replyTo.text.isNotEmpty()) replyTo.text.toString() else null
+            replyTo = if (replyTo.text.isNotEmpty()) replyTo.text.toString() else null,
         )
 
         val identities = account.identities
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt
index 4ccc496e7f8..2bcb0c121b5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/FolderInfoHolder.kt
@@ -9,15 +9,19 @@ import com.fsck.k9.ui.folders.FolderNameFormatter
 class FolderInfoHolder(
     private val folderNameFormatter: FolderNameFormatter,
     localFolder: LocalFolder,
-    account: Account
+    account: Account,
 ) {
-    @JvmField val databaseId = localFolder.databaseId
+    @JvmField
+    val databaseId = localFolder.databaseId
 
-    @JvmField val displayName = getDisplayName(account, localFolder)
+    @JvmField
+    val displayName = getDisplayName(account, localFolder)
 
-    @JvmField var loading = false
+    @JvmField
+    var loading = false
 
-    @JvmField var moreMessages = localFolder.hasMoreMessages()
+    @JvmField
+    var moreMessages = localFolder.hasMoreMessages()
 
     private fun getDisplayName(account: Account, localFolder: LocalFolder): String {
         val folderId = localFolder.databaseId
@@ -25,7 +29,7 @@ class FolderInfoHolder(
             id = folderId,
             name = localFolder.name,
             type = getFolderType(account, folderId),
-            isLocalOnly = localFolder.isLocalOnly
+            isLocalOnly = localFolder.isLocalOnly,
         )
         return folderNameFormatter.displayName(folder)
     }
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 a806a996b07..c3e2326769d 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
@@ -226,7 +226,10 @@ open class MessageList :
         setIntent(intent)
 
         // Start with a fresh fragment back stack
-        supportFragmentManager.popBackStackImmediate(FIRST_FRAGMENT_TRANSACTION, FragmentManager.POP_BACK_STACK_INCLUSIVE)
+        supportFragmentManager.popBackStackImmediate(
+            FIRST_FRAGMENT_TRANSACTION,
+            FragmentManager.POP_BACK_STACK_INCLUSIVE,
+        )
 
         removeMessageListFragment()
         removeMessageViewContainerFragment()
@@ -276,7 +279,7 @@ open class MessageList :
             val messageListFragment = MessageListFragment.newInstance(
                 search!!,
                 false,
-                K9.isThreadedViewEnabled && !noThreading
+                K9.isThreadedViewEnabled && !noThreading,
             )
             fragmentTransaction.add(R.id.message_list_container, messageListFragment)
             fragmentTransaction.commitNow()
@@ -447,7 +450,7 @@ open class MessageList :
 
             return LaunchData(
                 search = search,
-                noThreading = true
+                noThreading = true,
             )
         } else if (intent.hasExtra(EXTRA_MESSAGE_REFERENCE)) {
             val messageReferenceString = intent.getStringExtra(EXTRA_MESSAGE_REFERENCE)
@@ -463,7 +466,7 @@ open class MessageList :
                 return LaunchData(
                     search = search,
                     messageReference = messageReference,
-                    messageViewOnly = intent.getBooleanExtra(EXTRA_MESSAGE_VIEW_ONLY, false)
+                    messageViewOnly = intent.getBooleanExtra(EXTRA_MESSAGE_VIEW_ONLY, false),
                 )
             }
         } else if (intent.hasExtra(EXTRA_SEARCH)) {
@@ -906,17 +909,19 @@ open class MessageList :
         searchView.queryHint = resources.getString(R.string.search_action)
         val searchManager = getSystemService(SEARCH_SERVICE) as SearchManager
         searchView.setSearchableInfo(searchManager.getSearchableInfo(componentName))
-        searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String): Boolean {
-                messageListFragment?.onSearchRequested(query)
-                collapseSearchView()
-                return true
-            }
+        searchView.setOnQueryTextListener(
+            object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    messageListFragment?.onSearchRequested(query)
+                    collapseSearchView()
+                    return true
+                }
 
-            override fun onQueryTextChange(s: String): Boolean {
-                return false
-            }
-        })
+                override fun onQueryTextChange(s: String): Boolean {
+                    return false
+                }
+            },
+        )
 
         searchView.setQuery(initialSearchViewQuery, false)
         searchView.isIconified = initialSearchViewIconified
@@ -1255,7 +1260,7 @@ open class MessageList :
         fillInIntent: Intent?,
         flagsMask: Int,
         flagsValues: Int,
-        extraFlags: Int
+        extraFlags: Int,
     ) {
         // If any of the high 16 bits are set it is not one of our request codes
         if (requestCode and REQUEST_CODE_MASK != 0) {
@@ -1366,7 +1371,7 @@ open class MessageList :
         val account: Account? = null,
         val messageReference: MessageReference? = null,
         val noThreading: Boolean = false,
-        val messageViewOnly: Boolean = false
+        val messageViewOnly: Boolean = false,
     )
 
     companion object : KoinComponent {
@@ -1406,7 +1411,7 @@ open class MessageList :
             search: SearchSpecification?,
             noThreading: Boolean,
             newTask: Boolean,
-            clearTop: Boolean = true
+            clearTop: Boolean = true,
         ) {
             context.startActivity(intentDisplaySearch(context, search, noThreading, newTask, clearTop))
         }
@@ -1417,7 +1422,7 @@ open class MessageList :
             search: SearchSpecification?,
             noThreading: Boolean,
             newTask: Boolean,
-            clearTop: Boolean
+            clearTop: Boolean,
         ): Intent {
             return Intent(context, MessageList::class.java).apply {
                 putExtra(EXTRA_SEARCH, ParcelableUtil.marshall(search))
@@ -1482,7 +1487,7 @@ open class MessageList :
             context: Context,
             messageReference: MessageReference,
             openInUnifiedInbox: Boolean = false,
-            messageViewOnly: Boolean = false
+            messageViewOnly: Boolean = false,
         ): Intent {
             return actionDisplayMessageTemplateIntent(context, openInUnifiedInbox, messageViewOnly).apply {
                 putExtra(EXTRA_MESSAGE_REFERENCE, messageReference.toIdentityString())
@@ -1492,7 +1497,7 @@ open class MessageList :
         fun actionDisplayMessageTemplateIntent(
             context: Context,
             openInUnifiedInbox: Boolean,
-            messageViewOnly: Boolean
+            messageViewOnly: Boolean,
         ): Intent {
             return Intent(context, MessageList::class.java).apply {
                 if (openInUnifiedInbox) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
index 0e33ac54428..ba099bca565 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageListActivityConfig.kt
@@ -32,7 +32,7 @@ data class MessageListActivityConfig(
     val fontSizeMessageViewDate: Int,
     val fontSizeMessageViewContentAsPercent: Int,
     val swipeRightAction: SwipeAction,
-    val swipeLeftAction: SwipeAction
+    val swipeLeftAction: SwipeAction,
 ) {
 
     companion object {
@@ -64,7 +64,7 @@ data class MessageListActivityConfig(
                 fontSizeMessageViewDate = K9.fontSizes.messageViewDate,
                 fontSizeMessageViewContentAsPercent = K9.fontSizes.messageViewContentAsPercent,
                 swipeRightAction = K9.swipeRightAction,
-                swipeLeftAction = K9.swipeLeftAction
+                swipeLeftAction = K9.swipeLeftAction,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt
index 20e7c814b8d..5e0caab781b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageLoaderHelperFactory.kt
@@ -9,13 +9,13 @@ import com.fsck.k9.ui.helper.HtmlSettingsProvider
 
 class MessageLoaderHelperFactory(
     private val messageViewInfoExtractorFactory: MessageViewInfoExtractorFactory,
-    private val htmlSettingsProvider: HtmlSettingsProvider
+    private val htmlSettingsProvider: HtmlSettingsProvider,
 ) {
     fun createForMessageView(
         context: Context,
         loaderManager: LoaderManager,
         fragmentManager: FragmentManager,
-        callback: MessageLoaderCallbacks
+        callback: MessageLoaderCallbacks,
     ): MessageLoaderHelper {
         val htmlSettings = htmlSettingsProvider.createForMessageView()
         val messageViewInfoExtractor = messageViewInfoExtractorFactory.create(htmlSettings)
@@ -26,7 +26,7 @@ class MessageLoaderHelperFactory(
         context: Context,
         loaderManager: LoaderManager,
         fragmentManager: FragmentManager,
-        callback: MessageLoaderCallbacks
+        callback: MessageLoaderCallbacks,
     ): MessageLoaderHelper {
         val htmlSettings = htmlSettingsProvider.createForMessageCompose()
         val messageViewInfoExtractor = messageViewInfoExtractorFactory.create(htmlSettings)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt
index 5fcb1c64ac8..d2814639ef7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/ComposeCryptoStatus.kt
@@ -24,7 +24,7 @@ data class ComposeCryptoStatus(
     override val isEncryptAllDrafts: Boolean,
     override val isEncryptSubject: Boolean,
     private val cryptoMode: CryptoMode,
-    private val recipientAutocryptStatus: RecipientAutocryptStatus? = null
+    private val recipientAutocryptStatus: RecipientAutocryptStatus? = null,
 ) : CryptoStatus {
 
     constructor(
@@ -36,11 +36,17 @@ data class ComposeCryptoStatus(
         isReplyToEncrypted: Boolean,
         isEncryptAllDrafts: Boolean,
         isEncryptSubject: Boolean,
-        cryptoMode: CryptoMode
+        cryptoMode: CryptoMode,
     ) : this(
-        openPgpProviderState, openPgpKeyId,
+        openPgpProviderState,
+        openPgpKeyId,
         recipientAddresses.map { it.address.address },
-        isPgpInlineModeEnabled, isSenderPreferEncryptMutual, isReplyToEncrypted, isEncryptAllDrafts, isEncryptSubject, cryptoMode
+        isPgpInlineModeEnabled,
+        isSenderPreferEncryptMutual,
+        isReplyToEncrypted,
+        isEncryptAllDrafts,
+        isEncryptSubject,
+        cryptoMode,
     )
 
     private val recipientAutocryptStatusType = recipientAutocryptStatus?.type
@@ -132,7 +138,8 @@ data class ComposeCryptoStatus(
 
     fun allRecipientsCanEncrypt() = recipientAutocryptStatus?.type?.canEncrypt() == true
 
-    fun canEncryptAndIsMutualDefault() = allRecipientsCanEncrypt() && isSenderPreferEncryptMutual && isRecipientsPreferEncryptMutual
+    fun canEncryptAndIsMutualDefault() =
+        allRecipientsCanEncrypt() && isSenderPreferEncryptMutual && isRecipientsPreferEncryptMutual
 
     fun hasAutocryptPendingIntent() = recipientAutocryptStatus?.hasPendingIntent() == true
 
@@ -150,16 +157,16 @@ data class ComposeCryptoStatus(
         isEncryptAllDrafts = isEncryptAllDrafts,
         isEncryptSubject = isEncryptSubject,
         recipientAddresses = recipientAddresses,
-        recipientAutocryptStatus = recipientAutocryptStatusType
+        recipientAutocryptStatus = recipientAutocryptStatusType,
     )
 
     enum class SendErrorState {
         PROVIDER_ERROR,
         KEY_CONFIG_ERROR,
-        ENABLED_ERROR
+        ENABLED_ERROR,
     }
 
     enum class AttachErrorState {
-        IS_INLINE
+        IS_INLINE,
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt
index e3d8ca85577..3177640af6f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientMvpView.kt
@@ -19,7 +19,6 @@ import com.fsck.k9.ui.R
 import com.fsck.k9.view.RecipientSelectView
 import com.fsck.k9.view.RecipientSelectView.Recipient
 import com.fsck.k9.view.ToolableViewAnimator
-import java.lang.AssertionError
 
 class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChangeListener, View.OnClickListener {
     private val toView: RecipientSelectView = activity.findViewById(R.id.to)
@@ -80,35 +79,41 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang
 
     fun setPresenter(presenter: RecipientPresenter) {
         this.presenter = presenter
-        toView.setTokenListener(object : RecipientSelectView.TokenListener<Recipient> {
-            override fun onTokenAdded(recipient: Recipient) = presenter.onToTokenAdded()
+        toView.setTokenListener(
+            object : RecipientSelectView.TokenListener<Recipient> {
+                override fun onTokenAdded(recipient: Recipient) = presenter.onToTokenAdded()
 
-            override fun onTokenRemoved(recipient: Recipient) = presenter.onToTokenRemoved()
+                override fun onTokenRemoved(recipient: Recipient) = presenter.onToTokenRemoved()
 
-            override fun onTokenChanged(recipient: Recipient) = presenter.onToTokenChanged()
+                override fun onTokenChanged(recipient: Recipient) = presenter.onToTokenChanged()
 
-            override fun onTokenIgnored(token: Recipient) = Unit
-        })
+                override fun onTokenIgnored(token: Recipient) = Unit
+            },
+        )
 
-        ccView.setTokenListener(object : RecipientSelectView.TokenListener<Recipient> {
-            override fun onTokenAdded(recipient: Recipient) = presenter.onCcTokenAdded()
+        ccView.setTokenListener(
+            object : RecipientSelectView.TokenListener<Recipient> {
+                override fun onTokenAdded(recipient: Recipient) = presenter.onCcTokenAdded()
 
-            override fun onTokenRemoved(recipient: Recipient) = presenter.onCcTokenRemoved()
+                override fun onTokenRemoved(recipient: Recipient) = presenter.onCcTokenRemoved()
 
-            override fun onTokenChanged(recipient: Recipient) = presenter.onCcTokenChanged()
+                override fun onTokenChanged(recipient: Recipient) = presenter.onCcTokenChanged()
 
-            override fun onTokenIgnored(token: Recipient) = Unit
-        })
+                override fun onTokenIgnored(token: Recipient) = Unit
+            },
+        )
 
-        bccView.setTokenListener(object : RecipientSelectView.TokenListener<Recipient> {
-            override fun onTokenAdded(recipient: Recipient) = presenter.onBccTokenAdded()
+        bccView.setTokenListener(
+            object : RecipientSelectView.TokenListener<Recipient> {
+                override fun onTokenAdded(recipient: Recipient) = presenter.onBccTokenAdded()
 
-            override fun onTokenRemoved(recipient: Recipient) = presenter.onBccTokenRemoved()
+                override fun onTokenRemoved(recipient: Recipient) = presenter.onBccTokenRemoved()
 
-            override fun onTokenChanged(recipient: Recipient) = presenter.onBccTokenChanged()
+                override fun onTokenChanged(recipient: Recipient) = presenter.onBccTokenChanged()
 
-            override fun onTokenIgnored(token: Recipient) = Unit
-        })
+                override fun onTokenIgnored(token: Recipient) = Unit
+            },
+        )
     }
 
     fun addTextChangedListener(textWatcher: TextWatcher) {
@@ -396,14 +401,14 @@ class RecipientMvpView(private val activity: MessageCompose) : View.OnFocusChang
         ENABLED_ERROR(R.id.crypto_status_error),
         ENABLED_TRUSTED(R.id.crypto_status_trusted),
         AVAILABLE(R.id.crypto_status_disabled),
-        ERROR(R.id.crypto_status_error);
+        ERROR(R.id.crypto_status_error),
     }
 
     enum class CryptoSpecialModeDisplayType(val childIdToDisplay: Int) {
         NONE(VIEW_INDEX_HIDDEN),
         PGP_INLINE(R.id.crypto_special_inline),
         SIGN_ONLY(R.id.crypto_special_sign_only),
-        SIGN_ONLY_PGP_INLINE(R.id.crypto_special_sign_only_inline);
+        SIGN_ONLY_PGP_INLINE(R.id.crypto_special_sign_only_inline),
     }
 
     companion object {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
index c3a851a51ac..ff9560ea2f8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/compose/RecipientPresenter.kt
@@ -62,7 +62,7 @@ class RecipientPresenter(
     private val composePgpEnableByDefaultDecider: ComposePgpEnableByDefaultDecider,
     private val autocryptStatusInteractor: AutocryptStatusInteractor,
     private val replyToParser: ReplyToParser,
-    private val draftStateHeaderParser: AutocryptDraftStateHeaderParser
+    private val draftStateHeaderParser: AutocryptDraftStateHeaderParser,
 ) {
     private lateinit var account: Account
     private var alwaysBccAddresses: Array<Address>? = null
@@ -386,7 +386,7 @@ class RecipientPresenter(
             isReplyToEncrypted = isReplyToEncryptedMessage,
             isEncryptAllDrafts = account.isOpenPgpEncryptAllDrafts,
             isEncryptSubject = account.isOpenPgpEncryptSubject,
-            cryptoMode = currentCryptoMode
+            cryptoMode = currentCryptoMode,
         )
 
         if (openPgpProviderState != OpenPgpProviderState.OK) {
@@ -581,7 +581,7 @@ class RecipientPresenter(
             if (currentCryptoStatus.hasAutocryptPendingIntent()) {
                 recipientMvpView.launchUserInteractionPendingIntent(
                     currentCryptoStatus.autocryptPendingIntent,
-                    REQUEST_CODE_AUTOCRYPT
+                    REQUEST_CODE_AUTOCRYPT,
                 )
             } else if (isEncryptOnNoChoice) {
                 // TODO warning dialog if we override, especially from reply!
@@ -608,7 +608,8 @@ class RecipientPresenter(
     }
 
     private fun isContactPickerAvailable(): Boolean {
-        val resolveInfoList = context.packageManager.queryIntentActivities(ContactIntentHelper.getContactPickerIntent(), 0)
+        val resolveInfoList =
+            context.packageManager.queryIntentActivities(ContactIntentHelper.getContactPickerIntent(), 0)
         return resolveInfoList.isNotEmpty()
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
index 6c3b529c8a9..4b3fb0a80c9 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.kt
@@ -80,7 +80,7 @@ class AccountSetupAccountType : K9Activity() {
             initialAccountSettings.authenticationType,
             initialAccountSettings.email,
             initialAccountSettings.password,
-            initialAccountSettings.clientCertificateAlias
+            initialAccountSettings.clientCertificateAlias,
         )
         account.incomingServerSettings = storeServer
     }
@@ -95,7 +95,7 @@ class AccountSetupAccountType : K9Activity() {
             initialAccountSettings.authenticationType,
             initialAccountSettings.email,
             initialAccountSettings.password,
-            initialAccountSettings.clientCertificateAlias
+            initialAccountSettings.clientCertificateAlias,
         )
         account.outgoingServerSettings = transportServer
     }
@@ -118,7 +118,7 @@ class AccountSetupAccountType : K9Activity() {
             context: Context,
             account: Account,
             makeDefault: Boolean,
-            initialAccountSettings: InitialAccountSettings
+            initialAccountSettings: InitialAccountSettings,
         ) {
             val intent = Intent(context, AccountSetupAccountType::class.java).apply {
                 putExtra(EXTRA_ACCOUNT, account.uuid)
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 1ee50879d99..422ef0f2bae 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
@@ -285,7 +285,7 @@ class AccountSetupBasics : K9Activity() {
             authenticationType = authenticationType,
             email = email,
             password = password,
-            clientCertificateAlias = clientCertificateAlias
+            clientCertificateAlias = clientCertificateAlias,
         )
 
         AccountSetupAccountType.actionSelectAccountType(this, account, makeDefault = false, initialAccountSettings)
@@ -357,7 +357,7 @@ class AccountSetupBasics : K9Activity() {
 
     private enum class UiState {
         EMAIL_ADDRESS_ONLY,
-        PASSWORD_FLOW
+        PASSWORD_FLOW,
     }
 
     companion object {
@@ -387,6 +387,6 @@ private fun DiscoveredServerSettings.toServerSettings(): ServerSettings? {
         authenticationType = authType,
         username = username,
         password = null,
-        clientCertificateAlias = null
+        clientCertificateAlias = null,
     )
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
index 461865655af..1ac11bffd19 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.kt
@@ -139,12 +139,12 @@ class AccountSetupCheckSettings : K9Activity(), ConfirmationDialogFragmentListen
         if (chain != null) {
             acceptKeyDialog(
                 R.string.account_setup_failed_dlg_certificate_message_fmt,
-                exception
+                exception,
             )
         } else {
             showErrorDialog(
                 R.string.account_setup_failed_dlg_server_message_fmt,
-                errorMessageForCertificateException(exception)!!
+                errorMessageForCertificateException(exception)!!,
             )
         }
     }
@@ -333,7 +333,7 @@ class AccountSetupCheckSettings : K9Activity(), ConfirmationDialogFragmentListen
                 getString(R.string.account_setup_failed_dlg_title),
                 customMessage,
                 getString(R.string.account_setup_failed_dlg_edit_details_action),
-                getString(R.string.account_setup_failed_dlg_continue_action)
+                getString(R.string.account_setup_failed_dlg_continue_action),
             )
         } else {
             throw RuntimeException("Called showDialog(int) with unknown dialog id.")
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt
index fb66d03c7b2..13c92fbe80c 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/AuthViewModel.kt
@@ -39,7 +39,7 @@ private const val KEY_AUTHORIZATION = "app.k9mail_auth"
 class AuthViewModel(
     application: Application,
     private val accountManager: AccountManager,
-    private val oAuthConfigurationProvider: OAuthConfigurationProvider
+    private val oAuthConfigurationProvider: OAuthConfigurationProvider,
 ) : AndroidViewModel(application) {
     private var authService: AuthorizationService? = null
     private val authState = AuthState()
@@ -112,14 +112,14 @@ class AuthViewModel(
     private fun createAuthorizationRequestIntent(email: String, config: OAuthConfiguration): Intent {
         val serviceConfig = AuthorizationServiceConfiguration(
             config.authorizationEndpoint.toUri(),
-            config.tokenEndpoint.toUri()
+            config.tokenEndpoint.toUri(),
         )
 
         val authRequestBuilder = AuthorizationRequest.Builder(
             serviceConfig,
             config.clientId,
             ResponseTypeValues.CODE,
-            config.redirectUri.toUri()
+            config.redirectUri.toUri(),
         )
 
         val scopeString = config.scopes.joinToString(separator = " ")
@@ -152,7 +152,7 @@ class AuthViewModel(
             _uiState.update {
                 AuthFlowState.Failed(
                     errorCode = authorizationException.error,
-                    errorMessage = authorizationException.errorDescription
+                    errorMessage = authorizationException.errorDescription,
                 )
             }
         }
@@ -177,7 +177,7 @@ class AuthViewModel(
                     _uiState.update {
                         AuthFlowState.Failed(
                             errorCode = authorizationException.error,
-                            errorMessage = authorizationException.errorDescription
+                            errorMessage = authorizationException.errorDescription,
                         )
                     }
                 } else {
@@ -229,7 +229,7 @@ private class AuthorizationContract : ActivityResultContract<Intent, Authorizati
         return if (resultCode == Activity.RESULT_OK && intent != null) {
             AuthorizationResult(
                 response = AuthorizationResponse.fromIntent(intent),
-                exception = AuthorizationException.fromIntent(intent)
+                exception = AuthorizationException.fromIntent(intent),
             )
         } else {
             null
@@ -239,7 +239,7 @@ private class AuthorizationContract : ActivityResultContract<Intent, Authorizati
 
 private data class AuthorizationResult(
     val response: AuthorizationResponse?,
-    val exception: AuthorizationException?
+    val exception: AuthorizationException?,
 )
 
 sealed interface AuthFlowState {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/InitialAccountSettings.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/InitialAccountSettings.kt
index 1f6ce743fa3..b37b920a601 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/InitialAccountSettings.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/setup/InitialAccountSettings.kt
@@ -9,5 +9,5 @@ data class InitialAccountSettings(
     val authenticationType: AuthType,
     val email: String,
     val password: String?,
-    val clientCertificateAlias: String?
+    val clientCertificateAlias: String?,
 ) : Parcelable
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt
index bedac1b1230..f466e29ee98 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImage.kt
@@ -11,7 +11,7 @@ class ContactImage(
     val contactLetterOnly: Boolean,
     val backgroundCacheId: String,
     val contactLetterBitmapCreator: ContactLetterBitmapCreator,
-    val address: Address
+    val address: Address,
 ) : Key {
     private val contactLetterSignature = contactLetterBitmapCreator.signatureOf(address)
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt
index 2c7570a19b8..ccd46eb0205 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageBitmapDecoder.kt
@@ -14,7 +14,7 @@ import kotlin.math.max
  */
 internal class ContactImageBitmapDecoder(
     private val contactPhotoLoader: ContactPhotoLoader,
-    private val bitmapPool: BitmapPool
+    private val bitmapPool: BitmapPool,
 ) : ResourceDecoder<ContactImage, Bitmap> {
 
     override fun decode(contactImage: ContactImage, width: Int, height: Int, options: Options): Resource<Bitmap>? {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt
index afee28d4209..89fd29bf826 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactImageModelLoader.kt
@@ -18,7 +18,7 @@ class ContactImageModelLoader : ModelLoader<ContactImage, ContactImage> {
         contactImage: ContactImage,
         width: Int,
         height: Int,
-        options: Options
+        options: Options,
     ): ModelLoader.LoadData<ContactImage> {
         return ModelLoader.LoadData(contactImage, ContactImageDataFetcher(contactImage))
     }
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 eab56cc7fdd..ae0034d7204 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
@@ -11,7 +11,7 @@ import com.fsck.k9.mail.Address
  */
 class ContactLetterBitmapCreator(
     private val letterExtractor: ContactLetterExtractor,
-    val config: ContactLetterBitmapConfig
+    val config: ContactLetterBitmapConfig,
 ) {
     fun drawBitmap(bitmap: Bitmap, pictureSizeInPx: Int, address: Address): Bitmap {
         val canvas = Canvas(bitmap)
@@ -36,7 +36,7 @@ class ContactLetterBitmapCreator(
             letter,
             pictureSizeInPx / 2f - width / 2f,
             pictureSizeInPx / 2f + rect.height() / 2f,
-            paint
+            paint,
         )
 
         return bitmap
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
index 7204b21f0b7..250f584815e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/contacts/ContactPictureLoader.kt
@@ -14,7 +14,7 @@ import com.fsck.k9.view.RecipientSelectView.Recipient
 
 class ContactPictureLoader(
     private val context: Context,
-    private val contactLetterBitmapCreator: ContactLetterBitmapCreator
+    private val contactLetterBitmapCreator: ContactLetterBitmapCreator,
 ) {
     private val pictureSizeInPx: Int = PICTURE_SIZE.toDip(context)
     private val backgroundCacheId: String = with(contactLetterBitmapCreator.config) {
@@ -94,7 +94,7 @@ class ContactPictureLoader(
             contactLetterOnly = contactLetterOnly,
             backgroundCacheId = backgroundCacheId,
             contactLetterBitmapCreator = contactLetterBitmapCreator,
-            address = address
+            address = address,
         )
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt
index 98ca2abb690..ed122e5a189 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/FragmentExtras.kt
@@ -14,7 +14,7 @@ inline fun FragmentActivity.fragmentTransaction(crossinline block: FragmentTrans
 
 inline fun FragmentActivity.fragmentTransactionWithBackStack(
     name: String? = null,
-    crossinline block: FragmentTransaction.() -> Unit
+    crossinline block: FragmentTransaction.() -> Unit,
 ) {
     fragmentTransaction {
         block()
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
index 56ac2615636..b8ed58c401b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/K9Drawer.kt
@@ -51,7 +51,6 @@ import com.mikepenz.materialdrawer.util.getDrawerItem
 import com.mikepenz.materialdrawer.util.removeAllItems
 import com.mikepenz.materialdrawer.widget.AccountHeaderView
 import com.mikepenz.materialdrawer.widget.MaterialDrawerSliderView
-import java.util.ArrayList
 import org.koin.androidx.viewmodel.ext.android.viewModel
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
@@ -141,19 +140,21 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
     }
 
     private fun initializeImageLoader() {
-        DrawerImageLoader.init(object : AbstractDrawerImageLoader() {
-            override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
-                val email = uri.getQueryParameter(QUERY_EMAIL) ?: error("Missing '$QUERY_EMAIL' parameter in $uri")
-                val color = uri.getQueryParameter(QUERY_COLOR)?.toInt()
-                    ?: error("Missing '$QUERY_COLOR' parameter in $uri")
-
-                accountImageLoader.setAccountImage(imageView, email, color)
-            }
+        DrawerImageLoader.init(
+            object : AbstractDrawerImageLoader() {
+                override fun set(imageView: ImageView, uri: Uri, placeholder: Drawable, tag: String?) {
+                    val email = uri.getQueryParameter(QUERY_EMAIL) ?: error("Missing '$QUERY_EMAIL' parameter in $uri")
+                    val color = uri.getQueryParameter(QUERY_COLOR)?.toInt()
+                        ?: error("Missing '$QUERY_COLOR' parameter in $uri")
+
+                    accountImageLoader.setAccountImage(imageView, email, color)
+                }
 
-            override fun cancel(imageView: ImageView) {
-                accountImageLoader.cancel(imageView)
-            }
-        }).apply {
+                override fun cancel(imageView: ImageView) {
+                    accountImageLoader.cancel(imageView)
+                }
+            },
+        ).apply {
             handledProtocols = listOf(INTERNAL_URI_SCHEME)
         }
     }
@@ -275,7 +276,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
                 iconRes = folderIconProvider.iconFolderResId
                 identifier = DRAWER_ID_FOLDERS
                 isSelectable = false
-            }
+            },
         )
 
         sliderView.addStickyFooterItem(
@@ -284,7 +285,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
                 iconRes = getResId(R.attr.iconActionSettings)
                 identifier = DRAWER_ID_PREFERENCES
                 isSelectable = false
-            }
+            },
         )
     }
 
@@ -322,7 +323,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
                             swipeRefreshLayout.isRefreshing = false
                         }
                     }
-                }
+                },
             )
         }
     }
@@ -454,7 +455,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
 
     private data class DrawerColors(
         val accentColor: Int,
-        val selectedColor: Int
+        val selectedColor: Int,
     )
 
     private fun getDrawerColorsForAccount(account: Account): DrawerColors {
@@ -465,7 +466,7 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
         }
         return DrawerColors(
             accentColor = baseColor,
-            selectedColor = baseColor.and(0xffffff).or(0x22000000)
+            selectedColor = baseColor.and(0xffffff).or(0x22000000),
         )
     }
 
@@ -503,12 +504,12 @@ class K9Drawer(private val parent: MessageList, savedInstanceState: Bundle?) : K
     private fun Int.toSelectedColorStateList(): ColorStateList {
         val states = arrayOf(
             intArrayOf(android.R.attr.state_selected),
-            intArrayOf()
+            intArrayOf(),
         )
 
         val colors = intArrayOf(
             this,
-            textColor
+            textColor,
         )
 
         return ColorStateList(states, colors)
@@ -543,9 +544,10 @@ private fun Context.obtainDrawerTextColor(): Int {
         null,
         MaterialDrawerR.styleable.MaterialDrawerSliderView,
         MaterialDrawerR.attr.materialDrawerStyle,
-        MaterialDrawerR.style.Widget_MaterialDrawerStyle
+        MaterialDrawerR.style.Widget_MaterialDrawerStyle,
     )
-    val textColor = styledAttributes.getColor(MaterialDrawerR.styleable.MaterialDrawerSliderView_materialDrawerPrimaryText, 0)
+    val textColor =
+        styledAttributes.getColor(MaterialDrawerR.styleable.MaterialDrawerSliderView_materialDrawerPrimaryText, 0)
     styledAttributes.recycle()
 
     return textColor
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
index 2b52817b192..2fa106d70cb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountImageModelLoader.kt
@@ -18,18 +18,18 @@ import java.security.MessageDigest
  */
 internal class AccountImageModelLoader(
     private val contactPhotoLoader: ContactPhotoLoader,
-    private val accountFallbackImageProvider: AccountFallbackImageProvider
+    private val accountFallbackImageProvider: AccountFallbackImageProvider,
 ) : ModelLoader<AccountImage, Bitmap> {
     override fun buildLoadData(
         accountImage: AccountImage,
         width: Int,
         height: Int,
-        options: Options
+        options: Options,
     ): ModelLoader.LoadData<Bitmap> {
         val dataFetcher = AccountImageDataFetcher(
             contactPhotoLoader,
             accountFallbackImageProvider,
-            accountImage
+            accountImage,
         )
         return ModelLoader.LoadData(accountImage, dataFetcher)
     }
@@ -55,7 +55,7 @@ data class AccountImage(val email: String, val color: Int) : Key {
 internal class AccountImageDataFetcher(
     private val contactPhotoLoader: ContactPhotoLoader,
     private val accountFallbackImageProvider: AccountFallbackImageProvider,
-    private val accountImage: AccountImage
+    private val accountImage: AccountImage,
 ) : DataFetcher<Bitmap> {
     override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in Bitmap>) {
         val bitmap = loadAccountImage() ?: createFallbackBitmap()
@@ -81,7 +81,7 @@ internal class AccountImageDataFetcher(
 
 internal class AccountImageModelLoaderFactory(
     private val contactPhotoLoader: ContactPhotoLoader,
-    private val accountFallbackImageProvider: AccountFallbackImageProvider
+    private val accountFallbackImageProvider: AccountFallbackImageProvider,
 ) : ModelLoaderFactory<AccountImage, Bitmap> {
     override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AccountImage, Bitmap> {
         return AccountImageModelLoader(contactPhotoLoader, accountFallbackImageProvider)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
index 488e5c90f61..ff28bc8b5fa 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/AccountsViewModel.kt
@@ -23,7 +23,7 @@ import kotlinx.coroutines.launch
 class AccountsViewModel(
     accountManager: AccountManager,
     private val messageCountsProvider: MessageCountsProvider,
-    private val messageListRepository: MessageListRepository
+    private val messageListRepository: MessageListRepository,
 ) : ViewModel() {
     private val displayAccountFlow: Flow<List<DisplayAccount>> = accountManager.getAccountsFlow()
         .flatMapLatest { accounts ->
@@ -36,7 +36,7 @@ class AccountsViewModel(
                     DisplayAccount(
                         account = accounts[index],
                         unreadMessageCount = messageCounts.unread,
-                        starredMessageCount = messageCounts.starred
+                        starredMessageCount = messageCounts.starred,
                     )
                 }
             }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
index ef0e30b9d52..80224e49d0e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/account/DisplayAccount.kt
@@ -5,5 +5,5 @@ import com.fsck.k9.Account
 data class DisplayAccount(
     val account: Account,
     val unreadMessageCount: Int,
-    val starredMessageCount: Int
+    val starredMessageCount: Int,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt
index 391f56c3d6a..4a6d0f581c7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangeLogManager.kt
@@ -17,7 +17,7 @@ import kotlinx.coroutines.withContext
 class ChangeLogManager(
     private val context: Context,
     private val appCoroutineScope: CoroutineScope,
-    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) {
     private val mutableChangeLogFlow = MutableSharedFlow<ChangeLog>(replay = 1)
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
index d3860465b9e..449b4dfcb46 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogFragment.kt
@@ -35,7 +35,7 @@ class ChangelogFragment : Fragment() {
             owner = viewLifecycleOwner,
             loadingView = view.findViewById(R.id.changelog_loading),
             errorView = view.findViewById(R.id.changelog_error),
-            dataView = listView
+            dataView = listView,
         ) { changeLog ->
             listView.adapter = ChangelogAdapter(changeLog)
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt
index 200c3e1930f..84ba6f5c217 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/ChangelogViewModel.kt
@@ -15,7 +15,7 @@ private typealias ChangeLogState = LoaderState<List<ReleaseItem>>
 class ChangelogViewModel(
     private val generalSettingsManager: GeneralSettingsManager,
     private val changeLogManager: ChangeLogManager,
-    private val mode: ChangeLogMode
+    private val mode: ChangeLogMode,
 ) : ViewModel() {
     val showRecentChangesState: LiveData<Boolean> =
         generalSettingsManager.getSettingsFlow()
@@ -42,5 +42,5 @@ class ChangelogViewModel(
 
 enum class ChangeLogMode {
     CHANGE_LOG,
-    RECENT_CHANGES
+    RECENT_CHANGES,
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt
index c106e8738d4..c241d6d02a5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/changelog/RecentChangesViewModel.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.map
 @OptIn(ExperimentalCoroutinesApi::class)
 class RecentChangesViewModel(
     private val generalSettingsManager: GeneralSettingsManager,
-    private val changeLogManager: ChangeLogManager
+    private val changeLogManager: ChangeLogManager,
 ) : ViewModel() {
     val shouldShowRecentChangesHint = changeLogManager.changeLogFlow.flatMapLatest { changeLog ->
         if (changeLog.isFirstRun && !changeLog.isFirstRunEver) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt
index 067b5ca8f30..b55ef97e09b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/ChooseFolderActivity.kt
@@ -233,7 +233,7 @@ class ChooseFolderActivity : K9Activity() {
     enum class Action {
         MOVE,
         COPY,
-        CHOOSE
+        CHOOSE,
     }
 
     companion object {
@@ -256,7 +256,7 @@ class ChooseFolderActivity : K9Activity() {
             currentFolderId: Long? = null,
             scrollToFolderId: Long? = null,
             showDisplayableOnly: Boolean = false,
-            messageReference: MessageReference? = null
+            messageReference: MessageReference? = null,
         ): Intent {
             return Intent(context, ChooseFolderActivity::class.java).apply {
                 this.action = action.toString()
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
index 9a07c0cc3f0..4d08f2d9e24 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/choosefolder/FolderListItem.kt
@@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 class FolderListItem(
     val databaseId: Long,
     private val folderIconResource: Int,
-    val displayName: String
+    val displayName: String,
 ) : AbstractItem<FolderListViewHolder>() {
     override var identifier = databaseId
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt
index 2578be1fb49..064d3329deb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientCircleImageView.kt
@@ -12,7 +12,7 @@ import de.hdodenhof.circleimageview.CircleImageView
 class RecipientCircleImageView @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+    defStyleAttr: Int = 0,
 ) : CircleImageView(context, attrs, defStyleAttr) {
     var onSetImageDrawableListener: OnSetImageDrawableListener? = null
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt
index f021456b91c..b98cdb817f7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/RecipientTokenConstraintLayout.kt
@@ -11,7 +11,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 class RecipientTokenConstraintLayout @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+    defStyleAttr: Int = 0,
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
     private lateinit var textView: TextView
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt
index 7188421011d..5006b7edd94 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/compose/SimpleHighlightView.kt
@@ -65,7 +65,7 @@ class SimpleHighlightView private constructor(context: Context, style: Int) : Fr
         val styled = getContext().obtainStyledAttributes(style, R.styleable.SimpleHighlightView)
         backgroundColor = styled.getColor(
             R.styleable.SimpleHighlightView_highlightBackgroundColor,
-            Color.argb(128, 80, 80, 80)
+            Color.argb(128, 80, 80, 80),
         )
         styled.recycle()
     }
@@ -128,7 +128,7 @@ class SimpleHighlightView private constructor(context: Context, style: Int) : Fr
                 val point = targetView.getHighlightPoint()
                 setHighlightPosition(point.x, point.y)
             },
-            100
+            100,
         )
     }
 
@@ -193,20 +193,24 @@ class SimpleHighlightView private constructor(context: Context, style: Int) : Fr
     }
 
     private inline fun ObjectAnimator.onAnimationStart(crossinline block: () -> Unit): ObjectAnimator {
-        addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationStart(animation: Animator) {
-                block()
-            }
-        })
+        addListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationStart(animation: Animator) {
+                    block()
+                }
+            },
+        )
         return this
     }
 
     private inline fun ObjectAnimator.onAnimationEnd(crossinline block: () -> Unit): ObjectAnimator {
-        addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                block()
-            }
-        })
+        addListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animation: Animator) {
+                    block()
+                }
+            },
+        )
         return this
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt
index 046d08e6e28..6ddbdd796ea 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferPresenter.kt
@@ -17,7 +17,7 @@ class AutocryptKeyTransferPresenter internal constructor(
     private val openPgpApiManager: OpenPgpApiManager,
     private val preferences: Preferences,
     private val viewModel: AutocryptKeyTransferViewModel,
-    private val view: AutocryptKeyTransferActivity
+    private val view: AutocryptKeyTransferActivity,
 ) {
 
     private lateinit var account: Account
@@ -52,7 +52,7 @@ class AutocryptKeyTransferPresenter internal constructor(
                 override fun onOpenPgpProviderError(error: OpenPgpProviderError) {
                     view.finishWithProviderConnectError(openPgpApiManager.readableOpenPgpProviderName)
                 }
-            }
+            },
         )
 
         view.setAddress(account.identities[0].email!!)
@@ -71,7 +71,10 @@ class AutocryptKeyTransferPresenter internal constructor(
             view.uxDelay()
             view.setLoadingStateGenerating()
 
-            viewModel.autocryptSetupMessageLiveEvent.loadAutocryptSetupMessageAsync(openPgpApiManager.openPgpApi, account)
+            viewModel.autocryptSetupMessageLiveEvent.loadAutocryptSetupMessageAsync(
+                openPgpApiManager.openPgpApi,
+                account,
+            )
         }
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt
index 056514baf3c..4120b2ffddf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptKeyTransferViewModel.kt
@@ -4,5 +4,5 @@ import androidx.lifecycle.ViewModel
 
 internal class AutocryptKeyTransferViewModel(
     val autocryptSetupMessageLiveEvent: AutocryptSetupMessageLiveEvent,
-    val autocryptSetupTransferLiveEvent: AutocryptSetupTransferLiveEvent
+    val autocryptSetupTransferLiveEvent: AutocryptSetupTransferLiveEvent,
 ) : ViewModel()
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt
index 4ec55169d92..90685bc6a3c 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupMessageLiveEvent.kt
@@ -15,7 +15,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.openintents.openpgp.util.OpenPgpApi
 
-class AutocryptSetupMessageLiveEvent(val messageCreator: AutocryptTransferMessageCreator) : SingleLiveEvent<AutocryptSetupMessage>() {
+class AutocryptSetupMessageLiveEvent(
+    val messageCreator: AutocryptTransferMessageCreator,
+) : SingleLiveEvent<AutocryptSetupMessage>() {
     fun loadAutocryptSetupMessageAsync(openPgpApi: OpenPgpApi, account: Account) {
         GlobalScope.launch(Dispatchers.Main) {
             value = withContext(Dispatchers.IO) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt
index d1f93a87ea6..28a30dd09e3 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/AutocryptSetupTransferLiveEvent.kt
@@ -11,7 +11,7 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 
 class AutocryptSetupTransferLiveEvent(
-    private val messagingController: MessagingController
+    private val messagingController: MessagingController,
 ) : SingleLiveEvent<AutocryptSetupTransferResult>() {
 
     fun sendMessageAsync(account: Account, setupMsg: AutocryptSetupMessage) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt
index 89fa1671e65..f36857c5883 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/endtoend/KoinModule.kt
@@ -14,7 +14,7 @@ val endToEndUiModule = module {
             get { parametersOf(lifecycleOwner) },
             get(),
             get(),
-            autocryptTransferView
+            autocryptTransferView,
         )
     }
     viewModel { AutocryptKeyTransferViewModel(get(), get()) }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
index ef66e21cd4a..10b86e6ea7f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/folders/FoldersViewModel.kt
@@ -24,7 +24,7 @@ import kotlinx.coroutines.launch
 class FoldersViewModel(
     private val folderRepository: FolderRepository,
     private val messageCountsProvider: MessageCountsProvider,
-    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : ViewModel() {
     private val inputFlow = MutableSharedFlow<Account?>(replay = 1)
     private val foldersFlow = inputFlow
@@ -42,7 +42,7 @@ class FoldersViewModel(
             FolderList(
                 unifiedInbox = createDisplayUnifiedInbox(),
                 accountId = accountNumber + 1,
-                folders = displayFolders
+                folders = displayFolders,
             )
         }
         .flowOn(backgroundDispatcher)
@@ -76,10 +76,10 @@ class FoldersViewModel(
 data class FolderList(
     val unifiedInbox: DisplayUnifiedInbox?,
     val accountId: Int,
-    val folders: List<DisplayFolder>
+    val folders: List<DisplayFolder>,
 )
 
 data class DisplayUnifiedInbox(
     val unreadMessageCount: Int,
-    val starredMessageCount: Int
+    val starredMessageCount: Int,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt
index 8769cb805a1..0d6756bce7a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/BottomBaselineTextView.kt
@@ -10,7 +10,7 @@ import androidx.appcompat.widget.AppCompatTextView
 // Source: https://stackoverflow.com/a/62419876
 class BottomBaselineTextView @JvmOverloads constructor(
     context: Context,
-    attrs: AttributeSet? = null
+    attrs: AttributeSet? = null,
 ) : AppCompatTextView(context, attrs) {
 
     override fun getBaseline(): Int {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt
index c9d6089ed5f..4801a51beab 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/HtmlSettingsProvider.kt
@@ -8,11 +8,11 @@ import com.fsck.k9.ui.base.ThemeManager
 class HtmlSettingsProvider(private val themeManager: ThemeManager) {
     fun createForMessageView() = HtmlSettings(
         useDarkMode = themeManager.messageViewTheme == Theme.DARK,
-        useFixedWidthFont = K9.isUseMessageViewFixedWidthFont
+        useFixedWidthFont = K9.isUseMessageViewFixedWidthFont,
     )
 
     fun createForMessageCompose() = HtmlSettings(
         useDarkMode = themeManager.messageComposeTheme == Theme.DARK,
-        useFixedWidthFont = false
+        useFixedWidthFont = false,
     )
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt
index 6a3cda7907b..ce2067e6c55 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/helper/RecyclerViewBackgroundDrawable.kt
@@ -35,7 +35,7 @@ class RecyclerViewBackgroundDrawable internal constructor(private val color: Int
             recyclerView.top.toFloat(),
             recyclerView.right.toFloat(),
             bottom.toFloat(),
-            paint
+            paint,
         )
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
index 0a801cbf3d6..b6a08c0994a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderListItem.kt
@@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 class FolderListItem(
     val folderId: Long,
     private val folderIconResource: Int,
-    val displayName: String
+    val displayName: String,
 ) : AbstractItem<FolderListViewHolder>() {
     override var identifier: Long = folderId
     override val layoutRes = R.layout.folder_list_item
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt
index 4775b493a9e..0f731044d28 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsDataStore.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.launch
 class FolderSettingsDataStore(
     private val folderRepository: FolderRepository,
     private val account: Account,
-    private var folder: FolderDetails
+    private var folder: FolderDetails,
 ) : PreferenceDataStore() {
     private val saveScope = CoroutineScope(GlobalScope.coroutineContext + Dispatchers.IO)
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt
index cb3beda13f3..8f88fc03f3f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsFragment.kt
@@ -100,7 +100,7 @@ class FolderSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFra
             getString(R.string.dialog_confirm_clear_local_folder_title),
             getString(R.string.dialog_confirm_clear_local_folder_message),
             getString(R.string.dialog_confirm_clear_local_folder_action),
-            getString(R.string.cancel_action)
+            getString(R.string.cancel_action),
         )
         dialogFragment.setTargetFragment(this, REQUEST_CLEAR_FOLDER)
         dialogFragment.show(requireFragmentManager(), TAG_CLEAR_FOLDER_CONFIRMATION)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt
index 7c047ecaa00..5b894e9fc57 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/FolderSettingsViewModel.kt
@@ -20,7 +20,7 @@ private const val NO_FOLDER_ID = 0L
 class FolderSettingsViewModel(
     private val preferences: Preferences,
     private val folderRepository: FolderRepository,
-    private val messagingController: MessagingController
+    private val messagingController: MessagingController,
 ) : ViewModel() {
     private val actionLiveData = SingleLiveEvent<Action>()
     private var folderSettingsLiveData: LiveData<FolderSettingsResult>? = null
@@ -39,7 +39,7 @@ class FolderSettingsViewModel(
 
     private fun createFolderSettingsLiveData(
         accountUuid: String,
-        folderId: Long
+        folderId: Long,
     ): LiveData<FolderSettingsResult> {
         return liveData(context = viewModelScope.coroutineContext) {
             val account = loadAccount(accountUuid)
@@ -55,7 +55,7 @@ class FolderSettingsViewModel(
 
             val folderSettingsData = FolderSettingsData(
                 folder = folderDetails.folder,
-                dataStore = FolderSettingsDataStore(folderRepository, account, folderDetails)
+                dataStore = FolderSettingsDataStore(folderRepository, account, folderDetails),
             )
             emit(folderSettingsData)
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
index 7ee3744893d..66d3f0b6b12 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersActivity.kt
@@ -29,7 +29,7 @@ class ManageFoldersActivity : K9Activity() {
         navController = findNavController(R.id.nav_host_fragment)
 
         val fragmentArguments = bundleOf(
-            ManageFoldersFragment.EXTRA_ACCOUNT to accountUuid
+            ManageFoldersFragment.EXTRA_ACCOUNT to accountUuid,
         )
         navController.setGraph(R.navigation.navigation_manage_folders, fragmentArguments)
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt
index 094dcba5584..7ea09439a23 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/managefolders/ManageFoldersFragment.kt
@@ -89,7 +89,7 @@ class ManageFoldersFragment : Fragment() {
     private fun openFolderSettings(folderId: Long) {
         val folderSettingsArguments = bundleOf(
             FolderSettingsFragment.EXTRA_ACCOUNT to account.uuid,
-            FolderSettingsFragment.EXTRA_FOLDER_ID to folderId
+            FolderSettingsFragment.EXTRA_FOLDER_ID to folderId,
         )
         findNavController().navigate(R.id.action_manageFoldersScreen_to_folderSettingsScreen, folderSettingsArguments)
     }
@@ -103,17 +103,19 @@ class ManageFoldersFragment : Fragment() {
         val folderMenuItem = menu.findItem(R.id.filter_folders)
         val folderSearchView = folderMenuItem.actionView as SearchView
         folderSearchView.queryHint = getString(R.string.folder_list_filter_hint)
-        folderSearchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
-            override fun onQueryTextSubmit(query: String): Boolean {
-                itemAdapter.filter(query)
-                return true
-            }
-
-            override fun onQueryTextChange(newText: String): Boolean {
-                itemAdapter.filter(newText)
-                return true
-            }
-        })
+        folderSearchView.setOnQueryTextListener(
+            object : SearchView.OnQueryTextListener {
+                override fun onQueryTextSubmit(query: String): Boolean {
+                    itemAdapter.filter(query)
+                    return true
+                }
+
+                override fun onQueryTextChange(newText: String): Boolean {
+                    itemAdapter.filter(newText)
+                    return true
+                }
+            },
+        )
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
index 054344df9ad..deb3b30bfb8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/FolderNameItem.kt
@@ -10,7 +10,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 
 internal class FolderNameItem(
     val displayName: String,
-    @DrawableRes val iconResourceId: Int
+    @DrawableRes val iconResourceId: Int,
 ) : AbstractItem<FolderNameItem.ViewHolder>() {
     override val type: Int = R.id.message_details_folder_name
     override val layoutRes = R.layout.message_details_folder_name_item
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt
index afa9f2f4a4d..b1a854dc854 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/KoinModule.kt
@@ -14,7 +14,7 @@ val messageDetailsUiModule = module {
             clipboardManager = get(),
             accountManager = get(),
             participantFormatter = get(),
-            folderNameFormatter = get()
+            folderNameFormatter = get(),
         )
     }
     factory { ContactSettingsProvider() }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt
index 7650f2acab2..3cc42929b78 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsFragment.kt
@@ -57,7 +57,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
-        savedInstanceState: Bundle?
+        savedInstanceState: Bundle?,
     ): View? {
         return inflater.inflate(R.layout.message_bottom_sheet, container, false)
     }
@@ -88,11 +88,13 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
 
         // Don't allow dragging down the bottom sheet (by dragging the toolbar) unless the list is scrolled all the way
         // to the top.
-        recyclerView.addOnScrollListener(object : OnScrollListener() {
-            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                dialog.behavior.isDraggable = !recyclerView.canScrollVertically(-1)
-            }
-        })
+        recyclerView.addOnScrollListener(
+            object : OnScrollListener() {
+                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                    dialog.behavior.isDraggable = !recyclerView.canScrollVertically(-1)
+                }
+            },
+        )
 
         viewModel.uiEvents.observe(this) { event ->
             when (event) {
@@ -161,7 +163,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
     private fun ItemAdapter<GenericItem>.addParticipants(
         participants: List<Participant>,
         @StringRes title: Int,
-        showContactPicture: Boolean
+        showContactPicture: Boolean,
     ) {
         if (participants.isNotEmpty()) {
             val extraText = if (participants.size > 1) participants.size.toString() else null
@@ -176,7 +178,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
     private fun ItemAdapter<GenericItem>.addFolderName(folder: FolderInfoUi) {
         val folderNameItem = FolderNameItem(
             displayName = folder.displayName,
-            iconResourceId = folderIconProvider.getFolderIcon(folder.type)
+            iconResourceId = folderIconProvider.getFolderIcon(folder.type),
         )
         add(folderNameItem)
     }
@@ -194,7 +196,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
             v: View,
             position: Int,
             fastAdapter: FastAdapter<CryptoStatusItem>,
-            item: CryptoStatusItem
+            item: CryptoStatusItem,
         ) {
             if (item.cryptoDetails.isClickable) {
                 viewModel.onCryptoStatusClicked()
@@ -330,7 +332,7 @@ class MessageDetailsFragment : ToolbarBottomSheetDialogFragment() {
 
         fun create(messageReference: MessageReference): MessageDetailsFragment {
             return MessageDetailsFragment().withArguments(
-                ARG_REFERENCE to messageReference.toIdentityString()
+                ARG_REFERENCE to messageReference.toIdentityString(),
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt
index 87aed541477..761f75082cf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatter.kt
@@ -18,7 +18,7 @@ internal interface MessageDetailsParticipantFormatter {
 internal class RealMessageDetailsParticipantFormatter(
     private val contactNameProvider: ContactNameProvider,
     private val showContactNames: Boolean,
-    private val contactNameColor: Int?
+    private val contactNameColor: Int?,
 ) : MessageDetailsParticipantFormatter {
     override fun getDisplayName(address: Address, account: Account): CharSequence? {
         val identityDisplayName = account.findIdentity(address)?.name
@@ -47,11 +47,11 @@ internal class RealMessageDetailsParticipantFormatter(
 }
 
 internal fun createMessageDetailsParticipantFormatter(
-    contactNameProvider: ContactNameProvider
+    contactNameProvider: ContactNameProvider,
 ): MessageDetailsParticipantFormatter {
     return RealMessageDetailsParticipantFormatter(
         contactNameProvider = contactNameProvider,
         showContactNames = K9.isShowContactName,
-        contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null
+        contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null,
     )
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt
index d07369f5343..7b2c8dcfa5a 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsUi.kt
@@ -14,18 +14,18 @@ data class MessageDetailsUi(
     val to: List<Participant>,
     val cc: List<Participant>,
     val bcc: List<Participant>,
-    val folder: FolderInfoUi?
+    val folder: FolderInfoUi?,
 )
 
 data class CryptoDetails(
     val cryptoStatus: MessageCryptoDisplayStatus,
-    val isClickable: Boolean
+    val isClickable: Boolean,
 )
 
 data class Participant(
     val displayName: CharSequence?,
     val emailAddress: String,
-    val contactLookupUri: Uri?
+    val contactLookupUri: Uri?,
 ) {
     val isInContacts: Boolean
         get() = contactLookupUri != null
@@ -36,5 +36,5 @@ data class Participant(
 
 data class FolderInfoUi(
     val displayName: String,
-    val type: FolderType
+    val type: FolderType,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt
index c3348e0f894..30553770663 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/MessageDetailsViewModel.kt
@@ -36,7 +36,7 @@ internal class MessageDetailsViewModel(
     private val clipboardManager: ClipboardManager,
     private val accountManager: AccountManager,
     private val participantFormatter: MessageDetailsParticipantFormatter,
-    private val folderNameFormatter: FolderNameFormatter
+    private val folderNameFormatter: FolderNameFormatter,
 ) : ViewModel() {
     private val dateFormat = DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.MEDIUM, Locale.getDefault())
     private val uiState = MutableStateFlow<MessageDetailsState>(MessageDetailsState.Loading)
@@ -63,12 +63,12 @@ internal class MessageDetailsViewModel(
                     to = messageDetails.to.toParticipants(account),
                     cc = messageDetails.cc.toParticipants(account),
                     bcc = messageDetails.bcc.toParticipants(account),
-                    folder = folder?.toFolderInfo()
+                    folder = folder?.toFolderInfo(),
                 )
 
                 MessageDetailsState.DataLoaded(
                     showContactPicture = contactSettingsProvider.isShowContactPicture,
-                    details = messageDetailsUi
+                    details = messageDetailsUi,
                 )
             } catch (e: Exception) {
                 MessageDetailsState.Error
@@ -91,7 +91,7 @@ internal class MessageDetailsViewModel(
         return CryptoDetails(
             cryptoStatus = messageCryptoDisplayStatus,
             isClickable = messageCryptoDisplayStatus.hasAssociatedKey() || messageCryptoDisplayStatus.isUnknownKey ||
-                hasOpenPgpInsecureWarningPendingIntent()
+                hasOpenPgpInsecureWarningPendingIntent(),
         )
     }
 
@@ -103,7 +103,7 @@ internal class MessageDetailsViewModel(
             Participant(
                 displayName = displayName,
                 emailAddress = emailAddress,
-                contactLookupUri = contacts.getContactUri(emailAddress)
+                contactLookupUri = contacts.getContactUri(emailAddress),
             )
         }
     }
@@ -111,7 +111,7 @@ internal class MessageDetailsViewModel(
     private fun Folder.toFolderInfo(): FolderInfoUi {
         return FolderInfoUi(
             displayName = folderNameFormatter.displayName(this),
-            type = this.type
+            type = this.type,
         )
     }
 
@@ -155,7 +155,7 @@ sealed interface MessageDetailsState {
     object Error : MessageDetailsState
     data class DataLoaded(
         val showContactPicture: Boolean,
-        val details: MessageDetailsUi
+        val details: MessageDetailsUi,
     ) : MessageDetailsState
 }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
index ff93d06ea4c..40ff82831d8 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/ParticipantItem.kt
@@ -13,7 +13,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 internal class ParticipantItem(
     private val contactPictureLoader: ContactPictureLoader,
     private val showContactsPicture: Boolean,
-    val participant: Participant
+    val participant: Participant,
 ) : AbstractItem<ParticipantItem.ViewHolder>() {
     override val type: Int = R.id.message_details_participant
     override val layoutRes = R.layout.message_details_participant_item
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
index 487aba72907..0e2e7846ef9 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagedetails/SectionHeaderItem.kt
@@ -8,7 +8,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 
 internal class SectionHeaderItem(
     private val title: String,
-    private val extra: String?
+    private val extra: String?,
 ) : AbstractItem<SectionHeaderItem.ViewHolder>() {
     override val type: Int = R.id.message_details_section_header
     override val layoutRes = R.layout.message_details_section_header_item
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 487fcea1c55..11aa93041e5 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
@@ -11,7 +11,7 @@ val messageListUiModule = module {
             preferences = get(),
             localStoreProvider = get(),
             messageListRepository = get(),
-            messageHelper = get()
+            messageHelper = get(),
         )
     }
     factory {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
index 18846ed8bb4..17cc97b8505 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAdapter.kt
@@ -44,7 +44,7 @@ class MessageListAdapter internal constructor(
     private val contactsPictureLoader: ContactPictureLoader,
     private val listItemListener: MessageListItemActionListener,
     private val appearance: MessageListAppearance,
-    private val relativeDateTimeFormatter: RelativeDateTimeFormatter
+    private val relativeDateTimeFormatter: RelativeDateTimeFormatter,
 ) : RecyclerView.Adapter<MessageListViewHolder>() {
 
     private val forwardedIcon: Drawable = theme.resolveDrawableAttribute(R.attr.messageListForwarded)
@@ -54,16 +54,18 @@ class MessageListAdapter internal constructor(
     private val activeItemBackgroundColor: Int = theme.resolveColorAttribute(
         colorAttrId = R.attr.messageListActiveItemBackgroundColor,
         alphaFractionAttrId = R.attr.messageListActiveItemBackgroundAlphaFraction,
-        backgroundColorAttrId = R.attr.messageListActiveItemBackgroundAlphaBackground
+        backgroundColorAttrId = R.attr.messageListActiveItemBackgroundAlphaBackground,
     )
     private val selectedItemBackgroundColor: Int = theme.resolveColorAttribute(
         colorAttrId = R.attr.messageListSelectedBackgroundColor,
         alphaFractionAttrId = R.attr.messageListSelectedBackgroundAlphaFraction,
-        backgroundColorAttrId = R.attr.messageListSelectedBackgroundAlphaBackground
+        backgroundColorAttrId = R.attr.messageListSelectedBackgroundAlphaBackground,
     )
-    private val regularItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListRegularItemBackgroundColor)
+    private val regularItemBackgroundColor: Int =
+        theme.resolveColorAttribute(R.attr.messageListRegularItemBackgroundColor)
     private val readItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListReadItemBackgroundColor)
-    private val unreadItemBackgroundColor: Int = theme.resolveColorAttribute(R.attr.messageListUnreadItemBackgroundColor)
+    private val unreadItemBackgroundColor: Int =
+        theme.resolveColorAttribute(R.attr.messageListUnreadItemBackgroundColor)
 
     var messages: List<MessageListItem> = emptyList()
         @SuppressLint("NotifyDataSetChanged")
@@ -79,7 +81,7 @@ class MessageListAdapter internal constructor(
             }
 
             val diffResult = DiffUtil.calculateDiff(
-                MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value)
+                MessageListDiffCallback(oldMessageList = oldMessageList, newMessageList = value),
             )
             diffResult.dispatchUpdatesTo(this)
         }
@@ -267,7 +269,10 @@ class MessageListAdapter internal constructor(
         // 1 preview line is needed even if it is set to 0, because subject is part of the same text view
         holder.preview.maxLines = max(appearance.previewLines, 1)
         appearance.fontSizes.setViewTextSize(holder.preview, appearance.fontSizes.messageListPreview)
-        appearance.fontSizes.setViewTextSize(holder.threadCount, appearance.fontSizes.messageListSubject) // thread count is next to subject
+        appearance.fontSizes.setViewTextSize(
+            holder.threadCount,
+            appearance.fontSizes.messageListSubject,
+        ) // thread count is next to subject
 
         holder.star.isVisible = appearance.stars
         holder.star.tag = holder
@@ -379,7 +384,7 @@ class MessageListAdapter internal constructor(
             ForegroundColorSpan(previewTextColor),
             beforePreviewLength,
             previewText.length,
-            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+            Spannable.SPAN_EXCLUSIVE_EXCLUSIVE,
         )
     }
 
@@ -524,7 +529,7 @@ class MessageListAdapter internal constructor(
 
 private class MessageListDiffCallback(
     private val oldMessageList: List<MessageListItem>,
-    private val newMessageList: List<MessageListItem>
+    private val newMessageList: List<MessageListItem>,
 ) : DiffUtil.Callback() {
     override fun getOldListSize(): Int = oldMessageList.size
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt
index d7ee9cc38d8..f3638cf4bba 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListAppearance.kt
@@ -10,5 +10,5 @@ data class MessageListAppearance(
     val showContactPicture: Boolean,
     val showingThreadedList: Boolean,
     val backGroundAsReadIndicator: Boolean,
-    val showAccountChip: Boolean
+    val showAccountChip: Boolean,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt
index 8d8ad2d2721..71cc0bbd416 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListConfig.kt
@@ -11,10 +11,10 @@ data class MessageListConfig(
     val sortAscending: Boolean,
     val sortDateAscending: Boolean,
     val activeMessage: MessageReference?,
-    val sortOverrides: Map<MessageReference, MessageSortOverride>
+    val sortOverrides: Map<MessageReference, MessageSortOverride>,
 )
 
 data class MessageSortOverride(
     val isRead: Boolean,
-    val isStarred: Boolean
+    val isStarred: Boolean,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
index a389f70405d..b78aa47f806 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListFragment.kt
@@ -244,7 +244,7 @@ class MessageListFragment :
             contactsPictureLoader = ContactPicture.getContactPictureLoader(),
             listItemListener = this,
             appearance = messageListAppearance,
-            relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock)
+            relativeDateTimeFormatter = RelativeDateTimeFormatter(requireContext(), clock),
         ).apply {
             activeMessage = this@MessageListFragment.activeMessage
         }
@@ -343,8 +343,8 @@ class MessageListFragment :
                 swipeRightAction = K9.swipeRightAction,
                 swipeLeftAction = K9.swipeLeftAction,
                 adapter,
-                swipeListener
-            )
+                swipeListener,
+            ),
         )
         itemTouchHelper.attachToRecyclerView(recyclerView)
 
@@ -369,13 +369,15 @@ class MessageListFragment :
         recentChangesSnackbar = Snackbar
             .make(coordinatorLayout, R.string.changelog_snackbar_text, Snackbar.LENGTH_INDEFINITE)
             .setAction(R.string.okay_action) { launchRecentChangesActivity() }
-            .addCallback(object : BaseCallback<Snackbar>() {
-                override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
-                    if (event == DISMISS_EVENT_SWIPE) {
-                        recentChangesViewModel.onRecentChangesHintDismissed()
+            .addCallback(
+                object : BaseCallback<Snackbar>() {
+                    override fun onDismissed(transientBottomBar: Snackbar?, event: Int) {
+                        if (event == DISMISS_EVENT_SWIPE) {
+                            recentChangesViewModel.onRecentChangesHintDismissed()
+                        }
                     }
-                }
-            })
+                },
+            )
 
         recentChangesViewModel.shouldShowRecentChangesHint
             .observe(viewLifecycleOwner, shouldShowRecentChangesHintObserver)
@@ -409,7 +411,7 @@ class MessageListFragment :
             sortAscending,
             sortDateAscending,
             activeMessage,
-            viewModel.messageSortOverrides.toMap()
+            viewModel.messageSortOverrides.toMap(),
         )
         viewModel.loadMessageList(config)
     }
@@ -505,7 +507,7 @@ class MessageListFragment :
                 account,
                 currentFolder.databaseId,
                 loadSearchResults,
-                activityListener
+                activityListener,
             )
         }
     }
@@ -554,7 +556,7 @@ class MessageListFragment :
         outState.putBoolean(STATE_REMOTE_SEARCH_PERFORMED, isRemoteSearch)
         outState.putStringArray(
             STATE_ACTIVE_MESSAGES,
-            activeMessages?.map(MessageReference::toIdentityString)?.toTypedArray()
+            activeMessages?.map(MessageReference::toIdentityString)?.toTypedArray(),
         )
         if (activeMessage != null) {
             outState.putString(STATE_ACTIVE_MESSAGE, activeMessage!!.toIdentityString())
@@ -570,7 +572,7 @@ class MessageListFragment :
             showContactPicture = K9.isShowContactPicture,
             showingThreadedList = showingThreadedList,
             backGroundAsReadIndicator = K9.isUseBackgroundAsUnreadIndicator,
-            showAccountChip = isShowAccountChip
+            showAccountChip = isShowAccountChip,
         )
 
     private fun getFolderInfoHolder(folderId: Long, account: Account): FolderInfoHolder {
@@ -627,7 +629,7 @@ class MessageListFragment :
             queryString,
             null,
             null,
-            activityListener
+            activityListener,
         )
 
         invalidateMenu()
@@ -709,7 +711,8 @@ class MessageListFragment :
 
         when (requestCode) {
             ACTIVITY_CHOOSE_FOLDER_MOVE,
-            ACTIVITY_CHOOSE_FOLDER_COPY -> {
+            ACTIVITY_CHOOSE_FOLDER_COPY,
+            -> {
                 if (data == null) return
 
                 val destinationFolderId = data.getLongExtra(ChooseFolderActivity.RESULT_SELECTED_FOLDER_ID, -1L)
@@ -756,7 +759,7 @@ class MessageListFragment :
                 val message = resources.getQuantityString(
                     R.plurals.dialog_confirm_spam_message,
                     selectionSize,
-                    selectionSize
+                    selectionSize,
                 )
                 val confirmText = getString(R.string.dialog_confirm_spam_confirm_button)
                 val cancelText = getString(R.string.dialog_confirm_spam_cancel_button)
@@ -768,7 +771,7 @@ class MessageListFragment :
                 val message = resources.getQuantityString(
                     R.plurals.dialog_confirm_delete_messages,
                     selectionSize,
-                    selectionSize
+                    selectionSize,
                 )
                 val confirmText = getString(R.string.dialog_confirm_delete_confirm_button)
                 val cancelText = getString(R.string.dialog_confirm_delete_cancel_button)
@@ -1048,7 +1051,7 @@ class MessageListFragment :
             sourceFolderId = folderId,
             accountUuid = messages.first().accountUuid,
             lastSelectedFolderId = null,
-            messages = messages
+            messages = messages,
         )
     }
 
@@ -1071,7 +1074,7 @@ class MessageListFragment :
             sourceFolderId = folderId,
             accountUuid = messages.first().accountUuid,
             lastSelectedFolderId = null,
-            messages = messages
+            messages = messages,
         )
     }
 
@@ -1081,7 +1084,7 @@ class MessageListFragment :
         sourceFolderId: Long?,
         accountUuid: String,
         lastSelectedFolderId: Long?,
-        messages: List<MessageReference>
+        messages: List<MessageReference>,
     ) {
         val action = when (operation) {
             FolderOperation.COPY -> ChooseFolderActivity.Action.COPY
@@ -1094,7 +1097,7 @@ class MessageListFragment :
             currentFolderId = sourceFolderId,
             scrollToFolderId = lastSelectedFolderId,
             showDisplayableOnly = false,
-            messageReference = null
+            messageReference = null,
         )
 
         // remember the selected messages for #onActivityResult
@@ -1154,7 +1157,7 @@ class MessageListFragment :
                 val toast = Toast.makeText(
                     activity,
                     R.string.move_copy_cannot_copy_unsynced_message,
-                    Toast.LENGTH_LONG
+                    Toast.LENGTH_LONG,
                 )
                 toast.show()
                 return false
@@ -1286,7 +1289,7 @@ class MessageListFragment :
                     currentFolder!!.databaseId,
                     0,
                     searchAccount.remoteSearchNumResults,
-                    null
+                    null,
                 )
             } catch (e: Exception) {
                 // Since the user is going back, log and squash any exceptions.
@@ -1546,7 +1549,7 @@ class MessageListFragment :
             messageSortOverrides.addLast(existingEntry)
         } else {
             messageSortOverrides.addLast(
-                messageReference to MessageSortOverride(messageListItem.isRead, messageListItem.isStarred)
+                messageReference to MessageSortOverride(messageListItem.isRead, messageListItem.isStarred),
             )
             if (messageSortOverrides.size > MAXIMUM_MESSAGE_SORT_OVERRIDES) {
                 messageSortOverrides.removeFirst()
@@ -1707,7 +1710,7 @@ class MessageListFragment :
             folderId: Long,
             numResults: Int,
             maxResults: Int,
-            extraResults: List<String>?
+            extraResults: List<String>?,
         ) {
             handler.progress(false)
             handler.remoteSearchFinished()
@@ -1728,7 +1731,7 @@ class MessageListFragment :
                     R.plurals.remote_search_downloading_limited,
                     maxResults,
                     maxResults,
-                    numResults
+                    numResults,
                 )
             } else {
                 resources.getQuantityString(R.plurals.remote_search_downloading, numResults, numResults)
@@ -1760,7 +1763,7 @@ class MessageListFragment :
             account: Account,
             folderServerId: String,
             completed: Int,
-            total: Int
+            total: Int,
         ) {
             synchronized(lock) {
                 folderCompleted = completed
@@ -1774,7 +1777,7 @@ class MessageListFragment :
             account: Account,
             folderServerId: String,
             total: Int,
-            completed: Int
+            completed: Int,
         ) {
             synchronized(lock) {
                 folderCompleted = 0
@@ -2024,7 +2027,7 @@ class MessageListFragment :
     }
 
     private enum class Error(@StringRes val errorText: Int) {
-        FolderNotFound(R.string.message_list_error_folder_not_found)
+        FolderNotFound(R.string.message_list_error_folder_not_found),
     }
 
     interface MessageListFragmentListener {
@@ -2061,7 +2064,7 @@ class MessageListFragment :
                 arguments = bundleOf(
                     ARG_SEARCH to search,
                     ARG_IS_THREAD_DISPLAY to isThreadDisplay,
-                    ARG_THREADED_LIST to threadedList
+                    ARG_THREADED_LIST to threadedList,
                 )
             }
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt
index d83b045aa59..42e5a9f1f68 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItem.kt
@@ -23,7 +23,7 @@ data class MessageListItem(
     val folderId: Long,
     val messageUid: String,
     val databaseId: Long,
-    val threadRoot: Long
+    val threadRoot: Long,
 ) {
     val messageReference: MessageReference
         get() = MessageReference(account.uuid, folderId, messageUid)
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
index af65ac4a793..3967bc3a54a 100644
--- 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
@@ -15,7 +15,7 @@ class MessageListItemAnimator : DefaultItemAnimator() {
         fromX: Int,
         fromY: Int,
         toX: Int,
-        toY: Int
+        toY: Int,
     ): Boolean {
         if (oldHolder == newHolder && newHolder.wasSwiped) {
             // Don't touch views currently being swiped
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt
index 9292d708db7..d27521e0bbe 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListItemMapper.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.ui.helper.DisplayAddressHelper
 
 class MessageListItemMapper(
     private val messageHelper: MessageHelper,
-    private val account: Account
+    private val account: Account,
 ) : MessageMapper<MessageListItem> {
 
     override fun map(message: MessageDetailsAccessor): MessageListItem {
@@ -46,7 +46,7 @@ class MessageListItemMapper(
             message.folderId,
             message.messageServerId,
             message.id,
-            message.threadRoot
+            message.threadRoot,
         )
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt
index bf757521d24..38f614abc99 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveData.kt
@@ -15,7 +15,7 @@ class MessageListLiveData(
     private val preferences: Preferences,
     private val messageListRepository: MessageListRepository,
     private val coroutineScope: CoroutineScope,
-    val config: MessageListConfig
+    val config: MessageListConfig,
 ) : LiveData<MessageListInfo>() {
 
     private val messageListChangedListener = MessageListChangedListener {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt
index af995910f10..1d947aa6c5d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLiveDataFactory.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.CoroutineScope
 class MessageListLiveDataFactory(
     private val messageListLoader: MessageListLoader,
     private val preferences: Preferences,
-    private val messageListRepository: MessageListRepository
+    private val messageListRepository: MessageListRepository,
 ) {
     fun create(coroutineScope: CoroutineScope, config: MessageListConfig): MessageListLiveData {
         return MessageListLiveData(messageListLoader, preferences, messageListRepository, coroutineScope, config)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt
index 595e3f115a7..a59cb0a1bcf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagelist/MessageListLoader.kt
@@ -17,7 +17,7 @@ class MessageListLoader(
     private val preferences: Preferences,
     private val localStoreProvider: LocalStoreProvider,
     private val messageListRepository: MessageListRepository,
-    private val messageHelper: MessageHelper
+    private val messageHelper: MessageHelper,
 ) {
 
     fun getMessageList(config: MessageListConfig): MessageListInfo {
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
index 9c2311284d2..b6a89a7ba90 100644
--- 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
@@ -25,7 +25,7 @@ class MessageListSwipeCallback(
     private val swipeRightAction: SwipeAction,
     private val swipeLeftAction: SwipeAction,
     private val adapter: MessageListAdapter,
-    private val listener: MessageListSwipeListener
+    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)
@@ -63,7 +63,7 @@ class MessageListSwipeCallback(
     override fun onMove(
         recyclerView: RecyclerView,
         viewHolder: ViewHolder,
-        target: ViewHolder
+        target: ViewHolder,
     ): Boolean {
         throw UnsupportedOperationException("not implemented")
     }
@@ -128,7 +128,7 @@ class MessageListSwipeCallback(
         dY: Float,
         actionState: Int,
         isCurrentlyActive: Boolean,
-        success: Boolean
+        success: Boolean,
     ) {
         val view = viewHolder.itemView
         val viewWidth = view.width
@@ -158,7 +158,7 @@ class MessageListSwipeCallback(
             0F,
             width.toFloat(),
             height.toFloat(),
-            backgroundColorPaint
+            backgroundColorPaint,
         )
     }
 
@@ -230,7 +230,7 @@ class MessageListSwipeCallback(
         recyclerView: RecyclerView,
         animationType: Int,
         animateDx: Float,
-        animateDy: Float
+        animateDy: Float,
     ): Long {
         val percentage = abs(animateDx) / recyclerView.width
         return (super.getAnimationDuration(recyclerView, animationType, animateDx, animateDy) * percentage).toLong()
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
index 3f0142be6fc..b66020578e6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messagesource/MessageHeadersFragment.kt
@@ -39,7 +39,7 @@ class MessageHeadersFragment : Fragment() {
             owner = this,
             loadingView = view.findViewById(R.id.message_headers_loading),
             errorView = view.findViewById(R.id.message_headers_error),
-            dataView = view.findViewById(R.id.message_headers_data)
+            dataView = view.findViewById(R.id.message_headers_data),
         ) { headers ->
             populateHeadersList(messageHeaderView, headers)
         }
@@ -68,7 +68,7 @@ class MessageHeadersFragment : Fragment() {
 
         fun newInstance(reference: MessageReference): MessageHeadersFragment {
             return MessageHeadersFragment().withArguments(
-                ARG_REFERENCE to reference.toIdentityString()
+                ARG_REFERENCE to reference.toIdentityString(),
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt
index 62431d38716..172ecf0a585 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/Direction.kt
@@ -2,5 +2,5 @@ package com.fsck.k9.ui.messageview
 
 enum class Direction {
     PREVIOUS,
-    NEXT
+    NEXT,
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt
index 100fed4fd84..95a10e4925f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractor.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.mail.Message
  */
 internal class DisplayRecipientsExtractor(
     private val recipientFormatter: MessageViewRecipientFormatter,
-    private val maxNumberOfDisplayRecipients: Int
+    private val maxNumberOfDisplayRecipients: Int,
 ) {
     fun extractDisplayRecipients(message: Message, account: Account): DisplayRecipients {
         val toRecipients = message.getRecipients(Message.RecipientType.TO)
@@ -54,5 +54,5 @@ internal class DisplayRecipientsExtractor(
 
 internal data class DisplayRecipients(
     val recipientNames: List<CharSequence>,
-    val numberOfRecipients: Int
+    val numberOfRecipients: Int,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt
index b5bfd669483..3e347e8ddfd 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/LinkTextHandler.kt
@@ -8,7 +8,7 @@ import com.fsck.k9.ui.R
 
 internal class LinkTextHandler(
     private val context: Context,
-    private val clipboardManager: ClipboardManager
+    private val clipboardManager: ClipboardManager,
 ) : Handler() {
 
     override fun handleMessage(message: Message) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
index ca68a3b5a25..3e8f3903f9c 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageContainerView.kt
@@ -114,7 +114,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
     private fun createLinkMenu(
         menu: ContextMenu,
         webView: WebView,
-        linkUrl: String?
+        linkUrl: String?,
     ) {
         if (linkUrl == null) return
 
@@ -148,28 +148,28 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
             Menu.NONE,
             MENU_ITEM_LINK_VIEW,
             0,
-            context.getString(R.string.webview_contextmenu_link_view_action)
+            context.getString(R.string.webview_contextmenu_link_view_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_LINK_SHARE,
             1,
-            context.getString(R.string.webview_contextmenu_link_share_action)
+            context.getString(R.string.webview_contextmenu_link_share_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_LINK_COPY,
             2,
-            context.getString(R.string.webview_contextmenu_link_copy_action)
+            context.getString(R.string.webview_contextmenu_link_copy_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_LINK_TEXT_COPY,
             3,
-            context.getString(R.string.webview_contextmenu_link_text_copy_action)
+            context.getString(R.string.webview_contextmenu_link_text_copy_action),
         ).setOnMenuItemClickListener(listener)
     }
 
@@ -217,7 +217,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
             Menu.NONE,
             MENU_ITEM_IMAGE_VIEW,
             0,
-            context.getString(R.string.webview_contextmenu_image_view_action)
+            context.getString(R.string.webview_contextmenu_image_view_action),
         ).setOnMenuItemClickListener(listener)
 
         if (inlineImage || imageUri.scheme?.lowercase() in supportedDownloadUriSchemes) {
@@ -229,7 +229,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                     context.getString(R.string.webview_contextmenu_image_save_action)
                 } else {
                     context.getString(R.string.webview_contextmenu_image_download_action)
-                }
+                },
             ).setOnMenuItemClickListener(listener)
         }
 
@@ -238,7 +238,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                 Menu.NONE,
                 MENU_ITEM_IMAGE_COPY,
                 2,
-                context.getString(R.string.webview_contextmenu_image_copy_action)
+                context.getString(R.string.webview_contextmenu_image_copy_action),
             ).setOnMenuItemClickListener(listener)
         }
     }
@@ -271,21 +271,21 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
             Menu.NONE,
             MENU_ITEM_PHONE_CALL,
             0,
-            context.getString(R.string.webview_contextmenu_phone_call_action)
+            context.getString(R.string.webview_contextmenu_phone_call_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_PHONE_SAVE,
             1,
-            context.getString(R.string.webview_contextmenu_phone_save_action)
+            context.getString(R.string.webview_contextmenu_phone_save_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_PHONE_COPY,
             2,
-            context.getString(R.string.webview_contextmenu_phone_copy_action)
+            context.getString(R.string.webview_contextmenu_phone_copy_action),
         ).setOnMenuItemClickListener(listener)
     }
 
@@ -317,21 +317,21 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
             Menu.NONE,
             MENU_ITEM_EMAIL_SEND,
             0,
-            context.getString(R.string.webview_contextmenu_email_send_action)
+            context.getString(R.string.webview_contextmenu_email_send_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_EMAIL_SAVE,
             1,
-            context.getString(R.string.webview_contextmenu_email_save_action)
+            context.getString(R.string.webview_contextmenu_email_save_action),
         ).setOnMenuItemClickListener(listener)
 
         menu.add(
             Menu.NONE,
             MENU_ITEM_EMAIL_COPY,
             2,
-            context.getString(R.string.webview_contextmenu_email_copy_action)
+            context.getString(R.string.webview_contextmenu_email_copy_action),
         ).setOnMenuItemClickListener(listener)
     }
 
@@ -383,7 +383,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
         onRenderingFinishedListener: OnRenderingFinishedListener,
         loadPictures: Boolean,
         hideUnsignedTextDivider: Boolean,
-        attachmentCallback: AttachmentViewCallback?
+        attachmentCallback: AttachmentViewCallback?,
     ) {
         this.attachmentCallback = attachmentCallback
 
@@ -407,7 +407,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
         displayHtmlContentWithInlineAttachments(
             htmlText = textToDisplay,
             attachmentResolver = messageViewInfo.attachmentResolver,
-            onPageFinishedListener = onRenderingFinishedListener::onLoadFinished
+            onPageFinishedListener = onRenderingFinishedListener::onLoadFinished,
         )
 
         if (!messageViewInfo.extraText.isNullOrEmpty()) {
@@ -420,7 +420,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
     private fun displayHtmlContentWithInlineAttachments(
         htmlText: String,
         attachmentResolver: AttachmentResolver,
-        onPageFinishedListener: OnPageFinishedListener
+        onPageFinishedListener: OnPageFinishedListener,
     ) {
         currentHtmlText = htmlText
         currentAttachmentResolver = attachmentResolver
@@ -433,7 +433,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
         messageContentView.displayHtmlContentWithInlineAttachments(
             htmlText = htmlText,
             attachmentResolver = currentAttachmentResolver,
-            onPageFinishedListener = null
+            onPageFinishedListener = null,
         )
     }
 
@@ -441,7 +441,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
         messageContentView.displayHtmlContentWithInlineAttachments(
             htmlText = "",
             attachmentResolver = null,
-            onPageFinishedListener = null
+            onPageFinishedListener = null,
         )
 
         unsignedTextContainer.isVisible = false
@@ -459,7 +459,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                 val attachmentView = layoutInflater.inflate(
                     R.layout.message_view_attachment,
                     attachmentsContainer,
-                    false
+                    false,
                 ) as AttachmentView
 
                 attachmentView.setCallback(attachmentCallback)
@@ -480,7 +480,7 @@ class MessageContainerView(context: Context, attrs: AttributeSet?) :
                 val lockedAttachmentView = layoutInflater.inflate(
                     R.layout.message_view_attachment_locked,
                     attachmentsContainer,
-                    false
+                    false,
                 ) as LockedAttachmentView
 
                 lockedAttachmentView.setCallback(attachmentCallback)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
index b138f01e13e..3c6ff767882 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageTopView.kt
@@ -31,7 +31,7 @@ import com.fsck.k9.view.ToolableViewAnimator
 
 class MessageTopView(
     context: Context,
-    attrs: AttributeSet?
+    attrs: AttributeSet?,
 ) : LinearLayout(context, attrs) {
 
     private lateinit var layoutInflater: LayoutInflater
@@ -112,7 +112,7 @@ class MessageTopView(
         val view = layoutInflater.inflate(
             R.layout.message_container,
             containerView,
-            false
+            false,
         ) as MessageContainerView
         containerView.addView(view)
 
@@ -126,7 +126,7 @@ class MessageTopView(
             },
             loadPictures,
             hideUnsignedTextDivider,
-            attachmentCallback
+            attachmentCallback,
         )
 
         if (view.hasHiddenExternalImages && !showPicturesButtonClicked) {
@@ -280,13 +280,15 @@ class MessageTopView(
             progressBar,
             "progress",
             progressBar.progress,
-            PROGRESS_MAX
+            PROGRESS_MAX,
+        )
+        animator.addListener(
+            object : AnimatorListenerAdapter() {
+                override fun onAnimationEnd(animator: Animator) {
+                    viewAnimator.displayedChild = 2
+                }
+            },
         )
-        animator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animator: Animator) {
-                viewAnimator.displayedChild = 2
-            }
-        })
         animator.duration = PROGRESS_STEP_DURATION.toLong()
         animator.start()
     }
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 f2caf1b71b8..3444777cfec 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
@@ -99,21 +99,23 @@ class MessageViewContainerFragment : Fragment() {
         viewPager.isUserInputEnabled = true
         viewPager.offscreenPageLimit = ViewPager2.OFFSCREEN_PAGE_LIMIT_DEFAULT
         viewPager.setPageTransformer(MarginPageTransformer(pageMargin))
-        viewPager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
-            // The message list is updated each time the active message is changed. To avoid message list updates
-            // during the animation, we only set the active message after the animation has finished.
-            override fun onPageScrollStateChanged(state: Int) {
-                if (state == ViewPager2.SCROLL_STATE_IDLE) {
-                    setActiveMessage(viewPager.currentItem)
+        viewPager.registerOnPageChangeCallback(
+            object : ViewPager2.OnPageChangeCallback() {
+                // The message list is updated each time the active message is changed. To avoid message list updates
+                // during the animation, we only set the active message after the animation has finished.
+                override fun onPageScrollStateChanged(state: Int) {
+                    if (state == ViewPager2.SCROLL_STATE_IDLE) {
+                        setActiveMessage(viewPager.currentItem)
+                    }
                 }
-            }
 
-            override fun onPageSelected(position: Int) {
-                if (viewPager.scrollState == ViewPager2.SCROLL_STATE_IDLE) {
-                    setActiveMessage(position)
+                override fun onPageSelected(position: Int) {
+                    if (viewPager.scrollState == ViewPager2.SCROLL_STATE_IDLE) {
+                        setActiveMessage(position)
+                    }
                 }
-            }
-        })
+            },
+        )
 
         return view
     }
@@ -235,13 +237,13 @@ class MessageViewContainerFragment : Fragment() {
 
     private class MessageViewContainerAdapter(
         fragment: Fragment,
-        private val showAccountChip: Boolean
+        private val showAccountChip: Boolean,
     ) : FragmentStateAdapter(fragment) {
 
         var messageList: List<MessageListItem> = emptyList()
             set(value) {
                 val diffResult = DiffUtil.calculateDiff(
-                    MessageListDiffCallback(oldMessageList = messageList, newMessageList = value)
+                    MessageListDiffCallback(oldMessageList = messageList, newMessageList = value),
                 )
 
                 field = value
@@ -283,7 +285,7 @@ class MessageViewContainerFragment : Fragment() {
 
     private class MessageListDiffCallback(
         private val oldMessageList: List<MessageListItem>,
-        private val newMessageList: List<MessageListItem>
+        private val newMessageList: List<MessageListItem>,
     ) : DiffUtil.Callback() {
         override fun getOldListSize(): Int = oldMessageList.size
 
@@ -314,7 +316,7 @@ class MessageViewContainerFragment : Fragment() {
         fun newInstance(reference: MessageReference, showAccountChip: Boolean): MessageViewContainerFragment {
             return MessageViewContainerFragment().withArguments(
                 ARG_REFERENCE to reference.toIdentityString(),
-                ARG_SHOW_ACCOUNT_CHIP to showAccountChip
+                ARG_SHOW_ACCOUNT_CHIP to showAccountChip,
             )
         }
     }
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 73f3d5a4ed6..f8f22ad1206 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
@@ -130,7 +130,7 @@ class MessageViewFragment :
             context = requireContext().applicationContext,
             loaderManager = loaderManager,
             fragmentManager = parentFragmentManager,
-            callback = messageLoaderCallbacks
+            callback = messageLoaderCallbacks,
         )
 
         setFragmentResultListener(MessageDetailsFragment.FRAGMENT_RESULT_KEY, ::onMessageDetailsResult)
@@ -339,7 +339,7 @@ class MessageViewFragment :
         val handledByCryptoPresenter = messageCryptoPresenter.maybeHandleShowMessage(
             messageTopView,
             account,
-            messageViewInfo
+            messageViewInfo,
         )
 
         if (!handledByCryptoPresenter) {
@@ -463,7 +463,7 @@ class MessageViewFragment :
 
         fragmentListener.onReply(
             messageReference = message.makeMessageReference(),
-            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply,
         )
     }
 
@@ -472,7 +472,7 @@ class MessageViewFragment :
 
         fragmentListener.onReplyAll(
             messageReference = message.makeMessageReference(),
-            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply,
         )
     }
 
@@ -481,7 +481,7 @@ class MessageViewFragment :
 
         fragmentListener.onForward(
             messageReference = message.makeMessageReference(),
-            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply,
         )
     }
 
@@ -490,7 +490,7 @@ class MessageViewFragment :
 
         fragmentListener.onForwardAsAttachment(
             messageReference = message.makeMessageReference(),
-            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply
+            decryptionResultForReply = messageCryptoPresenter.decryptionResultForReply,
         )
     }
 
@@ -555,7 +555,7 @@ class MessageViewFragment :
             currentFolderId = messageReference.folderId,
             scrollToFolderId = account.lastSelectedFolderId,
             showDisplayableOnly = false,
-            messageReference = messageReference
+            messageReference = messageReference,
         )
 
         startActivityForResult(intent, requestCode)
@@ -679,7 +679,7 @@ class MessageViewFragment :
                     title,
                     message,
                     confirmText,
-                    cancelText
+                    cancelText,
                 )
             }
             R.id.dialog_confirm_spam -> {
@@ -692,7 +692,7 @@ class MessageViewFragment :
                     title,
                     message,
                     confirmText,
-                    cancelText
+                    cancelText,
                 )
             }
             R.id.dialog_attachment_progress -> {
@@ -826,7 +826,7 @@ class MessageViewFragment :
             fillIntent: Intent?,
             flagsMask: Int,
             flagValues: Int,
-            extraFlags: Int
+            extraFlags: Int,
         ) {
             if (requestCode == null) {
                 requireActivity().startIntentSender(intentSender, fillIntent, flagsMask, flagValues, extraFlags)
@@ -840,7 +840,7 @@ class MessageViewFragment :
                 fillIntent,
                 flagsMask,
                 flagValues,
-                extraFlags
+                extraFlags,
             )
         }
 
@@ -922,7 +922,7 @@ class MessageViewFragment :
             fillIntent: Intent?,
             flagsMask: Int,
             flagValues: Int,
-            extraFlags: Int
+            extraFlags: Int,
         ): Boolean {
             if (!isActive) return false
 
@@ -935,7 +935,7 @@ class MessageViewFragment :
                     fillIntent,
                     flagsMask,
                     flagValues,
-                    extraFlags
+                    extraFlags,
                 )
             } catch (e: SendIntentException) {
                 Timber.e(e, "Irrecoverable error calling PendingIntent!")
@@ -996,7 +996,7 @@ class MessageViewFragment :
         fun newInstance(reference: MessageReference, showAccountChip: Boolean): MessageViewFragment {
             return MessageViewFragment().withArguments(
                 ARG_REFERENCE to reference.toIdentityString(),
-                ARG_SHOW_ACCOUNT_CHIP to showAccountChip
+                ARG_SHOW_ACCOUNT_CHIP to showAccountChip,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt
index f438cb0aeca..546012c1f25 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatter.kt
@@ -23,7 +23,7 @@ internal class RealMessageViewRecipientFormatter(
     private val showCorrespondentNames: Boolean,
     private val showContactNames: Boolean,
     private val contactNameColor: Int?,
-    private val meText: String
+    private val meText: String,
 ) : MessageViewRecipientFormatter {
     override fun getDisplayName(address: Address, account: Account): CharSequence {
         val identity = account.findIdentity(address)
@@ -78,13 +78,13 @@ internal class RealMessageViewRecipientFormatter(
 
 internal fun createMessageViewRecipientFormatter(
     contactNameProvider: ContactNameProvider,
-    resources: Resources
+    resources: Resources,
 ): MessageViewRecipientFormatter {
     return RealMessageViewRecipientFormatter(
         contactNameProvider = contactNameProvider,
         showCorrespondentNames = K9.isShowCorrespondentNames,
         showContactNames = K9.isShowContactName,
         contactNameColor = if (K9.isChangeContactNameColor) K9.contactNameColor else null,
-        meText = resources.getString(R.string.message_view_me_text)
+        meText = resources.getString(R.string.message_view_me_text),
     )
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt
index 179caaae88e..f8f2c4ddf56 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientLayoutCreator.kt
@@ -21,12 +21,12 @@ internal class RecipientLayoutCreator(
     private val maxNumberOfRecipientNames: Int,
     private val recipientsPrefix: String,
     private val additionalRecipientSpacing: Int,
-    private val additionalRecipientsPrefix: String
+    private val additionalRecipientsPrefix: String,
 ) {
     fun createRecipientLayout(
         recipientNames: List<CharSequence>,
         totalNumberOfRecipients: Int,
-        availableWidth: Int
+        availableWidth: Int,
     ): RecipientLayoutData {
         require(recipientNames.isNotEmpty())
 
@@ -38,7 +38,7 @@ internal class RecipientLayoutCreator(
 
             return RecipientLayoutData(
                 recipientNames = displayRecipientsBuilder,
-                additionalRecipients = null
+                additionalRecipients = null,
             )
         }
 
@@ -63,7 +63,7 @@ internal class RecipientLayoutCreator(
             if (doesTextFitAvailableWidth(displayRecipientsBuilder, additionalRecipientsBuilder, availableWidth)) {
                 return RecipientLayoutData(
                     recipientNames = displayRecipientsBuilder,
-                    additionalRecipients = additionalRecipientsBuilder.toStringOrNull()
+                    additionalRecipients = additionalRecipientsBuilder.toStringOrNull(),
                 )
             }
         }
@@ -74,14 +74,14 @@ internal class RecipientLayoutCreator(
 
         return RecipientLayoutData(
             recipientNames = displayRecipientsBuilder,
-            additionalRecipients = "$additionalRecipientsPrefix${totalNumberOfRecipients - 1}"
+            additionalRecipients = "$additionalRecipientsPrefix${totalNumberOfRecipients - 1}",
         )
     }
 
     private fun doesTextFitAvailableWidth(
         displayRecipients: CharSequence,
         additionalRecipients: CharSequence,
-        availableWidth: Int
+        availableWidth: Int,
     ): Boolean {
         val recipientNamesWidth = textMeasure.measureRecipientNames(displayRecipients)
         if (recipientNamesWidth > availableWidth) {
@@ -103,7 +103,7 @@ private fun StringBuilder.toStringOrNull(): String? {
 
 internal data class RecipientLayoutData(
     val recipientNames: CharSequence,
-    val additionalRecipients: String?
+    val additionalRecipients: String?,
 )
 
 internal interface TextMeasure {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
index 9c8eb53ccff..5c82354de2b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/RecipientNamesView.kt
@@ -70,7 +70,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
             maxNumberOfRecipientNames = MAX_NUMBER_OF_RECIPIENT_NAMES,
             recipientsPrefix = context.getString(R.string.message_view_recipient_prefix),
             additionalRecipientSpacing = additionRecipientSpacing,
-            additionalRecipientsPrefix = context.getString(R.string.message_view_additional_recipient_prefix)
+            additionalRecipientsPrefix = context.getString(R.string.message_view_additional_recipient_prefix),
         )
 
         if (isInEditMode) {
@@ -79,7 +79,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
                 "Katherine Johnson",
                 "Margaret Hamilton",
                 "Adele Goldberg",
-                "Steve Shirley"
+                "Steve Shirley",
             )
             numberOfRecipients = 8
         }
@@ -122,7 +122,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
         val recipientLayoutData = recipientLayoutCreator.createRecipientLayout(
             recipientNames,
             numberOfRecipients,
-            availableWidth
+            availableWidth,
         )
 
         recipientNameTextView.text = recipientLayoutData.recipientNames
@@ -134,7 +134,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
 
             recipientCountTextView.measure(
                 MeasureSpec.makeMeasureSpec(availableWidth, MeasureSpec.AT_MOST),
-                MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST)
+                MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST),
             )
 
             remainingWidth = availableWidth - additionRecipientSpacing - recipientCountTextView.measuredWidth
@@ -145,7 +145,7 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
 
         recipientNameTextView.measure(
             MeasureSpec.makeMeasureSpec(remainingWidth, MeasureSpec.AT_MOST),
-            MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST)
+            MeasureSpec.makeMeasureSpec(measuredHeight, MeasureSpec.AT_MOST),
         )
 
         if (layoutDirection == LAYOUT_DIRECTION_LTR) {
@@ -154,14 +154,14 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
                 0,
                 0,
                 recipientNameRight,
-                recipientNameTextView.measuredHeight
+                recipientNameTextView.measuredHeight,
             )
             val recipientCountLeft = recipientNameRight + additionRecipientSpacing
             recipientCountTextView.layout(
                 recipientCountLeft,
                 0,
                 recipientCountLeft + recipientCountTextView.measuredWidth,
-                recipientCountTextView.measuredHeight
+                recipientCountTextView.measuredHeight,
             )
         } else {
             val recipientNameLeft = width - recipientNameTextView.measuredWidth
@@ -169,14 +169,14 @@ class RecipientNamesView(context: Context, attrs: AttributeSet?) : ViewGroup(con
                 recipientNameLeft,
                 0,
                 right,
-                recipientNameTextView.measuredHeight
+                recipientNameTextView.measuredHeight,
             )
             val recipientCountRight = recipientNameLeft - additionRecipientSpacing
             recipientCountTextView.layout(
                 recipientCountRight - recipientCountTextView.measuredWidth,
                 0,
                 recipientCountRight,
-                0 + recipientCountTextView.measuredHeight
+                0 + recipientCountTextView.measuredHeight,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt
index 380dd48303d..f01f559fac6 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/notification/DeleteConfirmationActivity.kt
@@ -60,7 +60,7 @@ class DeleteConfirmationActivity : K9Activity(ThemeType.DIALOG), ConfirmationDia
             getString(R.string.dialog_confirm_delete_title),
             message,
             getString(R.string.dialog_confirm_delete_confirm_button),
-            getString(R.string.dialog_confirm_delete_cancel_button)
+            getString(R.string.dialog_confirm_delete_cancel_button),
         )
     }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
index 3235ee7a59d..a2c7f650b2d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/onboarding/OnboardingActivity.kt
@@ -33,7 +33,8 @@ class OnboardingActivity : K9Activity() {
     }
 
     companion object {
-        @JvmStatic fun launch(activity: Activity) {
+        @JvmStatic
+        fun launch(activity: Activity) {
             val intent = Intent(activity, OnboardingActivity::class.java).apply {
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
             }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt
index d3e4595b902..390de548b73 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/Permission.kt
@@ -10,12 +10,12 @@ enum class Permission(
     val permission: String,
     val requestCode: Int,
     @param:StringRes val rationaleTitle: Int,
-    @param:StringRes val rationaleMessage: Int
+    @param:StringRes val rationaleMessage: Int,
 ) {
     READ_CONTACTS(
         Manifest.permission.READ_CONTACTS,
         PERMISSIONS_REQUEST_READ_CONTACTS,
         R.string.permission_contacts_rationale_title,
-        R.string.permission_contacts_rationale_message
-    );
+        R.string.permission_contacts_rationale_message,
+    ),
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt
index fe82f945241..85510ea09ee 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/permissions/PermissionRationaleDialogFragment.kt
@@ -27,7 +27,7 @@ class PermissionRationaleDialogFragment : DialogFragment() {
                 val permissionUiHelper = requireActivity() as? PermissionUiHelper
                     ?: throw AssertionError(
                         "Activities using PermissionRationaleDialogFragment need to " +
-                            "implement PermissionUiHelper"
+                            "implement PermissionUiHelper",
                     )
 
                 permissionUiHelper.requestPermission(permission)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
index 188226792b7..247f9ca740b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/push/PushInfoFragment.kt
@@ -41,7 +41,7 @@ class PushInfoFragment : Fragment() {
             val configureNotificationText = getString(R.string.push_info_configure_notification_text)
             notificationTextView.text = getString(
                 R.string.push_info_notification_explanation_text,
-                configureNotificationText
+                configureNotificationText,
             )
             val configureNotificationButton = view.findViewById<Button>(R.id.configureNotificationButton)
             configureNotificationButton.isVisible = true
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
index bfbbc071cb0..4fe1edcde68 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AboutFragment.kt
@@ -94,8 +94,16 @@ class AboutFragment : Fragment() {
 
     companion object {
         private val USED_LIBRARIES = arrayOf(
-            Library("Android Jetpack libraries", "https://developer.android.com/jetpack", "Apache License, Version 2.0"),
-            Library("AndroidX Preference eXtended", "https://github.com/takisoft/preferencex-android", "Apache License, Version 2.0"),
+            Library(
+                "Android Jetpack libraries",
+                "https://developer.android.com/jetpack",
+                "Apache License, Version 2.0",
+            ),
+            Library(
+                "AndroidX Preference eXtended",
+                "https://github.com/takisoft/preferencex-android",
+                "Apache License, Version 2.0",
+            ),
             Library("AppAuth for Android", "https://github.com/openid/AppAuth-Android", "Apache License, Version 2.0"),
             Library("CircleImageView", "https://github.com/hdodenhof/CircleImageView", "Apache License, Version 2.0"),
             Library("ckChangeLog", "https://github.com/cketti/ckChangeLog", "Apache License, Version 2.0"),
@@ -106,19 +114,39 @@ class AboutFragment : Fragment() {
             Library("jutf7", "http://jutf7.sourceforge.net/", "MIT License"),
             Library("JZlib", "http://www.jcraft.com/jzlib/", "BSD-style License"),
             Library("Koin", "https://insert-koin.io/", "Apache License, Version 2.0"),
-            Library("Kotlin Standard Library", "https://kotlinlang.org/api/latest/jvm/stdlib/", "Apache License, Version 2.0"),
-            Library("KotlinX coroutines", "https://github.com/Kotlin/kotlinx.coroutines", "Apache License, Version 2.0"),
-            Library("Material Components for Android", "https://github.com/material-components/material-components-android", "Apache License, Version 2.0"),
+            Library(
+                "Kotlin Standard Library",
+                "https://kotlinlang.org/api/latest/jvm/stdlib/",
+                "Apache License, Version 2.0",
+            ),
+            Library(
+                "KotlinX coroutines",
+                "https://github.com/Kotlin/kotlinx.coroutines",
+                "Apache License, Version 2.0",
+            ),
+            Library(
+                "Material Components for Android",
+                "https://github.com/material-components/material-components-android",
+                "Apache License, Version 2.0",
+            ),
             Library("Material Drawer", "https://github.com/mikepenz/MaterialDrawer", "Apache License, Version 2.0"),
             Library("Mime4j", "https://james.apache.org/mime4j/", "Apache License, Version 2.0"),
             Library("MiniDNS", "https://github.com/MiniDNS/minidns", "Multiple, Apache License, Version 2.0"),
             Library("Moshi", "https://github.com/square/moshi", "Apache License, Version 2.0"),
             Library("OkHttp", "https://github.com/square/okhttp", "Apache License, Version 2.0"),
             Library("Okio", "https://github.com/square/okio", "Apache License, Version 2.0"),
-            Library("SafeContentResolver", "https://github.com/cketti/SafeContentResolver", "Apache License, Version 2.0"),
+            Library(
+                "SafeContentResolver",
+                "https://github.com/cketti/SafeContentResolver",
+                "Apache License, Version 2.0",
+            ),
             Library("SearchPreference", "https://github.com/ByteHamster/SearchPreference", "MIT License"),
             Library("Timber", "https://github.com/JakeWharton/timber", "Apache License, Version 2.0"),
-            Library("TokenAutoComplete", "https://github.com/splitwise/TokenAutoComplete/", "Apache License, Version 2.0")
+            Library(
+                "TokenAutoComplete",
+                "https://github.com/splitwise/TokenAutoComplete/",
+                "Apache License, Version 2.0",
+            ),
         )
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
index a4a52e34ce1..b119822dcd1 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/AccountItem.kt
@@ -16,7 +16,7 @@ import com.mikepenz.fastadapter.listeners.TouchEventHook
 
 internal class AccountItem(
     val account: Account,
-    override var isDraggable: Boolean
+    override var isDraggable: Boolean,
 ) : AbstractItem<AccountItem.ViewHolder>(), IDraggable {
     override var identifier = 200L + account.accountNumber
 
@@ -62,7 +62,7 @@ internal class DragHandleTouchEvent(val action: (position: Int) -> Unit) : Touch
         event: MotionEvent,
         position: Int,
         fastAdapter: FastAdapter<AccountItem>,
-        item: AccountItem
+        item: AccountItem,
     ): Boolean {
         return if (event.action == MotionEvent.ACTION_DOWN) {
             action(position)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt
index 52498229f5c..eb055a03a1b 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/KoinModule.kt
@@ -31,7 +31,7 @@ val settingsUiModule = module {
             jobManager = get(),
             executorService = get(named("SaveSettingsExecutorService")),
             notificationChannelManager = get(),
-            notificationController = get()
+            notificationController = get(),
         )
     }
     factory { getSystemVibrator(context = get()) }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
index d8eada8801d..83aa3d66862 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActionItem.kt
@@ -13,7 +13,7 @@ internal class SettingsActionItem(
     override var identifier: Long,
     val text: String,
     @IdRes val navigationAction: Int,
-    val icon: Int
+    val icon: Int,
 ) : AbstractItem<SettingsActionItem.ViewHolder>() {
     override val type = R.id.settings_list_action_item
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
index 1fc0e6474cb..122b33207af 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsActivity.kt
@@ -38,7 +38,8 @@ class SettingsActivity : K9Activity() {
     }
 
     companion object {
-        @JvmStatic fun launch(activity: Activity) {
+        @JvmStatic
+        fun launch(activity: Activity) {
             val intent = Intent(activity, SettingsActivity::class.java)
             activity.startActivity(intent)
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
index f680282bb51..4fad2b75f29 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsDividerItem.kt
@@ -8,7 +8,7 @@ import com.mikepenz.fastadapter.items.AbstractItem
 
 internal class SettingsDividerItem(
     override var identifier: Long,
-    val text: String
+    val text: String,
 ) : AbstractItem<SettingsDividerItem.ViewHolder>() {
     override val type = R.id.settings_list_header_item
 
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 121883d90f1..69d952de325 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
@@ -63,7 +63,7 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
                     recyclerView.findViewHolderForAdapterPosition(position)?.let { viewHolder ->
                         touchHelper.startDrag(viewHolder)
                     }
-                }
+                },
             )
         }
 
@@ -90,7 +90,7 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
             addAction(
                 text = getString(R.string.general_settings_title),
                 navigationAction = R.id.action_settingsListScreen_to_generalSettingsScreen,
-                icon = R.attr.iconSettingsGeneral
+                icon = R.attr.iconSettingsGeneral,
             )
 
             addSection(title = getString(R.string.accounts_title)) {
@@ -102,7 +102,7 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
                 addAction(
                     text = getString(R.string.add_account_action),
                     navigationAction = R.id.action_settingsListScreen_to_addAccountScreen,
-                    icon = R.attr.iconSettingsAccountAdd
+                    icon = R.attr.iconSettingsAccountAdd,
                 )
 
                 NewSetupUiHack.addAction(this)
@@ -112,13 +112,13 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
                 addAction(
                     text = getString(R.string.settings_export_title),
                     navigationAction = R.id.action_settingsListScreen_to_settingsExportScreen,
-                    icon = R.attr.iconSettingsExport
+                    icon = R.attr.iconSettingsExport,
                 )
 
                 addAction(
                     text = getString(R.string.settings_import_title),
                     navigationAction = R.id.action_settingsListScreen_to_settingsImportScreen,
-                    icon = R.attr.iconSettingsImport
+                    icon = R.attr.iconSettingsImport,
                 )
             }
 
@@ -126,19 +126,19 @@ class SettingsListFragment : Fragment(), ItemTouchCallback {
                 addAction(
                     text = getString(R.string.about_action),
                     navigationAction = R.id.action_settingsListScreen_to_aboutScreen,
-                    icon = R.attr.iconSettingsAbout
+                    icon = R.attr.iconSettingsAbout,
                 )
 
                 addUrlAction(
                     text = getString(R.string.user_manual_title),
                     url = getString(R.string.user_manual_url),
-                    icon = R.attr.iconUserManual
+                    icon = R.attr.iconUserManual,
                 )
 
                 addUrlAction(
                     text = getString(R.string.get_help_title),
                     url = getString(R.string.user_forum_url),
-                    icon = R.attr.iconHelp
+                    icon = R.attr.iconHelp,
                 )
             }
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt
index bd87290d6ec..5036cd72a7f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/SettingsViewModel.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.launch
 internal class SettingsViewModel(
     private val accountManager: AccountManager,
     private val coroutineScope: CoroutineScope = GlobalScope,
-    private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val coroutineDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : ViewModel() {
     val accounts = accountManager.getAccountsFlow().asLiveData()
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
index de0ea2c466d..6a2064a45bf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/UrlActionItem.kt
@@ -12,7 +12,7 @@ internal class UrlActionItem(
     override var identifier: Long,
     val text: String,
     val url: String,
-    val icon: Int
+    val icon: Int,
 ) : AbstractItem<UrlActionItem.ViewHolder>() {
     override val type = R.id.settings_list_url_item
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt
index 60447151f63..664ce8d7964 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsActivity.kt
@@ -107,7 +107,7 @@ class AccountSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback {
 
     override fun onPreferenceStartScreen(
         caller: PreferenceFragmentCompat,
-        preferenceScreen: PreferenceScreen
+        preferenceScreen: PreferenceScreen,
     ): Boolean {
         fragmentTransactionWithBackStack {
             replace(R.id.accountSettingsContainer, AccountSettingsFragment.create(accountUuid, preferenceScreen.key))
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt
index 31551ec120c..2414247812d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStore.kt
@@ -17,7 +17,7 @@ class AccountSettingsDataStore(
     private val account: Account,
     private val jobManager: K9JobManager,
     private val notificationChannelManager: NotificationChannelManager,
-    private val notificationController: NotificationController
+    private val notificationController: NotificationController,
 ) : PreferenceDataStore() {
     private var notificationSettingsChanged = false
 
@@ -241,7 +241,7 @@ class AccountSettingsDataStore(
 
     private fun saveSpecialFolderSelection(
         preferenceValue: String,
-        specialFolderSetter: (Long?, SpecialFolderSelection) -> Unit
+        specialFolderSetter: (Long?, SpecialFolderSelection) -> Unit,
     ) {
         val specialFolder = extractFolderId(preferenceValue)
 
@@ -268,7 +268,7 @@ class AccountSettingsDataStore(
             VibrationPreference.encode(
                 isVibrationEnabled = isEnabled,
                 vibratePattern = pattern,
-                vibrationTimes = repeatCount
+                vibrationTimes = repeatCount,
             )
         }
     }
@@ -280,8 +280,8 @@ class AccountSettingsDataStore(
                 vibration = NotificationVibration(
                     isEnabled = isVibrationEnabled,
                     pattern = vibrationPattern,
-                    repeatCount = vibrationTimes
-                )
+                    repeatCount = vibrationTimes,
+                ),
             )
         }
         notificationSettingsChanged = true
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt
index 8760ddf28a1..11700a7cc5d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsDataStoreFactory.kt
@@ -12,7 +12,7 @@ class AccountSettingsDataStoreFactory(
     private val jobManager: K9JobManager,
     private val executorService: ExecutorService,
     private val notificationChannelManager: NotificationChannelManager,
-    private val notificationController: NotificationController
+    private val notificationController: NotificationController,
 ) {
     fun create(account: Account): AccountSettingsDataStore {
         return AccountSettingsDataStore(
@@ -21,7 +21,7 @@ class AccountSettingsDataStoreFactory(
             account,
             jobManager,
             notificationChannelManager,
-            notificationController
+            notificationController,
         )
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt
index 50050a97f6a..07817b7cf33 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsFragment.kt
@@ -266,7 +266,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFr
             preference.setVibration(
                 isVibrationEnabled = notificationVibration.isEnabled,
                 vibratePattern = notificationVibration.pattern,
-                vibrationTimes = notificationVibration.repeatCount
+                vibrationTimes = notificationVibration.repeatCount,
             )
             preference.isEnabled = true
         }
@@ -404,7 +404,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFr
             getString(R.string.account_delete_dlg_title),
             getString(R.string.account_delete_dlg_instructions_fmt, getAccount().displayName),
             getString(R.string.okay_action),
-            getString(R.string.cancel_action)
+            getString(R.string.cancel_action),
         )
         dialogFragment.setTargetFragment(this, REQUEST_DELETE_ACCOUNT)
         dialogFragment.show(requireFragmentManager(), TAG_DELETE_ACCOUNT_CONFIRMATION)
@@ -472,7 +472,7 @@ class AccountSettingsFragment : PreferenceFragmentCompat(), ConfirmationDialogFr
 
         fun create(accountUuid: String, rootKey: String?) = AccountSettingsFragment().withArguments(
             ARG_ACCOUNT_UUID to accountUuid,
-            PreferenceFragmentCompat.ARG_PREFERENCE_ROOT to rootKey
+            PreferenceFragmentCompat.ARG_PREFERENCE_ROOT to rootKey,
         )
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt
index 426e4229d52..2d7938ceddf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AccountSettingsViewModel.kt
@@ -20,7 +20,7 @@ class AccountSettingsViewModel(
     private val accountManager: AccountManager,
     private val folderRepository: FolderRepository,
     private val specialFolderSelectionStrategy: SpecialFolderSelectionStrategy,
-    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    private val backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : ViewModel() {
     val accounts = accountManager.getAccountsFlow().asLiveData()
     private var accountUuid: String? = null
@@ -72,7 +72,7 @@ class AccountSettingsViewModel(
                 val folders = folderRepository.getRemoteFolders(account)
                     .sortedWith(
                         compareByDescending<RemoteFolder> { it.type == FolderType.INBOX }
-                            .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name }
+                            .thenBy(String.CASE_INSENSITIVE_ORDER) { it.name },
                     )
 
                 val automaticSpecialFolders = getAutomaticSpecialFolders(folders)
@@ -88,12 +88,12 @@ class AccountSettingsViewModel(
             FolderType.DRAFTS to specialFolderSelectionStrategy.selectSpecialFolder(folders, FolderType.DRAFTS),
             FolderType.SENT to specialFolderSelectionStrategy.selectSpecialFolder(folders, FolderType.SENT),
             FolderType.SPAM to specialFolderSelectionStrategy.selectSpecialFolder(folders, FolderType.SPAM),
-            FolderType.TRASH to specialFolderSelectionStrategy.selectSpecialFolder(folders, FolderType.TRASH)
+            FolderType.TRASH to specialFolderSelectionStrategy.selectSpecialFolder(folders, FolderType.TRASH),
         )
     }
 }
 
 data class RemoteFolderInfo(
     val folders: List<RemoteFolder>,
-    val automaticSpecialFolders: Map<FolderType, RemoteFolder?>
+    val automaticSpecialFolders: Map<FolderType, RemoteFolder?>,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt
index 483f6dcaf8b..3240b176816 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/AutocryptPreferEncryptPreference.kt
@@ -18,9 +18,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.preferenceStyle,
-        android.R.attr.preferenceStyle
+        android.R.attr.preferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : DialogPreference(context, attrs, defStyleAttr, defStyleRes) {
 
     internal var isPreferEncryptEnabled: Boolean = false
@@ -62,7 +62,7 @@ constructor(
         init {
             PreferenceFragmentCompat.registerPreferenceFragment(
                 AutocryptPreferEncryptPreference::class.java,
-                AutocryptPreferEncryptDialogFragment::class.java
+                AutocryptPreferEncryptDialogFragment::class.java,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt
index 24a3a70eb10..5ca7c03b00d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/FolderListPreference.kt
@@ -27,9 +27,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.dialogPreferenceStyle,
-        android.R.attr.dialogPreferenceStyle
+        android.R.attr.dialogPreferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : ListPreference(context, attrs, defStyleAttr, defStyleRes), KoinComponent {
     private val folderNameFormatter: FolderNameFormatter by inject { parametersOf(context) }
     private val noFolderSelectedName = context.getString(R.string.account_settings_no_folder_selected).italicize()
@@ -57,11 +57,12 @@ constructor(
 
         automaticFolderOption = context.getString(
             R.string.account_settings_automatic_special_folder,
-            automaticFolderName
+            automaticFolderName,
         ).italicize()
 
         entries = (listOf(automaticFolderOption) + noFolderSelectedName + getFolderDisplayNames(folders)).toTypedArray()
-        entryValues = (listOf(automaticFolderValue) + NO_FOLDER_SELECTED_VALUE + getFolderValues(folders)).toTypedArray()
+        entryValues =
+            (listOf(automaticFolderValue) + NO_FOLDER_SELECTED_VALUE + getFolderValues(folders)).toTypedArray()
 
         isEnabled = true
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt
index 44050ee6699..2acfc5e16b4 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationSoundPreference.kt
@@ -23,9 +23,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.preferenceStyle,
-        android.R.attr.preferenceStyle
+        android.R.attr.preferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : Preference(context, attrs, defStyleAttr, defStyleRes), PreferenceActivityResultListener {
     var receivedActivityResultJustNow = false
 
@@ -54,7 +54,7 @@ constructor(
             .putExtra(RingtoneManager.EXTRA_RINGTONE_TYPE, RingtoneManager.TYPE_NOTIFICATION)
             .putExtra(
                 RingtoneManager.EXTRA_RINGTONE_DEFAULT_URI,
-                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
+                RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION),
             )
             .putExtra(RingtoneManager.EXTRA_RINGTONE_TITLE, title)
             .putExtra(RingtoneManager.EXTRA_RINGTONE_SHOW_SILENT, true)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt
index 9361ab1f2e2..378ef1ab17f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/NotificationsPreference.kt
@@ -25,9 +25,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.preferenceStyle,
-        android.R.attr.preferenceStyle
+        android.R.attr.preferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : Preference(context, attrs, defStyleAttr, defStyleRes) {
 
     var notificationChannelIdProvider: NotificationChannelIdProvider? = null
@@ -51,7 +51,7 @@ constructor(
         init {
             PreferenceFragmentCompat.registerPreferenceFragment(
                 NotificationsPreference::class.java,
-                DialogFragment::class.java
+                DialogFragment::class.java,
             )
         }
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
index 00f43bfd537..6408ed2c041 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationDialogFragment.kt
@@ -49,7 +49,7 @@ class VibrationDialogFragment : PreferenceDialogFragmentCompat() {
             entries = vibrationPreference.entries.map { it.toString() },
             entryValues = vibrationPreference.entryValues.map { it.toString().toInt() },
             vibratePattern,
-            vibrationTimes
+            vibrationTimes,
         )
 
         return AlertDialog.Builder(context)
@@ -64,7 +64,7 @@ class VibrationDialogFragment : PreferenceDialogFragmentCompat() {
             vibrationPreference.setVibration(
                 isVibrationEnabled = adapter.isVibrationEnabled,
                 vibratePattern = adapter.vibratePattern,
-                vibrationTimes = adapter.vibrationTimes
+                vibrationTimes = adapter.vibrationTimes,
             )
         }
     }
@@ -89,7 +89,7 @@ class VibrationDialogFragment : PreferenceDialogFragmentCompat() {
         private val entries: List<String>,
         private val entryValues: List<Int>,
         initialVibratePattern: VibratePattern,
-        initialVibrationTimes: Int
+        initialVibrationTimes: Int,
     ) : BaseAdapter() {
         private var checkedEntryIndex = entryValues.indexOf(initialVibratePattern.serialize()).takeIf { it != -1 } ?: 0
 
@@ -180,18 +180,20 @@ class VibrationDialogFragment : PreferenceDialogFragmentCompat() {
                     vibrationTimesSeekBar.progress = progress
                 }
 
-                vibrationTimesSeekBar.setOnSeekBarChangeListener(object : OnSeekBarChangeListener {
-                    override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-                        vibrationTimes = progress + 1
-                        vibrationTimesValue.text = vibrationTimes.toString()
-                    }
+                vibrationTimesSeekBar.setOnSeekBarChangeListener(
+                    object : OnSeekBarChangeListener {
+                        override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                            vibrationTimes = progress + 1
+                            vibrationTimesValue.text = vibrationTimes.toString()
+                        }
 
-                    override fun onStartTrackingTouch(seekBar: SeekBar) = Unit
+                        override fun onStartTrackingTouch(seekBar: SeekBar) = Unit
 
-                    override fun onStopTrackingTouch(seekBar: SeekBar) {
-                        playVibration()
-                    }
-                })
+                        override fun onStopTrackingTouch(seekBar: SeekBar) {
+                            playVibration()
+                        }
+                    },
+                )
             }
         }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt
index 8784906cfb4..6e126c49baa 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/VibrationPreference.kt
@@ -21,9 +21,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.preferenceStyle,
-        android.R.attr.preferenceStyle
+        android.R.attr.preferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : ListPreference(context, attrs, defStyleAttr, defStyleRes) {
     internal var isVibrationEnabled: Boolean = false
         private set
@@ -76,7 +76,7 @@ constructor(
         init {
             PreferenceFragmentCompat.registerPreferenceFragment(
                 VibrationPreference::class.java,
-                VibrationDialogFragment::class.java
+                VibrationDialogFragment::class.java,
             )
         }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
index 01f5602f4ab..c0c7ffc50b2 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportFragment.kt
@@ -53,7 +53,7 @@ class SettingsExportFragment : Fragment() {
             addEventHook(
                 CheckBoxClickEvent { position, isSelected ->
                     viewModel.onSettingsListItemSelected(position, isSelected)
-                }
+                },
             )
         }
 
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt
index 80295f17f91..407ab05e5bf 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportUiModel.kt
@@ -76,7 +76,7 @@ sealed class SettingsListItem {
     data class Account(
         val accountNumber: Int,
         val displayName: String,
-        val email: String
+        val email: String,
     ) : SettingsListItem()
 }
 
@@ -84,12 +84,12 @@ enum class ButtonState {
     DISABLED,
     ENABLED,
     INVISIBLE,
-    GONE
+    GONE,
 }
 
 enum class StatusText {
     HIDDEN,
     PROGRESS,
     EXPORT_SUCCESS,
-    EXPORT_FAILURE
+    EXPORT_FAILURE,
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt
index 865846ebd9b..cec002dad2f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/export/SettingsExportViewModel.kt
@@ -22,7 +22,7 @@ private typealias AccountNumber = Int
 class SettingsExportViewModel(
     val context: Context,
     val preferences: Preferences,
-    val settingsExporter: SettingsExporter
+    val settingsExporter: SettingsExporter,
 ) : ViewModel() {
     private val uiModelLiveData = MutableLiveData<SettingsExportUiModel>()
     private val actionLiveData = SingleLiveEvent<Action>()
@@ -87,13 +87,13 @@ class SettingsExportViewModel(
     fun initializeFromSavedState(savedInstanceState: Bundle) {
         savedSelection = SavedListItemSelection(
             includeGeneralSettings = savedInstanceState.getBoolean(STATE_INCLUDE_GENERAL_SETTINGS),
-            selectedAccountUuids = savedInstanceState.getStringArray(STATE_SELECTED_ACCOUNTS)?.toSet() ?: emptySet()
+            selectedAccountUuids = savedInstanceState.getStringArray(STATE_SELECTED_ACCOUNTS)?.toSet() ?: emptySet(),
         )
 
         uiModel.apply {
             isSettingsListEnabled = savedInstanceState.getBoolean(STATE_SETTINGS_LIST_ENABLED)
             exportButton = ButtonState.valueOf(
-                savedInstanceState.getString(STATE_EXPORT_BUTTON, ButtonState.DISABLED.name)
+                savedInstanceState.getString(STATE_EXPORT_BUTTON, ButtonState.DISABLED.name),
             )
             isShareButtonVisible = savedInstanceState.getBoolean(STATE_SHARE_BUTTON_VISIBLE)
             isProgressVisible = savedInstanceState.getBoolean(STATE_PROGRESS_VISIBLE)
@@ -211,5 +211,5 @@ sealed class Action {
 
 private data class SavedListItemSelection(
     val includeGeneralSettings: Boolean,
-    val selectedAccountUuids: Set<AccountUuid>
+    val selectedAccountUuids: Set<AccountUuid>,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt
index e2494165416..50351a857b7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsActivity.kt
@@ -82,16 +82,18 @@ class GeneralSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback, S
             index(R.xml.general_settings)
         }
 
-        searchPreferenceMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
-            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-                searchPreferenceActionView.cancelSearch()
-                return true
-            }
-
-            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-                return true
-            }
-        })
+        searchPreferenceMenuItem.setOnActionExpandListener(
+            object : MenuItem.OnActionExpandListener {
+                override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                    searchPreferenceActionView.cancelSearch()
+                    return true
+                }
+
+                override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                    return true
+                }
+            },
+        )
 
         if (searchEnabled) {
             Handler().post {
@@ -124,7 +126,7 @@ class GeneralSettingsActivity : K9Activity(), OnPreferenceStartScreenCallback, S
 
     override fun onPreferenceStartScreen(
         caller: PreferenceFragmentCompat,
-        preferenceScreen: PreferenceScreen
+        preferenceScreen: PreferenceScreen,
     ): Boolean {
         fragmentTransactionWithBackStack {
             replace(R.id.generalSettingsContainer, GeneralSettingsFragment.create(preferenceScreen.key))
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 8308befea57..54bc38c5a41 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
@@ -12,7 +12,7 @@ import com.fsck.k9.ui.base.AppLanguageManager
 class GeneralSettingsDataStore(
     private val jobManager: K9JobManager,
     private val appLanguageManager: AppLanguageManager,
-    private val generalSettingsManager: GeneralSettingsManager
+    private val generalSettingsManager: GeneralSettingsManager,
 ) : PreferenceDataStore() {
 
     private var skipSaveSettings = false
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt
index 91407bb039c..893d5de601f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/GeneralSettingsViewModel.kt
@@ -87,5 +87,5 @@ sealed interface GeneralSettingsUiState {
 enum class SnackbarState {
     Hidden,
     ExportLogSuccess,
-    ExportLogFailure
+    ExportLogFailure,
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt
index 8884c2f7302..19e5a85449c 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/general/LanguagePreference.kt
@@ -16,9 +16,9 @@ constructor(
     defStyleAttr: Int = TypedArrayUtils.getAttr(
         context,
         androidx.preference.R.attr.dialogPreferenceStyle,
-        android.R.attr.dialogPreferenceStyle
+        android.R.attr.dialogPreferenceStyle,
     ),
-    defStyleRes: Int = 0
+    defStyleRes: Int = 0,
 ) : ListPreference(context, attrs, defStyleAttr, defStyleRes) {
 
     init {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/AccountActivator.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/AccountActivator.kt
index e7de2f3dc83..3b8f28d2ecb 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/AccountActivator.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/AccountActivator.kt
@@ -12,7 +12,7 @@ import com.fsck.k9.controller.MessagingController
 class AccountActivator(
     private val context: Context,
     private val preferences: Preferences,
-    private val messagingController: MessagingController
+    private val messagingController: MessagingController,
 ) {
     fun enableAccount(accountUuid: String, incomingServerPassword: String?, outgoingServerPassword: String?) {
         val account = preferences.getAccount(accountUuid) ?: error("Account $accountUuid not found")
@@ -38,7 +38,7 @@ class AccountActivator(
     private fun setAccountPasswords(
         account: Account,
         incomingServerPassword: String?,
-        outgoingServerPassword: String?
+        outgoingServerPassword: String?,
     ) {
         if (incomingServerPassword != null) {
             account.incomingServerSettings = account.incomingServerSettings.newPassword(incomingServerPassword)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptDialogFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptDialogFragment.kt
index a8bd362d881..809e8ebd91d 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptDialogFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptDialogFragment.kt
@@ -42,7 +42,7 @@ class PasswordPromptDialogFragment : DialogFragment() {
             inputIncomingServerPassword,
             incomingServerName,
             inputOutgoingServerPassword,
-            outgoingServerName
+            outgoingServerName,
         )
 
         return AlertDialog.Builder(requireContext())
@@ -58,7 +58,7 @@ class PasswordPromptDialogFragment : DialogFragment() {
         inputIncomingServerPassword: Boolean,
         incomingServerName: String?,
         inputOutgoingServerPassword: Boolean,
-        outgoingServerName: String?
+        outgoingServerName: String?,
     ): View {
         val layoutInflater = LayoutInflater.from(requireContext())
         val view = layoutInflater.inflate(R.layout.password_prompt_dialog, null)
@@ -74,7 +74,7 @@ class PasswordPromptDialogFragment : DialogFragment() {
         passwordPromptIntro.text = resources.getQuantityString(
             R.plurals.settings_import_password_prompt,
             quantity,
-            accountName
+            accountName,
         )
         incomingServerNameView.text = getString(R.string.server_name_format, incomingServerName)
         outgoingServerNameView.text = getString(R.string.server_name_format, outgoingServerName)
@@ -132,7 +132,7 @@ class PasswordPromptDialogFragment : DialogFragment() {
             inputOutgoingServerPassword: Boolean,
             outgoingServerName: String?,
             targetFragment: Fragment,
-            requestCode: Int
+            requestCode: Int,
         ) = PasswordPromptDialogFragment().apply {
             arguments = bundleOf(
                 ARG_ACCOUNT_UUID to accountUuid,
@@ -140,7 +140,7 @@ class PasswordPromptDialogFragment : DialogFragment() {
                 ARG_INPUT_INCOMING_SERVER_PASSWORD to inputIncomingServerPassword,
                 ARG_INCOMING_SERVER_NAME to incomingServerName,
                 ARG_INPUT_OUTGOING_SERVER_PASSWORD to inputOutgoingServerPassword,
-                ARG_OUTGOING_SERVER_NAME to outgoingServerName
+                ARG_OUTGOING_SERVER_NAME to outgoingServerName,
             )
             setTargetFragment(targetFragment, requestCode)
         }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptResult.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptResult.kt
index 185dd1d3cce..42201b2b739 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptResult.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/PasswordPromptResult.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 data class PasswordPromptResult(
     val accountUuid: String,
     val incomingServerPassword: String?,
-    val outgoingServerPassword: String?
+    val outgoingServerPassword: String?,
 ) {
     fun asIntent() = Intent().apply {
         putExtra(EXTRA_ACCOUNT_UUID, accountUuid)
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportFragment.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportFragment.kt
index 4b3399dcbe2..10bd1e9a666 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportFragment.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportFragment.kt
@@ -60,7 +60,7 @@ class SettingsImportFragment : Fragment() {
             addEventHook(
                 ImportListItemClickEvent { position ->
                     viewModel.onSettingsListItemClicked(position)
-                }
+                },
             )
         }
 
@@ -171,7 +171,7 @@ class SettingsImportFragment : Fragment() {
     private fun startAuthorization(action: Action.StartAuthorization) {
         val intent = OAuthFlowActivity.buildLaunchIntent(
             context = requireContext(),
-            accountUuid = action.accountUuid
+            accountUuid = action.accountUuid,
         )
 
         startActivityForResult(intent, REQUEST_AUTHORIZATION)
@@ -186,7 +186,7 @@ class SettingsImportFragment : Fragment() {
             action.inputOutgoingServerPassword,
             action.outgoingServerName,
             targetFragment = this,
-            requestCode = REQUEST_PASSWORD_PROMPT
+            requestCode = REQUEST_PASSWORD_PROMPT,
         )
         dialogFragment.show(requireFragmentManager(), null)
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportListItems.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportListItems.kt
index 93f727a730b..1361bfda95f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportListItems.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportListItems.kt
@@ -16,7 +16,7 @@ private const val ACCOUNT_ITEMS_ID_OFFSET = 1L
 
 abstract class ImportListItem<VH : ImportCheckBoxViewHolder>(
     override var identifier: Long,
-    private val importStatus: ImportStatus
+    private val importStatus: ImportStatus,
 ) : AbstractItem<VH>() {
 
     override fun bindView(holder: VH, payloads: List<Any>) {
@@ -68,7 +68,7 @@ class ImportListItemClickEvent(val action: (position: Int) -> Unit) : ClickEvent
         v: View,
         position: Int,
         fastAdapter: FastAdapter<ImportListItem<*>>,
-        item: ImportListItem<*>
+        item: ImportListItem<*>,
     ) {
         action(position)
     }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportUiModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportUiModel.kt
index 817aed1c5df..5cbf83bfe16 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportUiModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportUiModel.kt
@@ -180,14 +180,14 @@ enum class ImportStatus(val isSuccess: Boolean, val isActionRequired: Boolean) {
     IMPORT_SUCCESS(isSuccess = true, isActionRequired = false),
     IMPORT_SUCCESS_PASSWORD_REQUIRED(isSuccess = true, isActionRequired = true),
     IMPORT_SUCCESS_AUTHORIZATION_REQUIRED(isSuccess = true, isActionRequired = true),
-    IMPORT_FAILURE(isSuccess = false, isActionRequired = false)
+    IMPORT_FAILURE(isSuccess = false, isActionRequired = false),
 }
 
 enum class ButtonState {
     DISABLED,
     ENABLED,
     INVISIBLE,
-    GONE
+    GONE,
 }
 
 enum class StatusText {
@@ -199,10 +199,10 @@ enum class StatusText {
     IMPORT_SUCCESS_PASSWORD_AND_AUTHORIZATION_REQUIRED,
     IMPORT_READ_FAILURE,
     IMPORT_PARTIAL_FAILURE,
-    IMPORT_FAILURE
+    IMPORT_FAILURE,
 }
 
 enum class CloseButtonLabel {
     OK,
-    LATER
+    LATER,
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportViewModel.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportViewModel.kt
index 35c744d2a45..6acdb62b75f 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportViewModel.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/import/SettingsImportViewModel.kt
@@ -27,7 +27,7 @@ private typealias AccountNumber = Int
 
 class SettingsImportViewModel(
     private val context: Context,
-    private val accountActivator: AccountActivator
+    private val accountActivator: AccountActivator,
 ) : ViewModel() {
     private val uiModelLiveData = MutableLiveData<SettingsImportUiModel>()
     private val actionLiveData = SingleLiveEvent<Action>()
@@ -91,7 +91,7 @@ class SettingsImportViewModel(
                 val includeGeneralSettings = savedInstanceState.getBoolean(STATE_INCLUDE_GENERAL_SETTINGS)
                 val generalSettingsImportState = savedInstanceState.getEnum(
                     STATE_GENERAL_SETTINGS_IMPORT_STATUS,
-                    ImportStatus.NOT_AVAILABLE
+                    ImportStatus.NOT_AVAILABLE,
                 )
 
                 SettingsListItem.GeneralSettings().apply {
@@ -111,7 +111,7 @@ class SettingsImportViewModel(
                     saved.incomingServerName,
                     saved.outgoingServerName,
                     saved.incomingServerPasswordNeeded,
-                    saved.outgoingServerPasswordNeeded
+                    saved.outgoingServerPasswordNeeded,
                 )
             }
 
@@ -328,7 +328,7 @@ class SettingsImportViewModel(
 
     private fun SettingsImportUiModel.setGeneralSettingsImportStatus(
         importResults: ImportResults,
-        importGeneralSettings: Boolean
+        importGeneralSettings: Boolean,
     ) {
         val importStatus = when {
             importResults.globalSettings -> ImportStatus.IMPORT_SUCCESS
@@ -361,7 +361,7 @@ class SettingsImportViewModel(
                             accountPair.incomingServerName,
                             accountPair.outgoingServerName,
                             accountPair.incomingPasswordNeeded,
-                            accountPair.outgoingPasswordNeeded
+                            accountPair.outgoingPasswordNeeded,
                         )
 
                         setSettingsListState(index, ImportStatus.IMPORT_SUCCESS_PASSWORD_REQUIRED)
@@ -408,8 +408,8 @@ class SettingsImportViewModel(
                 accountState.incomingServerPasswordNeeded,
                 accountState.incomingServerName,
                 accountState.outgoingServerPasswordNeeded,
-                accountState.outgoingServerName
-            )
+                accountState.outgoingServerName,
+            ),
         )
     }
 
@@ -438,7 +438,7 @@ class SettingsImportViewModel(
                     incomingServerName = accountState?.incomingServerName,
                     outgoingServerName = accountState?.outgoingServerName,
                     incomingServerPasswordNeeded = accountState?.incomingServerPasswordNeeded ?: false,
-                    outgoingServerPasswordNeeded = accountState?.outgoingServerPasswordNeeded ?: false
+                    outgoingServerPasswordNeeded = accountState?.outgoingServerPasswordNeeded ?: false,
                 )
             }
             .toCollection(ArrayList(uiModel.settingsList.size - 1))
@@ -476,7 +476,7 @@ sealed class Action {
         val inputIncomingServerPassword: Boolean,
         val incomingServerName: String?,
         val inputOutgoingServerPassword: Boolean,
-        val outgoingServerName: String?
+        val outgoingServerName: String?,
     ) : Action()
 }
 
@@ -484,7 +484,7 @@ private class AccountState(
     val incomingServerName: String?,
     val outgoingServerName: String?,
     val incomingServerPasswordNeeded: Boolean,
-    val outgoingServerPasswordNeeded: Boolean
+    val outgoingServerPasswordNeeded: Boolean,
 )
 
 @Parcelize
@@ -497,5 +497,5 @@ private class SavedAccountState(
     val incomingServerName: String?,
     val outgoingServerName: String?,
     val incomingServerPasswordNeeded: Boolean,
-    val outgoingServerPasswordNeeded: Boolean
+    val outgoingServerPasswordNeeded: Boolean,
 ) : Parcelable
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt b/app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt
index 7c21c23f69c..ce1bd985bb5 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/share/ShareIntentBuilder.kt
@@ -18,7 +18,7 @@ import com.fsck.k9.message.quote.QuoteDateFormatter
 class ShareIntentBuilder(
     private val resourceProvider: CoreResourceProvider,
     private val textPartFinder: TextPartFinder,
-    private val quoteDateFormatter: QuoteDateFormatter
+    private val quoteDateFormatter: QuoteDateFormatter,
 ) {
     // TODO: Pass MessageViewInfo and extract text from there
     // TODO: Use display HTML for EXTRA_HTML_TEXT and convert it to plain text for EXTRA_TEXT
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt
index 6145fba1548..bda9b58f986 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/DraggableFrameLayout.kt
@@ -8,7 +8,7 @@ import com.google.android.material.R
 private val DRAGGED_STATE_SET = intArrayOf(
     R.attr.state_dragged,
     // When the item is dragged we also set the 'pressed' state so the item background is changed
-    android.R.attr.state_pressed
+    android.R.attr.state_pressed,
 )
 
 class DraggableFrameLayout : FrameLayout {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt
index 4e157fd63c5..bf35f2016dd 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageCryptoDisplayStatus.kt
@@ -18,6 +18,7 @@ import org.openintents.openpgp.OpenPgpSignatureResult.RESULT_KEY_MISSING
 import org.openintents.openpgp.OpenPgpSignatureResult.RESULT_NO_SIGNATURE
 import org.openintents.openpgp.OpenPgpSignatureResult.RESULT_VALID_KEY_CONFIRMED
 import org.openintents.openpgp.OpenPgpSignatureResult.RESULT_VALID_KEY_UNCONFIRMED
+import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult
 import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult.UNKNOWN
 import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult.USER_ID_CONFIRMED
 import org.openintents.openpgp.OpenPgpSignatureResult.SenderStatusResult.USER_ID_MISSING
@@ -36,167 +37,168 @@ enum class MessageCryptoDisplayStatus(
     val titleTextRes: Int? = null,
 
     @StringRes
-    val descriptionTextRes: Int? = null
+    val descriptionTextRes: Int? = null,
 ) {
     LOADING(
         isEnabled = false,
         colorAttr = R.attr.openpgp_grey,
-        statusIconRes = R.drawable.status_lock_disabled
+        statusIconRes = R.drawable.status_lock_disabled,
     ),
     CANCELLED(
         colorAttr = R.attr.openpgp_black,
         statusIconRes = R.drawable.status_lock_unknown,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_cancelled
+        descriptionTextRes = R.string.crypto_msg_cancelled,
     ),
     DISABLED(
         isEnabled = false,
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_disabled,
-        titleTextRes = R.string.crypto_msg_title_plaintext
+        titleTextRes = R.string.crypto_msg_title_plaintext,
     ),
     UNENCRYPTED_SIGN_ERROR(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_plaintext,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_error
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_error,
     ),
     INCOMPLETE_SIGNED(
         colorAttr = R.attr.openpgp_black,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_plaintext,
-        descriptionTextRes = R.string.crypto_msg_incomplete_signed
+        descriptionTextRes = R.string.crypto_msg_incomplete_signed,
     ),
     UNENCRYPTED_SIGN_VERIFIED(
         colorAttr = R.attr.openpgp_blue,
         statusIconRes = R.drawable.status_signature_dots_3,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed_e2e,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_verified
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_verified,
     ),
     UNENCRYPTED_SIGN_UNVERIFIED(
         colorAttr = R.attr.openpgp_blue,
         statusIconRes = R.drawable.status_signature,
-        titleTextRes = R.string.crypto_msg_title_unencrypted_signed_e2e
+        titleTextRes = R.string.crypto_msg_title_unencrypted_signed_e2e,
     ),
     UNENCRYPTED_SIGN_UNKNOWN(
         colorAttr = R.attr.openpgp_orange,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_unknown
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_unknown,
     ),
     UNENCRYPTED_SIGN_MISMATCH(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_mismatch
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_mismatch,
     ),
     UNENCRYPTED_SIGN_EXPIRED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_expired
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_expired,
     ),
     UNENCRYPTED_SIGN_REVOKED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_revoked
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_revoked,
     ),
     UNENCRYPTED_SIGN_INSECURE(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_signature_unknown,
         titleTextRes = R.string.crypto_msg_title_unencrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_insecure
+        descriptionTextRes = R.string.crypto_msg_unencrypted_sign_insecure,
     ),
     ENCRYPTED_SIGN_VERIFIED(
         colorAttr = R.attr.openpgp_green,
         statusIconRes = R.drawable.status_lock_dots_3,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed_e2e,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_verified
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_verified,
     ),
     ENCRYPTED_SIGN_UNVERIFIED(
         colorAttr = R.attr.openpgp_green,
         statusIconRes = R.drawable.status_lock,
-        titleTextRes = R.string.crypto_msg_title_encrypted_signed_e2e
+        titleTextRes = R.string.crypto_msg_title_encrypted_signed_e2e,
     ),
     ENCRYPTED_SIGN_UNKNOWN(
         colorAttr = R.attr.openpgp_orange,
         statusIconRes = R.drawable.status_lock_unknown,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_unknown
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_unknown,
     ),
     ENCRYPTED_SIGN_MISMATCH(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_mismatch
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_mismatch,
     ),
     ENCRYPTED_SIGN_EXPIRED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_expired
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_expired,
     ),
     ENCRYPTED_SIGN_REVOKED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_revoked
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_revoked,
     ),
     ENCRYPTED_SIGN_INSECURE(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_insecure
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_insecure,
     ),
     ENCRYPTED_SIGN_ERROR(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_sign_error
+        descriptionTextRes = R.string.crypto_msg_encrypted_sign_error,
     ),
     ENCRYPTED_INSECURE(
         colorAttr = R.attr.openpgp_red,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_signed,
-        descriptionTextRes = R.string.crypto_msg_encrypted_insecure
+        descriptionTextRes = R.string.crypto_msg_encrypted_insecure,
     ),
     ENCRYPTED_UNSIGNED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_unsigned,
-        descriptionTextRes = R.string.crypto_msg_encrypted_unsigned
+        descriptionTextRes = R.string.crypto_msg_encrypted_unsigned,
     ),
     ENCRYPTED_ERROR(
         colorAttr = R.attr.openpgp_red,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_encrypted_error
+        descriptionTextRes = R.string.crypto_msg_encrypted_error,
     ),
     INCOMPLETE_ENCRYPTED(
         colorAttr = R.attr.openpgp_black,
         statusIconRes = R.drawable.status_lock_unknown,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_encrypted_incomplete
+        descriptionTextRes = R.string.crypto_msg_encrypted_incomplete,
     ),
     ENCRYPTED_NO_PROVIDER(
         colorAttr = R.attr.openpgp_red,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_encrypted_no_provider
+        descriptionTextRes = R.string.crypto_msg_encrypted_no_provider,
     ),
     UNSUPPORTED_ENCRYPTED(
         colorAttr = R.attr.openpgp_red,
         statusIconRes = R.drawable.status_lock_error,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_unsupported_encrypted
+        descriptionTextRes = R.string.crypto_msg_unsupported_encrypted,
     ),
     UNSUPPORTED_SIGNED(
         colorAttr = R.attr.openpgp_grey,
         statusIconRes = R.drawable.status_lock_disabled,
         titleTextRes = R.string.crypto_msg_title_encrypted_unknown,
-        descriptionTextRes = R.string.crypto_msg_unsupported_signed
-    );
+        descriptionTextRes = R.string.crypto_msg_unsupported_signed,
+    ),
+    ;
 
     fun hasAssociatedKey(): Boolean {
         return when (this) {
@@ -211,7 +213,8 @@ enum class MessageCryptoDisplayStatus(
             UNENCRYPTED_SIGN_MISMATCH,
             UNENCRYPTED_SIGN_EXPIRED,
             UNENCRYPTED_SIGN_REVOKED,
-            UNENCRYPTED_SIGN_INSECURE -> true
+            UNENCRYPTED_SIGN_INSECURE,
+            -> true
             else -> false
         }
     }
@@ -225,7 +228,8 @@ enum class MessageCryptoDisplayStatus(
             UNENCRYPTED_SIGN_MISMATCH,
             UNENCRYPTED_SIGN_EXPIRED,
             UNENCRYPTED_SIGN_REVOKED,
-            UNENCRYPTED_SIGN_INSECURE -> true
+            UNENCRYPTED_SIGN_INSECURE,
+            -> true
             else -> false
         }
 
@@ -237,7 +241,9 @@ enum class MessageCryptoDisplayStatus(
 
     companion object {
         @JvmStatic
-        fun fromResultAnnotation(cryptoResult: CryptoResultAnnotation?): MessageCryptoDisplayStatus {
+        fun fromResultAnnotation(
+            cryptoResult: CryptoResultAnnotation?,
+        ): MessageCryptoDisplayStatus {
             return when (cryptoResult?.errorType) {
                 null -> DISABLED
                 CryptoError.OPENPGP_OK -> getDisplayStatusForPgpResult(cryptoResult)
@@ -253,7 +259,9 @@ enum class MessageCryptoDisplayStatus(
             }
         }
 
-        private fun getDisplayStatusForPgpResult(cryptoResult: CryptoResultAnnotation): MessageCryptoDisplayStatus {
+        private fun getDisplayStatusForPgpResult(
+            cryptoResult: CryptoResultAnnotation,
+        ): MessageCryptoDisplayStatus {
             var signatureResult = cryptoResult.openPgpSignatureResult
             val decryptionResult = cryptoResult.openPgpDecryptionResult
             if (decryptionResult == null || signatureResult == null) {
@@ -268,7 +276,14 @@ enum class MessageCryptoDisplayStatus(
                 }
             }
 
-            return when (decryptionResult.getResult()) {
+            return getStatusForPgpResult(decryptionResult.getResult(), signatureResult)
+        }
+
+        private fun getStatusForPgpResult(
+            pgpResult: Int,
+            signatureResult: OpenPgpSignatureResult,
+        ): MessageCryptoDisplayStatus {
+            return when (pgpResult) {
                 RESULT_NOT_ENCRYPTED -> getStatusForPgpUnencryptedResult(signatureResult)
                 RESULT_ENCRYPTED -> getStatusForPgpEncryptedResult(signatureResult)
                 RESULT_INSECURE -> ENCRYPTED_INSECURE
@@ -277,19 +292,12 @@ enum class MessageCryptoDisplayStatus(
         }
 
         private fun getStatusForPgpEncryptedResult(
-            signatureResult: OpenPgpSignatureResult
+            signatureResult: OpenPgpSignatureResult,
         ): MessageCryptoDisplayStatus {
             return when (signatureResult.result) {
                 RESULT_NO_SIGNATURE -> ENCRYPTED_UNSIGNED
-                RESULT_VALID_KEY_CONFIRMED, RESULT_VALID_KEY_UNCONFIRMED -> {
-                    return when (signatureResult.senderStatusResult) {
-                        USER_ID_CONFIRMED -> ENCRYPTED_SIGN_VERIFIED
-                        USER_ID_UNCONFIRMED -> ENCRYPTED_SIGN_UNVERIFIED
-                        USER_ID_MISSING -> ENCRYPTED_SIGN_MISMATCH
-                        UNKNOWN -> ENCRYPTED_SIGN_UNVERIFIED
-                        else -> error("unhandled encrypted result case!")
-                    }
-                }
+                RESULT_VALID_KEY_CONFIRMED, RESULT_VALID_KEY_UNCONFIRMED ->
+                    getStatusForPgpEncryptedSenderStatusResult(signatureResult.senderStatusResult)
                 RESULT_KEY_MISSING -> ENCRYPTED_SIGN_UNKNOWN
                 RESULT_INVALID_SIGNATURE -> ENCRYPTED_SIGN_ERROR
                 RESULT_INVALID_KEY_EXPIRED -> ENCRYPTED_SIGN_EXPIRED
@@ -299,20 +307,25 @@ enum class MessageCryptoDisplayStatus(
             }
         }
 
+        private fun getStatusForPgpEncryptedSenderStatusResult(
+            senderStatusResult: SenderStatusResult,
+        ): MessageCryptoDisplayStatus {
+            return when (senderStatusResult) {
+                USER_ID_CONFIRMED -> ENCRYPTED_SIGN_VERIFIED
+                USER_ID_UNCONFIRMED -> ENCRYPTED_SIGN_UNVERIFIED
+                USER_ID_MISSING -> ENCRYPTED_SIGN_MISMATCH
+                UNKNOWN -> ENCRYPTED_SIGN_UNVERIFIED
+                else -> error("unhandled encrypted result case!")
+            }
+        }
+
         private fun getStatusForPgpUnencryptedResult(
-            signatureResult: OpenPgpSignatureResult
+            signatureResult: OpenPgpSignatureResult,
         ): MessageCryptoDisplayStatus {
             return when (signatureResult.result) {
                 RESULT_NO_SIGNATURE -> DISABLED
-                RESULT_VALID_KEY_CONFIRMED, RESULT_VALID_KEY_UNCONFIRMED -> {
-                    return when (signatureResult.senderStatusResult) {
-                        USER_ID_CONFIRMED -> UNENCRYPTED_SIGN_VERIFIED
-                        USER_ID_UNCONFIRMED -> UNENCRYPTED_SIGN_UNVERIFIED
-                        USER_ID_MISSING -> UNENCRYPTED_SIGN_MISMATCH
-                        UNKNOWN -> UNENCRYPTED_SIGN_UNVERIFIED
-                        else -> error("unhandled encrypted result case!")
-                    }
-                }
+                RESULT_VALID_KEY_CONFIRMED, RESULT_VALID_KEY_UNCONFIRMED ->
+                    getStatusForPgpUnencryptedSenderStatusResult(signatureResult.senderStatusResult)
                 RESULT_KEY_MISSING -> UNENCRYPTED_SIGN_UNKNOWN
                 RESULT_INVALID_SIGNATURE -> UNENCRYPTED_SIGN_ERROR
                 RESULT_INVALID_KEY_EXPIRED -> UNENCRYPTED_SIGN_EXPIRED
@@ -321,5 +334,17 @@ enum class MessageCryptoDisplayStatus(
                 else -> error("unhandled encrypted result case!")
             }
         }
+
+        private fun getStatusForPgpUnencryptedSenderStatusResult(
+            senderStatusResult: SenderStatusResult,
+        ): MessageCryptoDisplayStatus {
+            return when (senderStatusResult) {
+                USER_ID_CONFIRMED -> UNENCRYPTED_SIGN_VERIFIED
+                USER_ID_UNCONFIRMED -> UNENCRYPTED_SIGN_UNVERIFIED
+                USER_ID_MISSING -> UNENCRYPTED_SIGN_MISMATCH
+                UNKNOWN -> UNENCRYPTED_SIGN_UNVERIFIED
+                else -> error("unhandled encrypted result case!")
+            }
+        }
     }
 }
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
index fde796689ff..dc4b238cc2e 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/MessageWebView.kt
@@ -71,7 +71,7 @@ class MessageWebView : WebView {
     fun displayHtmlContentWithInlineAttachments(
         htmlText: String,
         attachmentResolver: AttachmentResolver?,
-        onPageFinishedListener: OnPageFinishedListener?
+        onPageFinishedListener: OnPageFinishedListener?,
     ) {
         setWebViewClient(attachmentResolver, onPageFinishedListener)
         setHtmlContent(htmlText)
@@ -79,7 +79,7 @@ class MessageWebView : WebView {
 
     private fun setWebViewClient(
         attachmentResolver: AttachmentResolver?,
-        onPageFinishedListener: OnPageFinishedListener?
+        onPageFinishedListener: OnPageFinishedListener?,
     ) {
         val webViewClient = K9WebViewClient.newInstance(attachmentResolver)
         if (onPageFinishedListener != null) {
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt
index a5a9253feea..2d202672011 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfig.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.view
 data class WebViewConfig(
     val useDarkMode: Boolean,
     val autoFitWidth: Boolean,
-    val textZoom: Int
+    val textZoom: Int,
 )
diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt b/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt
index 707209e50b8..39e7dcefa75 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/view/WebViewConfigProvider.kt
@@ -13,7 +13,7 @@ class WebViewConfigProvider(private val themeManager: ThemeManager) {
         return WebViewConfig(
             useDarkMode = theme == Theme.DARK,
             autoFitWidth = K9.isAutoFitWidth,
-            textZoom = K9.fontSizes.messageViewContentAsPercent
+            textZoom = K9.fontSizes.messageViewContentAsPercent,
         )
     }
 }
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt
index e67ec906ce7..7e69effccc5 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/AttachmentPresenterTest.kt
@@ -50,7 +50,7 @@ class AttachmentPresenterTest : K9RobolectricTest() {
             ApplicationProvider.getApplicationContext(),
             attachmentMvpView,
             loaderManager,
-            listener
+            listener,
         )
     }
 
@@ -66,11 +66,11 @@ class AttachmentPresenterTest : K9RobolectricTest() {
             URI,
             false,
             LocalBodyPart(ACCOUNT_UUID, mock(), MESSAGE_ID, size),
-            true
+            true,
         )
         val messageViewInfo = MessageViewInfo(
             message, false, message, SUBJECT, false, TEXT, listOf(attachmentViewInfo), null, attachmentResolver,
-            EXTRA_TEXT, ArrayList(), null
+            EXTRA_TEXT, ArrayList(), null,
         )
 
         mockLoaderManager({ attachmentPresenter.attachments.get(0) as Attachment })
@@ -99,11 +99,11 @@ class AttachmentPresenterTest : K9RobolectricTest() {
             URI,
             false,
             LocalBodyPart(ACCOUNT_UUID, mock(), MESSAGE_ID, size),
-            false
+            false,
         )
         val messageViewInfo = MessageViewInfo(
             message, false, message, SUBJECT, false, TEXT, listOf(attachmentViewInfo), null, attachmentResolver,
-            EXTRA_TEXT, ArrayList(), null
+            EXTRA_TEXT, ArrayList(), null,
         )
 
         val result = attachmentPresenter.loadAllAvailableAttachments(messageViewInfo)
@@ -124,7 +124,7 @@ class AttachmentPresenterTest : K9RobolectricTest() {
         val attachmentViewInfo = AttachmentViewInfo(MIME_TYPE, ATTACHMENT_NAME, size, URI, true, localBodyPart, true)
         val messageViewInfo = MessageViewInfo(
             message, false, message, SUBJECT, false, TEXT, listOf(attachmentViewInfo), null, attachmentResolver,
-            EXTRA_TEXT, ArrayList(), null
+            EXTRA_TEXT, ArrayList(), null,
         )
 
         mockLoaderManager({ attachmentPresenter.inlineAttachments.get(contentId) as Attachment })
@@ -152,7 +152,7 @@ class AttachmentPresenterTest : K9RobolectricTest() {
         val attachmentViewInfo = AttachmentViewInfo(MIME_TYPE, ATTACHMENT_NAME, size, URI, true, localBodyPart, false)
         val messageViewInfo = MessageViewInfo(
             message, false, message, SUBJECT, false, TEXT, listOf(attachmentViewInfo), null, attachmentResolver,
-            EXTRA_TEXT, ArrayList(), null
+            EXTRA_TEXT, ArrayList(), null,
         )
 
         val result = attachmentPresenter.loadAllAvailableAttachments(messageViewInfo)
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt
index 6d15ffb5dd9..b8b9b156cfc 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/activity/compose/RecipientPresenterTest.kt
@@ -77,7 +77,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
             composePgpEnableByDefaultDecider,
             autocryptStatusInteractor,
             replyToParser,
-            autocryptDraftStateHeaderParser
+            autocryptDraftStateHeaderParser,
         )
     }
 
@@ -156,7 +156,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withOpportunistic() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.AVAILABLE_UNCONFIRMED,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
@@ -172,7 +172,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withOpportunistic__confirmed() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.AVAILABLE_CONFIRMED,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
@@ -188,7 +188,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withOpportunistic__missingKeys() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.UNAVAILABLE,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
@@ -204,7 +204,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withOpportunistic__privateMissingKeys() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.UNAVAILABLE,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
@@ -222,7 +222,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withModeDisabled() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.AVAILABLE_UNCONFIRMED,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
@@ -240,7 +240,7 @@ class RecipientPresenterTest : K9RobolectricTest() {
     fun getCurrentCryptoStatus_withModePrivate() {
         val recipientAutocryptStatus = RecipientAutocryptStatus(
             RecipientAutocryptStatusType.AVAILABLE_UNCONFIRMED,
-            null
+            null,
         )
 
         setupCryptoProvider(recipientAutocryptStatus)
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt
index a37f1db7ff3..03e7ad1a3f9 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/message/PgpMessageBuilderTest.kt
@@ -71,12 +71,13 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         false,
         true,
         true,
-        CryptoMode.NO_CHOICE
+        CryptoMode.NO_CHOICE,
     )
     private val resourceProvider: CoreResourceProvider by inject()
     private val openPgpApi = mock(OpenPgpApi::class.java)
     private val autocryptOpenPgpApiInteractor = mock(AutocryptOpenPgpApiInteractor::class.java)
-    private val pgpMessageBuilder = createDefaultPgpMessageBuilder(openPgpApi, autocryptOpenPgpApiInteractor, resourceProvider)
+    private val pgpMessageBuilder =
+        createDefaultPgpMessageBuilder(openPgpApi, autocryptOpenPgpApiInteractor, resourceProvider)
 
     @Before
     @Throws(Exception::class)
@@ -169,7 +170,9 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
 
         val returnIntent = Intent()
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(returnIntent)
+        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(
+            returnIntent,
+        )
 
         val mockCallback = mock(Callback::class.java)
         pgpMessageBuilder.buildAsync(mockCallback)
@@ -193,8 +196,8 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             openPgpApi.executeApi(
                 capturedApiIntent.capture(),
                 any<OpenPgpDataSource>(),
-                anyOrNull()
-            )
+                anyOrNull(),
+            ),
         ).thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -219,7 +222,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         Assert.assertEquals(
             "first part must have content type text/plain",
             "text/plain",
-            MimeUtility.getHeaderParameter(contentBodyPart.contentType, null)
+            MimeUtility.getHeaderParameter(contentBodyPart.contentType, null),
         )
         assertTrue("signed message body must be TextBody", contentBodyPart.body is TextBody)
         Assert.assertEquals(MimeUtil.ENC_QUOTED_PRINTABLE, (contentBodyPart.body as TextBody).encoding)
@@ -230,17 +233,17 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         Assert.assertEquals(
             "second part must be pgp signature",
             "application/pgp-signature",
-            MimeUtility.getHeaderParameter(contentType, null)
+            MimeUtility.getHeaderParameter(contentType, null),
         )
         Assert.assertEquals(
             "second part must be called signature.asc",
             "signature.asc",
-            MimeUtility.getHeaderParameter(contentType, "name")
+            MimeUtility.getHeaderParameter(contentType, "name"),
         )
         assertContentOfBodyPartEquals(
             "content must match the supplied detached signature",
             signatureBodyPart,
-            byteArrayOf(1, 2, 3)
+            byteArrayOf(1, 2, 3),
         )
 
         assertMessageHasAutocryptHeader(message, SENDER_EMAIL, false, AUTOCRYPT_KEY_MATERIAL)
@@ -259,7 +262,9 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         `when`<Parcelable>(returnIntent.getParcelableExtra<Parcelable>(eq(OpenPgpApi.RESULT_INTENT)))
             .thenReturn(mockPendingIntent)
 
-        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(returnIntent)
+        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(
+            returnIntent,
+        )
 
         val mockCallback = mock(Callback::class.java)
         pgpMessageBuilder.buildAsync(mockCallback)
@@ -287,7 +292,9 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             `when`<Parcelable>(returnIntent.getParcelableExtra<Parcelable>(eq(OpenPgpApi.RESULT_INTENT)))
                 .thenReturn(mockPendingIntent)
 
-            `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(returnIntent)
+            `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(
+                returnIntent,
+            )
 
             val mockCallback = mock(Callback::class.java)
             pgpMessageBuilder.buildAsync(mockCallback)
@@ -307,7 +314,9 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
 
             val mockReturnIntent = mock(Intent::class.java)
-            `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(returnIntent)
+            `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(
+                returnIntent,
+            )
 
             val mockCallback = mock(Callback::class.java)
             pgpMessageBuilder.onActivityResult(returnedRequestCode, Activity.RESULT_OK, mockReturnIntent, mockCallback)
@@ -324,7 +333,13 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
 
         val returnIntent = spy(Intent())
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -360,7 +375,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
     fun buildDraft_replyToEncrypted() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.NO_CHOICE,
-            isReplyToEncrypted = true
+            isReplyToEncrypted = true,
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
         pgpMessageBuilder.isDraft = true
@@ -391,13 +406,22 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
 
         val mimeMessage = buildMessage()
 
-        assertEquals("encrypt=no; _sign-only=yes; _by-choice=yes; ", mimeMessage.getHeader("Autocrypt-Draft-State").get(0))
+        assertEquals(
+            "encrypt=no; _sign-only=yes; _by-choice=yes; ",
+            mimeMessage.getHeader("Autocrypt-Draft-State").get(0),
+        )
     }
 
     private fun buildMessage(): MimeMessage {
         val returnIntent = spy(Intent())
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -416,13 +440,19 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
     fun buildEncrypt__checkGossip() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.CHOICE_ENABLED,
-            recipientAddresses = listOf("alice@example.org", "bob@example.org")
+            recipientAddresses = listOf("alice@example.org", "bob@example.org"),
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
 
         val returnIntent = Intent()
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
         pgpMessageBuilder.buildAsync(mock(Callback::class.java))
 
@@ -435,18 +465,28 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
     fun buildEncrypt__checkGossip__filterBcc() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.CHOICE_ENABLED,
-            recipientAddresses = listOf("alice@example.org", "bob@example.org", "carol@example.org")
+            recipientAddresses = listOf("alice@example.org", "bob@example.org", "carol@example.org"),
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
         pgpMessageBuilder.setBcc(listOf(Address("carol@example.org")))
 
         val returnIntent = Intent()
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
         pgpMessageBuilder.buildAsync(mock(Callback::class.java))
 
-        verify(autocryptOpenPgpApiInteractor).getKeyMaterialForKeyId(same(openPgpApi), eq(TEST_KEY_ID), eq(SENDER_EMAIL))
+        verify(autocryptOpenPgpApiInteractor).getKeyMaterialForKeyId(
+            same(openPgpApi),
+            eq(TEST_KEY_ID),
+            eq(SENDER_EMAIL),
+        )
         verify(autocryptOpenPgpApiInteractor).getKeyMaterialForUserId(same(openPgpApi), eq("alice@example.org"))
         verify(autocryptOpenPgpApiInteractor).getKeyMaterialForUserId(same(openPgpApi), eq("bob@example.org"))
     }
@@ -457,18 +497,28 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.CHOICE_ENABLED,
             isPgpInlineModeEnabled = true,
-            recipientAddresses = listOf("alice@example.org", "carol@example.org")
+            recipientAddresses = listOf("alice@example.org", "carol@example.org"),
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
         pgpMessageBuilder.setBcc(listOf(Address("carol@example.org")))
 
         val returnIntent = Intent()
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
         pgpMessageBuilder.buildAsync(mock(Callback::class.java))
 
-        verify(autocryptOpenPgpApiInteractor).getKeyMaterialForKeyId(any(OpenPgpApi::class.java), any(Long::class.java), any(String::class.java))
+        verify(autocryptOpenPgpApiInteractor).getKeyMaterialForKeyId(
+            any(OpenPgpApi::class.java),
+            any(Long::class.java),
+            any(String::class.java),
+        )
         verifyNoMoreInteractions(autocryptOpenPgpApiInteractor)
     }
 
@@ -477,7 +527,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
     fun buildEncrypt__shouldSucceed() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.CHOICE_ENABLED,
-            recipientAddresses = listOf("test@example.org")
+            recipientAddresses = listOf("test@example.org"),
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
 
@@ -490,8 +540,8 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             openPgpApi.executeApi(
                 capturedApiIntent.capture(),
                 any(OpenPgpDataSource::class.java),
-                any(OutputStream::class.java)
-            )
+                any(OutputStream::class.java),
+            ),
         ).thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -519,23 +569,23 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         Assert.assertEquals(
             "first part must be pgp encrypted dummy part",
             "application/pgp-encrypted",
-            dummyBodyPart.contentType
+            dummyBodyPart.contentType,
         )
         assertContentOfBodyPartEquals(
             "content must match the supplied detached signature",
             dummyBodyPart,
-            "Version: 1"
+            "Version: 1",
         )
 
         val encryptedBodyPart = multipart.getBodyPart(1)
         Assert.assertEquals(
             "second part must be octet-stream of encrypted data",
             "application/octet-stream; name=\"encrypted.asc\"",
-            encryptedBodyPart.contentType
+            encryptedBodyPart.contentType,
         )
         assertTrue(
             "message body must be BinaryTempFileBody",
-            encryptedBodyPart.body is BinaryTempFileBody
+            encryptedBodyPart.body is BinaryTempFileBody,
         )
         Assert.assertEquals(MimeUtil.ENC_7BIT, (encryptedBodyPart.body as BinaryTempFileBody).encoding)
 
@@ -548,7 +598,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.CHOICE_ENABLED,
             isPgpInlineModeEnabled = true,
-            recipientAddresses = listOf("test@example.org")
+            recipientAddresses = listOf("test@example.org"),
         )
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
 
@@ -561,8 +611,8 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             openPgpApi.executeApi(
                 capturedApiIntent.capture(),
                 any(OpenPgpDataSource::class.java),
-                any(OutputStream::class.java)
-            )
+                any(OutputStream::class.java),
+            ),
         ).thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -593,7 +643,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         val cryptoStatus = defaultCryptoStatus.copy(
             cryptoMode = CryptoMode.SIGN_ONLY,
             isPgpInlineModeEnabled = true,
-            recipientAddresses = listOf("test@example.org")
+            recipientAddresses = listOf("test@example.org"),
         )
 
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
@@ -607,8 +657,8 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
             openPgpApi.executeApi(
                 capturedApiIntent.capture(),
                 any(OpenPgpDataSource::class.java),
-                any(OutputStream::class.java)
-            )
+                any(OutputStream::class.java),
+            ),
         ).thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -648,7 +698,8 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
     @Test
     @Throws(MessagingException::class)
     fun buildEncryptWithAttach__withInlineEnabled__shouldThrow() {
-        val cryptoStatus = defaultCryptoStatus.copy(cryptoMode = CryptoMode.CHOICE_ENABLED, isPgpInlineModeEnabled = true)
+        val cryptoStatus =
+            defaultCryptoStatus.copy(cryptoMode = CryptoMode.CHOICE_ENABLED, isPgpInlineModeEnabled = true)
 
         pgpMessageBuilder.setCryptoStatus(cryptoStatus)
         pgpMessageBuilder.setAttachments(listOf(Attachment.createAttachment(null, 0, null, true, true)))
@@ -671,10 +722,16 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         returnIntent.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR)
         returnIntent.putExtra(
             OpenPgpApi.RESULT_ERROR,
-            OpenPgpError(OpenPgpError.OPPORTUNISTIC_MISSING_KEYS, "Missing keys")
+            OpenPgpError(OpenPgpError.OPPORTUNISTIC_MISSING_KEYS, "Missing keys"),
         )
 
-        `when`(openPgpApi.executeApi(any(Intent::class.java), any(OpenPgpDataSource::class.java), any(OutputStream::class.java)))
+        `when`(
+            openPgpApi.executeApi(
+                any(Intent::class.java),
+                any(OpenPgpDataSource::class.java),
+                any(OutputStream::class.java),
+            ),
+        )
             .thenReturn(returnIntent)
 
         val mockCallback = mock(Callback::class.java)
@@ -698,7 +755,9 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         returnIntentSigned.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_SUCCESS)
         // no OpenPgpApi.EXTRA_DETACHED_SIGNATURE!
 
-        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(returnIntentSigned)
+        `when`(openPgpApi.executeApi(any<Intent>(), any<OpenPgpDataSource>(), any<OutputStream>())).thenReturn(
+            returnIntentSigned,
+        )
         val mockCallback = mock(Callback::class.java)
         pgpMessageBuilder.buildAsync(mockCallback)
 
@@ -715,14 +774,14 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
         private fun createDefaultPgpMessageBuilder(
             openPgpApi: OpenPgpApi,
             autocryptOpenPgpApiInteractor: AutocryptOpenPgpApiInteractor,
-            resourceProvider: CoreResourceProvider
+            resourceProvider: CoreResourceProvider,
         ): PgpMessageBuilder {
             val builder = PgpMessageBuilder(
                 MessageIdGenerator.getInstance(),
                 BoundaryGenerator.getInstance(),
                 AutocryptOperations.getInstance(),
                 autocryptOpenPgpApiInteractor,
-                resourceProvider
+                resourceProvider,
             )
             builder.setOpenPgpApi(openPgpApi)
 
@@ -730,7 +789,7 @@ class PgpMessageBuilderTest : K9RobolectricTest() {
                 name = "tester",
                 email = SENDER_EMAIL,
                 description = "test identity",
-                signatureUse = false
+                signatureUse = false,
             )
 
             builder.setSubject("subject")
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt
index 23bf0a46f5b..0da1ccbc7ea 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/helper/RelativeDateTimeFormatterTest.kt
@@ -16,7 +16,7 @@ import org.robolectric.annotation.Config
 
 @Config(
     qualifiers = "en",
-    sdk = [Build.VERSION_CODES.S]
+    sdk = [Build.VERSION_CODES.S],
 )
 class RelativeDateTimeFormatterTest : RobolectricTest() {
 
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt
index 574d0879288..eda03b74980 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagedetails/MessageDetailsParticipantFormatterTest.kt
@@ -112,12 +112,12 @@ class MessageDetailsParticipantFormatterTest : RobolectricTest() {
 
     private fun createParticipantFormatter(
         showContactNames: Boolean = true,
-        contactNameColor: Int? = null
+        contactNameColor: Int? = null,
     ): MessageDetailsParticipantFormatter {
         return RealMessageDetailsParticipantFormatter(
             contactNameProvider = contactNameProvider,
             showContactNames = showContactNames,
-            contactNameColor = contactNameColor
+            contactNameColor = contactNameColor,
         )
     }
 }
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
index 90c72b9f985..1d4f9f810ea 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messagelist/MessageListAdapterTest.kt
@@ -241,7 +241,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withoutSenderAboveSubjectAndDefaultFontSize_shouldNotSetTextSizeOfFirstLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(subject = FONT_DEFAULT),
-            senderAboveSubject = false
+            senderAboveSubject = false,
         )
 
         val view = adapter.createAndBindView()
@@ -253,7 +253,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withoutSenderAboveSubjectAndNonDefaultFontSize_shouldSetTextSizeOfFirstLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(subject = LARGE),
-            senderAboveSubject = false
+            senderAboveSubject = false,
         )
 
         val view = adapter.createAndBindView()
@@ -265,7 +265,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withSenderAboveSubjectAndDefaultFontSize_shouldNotSetTextSizeOfFirstLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(sender = FONT_DEFAULT),
-            senderAboveSubject = true
+            senderAboveSubject = true,
         )
 
         val view = adapter.createAndBindView()
@@ -277,7 +277,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withSenderAboveSubjectAndNonDefaultFontSize_shouldSetTextSizeOfFirstLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(sender = LARGE),
-            senderAboveSubject = true
+            senderAboveSubject = true,
         )
 
         val view = adapter.createAndBindView()
@@ -289,7 +289,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withoutSenderAboveSubjectAndDefaultFontSize_shouldNotSetTextSizeSpanInSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(sender = FONT_DEFAULT),
-            senderAboveSubject = false
+            senderAboveSubject = false,
         )
 
         val view = adapter.createAndBindView()
@@ -301,7 +301,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withoutSenderAboveSubjectAndNonDefaultFontSize_shouldSetTextSizeSpanInSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(sender = LARGE),
-            senderAboveSubject = false
+            senderAboveSubject = false,
         )
 
         val view = adapter.createAndBindView()
@@ -313,7 +313,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withSenderAboveSubjectAndDefaultFontSize_shouldNotSetTextSizeSpanInSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(subject = FONT_DEFAULT),
-            senderAboveSubject = true
+            senderAboveSubject = true,
         )
 
         val view = adapter.createAndBindView()
@@ -325,7 +325,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun withSenderAboveSubjectAndNonDefaultFontSize_shouldSetTextSizeSpanInSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(subject = LARGE),
-            senderAboveSubject = true
+            senderAboveSubject = true,
         )
 
         val view = adapter.createAndBindView()
@@ -355,7 +355,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun previewWithDefaultFontSize_shouldNotSetTextSizeOfSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(preview = FONT_DEFAULT),
-            previewLines = 1
+            previewLines = 1,
         )
 
         val view = adapter.createAndBindView()
@@ -367,7 +367,7 @@ class MessageListAdapterTest : RobolectricTest() {
     fun previewWithNonDefaultFontSize_shouldSetTextSizeOfSecondLineView() {
         val adapter = createAdapter(
             fontSizes = createFontSizes(preview = LARGE),
-            previewLines = 1
+            previewLines = 1,
         )
 
         val view = adapter.createAndBindView()
@@ -379,7 +379,7 @@ class MessageListAdapterTest : RobolectricTest() {
         subject: Int = FONT_DEFAULT,
         sender: Int = FONT_DEFAULT,
         preview: Int = FONT_DEFAULT,
-        date: Int = FONT_DEFAULT
+        date: Int = FONT_DEFAULT,
     ): FontSizes {
         return FontSizes().apply {
             messageListSubject = subject
@@ -397,7 +397,7 @@ class MessageListAdapterTest : RobolectricTest() {
         showContactPicture: Boolean = true,
         showingThreadedList: Boolean = true,
         backGroundAsReadIndicator: Boolean = false,
-        showAccountChip: Boolean = false
+        showAccountChip: Boolean = false,
     ): MessageListAdapter {
         val appearance = MessageListAppearance(
             fontSizes,
@@ -407,7 +407,7 @@ class MessageListAdapterTest : RobolectricTest() {
             showContactPicture,
             showingThreadedList,
             backGroundAsReadIndicator,
-            showAccountChip
+            showAccountChip,
         )
 
         return MessageListAdapter(
@@ -417,7 +417,7 @@ class MessageListAdapterTest : RobolectricTest() {
             contactsPictureLoader = contactsPictureLoader,
             listItemListener = listItemListener,
             appearance = appearance,
-            relativeDateTimeFormatter = RelativeDateTimeFormatter(context, TestClock())
+            relativeDateTimeFormatter = RelativeDateTimeFormatter(context, TestClock()),
         )
     }
 
@@ -440,7 +440,7 @@ class MessageListAdapterTest : RobolectricTest() {
         folderId: Long = 0L,
         messageUid: String = "irrelevant",
         databaseId: Long = 0L,
-        threadRoot: Long = 0L
+        threadRoot: Long = 0L,
     ): MessageListItem {
         return MessageListItem(
             account,
@@ -461,7 +461,7 @@ class MessageListAdapterTest : RobolectricTest() {
             folderId,
             messageUid,
             databaseId,
-            threadRoot
+            threadRoot,
         )
     }
 
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt
index d9f65b58499..6cae393400c 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/DisplayRecipientsExtractorTest.kt
@@ -12,7 +12,7 @@ private const val IDENTITY_ADDRESS = "me@domain.example"
 class DisplayRecipientsExtractorTest {
     private val account = Account("uuid").apply {
         identities += Identity(
-            email = IDENTITY_ADDRESS
+            email = IDENTITY_ADDRESS,
         )
     }
 
@@ -31,7 +31,7 @@ class DisplayRecipientsExtractorTest {
 
     private val displayRecipientsExtractor = DisplayRecipientsExtractor(
         recipientFormatter,
-        maxNumberOfDisplayRecipients = 5
+        maxNumberOfDisplayRecipients = 5,
     )
 
     @Test
@@ -43,7 +43,7 @@ class DisplayRecipientsExtractorTest {
         val displayRecipients = displayRecipientsExtractor.extractDisplayRecipients(message, account)
 
         assertThat(displayRecipients).isEqualTo(
-            DisplayRecipients(recipientNames = listOf("me"), numberOfRecipients = 1)
+            DisplayRecipients(recipientNames = listOf("me"), numberOfRecipients = 1),
         )
     }
 
@@ -56,7 +56,7 @@ class DisplayRecipientsExtractorTest {
         val displayRecipients = displayRecipientsExtractor.extractDisplayRecipients(message, account)
 
         assertThat(displayRecipients).isEqualTo(
-            DisplayRecipients(recipientNames = listOf("Contact One"), numberOfRecipients = 1)
+            DisplayRecipients(recipientNames = listOf("Contact One"), numberOfRecipients = 1),
         )
     }
 
@@ -69,7 +69,7 @@ class DisplayRecipientsExtractorTest {
         val displayRecipients = displayRecipientsExtractor.extractDisplayRecipients(message, account)
 
         assertThat(displayRecipients).isEqualTo(
-            DisplayRecipients(recipientNames = listOf("Alice"), numberOfRecipients = 1)
+            DisplayRecipients(recipientNames = listOf("Alice"), numberOfRecipients = 1),
         )
     }
 
@@ -82,7 +82,7 @@ class DisplayRecipientsExtractorTest {
         val displayRecipients = displayRecipientsExtractor.extractDisplayRecipients(message, account)
 
         assertThat(displayRecipients).isEqualTo(
-            DisplayRecipients(recipientNames = listOf("alice@domain.example"), numberOfRecipients = 1)
+            DisplayRecipients(recipientNames = listOf("alice@domain.example"), numberOfRecipients = 1),
         )
     }
 
@@ -98,8 +98,8 @@ class DisplayRecipientsExtractorTest {
         assertThat(displayRecipients).isEqualTo(
             DisplayRecipients(
                 recipientNames = listOf("Unknown 1", "Unknown 2", "Unknown 3"),
-                numberOfRecipients = 3
-            )
+                numberOfRecipients = 3,
+            ),
         )
     }
 
@@ -116,8 +116,8 @@ class DisplayRecipientsExtractorTest {
         assertThat(displayRecipients).isEqualTo(
             DisplayRecipients(
                 recipientNames = listOf("me", "Contact One", "Alice", "Contact Two", "Contact Four"),
-                numberOfRecipients = 7
-            )
+                numberOfRecipients = 7,
+            ),
         )
     }
 
@@ -136,7 +136,7 @@ class DisplayRecipientsExtractorTest {
         }
         val displayRecipientsExtractor = DisplayRecipientsExtractor(
             recipientFormatter,
-            maxNumberOfDisplayRecipients = 5
+            maxNumberOfDisplayRecipients = 5,
         )
 
         val displayRecipients = displayRecipientsExtractor.extractDisplayRecipients(message, account)
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt
index 2ad4bbd563d..683030419d6 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/MessageViewRecipientFormatterTest.kt
@@ -150,7 +150,7 @@ class MessageViewRecipientFormatterTest : RobolectricTest() {
 
         val displayName = recipientFormatter.getDisplayName(
             Address("mallory@domain.example", "potus@whitehouse.gov"),
-            account
+            account,
         )
 
         assertThat(displayName).isEqualTo("mallory@domain.example")
@@ -162,7 +162,7 @@ class MessageViewRecipientFormatterTest : RobolectricTest() {
 
         val displayName = recipientFormatter.getDisplayName(
             Address("gitlab@gitlab.example", "username (@username)"),
-            account
+            account,
         )
 
         assertThat(displayName).isEqualTo("username (@username)")
@@ -183,7 +183,7 @@ class MessageViewRecipientFormatterTest : RobolectricTest() {
 
         val displayName = recipientFormatter.getDisplayName(
             Address("spoof@domain.example", "contact@important.example"),
-            account
+            account,
         )
 
         assertThat(displayName).isEqualTo("contact@important.example")
@@ -201,14 +201,14 @@ class MessageViewRecipientFormatterTest : RobolectricTest() {
     private fun createRecipientFormatter(
         showCorrespondentNames: Boolean = true,
         showContactNames: Boolean = true,
-        contactNameColor: Int? = null
+        contactNameColor: Int? = null,
     ): RealMessageViewRecipientFormatter {
         return RealMessageViewRecipientFormatter(
             contactNameProvider = contactNameProvider,
             showCorrespondentNames = showCorrespondentNames,
             showContactNames = showContactNames,
             contactNameColor = contactNameColor,
-            meText = ME_TEXT
+            meText = ME_TEXT,
         )
     }
 }
diff --git a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt
index 18add6b7fc2..7cdba3ea219 100644
--- a/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt
+++ b/app/ui/legacy/src/test/java/com/fsck/k9/ui/messageview/RecipientLayoutCreatorTest.kt
@@ -24,7 +24,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         maxNumberOfRecipientNames = 5,
         recipientsPrefix = "to ",
         additionalRecipientSpacing = 1,
-        additionalRecipientsPrefix = "+"
+        additionalRecipientsPrefix = "+",
     )
 
     @Test(expected = IllegalArgumentException::class)
@@ -32,7 +32,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         recipientLayoutCreator.createRecipientLayout(
             recipientNames = emptyList(),
             totalNumberOfRecipients = 0,
-            availableWidth = 100
+            availableWidth = 100,
         )
     }
 
@@ -41,7 +41,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("me"),
             totalNumberOfRecipients = 1,
-            availableWidth = 10
+            availableWidth = 10,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to me")
@@ -53,7 +53,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("me"),
             totalNumberOfRecipients = 1,
-            availableWidth = 1
+            availableWidth = 1,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to me")
@@ -65,7 +65,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("Alice", "Bob"),
             totalNumberOfRecipients = 2,
-            availableWidth = 5
+            availableWidth = 5,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to Alice")
@@ -77,7 +77,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("Alice", "Bob"),
             totalNumberOfRecipients = 2,
-            availableWidth = 13
+            availableWidth = 13,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to Alice, Bob")
@@ -89,7 +89,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("Alice", "Bob", "Charly"),
             totalNumberOfRecipients = 3,
-            availableWidth = 13
+            availableWidth = 13,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to Alice")
@@ -101,7 +101,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("Alice", "Bob", "Charly"),
             totalNumberOfRecipients = 3,
-            availableWidth = 16
+            availableWidth = 16,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to Alice, Bob")
@@ -113,7 +113,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("Alice", "Bob", "Charly"),
             totalNumberOfRecipients = 3,
-            availableWidth = 100
+            availableWidth = 100,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to Alice, Bob, Charly")
@@ -125,7 +125,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("One", "Two", "Three", "Four", "Five"),
             totalNumberOfRecipients = 10,
-            availableWidth = 20
+            availableWidth = 20,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to One, Two")
@@ -137,7 +137,7 @@ class RecipientLayoutCreatorTest : RobolectricTest() {
         val result = recipientLayoutCreator.createRecipientLayout(
             recipientNames = listOf("One", "Two", "Three", "Four", "Five"),
             totalNumberOfRecipients = 10,
-            availableWidth = 100
+            availableWidth = 100,
         )
 
         assertThat(result.recipientNames.toString()).isEqualTo("to One, Two, Three, Four, Five")
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
index ba9d726ef0c..2b34ad90448 100644
--- 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
@@ -8,5 +8,5 @@ internal data class MessageListConfig(
     val showingThreadedList: Boolean,
     val sortType: SortType,
     val sortAscending: Boolean,
-    val sortDateAscending: 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
index 230fe6cf078..19c266df108 100644
--- 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
@@ -18,5 +18,5 @@ internal data class MessageListItem(
     val sortMessageDate: Long,
     val sortInternalDate: Long,
     val sortIsStarred: Boolean,
-    val sortDatabaseId: Long
+    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
index bac2745fbdc..8b3bf20c83a 100644
--- 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
@@ -11,7 +11,7 @@ import java.util.Locale
 
 internal class MessageListItemMapper(
     private val messageHelper: MessageHelper,
-    private val account: Account
+    private val account: Account,
 ) : MessageMapper<MessageListItem> {
     private val calendar: Calendar = Calendar.getInstance()
 
@@ -44,7 +44,7 @@ internal class MessageListItemMapper(
             sortMessageDate = message.messageDate,
             sortInternalDate = message.internalDate,
             sortIsStarred = message.isStarred,
-            sortDatabaseId = message.id
+            sortDatabaseId = message.id,
         )
     }
 
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
index 819c3d9ba13..b51b7d405b5 100644
--- 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
@@ -13,7 +13,7 @@ import timber.log.Timber
 internal class MessageListLoader(
     private val preferences: Preferences,
     private val messageListRepository: MessageListRepository,
-    private val messageHelper: MessageHelper
+    private val messageHelper: MessageHelper,
 ) {
 
     fun getMessageList(config: MessageListConfig): List<MessageListItem> {
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
index b446a8b7856..9d94ae7b5e8 100644
--- 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
@@ -46,7 +46,7 @@ internal class MessageListRemoteViewFactory(private val context: Context) : Remo
             showingThreadedList = K9.isThreadedViewEnabled,
             sortType = SortType.SORT_DATE,
             sortAscending = false,
-            sortDateAscending = false
+            sortDateAscending = false,
         )
 
         messageListItems = messageListLoader.getMessageList(messageListConfig)
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
index e503d1ce586..6eab9f1d38b 100644
--- 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
@@ -12,7 +12,7 @@ import timber.log.Timber
 class MessageListWidgetManager(
     private val context: Context,
     private val messageListRepository: MessageListRepository,
-    private val config: MessageListWidgetConfig
+    private val config: MessageListWidgetConfig,
 ) {
     private lateinit var appWidgetManager: AppWidgetManager
 
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
index fffb2d470f6..025cb5ffd0f 100644
--- 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
@@ -57,7 +57,7 @@ open class MessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
         val intent = MessageList.actionDisplayMessageTemplateIntent(
             context,
             openInUnifiedInbox = true,
-            messageViewOnly = true
+            messageViewOnly = true,
         )
 
         return PendingIntent.getActivity(context, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_MUTABLE)
@@ -70,7 +70,7 @@ open class MessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
             search = unifiedInboxAccount.relatedSearch,
             noThreading = true,
             newTask = true,
-            clearTop = true
+            clearTop = true,
         )
 
         return PendingIntent.getActivity(context, -1, intent, PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE)
diff --git a/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt b/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt
index d30476a447f..4b2073cebe9 100644
--- a/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt
+++ b/backend/api/src/main/java/com/fsck/k9/backend/api/Backend.kt
@@ -53,21 +53,21 @@ interface Backend {
     fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>?
 
     @Throws(MessagingException::class)
     fun moveMessagesAndMarkAsRead(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>?
 
     @Throws(MessagingException::class)
     fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>?
 
     @Throws(MessagingException::class)
@@ -76,7 +76,7 @@ interface Backend {
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String>
 
     @Throws(MessagingException::class)
diff --git a/backend/api/src/main/java/com/fsck/k9/backend/api/BackendFolder.kt b/backend/api/src/main/java/com/fsck/k9/backend/api/BackendFolder.kt
index 37b92d7a748..ad54686df41 100644
--- a/backend/api/src/main/java/com/fsck/k9/backend/api/BackendFolder.kt
+++ b/backend/api/src/main/java/com/fsck/k9/backend/api/BackendFolder.kt
@@ -31,6 +31,6 @@ interface BackendFolder {
     enum class MoreMessages {
         UNKNOWN,
         FALSE,
-        TRUE
+        TRUE,
     }
 }
diff --git a/backend/api/src/main/java/com/fsck/k9/backend/api/SyncConfig.kt b/backend/api/src/main/java/com/fsck/k9/backend/api/SyncConfig.kt
index 6e3f6f86ef6..78c600ece12 100644
--- a/backend/api/src/main/java/com/fsck/k9/backend/api/SyncConfig.kt
+++ b/backend/api/src/main/java/com/fsck/k9/backend/api/SyncConfig.kt
@@ -9,11 +9,11 @@ data class SyncConfig(
     val syncRemoteDeletions: Boolean,
     val maximumAutoDownloadMessageSize: Int,
     val defaultVisibleLimit: Int,
-    val syncFlags: Set<Flag>
+    val syncFlags: Set<Flag>,
 ) {
     enum class ExpungePolicy {
         IMMEDIATELY,
         MANUALLY,
-        ON_POLL
+        ON_POLL,
     }
 }
diff --git a/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt b/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt
index c8823c450ef..179b7b6af4d 100644
--- a/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt
+++ b/backend/demo/src/main/java/app/k9mail/backend/demo/DemoBackend.kt
@@ -114,7 +114,7 @@ class DemoBackend(private val backendStorage: BackendStorage) : Backend {
     override fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String> {
         // We do just enough to simulate a successful operation on the server.
         return messageServerIds.associateWith { createNewServerId() }
@@ -123,7 +123,7 @@ class DemoBackend(private val backendStorage: BackendStorage) : Backend {
     override fun moveMessagesAndMarkAsRead(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String> {
         // We do just enough to simulate a successful operation on the server.
         return messageServerIds.associateWith { createNewServerId() }
@@ -132,7 +132,7 @@ class DemoBackend(private val backendStorage: BackendStorage) : Backend {
     override fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String> {
         // We do just enough to simulate a successful operation on the server.
         return messageServerIds.associateWith { createNewServerId() }
@@ -143,7 +143,7 @@ class DemoBackend(private val backendStorage: BackendStorage) : Backend {
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         throw UnsupportedOperationException("not implemented")
     }
diff --git a/backend/demo/src/main/java/app/k9mail/backend/demo/MessageStoreInfo.kt b/backend/demo/src/main/java/app/k9mail/backend/demo/MessageStoreInfo.kt
index 6176d43b1ce..0b772299514 100644
--- a/backend/demo/src/main/java/app/k9mail/backend/demo/MessageStoreInfo.kt
+++ b/backend/demo/src/main/java/app/k9mail/backend/demo/MessageStoreInfo.kt
@@ -9,5 +9,5 @@ typealias MessageStoreInfo = Map<String, FolderData>
 data class FolderData(
     val name: String,
     val type: FolderType,
-    val messageServerIds: List<String>
+    val messageServerIds: List<String>,
 )
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/BackendIdleRefreshManager.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/BackendIdleRefreshManager.kt
index b7996a1004d..06f50658533 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/BackendIdleRefreshManager.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/BackendIdleRefreshManager.kt
@@ -112,7 +112,7 @@ class BackendIdleRefreshManager(private val alarmManager: SystemAlarmManager) :
 
     internal inner class BackendIdleRefreshTimer(
         val triggerTime: Long,
-        val callback: Callback
+        val callback: Callback,
     ) : IdleRefreshTimer {
         override var isWaiting: Boolean = true
             private set
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandMoveOrCopyMessages.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandMoveOrCopyMessages.kt
index b834f9a3b34..ae0d9b3f6e6 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandMoveOrCopyMessages.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandMoveOrCopyMessages.kt
@@ -11,7 +11,7 @@ internal class CommandMoveOrCopyMessages(private val imapStore: ImapStore) {
     fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return moveOrCopyMessages(sourceFolderServerId, targetFolderServerId, messageServerIds, false)
     }
@@ -19,7 +19,7 @@ internal class CommandMoveOrCopyMessages(private val imapStore: ImapStore) {
     fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return moveOrCopyMessages(sourceFolderServerId, targetFolderServerId, messageServerIds, true)
     }
@@ -28,7 +28,7 @@ internal class CommandMoveOrCopyMessages(private val imapStore: ImapStore) {
         srcFolder: String,
         destFolder: String,
         uids: Collection<String>,
-        isCopy: Boolean
+        isCopy: Boolean,
     ): Map<String, String>? {
         var remoteSrcFolder: ImapFolder? = null
         var remoteDestFolder: ImapFolder? = null
@@ -49,7 +49,7 @@ internal class CommandMoveOrCopyMessages(private val imapStore: ImapStore) {
             if (remoteSrcFolder.mode != OpenMode.READ_WRITE) {
                 throw MessagingException(
                     "moveOrCopyMessages: could not open remoteSrcFolder $srcFolder read/write",
-                    true
+                    true,
                 )
             }
 
@@ -60,7 +60,7 @@ internal class CommandMoveOrCopyMessages(private val imapStore: ImapStore) {
                 srcFolder,
                 messages.size,
                 destFolder,
-                isCopy
+                isCopy,
             )
 
             remoteDestFolder = imapStore.getFolder(destFolder)
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandRefreshFolderList.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandRefreshFolderList.kt
index cf71ed7113a..3a79960785d 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandRefreshFolderList.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandRefreshFolderList.kt
@@ -9,7 +9,7 @@ import com.fsck.k9.mail.store.imap.ImapStore
 
 internal class CommandRefreshFolderList(
     private val backendStorage: BackendStorage,
-    private val imapStore: ImapStore
+    private val imapStore: ImapStore,
 ) {
     fun refreshFolderList() {
         // TODO: Start using the proper server ID.
@@ -43,5 +43,5 @@ private fun List<FolderListItem>.toLegacyFolderList(): List<LegacyFolderListItem
 private data class LegacyFolderListItem(
     val serverId: String,
     val name: String,
-    val type: FolderType
+    val type: FolderType,
 )
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandSearch.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandSearch.kt
index f052343b121..b7d3165f95e 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandSearch.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandSearch.kt
@@ -10,7 +10,7 @@ internal class CommandSearch(private val imapStore: ImapStore) {
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         val folder = imapStore.getFolder(folderServerId)
         try {
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt
index 46c16cf6e38..9d342b76cf7 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackend.kt
@@ -22,7 +22,7 @@ class ImapBackend(
     private val powerManager: PowerManager,
     private val idleRefreshManager: IdleRefreshManager,
     private val pushConfigProvider: ImapPushConfigProvider,
-    private val smtpTransport: SmtpTransport
+    private val smtpTransport: SmtpTransport,
 ) : Backend {
     private val imapSync = ImapSync(accountName, backendStorage, imapStore)
     private val commandRefreshFolderList = CommandRefreshFolderList(backendStorage, imapStore)
@@ -93,7 +93,7 @@ class ImapBackend(
     override fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return commandMoveOrCopyMessages.moveMessages(sourceFolderServerId, targetFolderServerId, messageServerIds)
     }
@@ -101,12 +101,12 @@ class ImapBackend(
     override fun moveMessagesAndMarkAsRead(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         val uidMapping = commandMoveOrCopyMessages.moveMessages(
             sourceFolderServerId,
             targetFolderServerId,
-            messageServerIds
+            messageServerIds,
         )
         if (uidMapping != null) {
             setFlag(targetFolderServerId, uidMapping.values.toList(), Flag.SEEN, true)
@@ -117,7 +117,7 @@ class ImapBackend(
     override fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return commandMoveOrCopyMessages.copyMessages(sourceFolderServerId, targetFolderServerId, messageServerIds)
     }
@@ -127,7 +127,7 @@ class ImapBackend(
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         return commandSearch.search(folderServerId, query, requiredFlags, forbiddenFlags, performFullTextSearch)
     }
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackendPusher.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackendPusher.kt
index f08c4a88b57..f9f31ba38ab 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackendPusher.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapBackendPusher.kt
@@ -30,7 +30,7 @@ internal class ImapBackendPusher(
     private val pushConfigProvider: ImapPushConfigProvider,
     private val callback: BackendPusherCallback,
     private val accountName: String,
-    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO
+    backgroundDispatcher: CoroutineDispatcher = Dispatchers.IO,
 ) : BackendPusher, ImapPusherCallback {
     private val coroutineScope = CoroutineScope(backgroundDispatcher)
     private val lock = Any()
@@ -178,7 +178,7 @@ internal class ImapBackendPusher(
             this,
             accountName,
             folderServerId,
-            idleRefreshTimeoutProvider
+            idleRefreshTimeoutProvider,
         )
     }
 
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapFolderPusher.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapFolderPusher.kt
index ef3ffe03207..c189e98e561 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapFolderPusher.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapFolderPusher.kt
@@ -19,7 +19,7 @@ class ImapFolderPusher(
     private val callback: ImapPusherCallback,
     private val accountName: String,
     private val folderServerId: String,
-    private val idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider
+    private val idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider,
 ) {
     @Volatile
     private var folderIdler: ImapFolderIdler? = null
@@ -63,7 +63,7 @@ class ImapFolderPusher(
             wakeLock,
             imapStore,
             folderServerId,
-            idleRefreshTimeoutProvider
+            idleRefreshTimeoutProvider,
         ).also {
             folderIdler = it
         }
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
index f5276a90066..cfe5c6b3c92 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
@@ -28,7 +28,7 @@ import kotlin.math.max
 internal class ImapSync(
     private val accountName: String,
     private val backendStorage: BackendStorage,
-    private val imapStore: ImapStore
+    private val imapStore: ImapStore,
 ) {
     fun sync(folder: String, syncConfig: SyncConfig, listener: SyncListener) {
         synchronizeMailboxSynchronous(folder, syncConfig, listener)
@@ -133,7 +133,7 @@ internal class ImapSync(
                     "SYNC: About to get messages %d through %d for folder %s",
                     remoteStart,
                     remoteMessageCount,
-                    folder
+                    folder,
                 )
 
                 val headerProgress = AtomicInteger(0)
@@ -203,7 +203,7 @@ internal class ImapSync(
                 backendFolder,
                 remoteMessages,
                 highestKnownUid,
-                listener
+                listener,
             )
 
             listener.folderStatusChanged(folder)
@@ -240,7 +240,7 @@ internal class ImapSync(
                 "Failed synchronizing folder %s:%s @ %tc",
                 accountName,
                 folder,
-                System.currentTimeMillis()
+                System.currentTimeMillis(),
             )
         } finally {
             if (newHighestKnownUid > 0 && backendFolder != null) {
@@ -264,7 +264,7 @@ internal class ImapSync(
                 backendFolder,
                 listOf(remoteMessage),
                 null,
-                SimpleSyncListener()
+                SimpleSyncListener(),
             )
         } finally {
             remoteFolder.close()
@@ -287,7 +287,7 @@ internal class ImapSync(
         backendFolder: BackendFolder,
         inputMessages: List<ImapMessage>,
         highestKnownUid: Long?,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         val folder = remoteFolder.serverId
 
@@ -301,7 +301,7 @@ internal class ImapSync(
                 message,
                 backendFolder,
                 unsyncedMessages,
-                syncFlagMessages
+                syncFlagMessages,
             )
         }
 
@@ -333,7 +333,7 @@ internal class ImapSync(
                 largeMessages,
                 progress,
                 todo,
-                listener
+                listener,
             )
 
             Timber.d("SYNC: Synced unsynced messages for folder %s", folder)
@@ -343,7 +343,7 @@ internal class ImapSync(
             "SYNC: Have %d large messages and %d small messages out of %d unsynced messages",
             largeMessages.size,
             smallMessages.size,
-            unsyncedMessages.size
+            unsyncedMessages.size,
         )
 
         unsyncedMessages.clear()
@@ -363,7 +363,7 @@ internal class ImapSync(
             downloadedMessageCount,
             todo,
             highestKnownUid,
-            listener
+            listener,
         )
         smallMessages.clear()
 
@@ -379,7 +379,7 @@ internal class ImapSync(
             todo,
             highestKnownUid,
             listener,
-            maxDownloadSize
+            maxDownloadSize,
         )
         largeMessages.clear()
 
@@ -396,7 +396,7 @@ internal class ImapSync(
         message: ImapMessage,
         backendFolder: BackendFolder,
         unsyncedMessages: MutableList<ImapMessage>,
-        syncFlagMessages: MutableList<ImapMessage>
+        syncFlagMessages: MutableList<ImapMessage>,
     ) {
         val messageServerId = message.uid
         if (message.isSet(Flag.DELETED)) {
@@ -447,7 +447,7 @@ internal class ImapSync(
         largeMessages: MutableList<ImapMessage>,
         progress: AtomicInteger,
         todo: Int,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         val folder = remoteFolder.serverId
         val fetchProfile = FetchProfile().apply {
@@ -466,7 +466,7 @@ internal class ImapSync(
                                 "Newly downloaded message %s:%s:%s was marked deleted on server, skipping",
                                 accountName,
                                 folder,
-                                message.uid
+                                message.uid,
                             )
 
                             if (isFirstResponse) {
@@ -491,7 +491,7 @@ internal class ImapSync(
                     }
                 }
             },
-            syncConfig.maximumAutoDownloadMessageSize
+            syncConfig.maximumAutoDownloadMessageSize,
         )
     }
 
@@ -503,7 +503,7 @@ internal class ImapSync(
         downloadedMessageCount: AtomicInteger,
         todo: Int,
         highestKnownUid: Long?,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         val folder = remoteFolder.serverId
         val fetchProfile = FetchProfile().apply {
@@ -531,7 +531,7 @@ internal class ImapSync(
                             "About to notify listeners that we got a new small message %s:%s:%s",
                             accountName,
                             folder,
-                            messageServerId
+                            messageServerId,
                         )
 
                         // Update the listener with what we've found
@@ -544,7 +544,7 @@ internal class ImapSync(
                     }
                 }
             },
-            -1
+            -1,
         )
 
         Timber.d("SYNC: Done fetching small messages for folder %s", folder)
@@ -559,7 +559,7 @@ internal class ImapSync(
         todo: Int,
         highestKnownUid: Long?,
         listener: SyncListener,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         val folder = remoteFolder.serverId
         val fetchProfile = FetchProfile().apply {
@@ -581,7 +581,7 @@ internal class ImapSync(
                 "About to notify listeners that we got a new large message %s:%s:%s",
                 accountName,
                 folder,
-                messageServerId
+                messageServerId,
             )
 
             // Update the listener with what we've found
@@ -604,7 +604,7 @@ internal class ImapSync(
         syncFlagMessages: List<ImapMessage>,
         progress: AtomicInteger,
         todo: Int,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         val folder = remoteFolder.serverId
         Timber.d("SYNC: About to sync flags for %d remote messages for folder %s", syncFlagMessages.size, folder)
@@ -635,7 +635,7 @@ internal class ImapSync(
         remoteFolder: ImapFolder,
         backendFolder: BackendFolder,
         message: ImapMessage,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         /*
          * The provider was unable to get the structure of the message, so
@@ -660,7 +660,7 @@ internal class ImapSync(
         remoteFolder: ImapFolder,
         backendFolder: BackendFolder,
         message: ImapMessage,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         /*
          * We have a structure to deal with, from which
@@ -711,7 +711,7 @@ internal class ImapSync(
         remoteFolder: ImapFolder,
         backendFolder: BackendFolder,
         earliestDate: Date?,
-        remoteStart: Int
+        remoteStart: Int,
     ) {
         if (remoteStart == 1) {
             backendFolder.setMoreMessages(MoreMessages.FALSE)
diff --git a/backend/imap/src/test/java/com/fsck/k9/backend/imap/BackendIdleRefreshManagerTest.kt b/backend/imap/src/test/java/com/fsck/k9/backend/imap/BackendIdleRefreshManagerTest.kt
index cd5c4d7e7b0..861501e4d16 100644
--- a/backend/imap/src/test/java/com/fsck/k9/backend/imap/BackendIdleRefreshManagerTest.kt
+++ b/backend/imap/src/test/java/com/fsck/k9/backend/imap/BackendIdleRefreshManagerTest.kt
@@ -98,7 +98,7 @@ class BackendIdleRefreshManagerTest {
         alarmManager.advanceTime(timeout1)
 
         assertThat(alarmManager.alarmTimes).isEqualTo(
-            listOf(START_TIME + timeout1, START_TIME + timeout2, START_TIME + timeout1 + timeout1)
+            listOf(START_TIME + timeout1, START_TIME + timeout2, START_TIME + timeout1 + timeout1),
         )
         assertThat(callback2.wasCalled).isTrue()
         assertThat(callback3.wasCalled).isTrue()
diff --git a/backend/imap/src/test/java/com/fsck/k9/backend/imap/ImapSyncTest.kt b/backend/imap/src/test/java/com/fsck/k9/backend/imap/ImapSyncTest.kt
index 273de02a110..e58f2478ad5 100644
--- a/backend/imap/src/test/java/com/fsck/k9/backend/imap/ImapSyncTest.kt
+++ b/backend/imap/src/test/java/com/fsck/k9/backend/imap/ImapSyncTest.kt
@@ -59,7 +59,7 @@ class ImapSyncTest {
         verify(syncListener).syncFailed(
             folderServerId = eq(FOLDER_SERVER_ID),
             message = eq("Exception: Message count -1 for folder $FOLDER_SERVER_ID"),
-            exception = any()
+            exception = any(),
         )
     }
 
@@ -136,7 +136,7 @@ class ImapSyncTest {
         addMessageToImapAndBackendFolder(uid = 42, date = "Wed, 05 Jan 2022 20:00:00 +0100")
         val syncConfig = defaultSyncConfig.copy(
             syncRemoteDeletions = true,
-            earliestPollDate = "Tue, 04 Jan 2022 12:00:00 +0100".toDate()
+            earliestPollDate = "Tue, 04 Jan 2022 12:00:00 +0100".toDate(),
         )
 
         imapSync.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -221,7 +221,7 @@ class ImapSyncTest {
                 messages: List<ImapMessage>,
                 fetchProfile: FetchProfile,
                 listener: FetchListener?,
-                maxDownloadSize: Int
+                maxDownloadSize: Int,
             ) {
                 super.fetch(messages, fetchProfile, listener, maxDownloadSize)
 
@@ -261,7 +261,7 @@ class ImapSyncTest {
     private fun TestImapFolder.addMessage(
         uid: Long,
         flags: Set<Flag> = emptySet(),
-        date: String = DEFAULT_MESSAGE_DATE
+        date: String = DEFAULT_MESSAGE_DATE,
     ) {
         val messageServerId = uid.toString()
         val message = createSimpleMessage(messageServerId, date)
@@ -289,7 +289,7 @@ class ImapSyncTest {
             val folderInfo = FolderInfo(
                 serverId = serverId,
                 name = "irrelevant",
-                type = FolderType.REGULAR
+                type = FolderType.REGULAR,
             )
             updater.createFolders(listOf(folderInfo))
         }
@@ -302,7 +302,7 @@ class ImapSyncTest {
             syncRemoteDeletions = true,
             maximumAutoDownloadMessageSize = MAXIMUM_AUTO_DOWNLOAD_MESSAGE_SIZE,
             defaultVisibleLimit = DEFAULT_VISIBLE_LIMIT,
-            syncFlags = setOf(Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED, Flag.FORWARDED)
+            syncFlags = setOf(Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED, Flag.FORWARDED),
         )
     }
 
diff --git a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
index 729a909f919..9e3b6a9d40d 100644
--- a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
+++ b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
@@ -75,7 +75,7 @@ open class TestImapFolder(override val serverId: String) : ImapFolder {
         start: Int,
         end: Int,
         earliestDate: Date?,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         require(start > 0)
         require(end >= start)
@@ -94,7 +94,7 @@ open class TestImapFolder(override val serverId: String) : ImapFolder {
         messages: List<ImapMessage>,
         fetchProfile: FetchProfile,
         listener: FetchListener?,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         if (messages.isEmpty()) return
 
@@ -118,7 +118,7 @@ open class TestImapFolder(override val serverId: String) : ImapFolder {
         message: ImapMessage,
         part: Part,
         bodyFactory: BodyFactory,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         throw UnsupportedOperationException("not implemented")
     }
@@ -127,7 +127,7 @@ open class TestImapFolder(override val serverId: String) : ImapFolder {
         queryString: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<ImapMessage> {
         throw UnsupportedOperationException("not implemented")
     }
diff --git a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapStore.kt b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapStore.kt
index db698d52efb..acd95b9c483 100644
--- a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapStore.kt
+++ b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapStore.kt
@@ -33,7 +33,7 @@ class TestImapStore : ImapStore {
                 serverId = folder.serverId,
                 name = "irrelevant",
                 type = FolderType.REGULAR,
-                oldServerId = null
+                oldServerId = null,
             )
         }
     }
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandDelete.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandDelete.kt
index 0db6100f6d7..cf8fac92cf0 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandDelete.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandDelete.kt
@@ -11,7 +11,7 @@ import rs.ltt.jmap.common.method.response.email.SetEmailMethodResponse
 
 class CommandDelete(
     private val jmapClient: JmapClient,
-    private val accountId: String
+    private val accountId: String,
 ) {
     fun deleteMessages(messageServerIds: List<String>) {
         Timber.v("Deleting messages %s", messageServerIds)
@@ -24,7 +24,7 @@ class CommandDelete(
                 SetEmailMethodCall.builder()
                     .accountId(accountId)
                     .destroy(emailIds.toTypedArray())
-                    .build()
+                    .build(),
             )
 
             setEmailCall.getMainResponseBlocking<SetEmailMethodResponse>()
@@ -47,14 +47,14 @@ class CommandDelete(
                     .filter(EmailFilterCondition.builder().inMailbox(folderServerId).build())
                     .calculateTotal(true)
                     .limit(limit)
-                    .build()
+                    .build(),
             )
 
             val setEmailCall = multiCall.call(
                 SetEmailMethodCall.builder()
                     .accountId(accountId)
                     .destroyReference(queryEmailCall.createResultReference(ResultReference.Path.IDS))
-                    .build()
+                    .build(),
             )
 
             multiCall.execute()
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandMove.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandMove.kt
index f45461c64a3..5c2b7260d84 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandMove.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandMove.kt
@@ -8,7 +8,7 @@ import rs.ltt.jmap.common.util.Patches
 
 class CommandMove(
     private val jmapClient: JmapClient,
-    private val accountId: String
+    private val accountId: String,
 ) {
     fun moveMessages(targetFolderServerId: String, messageServerIds: List<String>) {
         Timber.v("Moving %d messages to %s", messageServerIds.size, targetFolderServerId)
@@ -47,7 +47,7 @@ class CommandMove(
                 SetEmailMethodCall.builder()
                     .accountId(accountId)
                     .update(updates)
-                    .build()
+                    .build(),
             )
 
             setEmailCall.getMainResponseBlocking<SetEmailMethodResponse>()
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandRefreshFolderList.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandRefreshFolderList.kt
index 2b6f9cef06d..53ff47793b4 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandRefreshFolderList.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandRefreshFolderList.kt
@@ -22,7 +22,7 @@ import rs.ltt.jmap.common.method.response.mailbox.GetMailboxMethodResponse
 internal class CommandRefreshFolderList(
     private val backendStorage: BackendStorage,
     private val jmapClient: JmapClient,
-    private val accountId: String
+    private val accountId: String,
 ) {
     fun refreshFolderList() {
         try {
@@ -49,7 +49,7 @@ internal class CommandRefreshFolderList(
 
     private fun fetchMailboxes(folderUpdater: BackendFolderUpdater) {
         val call = jmapClient.call(
-            GetMailboxMethodCall.builder().accountId(accountId).build()
+            GetMailboxMethodCall.builder().accountId(accountId).build(),
         )
         val response = call.getMainResponseBlocking<GetMailboxMethodResponse>()
         val foldersOnServer = response.list
@@ -99,19 +99,19 @@ internal class CommandRefreshFolderList(
             ChangesMailboxMethodCall.builder()
                 .accountId(accountId)
                 .sinceState(state)
-                .build()
+                .build(),
         )
         val createdMailboxesCall = multiCall.call(
             GetMailboxMethodCall.builder()
                 .accountId(accountId)
                 .idsReference(mailboxChangesCall.createResultReference(ResultReference.Path.CREATED))
-                .build()
+                .build(),
         )
         val changedMailboxesCall = multiCall.call(
             GetMailboxMethodCall.builder()
                 .accountId(accountId)
                 .idsReference(mailboxChangesCall.createResultReference(ResultReference.Path.UPDATED))
-                .build()
+                .build(),
         )
         multiCall.execute()
 
@@ -137,7 +137,7 @@ internal class CommandRefreshFolderList(
 
         return UpdateState(
             state = mailboxChangesResponse.newState,
-            hasMoreChanges = mailboxChangesResponse.isHasMoreChanges
+            hasMoreChanges = mailboxChangesResponse.isHasMoreChanges,
         )
     }
 
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSetFlag.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSetFlag.kt
index 1a1646337e0..b302c394532 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSetFlag.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSetFlag.kt
@@ -12,7 +12,7 @@ import rs.ltt.jmap.common.util.Patches
 
 class CommandSetFlag(
     private val jmapClient: JmapClient,
-    private val accountId: String
+    private val accountId: String,
 ) {
     fun setFlag(messageServerIds: List<String>, flag: Flag, newState: Boolean) {
         if (newState) {
@@ -40,7 +40,7 @@ class CommandSetFlag(
                 SetEmailMethodCall.builder()
                     .accountId(accountId)
                     .update(updates)
-                    .build()
+                    .build(),
             )
 
             setEmailCall.getMainResponseBlocking<SetEmailMethodResponse>()
@@ -65,11 +65,11 @@ class CommandSetFlag(
                         EmailFilterCondition.builder()
                             .inMailbox(folderServerId)
                             .notKeyword("\$seen")
-                            .build()
+                            .build(),
                     )
                     .calculateTotal(true)
                     .limit(limit)
-                    .build()
+                    .build(),
             )
 
             val queryEmailResponse = queryEmailCall.getMainResponseBlocking<QueryEmailMethodResponse>()
@@ -87,7 +87,7 @@ class CommandSetFlag(
                     SetEmailMethodCall.builder()
                         .accountId(accountId)
                         .update(updates)
-                        .build()
+                        .build(),
                 )
 
                 setEmailCall.getMainResponseBlocking<SetEmailMethodResponse>()
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSync.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSync.kt
index 876d3b8ef6e..91b0bf9df2f 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSync.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandSync.kt
@@ -33,7 +33,7 @@ class CommandSync(
     private val jmapClient: JmapClient,
     private val okHttpClient: OkHttpClient,
     private val accountId: String,
-    private val httpAuthentication: HttpAuthentication
+    private val httpAuthentication: HttpAuthentication,
 ) {
 
     fun sync(folderServerId: String, syncConfig: SyncConfig, listener: SyncListener) {
@@ -68,7 +68,7 @@ class CommandSync(
         folderServerId: String,
         syncConfig: SyncConfig,
         limit: Long?,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         val cachedServerIds: Set<String> = backendFolder.getMessageServerIds()
 
@@ -83,7 +83,7 @@ class CommandSync(
                 .accountId(accountId)
                 .query(createEmailQuery(folderServerId))
                 .limit(limit)
-                .build()
+                .build(),
         )
         val queryEmailResponse = queryEmailCall.getMainResponseBlocking<QueryEmailMethodResponse>()
         val queryState = if (queryEmailResponse.isCanCalculateChanges) queryEmailResponse.queryState else null
@@ -113,7 +113,7 @@ class CommandSync(
         syncConfig: SyncConfig,
         limit: Long?,
         queryState: String,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         Timber.d("Updating messages in %s (%s)", backendFolder.name, folderServerId)
 
@@ -123,7 +123,7 @@ class CommandSync(
                 .accountId(accountId)
                 .sinceQueryState(queryState)
                 .query(emailQuery)
-                .build()
+                .build(),
         )
 
         val queryChangesEmailResponse = try {
@@ -164,7 +164,7 @@ class CommandSync(
         destroyServerIds: List<String>,
         newServerIds: Set<String>,
         newQueryState: String?,
-        listener: SyncListener
+        listener: SyncListener,
     ) {
         if (destroyServerIds.isNotEmpty()) {
             Timber.d("Removing messages no longer on server: %s", destroyServerIds)
@@ -221,7 +221,7 @@ class CommandSync(
                 .accountId(accountId)
                 .ids(emailIdsChunk.toTypedArray())
                 .properties(properties)
-                .build()
+                .build(),
         )
 
         val getEmailResponse = getEmailCall.getMainResponseBlocking<GetEmailMethodResponse>()
@@ -318,5 +318,5 @@ private data class MessageInfo(
     val serverId: String,
     val downloadUrl: HttpUrl,
     val receivedAt: Date,
-    val flags: Set<Flag>
+    val flags: Set<Flag>,
 )
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandUpload.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandUpload.kt
index 89da6e6f414..e0a672dc37a 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandUpload.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/CommandUpload.kt
@@ -20,7 +20,7 @@ class CommandUpload(
     private val jmapClient: JmapClient,
     private val okHttpClient: OkHttpClient,
     private val httpAuthentication: HttpAuthentication,
-    private val accountId: String
+    private val accountId: String,
 ) {
     private val moshi = Moshi.Builder().build()
 
@@ -65,7 +65,7 @@ class CommandUpload(
                     .blobId(uploadResponse.blobId)
                     .keywords(mapOf("\$seen" to true))
                     .mailboxIds(mapOf(folderServerId to true))
-                    .build()
+                    .build(),
             )
             .build()
 
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt
index 70350e0e4e5..14009b21c29 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapBackend.kt
@@ -20,7 +20,7 @@ import rs.ltt.jmap.common.method.call.core.EchoMethodCall
 class JmapBackend(
     backendStorage: BackendStorage,
     okHttpClient: OkHttpClient,
-    config: JmapConfig
+    config: JmapConfig,
 ) : Backend {
     private val httpAuthentication = config.toHttpAuthentication()
     private val jmapClient = createJmapClient(config, httpAuthentication)
@@ -87,7 +87,7 @@ class JmapBackend(
     override fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         commandMove.moveMessages(targetFolderServerId, messageServerIds)
         return messageServerIds.associateWith { it }
@@ -101,7 +101,7 @@ class JmapBackend(
     override fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         commandMove.copyMessages(targetFolderServerId, messageServerIds)
         return messageServerIds.associateWith { it }
@@ -112,7 +112,7 @@ class JmapBackend(
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         throw UnsupportedOperationException("not implemented")
     }
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapConfig.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapConfig.kt
index 6ac523923c2..890be0a5fe6 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapConfig.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapConfig.kt
@@ -4,5 +4,5 @@ data class JmapConfig(
     val username: String,
     val password: String,
     val baseUrl: String?,
-    val accountId: String
+    val accountId: String,
 )
diff --git a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapUploadResponse.kt b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapUploadResponse.kt
index f93b43ec0f4..bba2eddf914 100644
--- a/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapUploadResponse.kt
+++ b/backend/jmap/src/main/java/com/fsck/k9/backend/jmap/JmapUploadResponse.kt
@@ -7,5 +7,5 @@ data class JmapUploadResponse(
     val accountId: String,
     val blobId: String,
     val type: String,
-    val size: Long
+    val size: Long,
 )
diff --git a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandRefreshFolderListTest.kt b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandRefreshFolderListTest.kt
index f79740b0927..d2f5db91b64 100644
--- a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandRefreshFolderListTest.kt
+++ b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandRefreshFolderListTest.kt
@@ -22,7 +22,7 @@ class CommandRefreshFolderListTest {
     @Test
     fun sessionResourceWithAuthenticationError() {
         val command = createCommandRefreshFolderList(
-            MockResponse().setResponseCode(401)
+            MockResponse().setResponseCode(401),
         )
 
         try {
@@ -35,7 +35,7 @@ class CommandRefreshFolderListTest {
     @Test
     fun invalidSessionResource() {
         val command = createCommandRefreshFolderList(
-            MockResponse().setBody("invalid")
+            MockResponse().setBody("invalid"),
         )
 
         try {
@@ -50,7 +50,7 @@ class CommandRefreshFolderListTest {
     fun fetchMailboxes() {
         val command = createCommandRefreshFolderList(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
-            responseBodyFromResource("/jmap_responses/mailbox/mailbox_get.json")
+            responseBodyFromResource("/jmap_responses/mailbox/mailbox_get.json"),
         )
 
         command.refreshFolderList()
@@ -69,7 +69,7 @@ class CommandRefreshFolderListTest {
     fun fetchMailboxUpdates() {
         val command = createCommandRefreshFolderList(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
-            responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes.json")
+            responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes.json"),
         )
         createFoldersInBackendStorage(state = "23")
 
@@ -90,7 +90,7 @@ class CommandRefreshFolderListTest {
         val command = createCommandRefreshFolderList(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
             responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes_1.json"),
-            responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes_2.json")
+            responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes_2.json"),
         )
         createFoldersInBackendStorage(state = "23")
 
@@ -111,7 +111,7 @@ class CommandRefreshFolderListTest {
         val command = createCommandRefreshFolderList(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
             responseBodyFromResource("/jmap_responses/mailbox/mailbox_changes_error_cannot_calculate_changes.json"),
-            responseBodyFromResource("/jmap_responses/mailbox/mailbox_get.json")
+            responseBodyFromResource("/jmap_responses/mailbox/mailbox_get.json"),
         )
         setMailboxState("unknownToServer")
 
@@ -134,7 +134,7 @@ class CommandRefreshFolderListTest {
 
     private fun createCommandRefreshFolderList(
         baseUrl: HttpUrl,
-        accountId: String = "test@example.com"
+        accountId: String = "test@example.com",
     ): CommandRefreshFolderList {
         val jmapClient = JmapClient("test", "test", baseUrl)
         return CommandRefreshFolderList(backendStorage, jmapClient, accountId)
diff --git a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandSyncTest.kt b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandSyncTest.kt
index b4bbdbb50c5..94cf2fe1486 100644
--- a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandSyncTest.kt
+++ b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/CommandSyncTest.kt
@@ -32,7 +32,7 @@ class CommandSyncTest {
         syncRemoteDeletions = true,
         maximumAutoDownloadMessageSize = 1000,
         defaultVisibleLimit = 25,
-        syncFlags = EnumSet.of(Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED, Flag.FORWARDED)
+        syncFlags = EnumSet.of(Flag.SEEN, Flag.FLAGGED, Flag.ANSWERED, Flag.FORWARDED),
     )
 
     @Before
@@ -44,7 +44,7 @@ class CommandSyncTest {
     @Test
     fun sessionResourceWithAuthenticationError() {
         val command = createCommandSync(
-            MockResponse().setResponseCode(401)
+            MockResponse().setResponseCode(401),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -61,7 +61,7 @@ class CommandSyncTest {
             responseBodyFromResource("/jmap_responses/email/email_query_M001_and_M002.json"),
             responseBodyFromResource("/jmap_responses/email/email_get_ids_M001_and_M002.json"),
             responseBodyFromResource("/jmap_responses/blob/email/email_1.eml"),
-            responseBodyFromResource("/jmap_responses/blob/email/email_2.eml")
+            responseBodyFromResource("/jmap_responses/blob/email/email_2.eml"),
         )
         val baseUrl = server.url("/jmap/")
         val command = createCommandSync(baseUrl)
@@ -71,14 +71,14 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.assertMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         backendFolder.assertQueryState("50:0")
         syncListener.assertSyncEvents(
             SyncListenerEvent.SyncStarted(FOLDER_SERVER_ID),
             SyncListenerEvent.SyncProgress(FOLDER_SERVER_ID, completed = 1, total = 2),
             SyncListenerEvent.SyncProgress(FOLDER_SERVER_ID, completed = 2, total = 2),
-            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID)
+            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID),
         )
         server.skipRequests(3)
         server.assertRequestUrlPath("/jmap/download/test%40example.com/B001/B001?accept=application%2Foctet-stream")
@@ -97,7 +97,7 @@ class CommandSyncTest {
             responseBodyFromResource("/jmap_responses/blob/email/email_2.eml"),
             responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
             responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
-            responseBodyFromResource("/jmap_responses/blob/email/email_3.eml")
+            responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -112,21 +112,21 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.createMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         val command = createCommandSync(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
             responseBodyFromResource("/jmap_responses/email/email_query_M002_and_M003.json"),
             responseBodyFromResource("/jmap_responses/email/email_get_ids_M003.json"),
             responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
-            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json")
+            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
 
         backendFolder.assertMessages(
             "M002" to "/jmap_responses/blob/email/email_2.eml",
-            "M003" to "/jmap_responses/blob/email/email_3.eml"
+            "M003" to "/jmap_responses/blob/email/email_3.eml",
         )
         syncListener.assertSyncSuccess()
     }
@@ -136,11 +136,11 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.createMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         val command = createCommandSync(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
-            responseBodyFromResource("/jmap_responses/email/email_query_empty_result.json")
+            responseBodyFromResource("/jmap_responses/email/email_query_empty_result.json"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -148,7 +148,7 @@ class CommandSyncTest {
         assertEquals(emptySet<String>(), backendFolder.getMessageServerIds())
         syncListener.assertSyncEvents(
             SyncListenerEvent.SyncStarted(FOLDER_SERVER_ID),
-            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID)
+            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID),
         )
     }
 
@@ -157,13 +157,13 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.createMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         backendFolder.setQueryState("50:0")
         val command = createCommandSync(
             responseBodyFromResource("/jmap_responses/session/valid_session.json"),
             responseBodyFromResource("/jmap_responses/email/email_query_changes_empty_result.json"),
-            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M001_and_M002.json")
+            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M001_and_M002.json"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -174,7 +174,7 @@ class CommandSyncTest {
         backendFolder.assertQueryState("50:0")
         syncListener.assertSyncEvents(
             SyncListenerEvent.SyncStarted(FOLDER_SERVER_ID),
-            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID)
+            SyncListenerEvent.SyncFinished(FOLDER_SERVER_ID),
         )
     }
 
@@ -183,7 +183,7 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.createMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         backendFolder.setQueryState("50:0")
         val command = createCommandSync(
@@ -191,7 +191,7 @@ class CommandSyncTest {
             responseBodyFromResource("/jmap_responses/email/email_query_changes_M001_deleted_M003_added.json"),
             responseBodyFromResource("/jmap_responses/email/email_get_ids_M003.json"),
             responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
-            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json")
+            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
@@ -206,7 +206,7 @@ class CommandSyncTest {
         val backendFolder = backendStorage.getFolder(FOLDER_SERVER_ID)
         backendFolder.createMessages(
             "M001" to "/jmap_responses/blob/email/email_1.eml",
-            "M002" to "/jmap_responses/blob/email/email_2.eml"
+            "M002" to "/jmap_responses/blob/email/email_2.eml",
         )
         backendFolder.setQueryState("10:0")
         val command = createCommandSync(
@@ -215,7 +215,7 @@ class CommandSyncTest {
             responseBodyFromResource("/jmap_responses/email/email_query_M002_and_M003.json"),
             responseBodyFromResource("/jmap_responses/email/email_get_ids_M003.json"),
             responseBodyFromResource("/jmap_responses/blob/email/email_3.eml"),
-            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json")
+            responseBodyFromResource("/jmap_responses/email/email_get_keywords_M002.json"),
         )
 
         command.sync(FOLDER_SERVER_ID, syncConfig, syncListener)
diff --git a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/LoggingSyncListener.kt b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/LoggingSyncListener.kt
index 2bc08cfbf5c..b1aad2a24d5 100644
--- a/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/LoggingSyncListener.kt
+++ b/backend/jmap/src/test/java/com/fsck/k9/backend/jmap/LoggingSyncListener.kt
@@ -89,7 +89,7 @@ sealed class SyncListenerEvent {
     data class SyncFailed(
         val folderServerId: String,
         val message: String,
-        val exception: Exception?
+        val exception: Exception?,
     ) : SyncListenerEvent()
 
     data class SyncProgress(val folderServerId: String, val completed: Int, val total: Int) : SyncListenerEvent()
diff --git a/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt b/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt
index f3974aebbb0..90193fc961a 100644
--- a/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt
+++ b/backend/pop3/src/main/java/com/fsck/k9/backend/pop3/Pop3Backend.kt
@@ -17,7 +17,7 @@ class Pop3Backend(
     accountName: String,
     backendStorage: BackendStorage,
     private val pop3Store: Pop3Store,
-    private val smtpTransport: SmtpTransport
+    private val smtpTransport: SmtpTransport,
 ) : Backend {
     private val pop3Sync: Pop3Sync = Pop3Sync(accountName, backendStorage, pop3Store)
     private val commandRefreshFolderList = CommandRefreshFolderList(backendStorage)
@@ -80,7 +80,7 @@ class Pop3Backend(
     override fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         throw UnsupportedOperationException("not supported")
     }
@@ -88,7 +88,7 @@ class Pop3Backend(
     override fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         throw UnsupportedOperationException("not supported")
     }
@@ -96,7 +96,7 @@ class Pop3Backend(
     override fun moveMessagesAndMarkAsRead(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         throw UnsupportedOperationException("not supported")
     }
@@ -106,7 +106,7 @@ class Pop3Backend(
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         throw UnsupportedOperationException("not supported")
     }
diff --git a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/CommandRefreshFolderList.kt b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/CommandRefreshFolderList.kt
index 751bd7defa0..be5a3f011f5 100644
--- a/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/CommandRefreshFolderList.kt
+++ b/backend/webdav/src/main/java/com/fsck/k9/backend/webdav/CommandRefreshFolderList.kt
@@ -7,7 +7,7 @@ import com.fsck.k9.mail.store.webdav.WebDavStore
 
 internal class CommandRefreshFolderList(
     private val backendStorage: BackendStorage,
-    private val webDavStore: WebDavStore
+    private val webDavStore: WebDavStore,
 ) {
     fun refreshFolderList() {
         val foldersOnServer = webDavStore.personalNamespaces
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 aeeece2311f..40a93c0b011 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
@@ -17,7 +17,7 @@ import com.fsck.k9.mail.store.webdav.WebDavStore
 class WebDavBackend(
     accountName: String,
     backendStorage: BackendStorage,
-    private val webDavStore: WebDavStore
+    private val webDavStore: WebDavStore,
 ) : Backend {
     private val webDavSync: WebDavSync = WebDavSync(accountName, backendStorage, webDavStore)
     private val commandGetFolders = CommandRefreshFolderList(backendStorage, webDavStore)
@@ -83,7 +83,7 @@ class WebDavBackend(
     override fun moveMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return commandMoveOrCopyMessages.moveMessages(sourceFolderServerId, targetFolderServerId, messageServerIds)
     }
@@ -91,7 +91,7 @@ class WebDavBackend(
     override fun moveMessagesAndMarkAsRead(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         val uidMapping = commandMoveOrCopyMessages
             .moveMessages(sourceFolderServerId, targetFolderServerId, messageServerIds)
@@ -104,7 +104,7 @@ class WebDavBackend(
     override fun copyMessages(
         sourceFolderServerId: String,
         targetFolderServerId: String,
-        messageServerIds: List<String>
+        messageServerIds: List<String>,
     ): Map<String, String>? {
         return commandMoveOrCopyMessages.copyMessages(sourceFolderServerId, targetFolderServerId, messageServerIds)
     }
@@ -114,7 +114,7 @@ class WebDavBackend(
         query: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<String> {
         throw UnsupportedOperationException("not supported")
     }
diff --git a/build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts b/build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts
index 166de9e2305..478e344a693 100644
--- a/build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts
+++ b/build-plugin/src/main/kotlin/thunderbird.app.android.compose.gradle.kts
@@ -16,7 +16,7 @@ android {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
diff --git a/build.gradle.kts b/build.gradle.kts
index 08bf6bf95e3..ef8f2ebdc91 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -87,6 +87,6 @@ tasks.register("testsOnCi") {
     dependsOn(
         subprojects.map { project -> project.tasks.withType(Test::class.java) }
             .flatten()
-            .filterNot { task -> task.name in arrayOf("testDebugUnitTest", "test") }
+            .filterNot { task -> task.name in arrayOf("testDebugUnitTest", "test") },
     )
 }
diff --git a/cli/html-cleaner-cli/src/main/kotlin/Main.kt b/cli/html-cleaner-cli/src/main/kotlin/Main.kt
index 9fc78309cdd..a5580f4cc47 100644
--- a/cli/html-cleaner-cli/src/main/kotlin/Main.kt
+++ b/cli/html-cleaner-cli/src/main/kotlin/Main.kt
@@ -14,7 +14,7 @@ import okio.source
 
 @Suppress("MemberVisibilityCanBePrivate")
 class HtmlCleaner : CliktCommand(
-    help = "A tool that modifies HTML to only keep allowed elements and attributes the same way that K-9 Mail does."
+    help = "A tool that modifies HTML to only keep allowed elements and attributes the same way that K-9 Mail does.",
 ) {
     val input by argument(help = "HTML input file (needs to be UTF-8 encoded)")
         .inputStream()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 012dfec328e..e82ca85bfc7 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -3,7 +3,7 @@
 
 [versions]
 androidGradlePlugin = "7.4.0"
-ktlint = "0.47.1"
+ktlint = "0.48.2"
 
 kotlin = "1.8.0"
 kotlinCoroutines = "1.6.4"
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.kt b/mail/common/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.kt
index aeab48441fb..efeccb70f17 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.mail
 class AuthenticationFailedException @JvmOverloads constructor(
     message: String,
     throwable: Throwable? = null,
-    val messageFromServer: String? = null
+    val messageFromServer: String? = null,
 ) : MessagingException(message, throwable) {
     val isMessageFromServerAvailable = messageFromServer != null
 }
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/BoundaryGenerator.kt b/mail/common/src/main/java/com/fsck/k9/mail/BoundaryGenerator.kt
index a8ce9fe8759..1f84293e5aa 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/BoundaryGenerator.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/BoundaryGenerator.kt
@@ -22,7 +22,7 @@ class BoundaryGenerator @VisibleForTesting internal constructor(private val rand
             '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
             'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
             'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
-            'U', 'V', 'W', 'X', 'Y', 'Z'
+            'U', 'V', 'W', 'X', 'Y', 'Z',
         )
 
         private val INSTANCE = BoundaryGenerator(Random())
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/MessageDownloadState.kt b/mail/common/src/main/java/com/fsck/k9/mail/MessageDownloadState.kt
index b4a3304cb42..bd603cc7c59 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/MessageDownloadState.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/MessageDownloadState.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.mail
 enum class MessageDownloadState {
     ENVELOPE,
     PARTIAL,
-    FULL
+    FULL,
 }
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/MimeType.kt b/mail/common/src/main/java/com/fsck/k9/mail/MimeType.kt
index 33122ad0f69..1efd1fb2ccc 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/MimeType.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/MimeType.kt
@@ -2,7 +2,7 @@ package com.fsck.k9.mail
 
 class MimeType private constructor(
     val type: String,
-    val subtype: String
+    val subtype: String,
 ) {
     override fun toString(): String {
         return "$type/$subtype"
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt b/mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt
index ca365fb4d3a..9be006f679d 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/ServerSettings.kt
@@ -12,7 +12,7 @@ data class ServerSettings @JvmOverloads constructor(
     @JvmField val username: String,
     @JvmField val password: String?,
     @JvmField val clientCertificateAlias: String?,
-    val extra: Map<String, String?> = emptyMap()
+    val extra: Map<String, String?> = emptyMap(),
 ) {
     val isMissingCredentials: Boolean = when (authenticationType) {
         AuthType.EXTERNAL -> clientCertificateAlias == null
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.kt
index eb5cec8ecfd..4a9ddbcc2f4 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.kt
@@ -96,7 +96,7 @@ internal object DecoderUtil {
         output: StringBuilder,
         previousWord: EncodedWord?,
         body: String,
-        previousEnd: Int
+        previousEnd: Int,
     ) {
         if (previousWord != null) {
             output.append(charsetDecode(previousWord))
@@ -184,7 +184,7 @@ internal object DecoderUtil {
     private class EncodedWord(
         val charset: String,
         val encoding: Encoding,
-        var data: ByteString
+        var data: ByteString,
     ) {
         fun canBeCombinedWith(other: EncodedWord): Boolean {
             return encoding == other.encoding && charset == other.charset && !isAsciiEscapeSequence()
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeExtensions.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeExtensions.kt
index 779518b901e..b1d6a4c10f6 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeExtensions.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeExtensions.kt
@@ -7,7 +7,7 @@ internal const val RECOMMENDED_MAX_LINE_LENGTH = 78
 private val TSPECIALS = charArrayOf('(', ')', '<', '>', '@', ',', ';', ':', '\\', '"', '/', '[', ']', '?', '=')
 
 private val ATEXT_SPECIAL = charArrayOf(
-    '!', '#', '$', '%', '&', '\'', '*', '+', '-', '/', '=', '?', '^', '_', '`', '{', '|', '}', '~'
+    '!', '#', '$', '%', '&', '\'', '*', '+', '-', '/', '=', '?', '^', '_', '`', '{', '|', '}', '~',
 )
 
 // RFC 5234: HTAB = %x09
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeHeaderParser.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeHeaderParser.kt
index f013b87b8e0..d55dc1014a7 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeHeaderParser.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeHeaderParser.kt
@@ -149,7 +149,7 @@ class MimeHeaderParser(private val input: String) {
                     currentIndex--
                     throw MimeHeaderParserException(
                         "Unexpected '$character' (${character.code}) in comment",
-                        errorIndex = currentIndex
+                        errorIndex = currentIndex,
                     )
                 }
             }
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterDecoder.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterDecoder.kt
index ebe89d3b9d0..c2d96684c03 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterDecoder.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeParameterDecoder.kt
@@ -50,7 +50,7 @@ object MimeParameterDecoder {
             value = value,
             parameters = parameters,
             ignoredParameters = duplicateParameters + ignoredParameters,
-            parserErrorIndex = parserErrorIndex
+            parserErrorIndex = parserErrorIndex,
         )
     }
 
@@ -70,7 +70,7 @@ object MimeParameterDecoder {
             value = value,
             parameters = parameters,
             ignoredParameters = duplicateParameters,
-            parserErrorIndex = parserErrorIndex
+            parserErrorIndex = parserErrorIndex,
         )
     }
 
@@ -205,7 +205,7 @@ object MimeParameterDecoder {
         parameterName: String,
         newParameterName: String,
         section: Int?,
-        parameterText: String
+        parameterText: String,
     ): ParameterSection? {
         return try {
             val charsetName = parser.readUntil(SINGLE_QUOTE)
@@ -223,7 +223,7 @@ object MimeParameterDecoder {
                     section,
                     charsetName,
                     language,
-                    data
+                    data,
                 )
             } else {
                 val encodedParameterText = parameterText.substring(parser.position())
@@ -306,5 +306,5 @@ private data class ParameterValue(val value: String, val wasToken: Boolean)
 private data class BasicParameterResults(
     val parameters: BasicParameters,
     val ignoredParameters: IgnoredParameters,
-    val parserErrorIndex: Int?
+    val parserErrorIndex: Int?,
 )
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeValue.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeValue.kt
index df8c2cea6ff..30e0d2d2a83 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeValue.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/MimeValue.kt
@@ -4,5 +4,5 @@ data class MimeValue(
     val value: String,
     val parameters: Map<String, String> = emptyMap(),
     val ignoredParameters: List<Pair<String, String>> = emptyList(),
-    val parserErrorIndex: Int? = null
+    val parserErrorIndex: Int? = null,
 )
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/internet/ParameterSection.kt b/mail/common/src/main/java/com/fsck/k9/mail/internet/ParameterSection.kt
index c7b9b12da62..9bc6d28c2bc 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/internet/ParameterSection.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/internet/ParameterSection.kt
@@ -5,14 +5,14 @@ import okio.Buffer
 internal sealed class ParameterSection(
     val name: String,
     val originalName: String,
-    val section: Int?
+    val section: Int?,
 )
 
 internal open class ExtendedValueParameterSection(
     name: String,
     originalName: String,
     section: Int?,
-    val data: Buffer
+    val data: Buffer,
 ) : ParameterSection(name, originalName, section)
 
 internal class InitialExtendedValueParameterSection(
@@ -21,12 +21,12 @@ internal class InitialExtendedValueParameterSection(
     section: Int?,
     val charsetName: String,
     val language: String?,
-    data: Buffer
+    data: Buffer,
 ) : ExtendedValueParameterSection(name, originalName, section, data)
 
 internal class RegularValueParameterSection(
     name: String,
     originalName: String = name,
     section: Int? = null,
-    val text: String
+    val text: String,
 ) : ParameterSection(name, originalName, section)
diff --git a/mail/common/src/main/java/com/fsck/k9/mail/message/MessageHeaderParser.kt b/mail/common/src/main/java/com/fsck/k9/mail/message/MessageHeaderParser.kt
index ab055f954a4..b295f545ce8 100644
--- a/mail/common/src/main/java/com/fsck/k9/mail/message/MessageHeaderParser.kt
+++ b/mail/common/src/main/java/com/fsck/k9/mail/message/MessageHeaderParser.kt
@@ -37,7 +37,7 @@ object MessageHeaderParser {
     }
 
     private class MessageHeaderParserContentHandler(
-        private val collector: MessageHeaderCollector
+        private val collector: MessageHeaderCollector,
     ) : AbstractContentHandler() {
         override fun field(rawField: Field) {
             val name = rawField.name
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 280a0d60297..848becd0ffa 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
@@ -121,7 +121,7 @@ class LocalKeyStore(private val directoryProvider: KeyStoreDirectoryProvider) {
                     host,
                     port,
                     storedCert,
-                    certificate
+                    certificate,
                 )
                 false
             } else {
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/BoundaryGeneratorTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/BoundaryGeneratorTest.kt
index 990a410062c..defca7ee800 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/BoundaryGeneratorTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/BoundaryGeneratorTest.kt
@@ -19,7 +19,7 @@ class BoundaryGeneratorTest {
     @Test
     fun generateBoundary() {
         val random = createRandom(
-            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 35
+            0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 35,
         )
         val boundaryGenerator = BoundaryGenerator(random)
 
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/MessageTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/MessageTest.kt
index 65125df5ae7..13f99f9fcb1 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/MessageTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/MessageTest.kt
@@ -165,7 +165,7 @@ class MessageTest {
 
             ------Boundary103--
 
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -266,7 +266,7 @@ class MessageTest {
 
             ------Boundary103--
 
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -324,7 +324,7 @@ class MessageTest {
             αβγδεζηθ
             End of test.
 
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
 
         return MimeBodyPart().apply {
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/AddressHeaderBuilderTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/AddressHeaderBuilderTest.kt
index 672b8eddf8d..156458f4688 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/AddressHeaderBuilderTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/AddressHeaderBuilderTest.kt
@@ -20,7 +20,7 @@ class AddressHeaderBuilderTest {
     fun createHeaderValue_withTwoAddressesThatFitOnSingleLine() {
         val addresses = arrayOf(
             Address("one@domain.example"),
-            Address("two@domain.example")
+            Address("two@domain.example"),
         )
 
         val headerValue = AddressHeaderBuilder.createHeaderValue(addresses)
@@ -35,7 +35,7 @@ class AddressHeaderBuilderTest {
             Address("two+because.i.can@this.is.quite.some.domain.example", "Person \"Long Email Address\" Two"),
             Address("three@domain.example", "Person Three"),
             Address("four@domain.example", "Person Four"),
-            Address("five@domain.example", "Person Five")
+            Address("five@domain.example", "Person Five"),
         )
 
         val headerValue = AddressHeaderBuilder.createHeaderValue(addresses)
@@ -47,7 +47,7 @@ class AddressHeaderBuilderTest {
             | Person Three <three@domain.example>, Person Four <four@domain.example>,
             | Person Five <five@domain.example>
             """.trimMargin().crlf(),
-            headerValue
+            headerValue,
         )
     }
 
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/EncoderUtilTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/EncoderUtilTest.kt
index 422c7b89990..22015a333b0 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/EncoderUtilTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/EncoderUtilTest.kt
@@ -22,7 +22,7 @@ class EncoderUtilTest {
                 "\uD83D\uDC25\uD83D\uDC26\uD83D\uDC0F\uD83D\uDC11\uD83D\uDC10",
             "=?UTF-8?B?UmU6IPCfkJXwn5C28J+QqfCfkIjwn5Cx8J+QgPCfkIHwn5Ct8J+QuQ==?= " +
                 "=?UTF-8?B?8J+QovCfkIfwn5Cw8J+Qk/CfkJTwn5Cj?= " +
-                "=?UTF-8?B?8J+QpPCfkKXwn5Cm8J+Qj/CfkJHwn5CQ?="
+                "=?UTF-8?B?8J+QpPCfkKXwn5Cm8J+Qj/CfkJHwn5CQ?=",
         )
     }
 
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.kt
index f9ef77ede7e..fc8d33fa711 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/FlowedMessageUtilsTest.kt
@@ -31,7 +31,7 @@ class FlowedMessageUtilsTest {
             Text that should be displayed on one line.
             Text that should retain
             its line break.
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -62,7 +62,7 @@ class FlowedMessageUtilsTest {
             |
             |Some more text that should be displayed on one line.
             |
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -90,7 +90,7 @@ class FlowedMessageUtilsTest {
             >> Depth 2${" "}
             > Depth 1 is here
             Some other text
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -172,7 +172,7 @@ class FlowedMessageUtilsTest {
             
             --${" "}
             Signature text
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -193,7 +193,7 @@ class FlowedMessageUtilsTest {
             >${" "}
             > --${" "}
             > Signature text
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 
@@ -210,7 +210,7 @@ class FlowedMessageUtilsTest {
             Fake flowed line
             --${" "}
             Signature
-            """.trimIndent().crlf()
+            """.trimIndent().crlf(),
         )
     }
 }
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.kt
index 6ce7a465405..64668e46e77 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/MessageIdGeneratorTest.kt
@@ -8,7 +8,7 @@ class MessageIdGeneratorTest {
     private val messageIdGenerator = MessageIdGenerator(
         object : UuidGenerator {
             override fun randomUuid() = "00000000-0000-4000-0000-000000000000"
-        }
+        },
     )
 
     @Test
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterDecoderTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterDecoderTest.kt
index 4f16aba0127..bf45dbcdef7 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterDecoderTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterDecoderTest.kt
@@ -29,13 +29,13 @@ class MimeParameterDecoderTest {
         val mimeValue = MimeParameterDecoder.decode(
             "message/external-body; access-type=URL;\r\n" +
                 " URL*0=\"ftp://\";\r\n" +
-                " URL*1=\"cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\""
+                " URL*1=\"cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\"",
         )
 
         assertThat(mimeValue.value).isEqualTo("message/external-body")
         assertThat(mimeValue.parameters).containsExactlyEntries(
             "access-type" to "URL",
-            "url" to "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+            "url" to "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar",
         )
         assertThat(mimeValue.ignoredParameters).isEmpty()
     }
@@ -44,13 +44,13 @@ class MimeParameterDecoderTest {
     fun rfc2231_example2() {
         val mimeValue = MimeParameterDecoder.decode(
             "message/external-body; access-type=URL;\r\n" +
-                " URL=\"ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\""
+                " URL=\"ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar\"",
         )
 
         assertThat(mimeValue.value).isEqualTo("message/external-body")
         assertThat(mimeValue.parameters).containsExactlyEntries(
             "access-type" to "URL",
-            "url" to "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+            "url" to "ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar",
         )
         assertThat(mimeValue.ignoredParameters).isEmpty()
     }
@@ -59,7 +59,7 @@ class MimeParameterDecoderTest {
     fun rfc2231_example3() {
         val mimeValue = MimeParameterDecoder.decode(
             "application/x-stuff;\r\n" +
-                " name*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A"
+                " name*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A",
         )
 
         assertThat(mimeValue.value).isEqualTo("application/x-stuff")
@@ -73,7 +73,7 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name*0*=us-ascii'en'This%20is%20even%20more%20;\r\n" +
                 " name*1*=%2A%2A%2Afun%2A%2A%2A%20;\r\n" +
-                " name*2=\"isn't it!\""
+                " name*2=\"isn't it!\"",
         )
 
         assertThat(mimeValue.value).isEqualTo("application/x-stuff")
@@ -87,7 +87,7 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name*2=\"[three]\";\r\n" +
                 " name*1=\"[two]\";\r\n" +
-                " name*0=\"[one]\""
+                " name*0=\"[one]\"",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "[one][two][three]")
@@ -100,7 +100,7 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name*0=\"[one]\";\r\n" +
                 " NAME*1=\"[two]\";\r\n" +
-                " nAmE*2=\"[three]\""
+                " nAmE*2=\"[three]\"",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "[one][two][three]")
@@ -116,7 +116,7 @@ class MimeParameterDecoderTest {
                 " name*2=\"[three]\";\r\n" +
                 " name*3*=%5Bfour%5D;\r\n" +
                 " name*4=\"[five]\";\r\n" +
-                " name*5=six"
+                " name*5=six",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "[one][two][three][four][five]six")
@@ -128,7 +128,7 @@ class MimeParameterDecoderTest {
         val mimeValue = MimeParameterDecoder.decode(
             "application/x-stuff;\r\n" +
                 " name=\"filename.ext\";\r\n" +
-                " name*=utf-8''filen%C3%A4me.ext"
+                " name*=utf-8''filen%C3%A4me.ext",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "filenäme.ext")
@@ -141,7 +141,7 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name=one;\r\n" +
                 " extra=something;\r\n" +
-                " name=two"
+                " name=two",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("extra" to "something")
@@ -154,7 +154,7 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name=one;\r\n" +
                 " extra=something;\r\n" +
-                " NAME=two"
+                " NAME=two",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("extra" to "something")
@@ -185,7 +185,7 @@ class MimeParameterDecoderTest {
             "(comment)application(comment)/(comment)x-stuff" +
                 "(comment);(comment)\r\n" +
                 " (comment)name(comment)=(comment)one(comment);(comment)\r\n" +
-                "  (comment) extra (comment) = (comment) something (comment)"
+                "  (comment) extra (comment) = (comment) something (comment)",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "one", "extra" to "something")
@@ -261,7 +261,7 @@ class MimeParameterDecoderTest {
         val mimeValue = MimeParameterDecoder.decode(
             "application/x-stuff;\r\n" +
                 " name*0=one;\r\n" +
-                " name*01=two"
+                " name*01=two",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "one", "name*01" to "two")
@@ -272,7 +272,7 @@ class MimeParameterDecoderTest {
     fun section_index_with_huge_number() {
         val mimeValue = MimeParameterDecoder.decode(
             "application/x-stuff;\r\n" +
-                " name*10000000000000000000=filename"
+                " name*10000000000000000000=filename",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name*10000000000000000000" to "filename")
@@ -355,7 +355,7 @@ class MimeParameterDecoderTest {
     fun rfc2047_encoded() {
         val mimeValue = MimeParameterDecoder.decode(
             "application/x-stuff;\r\n" +
-                " name=\"=?UTF-8?Q?filn=C3=A4me=2Eext?=\""
+                " name=\"=?UTF-8?Q?filn=C3=A4me=2Eext?=\"",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries("name" to "filnäme.ext")
@@ -368,12 +368,12 @@ class MimeParameterDecoderTest {
             "application/x-stuff;\r\n" +
                 " name=\"=?UTF-8?Q?File_name_that_is_so_long_it_likes_to_be_wrapped_i?=\r\n" +
                 " =?UTF-8?Q?nto_multiple_lines=2E_Also_?=\r\n" +
-                " =?UTF-8?Q?non-ASCII_characters=3A_=C3=A4=E2=82=AC=F0=9F=8C=9E?=\""
+                " =?UTF-8?Q?non-ASCII_characters=3A_=C3=A4=E2=82=AC=F0=9F=8C=9E?=\"",
         )
 
         assertThat(mimeValue.parameters).containsExactlyEntries(
             "name" to "File name that is so long it likes to be wrapped " +
-                "into multiple lines. Also non-ASCII characters: ä€\uD83C\uDF1E"
+                "into multiple lines. Also non-ASCII characters: ä€\uD83C\uDF1E",
         )
         assertThat(mimeValue.ignoredParameters).isEmpty()
     }
diff --git a/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterEncoderTest.kt b/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterEncoderTest.kt
index c18c75dbcc6..ba0c92db3c9 100644
--- a/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterEncoderTest.kt
+++ b/mail/common/src/test/java/com/fsck/k9/mail/internet/MimeParameterEncoderTest.kt
@@ -20,7 +20,7 @@ class MimeParameterEncoderTest {
             """
             |attachment;
             | filename=kitten.png
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -28,14 +28,14 @@ class MimeParameterEncoderTest {
     fun backslashesInParameterValue() {
         val header = MimeParameterEncoder.encode(
             "attachment",
-            mapOf("filename" to "Important Document \\Confidential\\.pdf")
+            mapOf("filename" to "Important Document \\Confidential\\.pdf"),
         )
 
         assertThat(header).isEqualTo(
             """
             |attachment;
             | filename="Important Document \\Confidential\\.pdf"
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -47,7 +47,7 @@ class MimeParameterEncoderTest {
             """
             |attachment;
             | filename*=UTF-8''%C3%9Cbergr%C3%B6%C3%9Fentr%C3%A4ger.dat
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -57,8 +57,8 @@ class MimeParameterEncoderTest {
             "attachment",
             mapOf(
                 "filename" to "This file name is quite long and exceeds the recommended header line length " +
-                    "of 78 characters.txt"
-            )
+                    "of 78 characters.txt",
+            ),
         )
 
         // For now this is encoded like parameters that contain non-ASCII characters. However we could use
@@ -73,7 +73,7 @@ class MimeParameterEncoderTest {
             | filename*0*=UTF-8''This%20file%20name%20is%20quite%20long%20and%20exceeds%20;
             | filename*1*=the%20recommended%20header%20line%20length%20of%2078%20character;
             | filename*2*=s.txt
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -81,7 +81,7 @@ class MimeParameterEncoderTest {
     fun longParameterValueWithNonAsciiCharacters() {
         val header = MimeParameterEncoder.encode(
             "attachment",
-            mapOf("filename" to "üüüüüüüüüüüüüüüüüüüüüü.txt", "size" to "54321")
+            mapOf("filename" to "üüüüüüüüüüüüüüüüüüüüüü.txt", "size" to "54321"),
         )
 
         assertThat(header).isEqualTo(
@@ -91,7 +91,7 @@ class MimeParameterEncoderTest {
             | filename*1*=%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC%C3%BC;
             | filename*2*=%C3%BC%C3%BC%C3%BC.txt;
             | size=54321
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -99,14 +99,14 @@ class MimeParameterEncoderTest {
     fun parameterValueWithControlCharacter() {
         val header = MimeParameterEncoder.encode(
             "value",
-            mapOf("something" to "foo\u0000bar")
+            mapOf("something" to "foo\u0000bar"),
         )
 
         assertThat(header).isEqualTo(
             """
             |value;
             | something*=UTF-8''foo%00bar
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -118,8 +118,8 @@ class MimeParameterEncoderTest {
                 "token" to "foobar",
                 "quoted" to "something containing spaces",
                 "non-ascii" to "Grüße",
-                "long" to "one~two~three~four~five~six~seven~eight~nine~ten~eleven~twelve~thirteen~fourteen~fifteen"
-            )
+                "long" to "one~two~three~four~five~six~seven~eight~nine~ten~eleven~twelve~thirteen~fourteen~fifteen",
+            ),
         )
 
         assertThat(header).isEqualTo(
@@ -130,7 +130,7 @@ class MimeParameterEncoderTest {
             | non-ascii*=UTF-8''Gr%C3%BC%C3%9Fe;
             | long*0*=UTF-8''one~two~three~four~five~six~seven~eight~nine~ten~eleven~twelv;
             | long*1*=e~thirteen~fourteen~fifteen
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -141,8 +141,8 @@ class MimeParameterEncoderTest {
             mapOf(
                 "param1" to "*'%",
                 "param2" to "=*'%",
-                "param3" to "ü*'%"
-            )
+                "param3" to "ü*'%",
+            ),
         )
 
         assertThat(header).isEqualTo(
@@ -151,7 +151,7 @@ class MimeParameterEncoderTest {
             | param1=*'%;
             | param2="=*'%";
             | param3*=UTF-8''%C3%BC%2A%27%25
-            """.trimMargin().crlf()
+            """.trimMargin().crlf(),
         )
     }
 
@@ -159,7 +159,7 @@ class MimeParameterEncoderTest {
     fun overlyLongParameterName_shouldThrow() {
         MimeParameterEncoder.encode(
             "attachment",
-            mapOf("parameter_name_that_exceeds_the_line_length_recommendation_almost_on_its_own" to "foobar")
+            mapOf("parameter_name_that_exceeds_the_line_length_recommendation_almost_on_its_own" to "foobar"),
         )
     }
 }
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderListItem.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderListItem.kt
index 3bc7bb08aba..b0bc0154edc 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderListItem.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/FolderListItem.kt
@@ -6,5 +6,5 @@ data class FolderListItem(
     val serverId: String,
     val name: String,
     val type: FolderType,
-    val oldServerId: String?
+    val oldServerId: String?,
 )
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
index 821522bba77..784cab2b671 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
@@ -35,7 +35,7 @@ interface ImapFolder {
         start: Int,
         end: Int,
         earliestDate: Date?,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage>
 
     @Throws(IOException::class, MessagingException::class)
@@ -46,7 +46,7 @@ interface ImapFolder {
         messages: List<ImapMessage>,
         fetchProfile: FetchProfile,
         listener: FetchListener?,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     )
 
     @Throws(MessagingException::class)
@@ -54,7 +54,7 @@ interface ImapFolder {
         message: ImapMessage,
         part: Part,
         bodyFactory: BodyFactory,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     )
 
     @Throws(MessagingException::class)
@@ -62,7 +62,7 @@ interface ImapFolder {
         queryString: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<ImapMessage>
 
     @Throws(MessagingException::class)
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderIdler.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderIdler.kt
index be6397fa610..b8abda74920 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderIdler.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolderIdler.kt
@@ -20,7 +20,7 @@ interface ImapFolderIdler {
             wakeLock: WakeLock,
             imapStore: ImapStore,
             folderServerId: String,
-            idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider
+            idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider,
         ): ImapFolderIdler {
             return RealImapFolderIdler(
                 idleRefreshManager,
@@ -28,7 +28,7 @@ interface ImapFolderIdler {
                 imapStore,
                 connectionProvider,
                 folderServerId,
-                idleRefreshTimeoutProvider
+                idleRefreshTimeoutProvider,
             )
         }
     }
@@ -37,5 +37,5 @@ interface ImapFolderIdler {
 enum class IdleResult {
     SYNC,
     STOPPED,
-    NOT_SUPPORTED
+    NOT_SUPPORTED,
 }
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.kt
index bcb484c6a21..af1a98053f8 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.kt
@@ -21,7 +21,7 @@ interface ImapStore {
             serverSettings: ServerSettings,
             config: ImapStoreConfig,
             trustedSocketFactory: TrustedSocketFactory,
-            oauthTokenProvider: OAuth2TokenProvider?
+            oauthTokenProvider: OAuth2TokenProvider?,
         ): ImapStore {
             return RealImapStore(serverSettings, config, trustedSocketFactory, oauthTokenProvider)
         }
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStoreSettings.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStoreSettings.kt
index e06414d3218..db7a0da20ee 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStoreSettings.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapStoreSettings.kt
@@ -21,7 +21,7 @@ object ImapStoreSettings {
     fun createExtra(autoDetectNamespace: Boolean, pathPrefix: String?): Map<String, String?> {
         return mapOf(
             AUTODETECT_NAMESPACE_KEY to autoDetectNamespace.toString(),
-            PATH_PREFIX_KEY to pathPrefix
+            PATH_PREFIX_KEY to pathPrefix,
         )
     }
 }
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 b4d28facc5b..67adcece22b 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
@@ -46,7 +46,7 @@ internal class RealImapConnection(
     private val oauthTokenProvider: OAuth2TokenProvider?,
     override val connectionGeneration: Int,
     private val socketConnectTimeout: Int = SOCKET_CONNECT_TIMEOUT,
-    private val socketReadTimeout: Int = SOCKET_READ_TIMEOUT
+    private val socketReadTimeout: Int = SOCKET_READ_TIMEOUT,
 ) : ImapConnection {
     private var socket: Socket? = null
     private var inputStream: PeekableInputStream? = null
@@ -70,7 +70,7 @@ internal class RealImapConnection(
         } else if (stacktraceForClose != null) {
             throw IllegalStateException(
                 "open() called after close(). Check wrapped exception to see where close() was called.",
-                stacktraceForClose
+                stacktraceForClose,
             )
         }
 
@@ -320,7 +320,7 @@ internal class RealImapConnection(
                     login()
                 } else {
                     throw MessagingException(
-                        "Server doesn't support unencrypted passwords using AUTH=PLAIN and LOGIN is disabled."
+                        "Server doesn't support unencrypted passwords using AUTH=PLAIN and LOGIN is disabled.",
                     )
                 }
             }
@@ -513,7 +513,7 @@ internal class RealImapConnection(
     }
 
     private fun handleAuthenticationFailure(
-        negativeResponseException: NegativeImapResponseException
+        negativeResponseException: NegativeImapResponseException,
     ): MessagingException {
         val lastResponse = negativeResponseException.lastResponse
         val responseCode = ResponseCodeExtractor.getResponseCode(lastResponse)
@@ -706,14 +706,14 @@ internal class RealImapConnection(
     override fun executeCommandWithIdSet(
         commandPrefix: String,
         commandSuffix: String,
-        ids: Set<Long>
+        ids: Set<Long>,
     ): List<ImapResponse> {
         val groupedIds = IdGrouper.groupIds(ids)
         val splitCommands = ImapCommandSplitter.splitCommand(
             commandPrefix,
             commandSuffix,
             groupedIds,
-            lineLengthLimit
+            lineLengthLimit,
         )
 
         return splitCommands.flatMap { splitCommand ->
@@ -836,7 +836,7 @@ internal class RealImapConnection(
                         "After sending tag %s, got tag response from previous command %s for %s",
                         tag,
                         response,
-                        logId
+                        logId,
                     )
                 }
             }
@@ -863,7 +863,8 @@ internal class RealImapConnection(
             override fun buildInitialClientResponse(username: String, token: String): String {
                 return buildOAuthBearerInitialClientResponse(username, token)
             }
-        };
+        },
+        ;
 
         abstract val command: String
         abstract fun buildInitialClientResponse(username: String, token: String): String
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
index 46e132efb5b..6746d890520 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
@@ -30,7 +30,7 @@ internal class RealImapFolder(
     private val internalImapStore: InternalImapStore,
     private val connectionManager: ImapConnectionManager,
     override val serverId: String,
-    private val folderNameCodec: FolderNameCodec
+    private val folderNameCodec: FolderNameCodec,
 ) : ImapFolder {
     private var uidNext = -1L
     internal var connection: ImapConnection? = null
@@ -293,7 +293,7 @@ internal class RealImapFolder(
                 Timber.i(
                     "ImapFolder.copyMessages: couldn't find remote folder '%s' for %s",
                     escapedDestinationFolderName,
-                    logId
+                    logId,
                 )
             }
 
@@ -304,7 +304,7 @@ internal class RealImapFolder(
             val imapResponses = connection!!.executeCommandWithIdSet(
                 Commands.UID_COPY,
                 escapedDestinationFolderName,
-                uids
+                uids,
             )
 
             UidCopyResponse.parse(imapResponses)?.uidMapping
@@ -379,7 +379,7 @@ internal class RealImapFolder(
         start: Int,
         end: Int,
         earliestDate: Date?,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         return getMessages(start, end, earliestDate, false, listener)
     }
@@ -390,7 +390,7 @@ internal class RealImapFolder(
         end: Int,
         earliestDate: Date?,
         includeDeleted: Boolean,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         if (start < 1 || end < 1 || end < start) {
             throw MessagingException(String.format(Locale.US, "Invalid message set %d %d", start, end))
@@ -405,7 +405,7 @@ internal class RealImapFolder(
             start,
             end,
             dateSearchString,
-            if (includeDeleted) "" else " NOT DELETED"
+            if (includeDeleted) "" else " NOT DELETED",
         )
 
         try {
@@ -454,7 +454,7 @@ internal class RealImapFolder(
             "SEARCH %d:%d%s NOT DELETED",
             startIndex,
             endIndex,
-            dateSearchString
+            dateSearchString,
         )
         val imapResponses = executeSimpleCommand(command)
 
@@ -466,7 +466,7 @@ internal class RealImapFolder(
     internal fun getMessages(
         mesgSeqs: Set<Long>,
         includeDeleted: Boolean,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         checkOpen()
 
@@ -499,7 +499,7 @@ internal class RealImapFolder(
 
     private fun getMessages(
         searchResponse: SearchResponse,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         // Sort the uids in numerically decreasing order
         // By doing it in decreasing order, we ensure newest messages are dealt with first
@@ -521,7 +521,7 @@ internal class RealImapFolder(
         messages: List<ImapMessage>,
         fetchProfile: FetchProfile,
         listener: FetchListener?,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         if (messages.isEmpty()) {
             return
@@ -544,7 +544,7 @@ internal class RealImapFolder(
             fetchFields.add(
                 "BODY.PEEK[HEADER.FIELDS (date subject from content-type to cc bcc " +
                     "reply-to message-id references in-reply-to list-unsubscribe sender " +
-                    K9MailLib.IDENTITY_HEADER + " " + K9MailLib.CHAT_HEADER + ")]"
+                    K9MailLib.IDENTITY_HEADER + " " + K9MailLib.CHAT_HEADER + ")]",
             )
         }
 
@@ -637,7 +637,7 @@ internal class RealImapFolder(
         message: ImapMessage,
         part: Part,
         bodyFactory: BodyFactory,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         checkOpen()
 
@@ -971,14 +971,14 @@ internal class RealImapFolder(
                 val escapedFolderName = ImapUtility.encodeString(encodeFolderName)
                 val combinedFlags = ImapUtility.combineFlags(
                     message.flags,
-                    canCreateKeywords || internalImapStore.getPermanentFlagsIndex().contains(Flag.FORWARDED)
+                    canCreateKeywords || internalImapStore.getPermanentFlagsIndex().contains(Flag.FORWARDED),
                 )
                 val command = String.format(
                     Locale.US,
                     "APPEND %s (%s) {%d}",
                     escapedFolderName,
                     combinedFlags,
-                    messageSize
+                    messageSize,
                 )
                 connection!!.sendCommand(command, false)
 
@@ -1107,7 +1107,7 @@ internal class RealImapFolder(
                 "%s 1:* %sFLAGS.SILENT (%s)",
                 Commands.UID_STORE,
                 if (value) "+" else "-",
-                combinedFlags
+                combinedFlags,
             )
 
             executeSimpleCommand(command)
@@ -1174,7 +1174,7 @@ internal class RealImapFolder(
         queryString: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<ImapMessage> {
         try {
             open(OpenMode.READ_ONLY)
@@ -1218,5 +1218,5 @@ internal class RealImapFolder(
 
 enum class OpenMode {
     READ_WRITE,
-    READ_ONLY
+    READ_ONLY,
 }
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolderIdler.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolderIdler.kt
index 12b55d660ee..f9b5beb10b9 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolderIdler.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolderIdler.kt
@@ -13,7 +13,7 @@ internal class RealImapFolderIdler(
     private val imapStore: ImapStore,
     private val connectionProvider: ImapConnectionProvider,
     private val folderServerId: String,
-    private val idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider
+    private val idleRefreshTimeoutProvider: IdleRefreshTimeoutProvider,
 ) : ImapFolderIdler {
     private val logTag = "ImapFolderIdler[$folderServerId]"
 
@@ -115,7 +115,7 @@ internal class RealImapFolderIdler(
             do {
                 idleRefreshTimer = idleRefreshManager.startTimer(
                     timeout = idleRefreshTimeoutProvider.idleRefreshTimeoutMs,
-                    callback = ::idleRefresh
+                    callback = ::idleRefresh,
                 )
 
                 wakeLock.release()
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapStore.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapStore.kt
index 70914a6d3ac..b100bb65e9f 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapStore.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapStore.kt
@@ -20,7 +20,7 @@ internal open class RealImapStore(
     private val serverSettings: ServerSettings,
     private val config: ImapStoreConfig,
     private val trustedSocketFactory: TrustedSocketFactory,
-    private val oauthTokenProvider: OAuth2TokenProvider?
+    private val oauthTokenProvider: OAuth2TokenProvider?,
 ) : ImapStore, ImapConnectionManager, InternalImapStore {
     private val folderNameCodec: FolderNameCodec = FolderNameCodec()
 
@@ -49,7 +49,7 @@ internal open class RealImapStore(
             internalImapStore = this,
             connectionManager = this,
             serverId = name,
-            folderNameCodec = folderNameCodec
+            folderNameCodec = folderNameCodec,
         )
     }
 
@@ -100,7 +100,7 @@ internal open class RealImapStore(
 
     private fun limitToSubscribedFolders(
         folders: List<FolderListItem>,
-        subscribedFolders: List<FolderListItem>
+        subscribedFolders: List<FolderListItem>,
     ): List<FolderListItem> {
         val subscribedFolderServerIds = subscribedFolders.map { it.serverId }.toSet()
         return folders.filter { it.serverId in subscribedFolderServerIds }
@@ -276,7 +276,7 @@ internal open class RealImapStore(
             StoreImapSettings(),
             trustedSocketFactory,
             oauthTokenProvider,
-            connectionGeneration
+            connectionGeneration,
         )
     }
 
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 d6a6eb2931f..2cebadbaf5f 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
@@ -591,7 +591,7 @@ class RealImapConnectionTest {
             output(
                 "* CAPABILITY IMAP4rev1 UNSELECT IDLE QUOTA ID XLIST CHILDREN X-GM-EXT-1 UIDPLUS " +
                     "ENABLE MOVE CONDSTORE ESEARCH UTF8=ACCEPT LIST-EXTENDED LIST-STATUS LITERAL- SPECIAL-USE " +
-                    "APPENDLIMIT=35651584"
+                    "APPENDLIMIT=35651584",
             )
             output("2 OK")
             simplePostAuthenticationDialog(tag = 3)
@@ -681,7 +681,7 @@ class RealImapConnectionTest {
         val imapConnection = startServerAndCreateImapConnection(
             server,
             connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
-            authType = AuthType.PLAIN
+            authType = AuthType.PLAIN,
         )
 
         imapConnection.open()
@@ -697,7 +697,7 @@ class RealImapConnectionTest {
         }
         val imapConnection = startServerAndCreateImapConnection(
             server,
-            connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
+            connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
         )
 
         try {
@@ -730,7 +730,7 @@ class RealImapConnectionTest {
         val imapConnection = startServerAndCreateImapConnection(
             server,
             connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
-            authType = AuthType.PLAIN
+            authType = AuthType.PLAIN,
         )
 
         imapConnection.open()
@@ -749,7 +749,7 @@ class RealImapConnectionTest {
         val imapConnection = startServerAndCreateImapConnection(
             server,
             connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
-            authType = AuthType.PLAIN
+            authType = AuthType.PLAIN,
         )
 
         try {
@@ -998,7 +998,7 @@ class RealImapConnectionTest {
     private fun createImapConnection(
         settings: ImapSettings,
         socketFactory: TrustedSocketFactory,
-        oAuth2TokenProvider: OAuth2TokenProvider
+        oAuth2TokenProvider: OAuth2TokenProvider,
     ): ImapConnection {
         val connectionGeneration = 1
         return RealImapConnection(
@@ -1007,7 +1007,7 @@ class RealImapConnectionTest {
             oAuth2TokenProvider,
             connectionGeneration,
             SOCKET_CONNECT_TIMEOUT,
-            SOCKET_READ_TIMEOUT
+            SOCKET_READ_TIMEOUT,
         )
     }
 
@@ -1015,7 +1015,7 @@ class RealImapConnectionTest {
         server: MockImapServer,
         connectionSecurity: ConnectionSecurity = ConnectionSecurity.NONE,
         authType: AuthType = AuthType.PLAIN,
-        useCompression: Boolean = false
+        useCompression: Boolean = false,
     ): ImapConnection {
         server.start()
 
@@ -1026,7 +1026,7 @@ class RealImapConnectionTest {
             authType = authType,
             username = USERNAME,
             password = PASSWORD,
-            useCompression = useCompression
+            useCompression = useCompression,
         )
 
         return createImapConnection(settings, socketFactory, oAuth2TokenProvider)
@@ -1085,7 +1085,7 @@ class RealImapConnectionTest {
             host = host,
             port = 143,
             authType = AuthType.PLAIN,
-            username = "irrelevant"
+            username = "irrelevant",
         )
     }
 }
@@ -1101,7 +1101,7 @@ class TestTokenProvider : OAuth2TokenProvider {
             1 -> XOAUTH_TOKEN_2
             else -> {
                 throw AuthenticationFailedException(
-                    "Ran out of auth tokens. invalidateToken() called too often?"
+                    "Ran out of auth tokens. invalidateToken() called too often?",
                 )
             }
         }
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderIdlerTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderIdlerTest.kt
index fc13a7a5f51..19cb1a3a5cf 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderIdlerTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderIdlerTest.kt
@@ -30,7 +30,7 @@ class RealImapFolderIdlerTest {
         imapStore,
         imapStore,
         FOLDER_SERVER_ID,
-        idleRefreshTimeoutProvider
+        idleRefreshTimeoutProvider,
     )
 
     @Test
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
index 9289e7e706e..89c0ea37bf8 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
@@ -179,7 +179,7 @@ class RealImapFolderTest {
         val imapFolder = createFolder("Folder")
         val selectResponses = listOf(
             createImapResponse("* OK [UIDNEXT 57576] Predicted next UID"),
-            createImapResponse("2 OK [READ-WRITE] Select completed.")
+            createImapResponse("2 OK [READ-WRITE] Select completed."),
         )
         whenever(imapConnection.executeSimpleCommand("SELECT \"Folder\"")).thenReturn(selectResponses)
 
@@ -396,7 +396,7 @@ class RealImapFolderTest {
         prepareImapFolderForOpen(OpenMode.READ_WRITE)
         val imapResponses = listOf(
             createImapResponse("* SEARCH 1 2"),
-            createImapResponse("* SEARCH 23 42")
+            createImapResponse("* SEARCH 23 42"),
         )
         whenever(imapConnection.executeSimpleCommand("SEARCH 1:* FLAGGED NOT DELETED")).thenReturn(imapResponses)
         folder.open(OpenMode.READ_WRITE)
@@ -699,7 +699,7 @@ class RealImapFolderTest {
             "UID FETCH 1 (UID INTERNALDATE RFC822.SIZE BODY.PEEK[HEADER.FIELDS " +
                 "(date subject from content-type to cc bcc reply-to message-id references in-reply-to " +
                 "list-unsubscribe sender X-K9mail-Identity Chat-Version)])",
-            false
+            false,
         )
     }
 
@@ -739,7 +739,7 @@ class RealImapFolderTest {
         testHeaderFromBodyStructure(
             bodyStructure = """("text" "plain" ("name" "token") NIL NIL "7bit" 42 23)""",
             headerName = MimeHeader.HEADER_CONTENT_TYPE,
-            expectedHeaderValue = "text/plain;\r\n name=token"
+            expectedHeaderValue = "text/plain;\r\n name=token",
         )
     }
 
@@ -748,7 +748,7 @@ class RealImapFolderTest {
         testHeaderFromBodyStructure(
             bodyStructure = """("text" "plain" ("name" "one two three") NIL NIL "7bit" 42 23)""",
             headerName = MimeHeader.HEADER_CONTENT_TYPE,
-            expectedHeaderValue = "text/plain;\r\n name=\"one two three\""
+            expectedHeaderValue = "text/plain;\r\n name=\"one two three\"",
         )
     }
 
@@ -757,7 +757,7 @@ class RealImapFolderTest {
         testHeaderFromBodyStructure(
             bodyStructure = """("text" "plain" ("name" "one \"two\" three") NIL NIL "7bit" 42 23)""",
             headerName = MimeHeader.HEADER_CONTENT_TYPE,
-            expectedHeaderValue = "text/plain;\r\n name=\"one \\\"two\\\" three\""
+            expectedHeaderValue = "text/plain;\r\n name=\"one \\\"two\\\" three\"",
         )
     }
 
@@ -766,7 +766,7 @@ class RealImapFolderTest {
         testHeaderFromBodyStructure(
             bodyStructure = """("text" "plain" ("name*" "utf-8''filen%C3%A4me.ext") NIL NIL "7bit" 42 23)""",
             headerName = MimeHeader.HEADER_CONTENT_TYPE,
-            expectedHeaderValue = "text/plain;\r\n name*=utf-8''filen%C3%A4me.ext"
+            expectedHeaderValue = "text/plain;\r\n name*=utf-8''filen%C3%A4me.ext",
         )
     }
 
@@ -775,7 +775,7 @@ class RealImapFolderTest {
         testHeaderFromBodyStructure(
             bodyStructure = """("text" "plain" ("name" "filenäme.ext") NIL NIL "7bit" 42 23)""",
             headerName = MimeHeader.HEADER_CONTENT_TYPE,
-            expectedHeaderValue = "text/plain;\r\n name=\"filenäme.ext\""
+            expectedHeaderValue = "text/plain;\r\n name=\"filenäme.ext\"",
         )
     }
 
@@ -785,7 +785,7 @@ class RealImapFolderTest {
             bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
                 """("attachment" ("filename" "token")) NIL NIL)""",
             headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
-            expectedHeaderValue = "attachment;\r\n filename=token;\r\n size=23"
+            expectedHeaderValue = "attachment;\r\n filename=token;\r\n size=23",
         )
     }
 
@@ -795,7 +795,7 @@ class RealImapFolderTest {
             bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
                 """("attachment" ("filename" "one two three")) NIL NIL)""",
             headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
-            expectedHeaderValue = "attachment;\r\n filename=\"one two three\";\r\n size=23"
+            expectedHeaderValue = "attachment;\r\n filename=\"one two three\";\r\n size=23",
         )
     }
 
@@ -805,7 +805,7 @@ class RealImapFolderTest {
             bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
                 """("attachment" ("filename" "one \"two\" three")) NIL NIL)""",
             headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
-            expectedHeaderValue = "attachment;\r\n filename=\"one \\\"two\\\" three\";\r\n size=23"
+            expectedHeaderValue = "attachment;\r\n filename=\"one \\\"two\\\" three\";\r\n size=23",
         )
     }
 
@@ -815,7 +815,7 @@ class RealImapFolderTest {
             bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
                 """("attachment" ("filename*" "utf-8''filen%C3%A4me.ext")) NIL NIL)""",
             headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
-            expectedHeaderValue = "attachment;\r\n filename*=utf-8''filen%C3%A4me.ext;\r\n size=23"
+            expectedHeaderValue = "attachment;\r\n filename*=utf-8''filen%C3%A4me.ext;\r\n size=23",
         )
     }
 
@@ -825,7 +825,7 @@ class RealImapFolderTest {
             bodyStructure = """("application" "octet-stream" NIL NIL NIL "8bit" 23 NIL """ +
                 """("attachment" ("filename" "filenäme.ext")) NIL NIL)""",
             headerName = MimeHeader.HEADER_CONTENT_DISPOSITION,
-            expectedHeaderValue = "attachment;\r\n filename=\"filenäme.ext\";\r\n size=23"
+            expectedHeaderValue = "attachment;\r\n filename=\"filenäme.ext\";\r\n size=23",
         )
     }
 
@@ -1141,7 +1141,7 @@ class RealImapFolderTest {
             createImapResponse("* FLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft NonJunk \$MDNSent)"),
             createImapResponse(
                 "* OK [PERMANENTFLAGS (\\Answered \\Flagged \\Deleted \\Seen \\Draft NonJunk \$MDNSent \\*)] " +
-                    "Flags permitted."
+                    "Flags permitted.",
             ),
             createImapResponse("* 23 EXISTS"),
             createImapResponse("* 0 RECENT"),
@@ -1151,7 +1151,7 @@ class RealImapFolderTest {
                 createImapResponse("2 OK [READ-WRITE] Select completed.")
             } else {
                 createImapResponse("2 OK [READ-ONLY] Examine completed.")
-            }
+            },
         )
 
         if (openMode == OpenMode.READ_WRITE) {
@@ -1173,7 +1173,7 @@ class RealImapFolderTest {
         verify(imapConnection, atLeastOnce()).executeCommandWithIdSet(
             commandPrefixCaptor.capture(),
             commandSuffixCaptor.capture(),
-            commandUidsCaptor.capture()
+            commandUidsCaptor.capture(),
         )
 
         val commandPrefixes = commandPrefixCaptor.allValues
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt
index e03414d513c..c970466afda 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapStoreTest.kt
@@ -67,7 +67,7 @@ class RealImapStoreTest {
                 createImapResponse("""* LIST (\HasNoChildren \Junk) "/" "[Gmail]/Spam""""),
                 createImapResponse("""* LIST (\HasNoChildren \Flagged) "/" "[Gmail]/Starred""""),
                 createImapResponse("""* LIST (\HasNoChildren \Trash) "/" "[Gmail]/Trash""""),
-                createImapResponse("5 OK Success")
+                createImapResponse("5 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -83,7 +83,7 @@ class RealImapStoreTest {
             "[Gmail]/Sent Mail" to FolderType.SENT,
             "[Gmail]/Spam" to FolderType.SPAM,
             "[Gmail]/Starred" to FolderType.REGULAR,
-            "[Gmail]/Trash" to FolderType.TRASH
+            "[Gmail]/Trash" to FolderType.TRASH,
         )
     }
 
@@ -123,7 +123,7 @@ class RealImapStoreTest {
                 createImapResponse("""* LIST (\HasNoChildren) "." "INBOX""""),
                 createImapResponse("""* LIST (\Noselect \HasChildren) "." "Folder""""),
                 createImapResponse("""* LIST (\HasNoChildren) "." "Folder.SubFolder""""),
-                createImapResponse("6 OK Success")
+                createImapResponse("6 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -143,13 +143,13 @@ class RealImapStoreTest {
                 createImapResponse("""* LSUB (\Noselect \HasChildren) "." "Folder""""),
                 createImapResponse("""* LSUB (\HasNoChildren) "." "Folder.SubFolder""""),
                 createImapResponse("""* LSUB (\HasNoChildren) "." "SubscribedFolderThatHasBeenDeleted""""),
-                createImapResponse("5 OK Success")
+                createImapResponse("5 OK Success"),
             )
             on { executeSimpleCommand("""LIST "" "*"""") } doReturn listOf(
                 createImapResponse("""* LIST (\HasNoChildren) "." "INBOX""""),
                 createImapResponse("""* LIST (\Noselect \HasChildren) "." "Folder""""),
                 createImapResponse("""* LIST (\HasNoChildren) "." "Folder.SubFolder""""),
-                createImapResponse("6 OK Success")
+                createImapResponse("6 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -167,7 +167,7 @@ class RealImapStoreTest {
                 createImapResponse("""* LIST () "." "INBOX""""),
                 createImapResponse("""* LIST () "." "INBOX.FolderOne""""),
                 createImapResponse("""* LIST () "." "INBOX.FolderTwo""""),
-                createImapResponse("5 OK Success")
+                createImapResponse("5 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -188,7 +188,7 @@ class RealImapStoreTest {
                 createImapResponse("""* LIST () "." "INBOX""""),
                 createImapResponse("""* LIST () "." "INBOX.FolderOne""""),
                 createImapResponse("""* LIST () "." "FolderTwo""""),
-                createImapResponse("5 OK Success")
+                createImapResponse("5 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -212,7 +212,7 @@ class RealImapStoreTest {
                 createImapResponse("""* LIST (\HasNoChildren) "." "Junk""""),
                 createImapResponse("""* LIST (\Junk) "." "Junk""""),
                 createImapResponse("""* LIST (\HasNoChildren) "." "Junk""""),
-                createImapResponse("5 OK Success")
+                createImapResponse("5 OK Success"),
             )
         }
         imapStore.enqueueImapConnection(imapConnection)
@@ -221,7 +221,7 @@ class RealImapStoreTest {
 
         assertThat(folders.map { it.serverId to it.type }).containsExactly(
             "INBOX" to FolderType.INBOX,
-            "Junk" to FolderType.SPAM
+            "Junk" to FolderType.SPAM,
         )
     }
 
@@ -383,19 +383,19 @@ class RealImapStoreTest {
             username = "user",
             password = "password",
             clientCertificateAlias = null,
-            extra = createExtra(autoDetectNamespace = true, pathPrefix = null)
+            extra = createExtra(autoDetectNamespace = true, pathPrefix = null),
         )
     }
 
     private fun createTestImapStore(
         isSubscribedFoldersOnly: Boolean = false,
-        useCompression: Boolean = false
+        useCompression: Boolean = false,
     ): TestImapStore {
         return TestImapStore(
             serverSettings = createServerSettings(),
             config = createImapStoreConfig(isSubscribedFoldersOnly, useCompression),
             trustedSocketFactory = mock(),
-            oauth2TokenProvider = null
+            oauth2TokenProvider = null,
         )
     }
 
@@ -411,12 +411,12 @@ class RealImapStoreTest {
         serverSettings: ServerSettings,
         config: ImapStoreConfig,
         trustedSocketFactory: TrustedSocketFactory,
-        oauth2TokenProvider: OAuth2TokenProvider?
+        oauth2TokenProvider: OAuth2TokenProvider?,
     ) : RealImapStore(
         serverSettings,
         config,
         trustedSocketFactory,
-        oauth2TokenProvider
+        oauth2TokenProvider,
     ) {
         private val imapConnections: Deque<ImapConnection> = ArrayDeque()
         private var testCombinedPrefix: String? = null
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/SimpleImapSettings.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/SimpleImapSettings.kt
index 5e75c230d34..4cc68586e69 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/SimpleImapSettings.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/SimpleImapSettings.kt
@@ -10,7 +10,7 @@ internal class SimpleImapSettings(
     override val authType: AuthType,
     override val username: String,
     override val password: String? = null,
-    override val useCompression: Boolean = false
+    override val useCompression: Boolean = false,
 ) : ImapSettings {
     override val clientCertificateAlias: String? = null
 
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapConnection.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapConnection.kt
index 5bfd672fa93..928e2f298ca 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapConnection.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapConnection.kt
@@ -48,7 +48,7 @@ internal open class TestImapConnection(val timeout: Long, override val connectio
     override fun executeCommandWithIdSet(
         commandPrefix: String,
         commandSuffix: String,
-        ids: Set<Long>
+        ids: Set<Long>,
     ): List<ImapResponse> {
         throw UnsupportedOperationException("not implemented")
     }
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
index 495280a7868..8bd973fe041 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
@@ -10,7 +10,7 @@ import java.util.Date
 
 internal open class TestImapFolder(
     override val serverId: String,
-    val connection: TestImapConnection
+    val connection: TestImapConnection,
 ) : ImapFolder {
     override var mode: OpenMode? = null
         protected set
@@ -56,7 +56,7 @@ internal open class TestImapFolder(
         start: Int,
         end: Int,
         earliestDate: Date?,
-        listener: MessageRetrievalListener<ImapMessage>?
+        listener: MessageRetrievalListener<ImapMessage>?,
     ): List<ImapMessage> {
         throw UnsupportedOperationException("not implemented")
     }
@@ -69,7 +69,7 @@ internal open class TestImapFolder(
         messages: List<ImapMessage>,
         fetchProfile: FetchProfile,
         listener: FetchListener?,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         throw UnsupportedOperationException("not implemented")
     }
@@ -78,7 +78,7 @@ internal open class TestImapFolder(
         message: ImapMessage,
         part: Part,
         bodyFactory: BodyFactory,
-        maxDownloadSize: Int
+        maxDownloadSize: Int,
     ) {
         throw UnsupportedOperationException("not implemented")
     }
@@ -87,7 +87,7 @@ internal open class TestImapFolder(
         queryString: String?,
         requiredFlags: Set<Flag>?,
         forbiddenFlags: Set<Flag>?,
-        performFullTextSearch: Boolean
+        performFullTextSearch: Boolean,
     ): List<ImapMessage> {
         throw UnsupportedOperationException("not implemented")
     }
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
index 5d627b1358d..69737b2eb54 100644
--- 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
@@ -360,7 +360,7 @@ class Pop3ConnectionTest {
 
     private fun createAndOpenPop3Connection(
         settings: Pop3Settings,
-        trustedSocketFactory: TrustedSocketFactory = socketFactory
+        trustedSocketFactory: TrustedSocketFactory = socketFactory,
     ) {
         val connection = Pop3Connection(settings, trustedSocketFactory)
         connection.open()
@@ -391,7 +391,7 @@ class Pop3ConnectionTest {
 
     private fun MockPop3Server.createSettings(
         authType: AuthType = LOGIN,
-        connectionSecurity: ConnectionSecurity = NONE
+        connectionSecurity: ConnectionSecurity = NONE,
     ): Pop3Settings {
         return SimplePop3Settings().apply {
             username = USERNAME
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
index 554f7668333..8f90fb5d336 100644
--- 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
@@ -50,7 +50,7 @@ class Pop3StoreTest {
                 CAPA_RESPONSE +
                 AUTH_PLAIN_AUTHENTICATED_RESPONSE +
                 STAT_RESPONSE +
-                UIDL_UNSUPPORTED_RESPONSE
+                UIDL_UNSUPPORTED_RESPONSE,
         )
 
         store.checkSettings()
@@ -63,7 +63,7 @@ class Pop3StoreTest {
                 CAPA_RESPONSE +
                 AUTH_PLAIN_AUTHENTICATED_RESPONSE +
                 STAT_RESPONSE +
-                UIDL_SUPPORTED_RESPONSE
+                UIDL_SUPPORTED_RESPONSE,
         )
 
         store.checkSettings()
@@ -78,7 +78,7 @@ class Pop3StoreTest {
             authenticationType = AuthType.PLAIN,
             username = "user",
             password = "password",
-            clientCertificateAlias = null
+            clientCertificateAlias = null,
         )
     }
 
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/EnhancedStatusCode.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/EnhancedStatusCode.kt
index 34718d335da..b54a418ff76 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/EnhancedStatusCode.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/EnhancedStatusCode.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.mail.transport.smtp
 data class EnhancedStatusCode(
     val statusClass: StatusCodeClass,
     val subject: Int,
-    val detail: Int
+    val detail: Int,
 )
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/NegativeSmtpReplyException.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/NegativeSmtpReplyException.kt
index 8d430ab7e61..d25760cb325 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/NegativeSmtpReplyException.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/NegativeSmtpReplyException.kt
@@ -8,10 +8,10 @@ import com.fsck.k9.mail.MessagingException
 open class NegativeSmtpReplyException(
     val replyCode: Int,
     val replyText: String,
-    val enhancedStatusCode: EnhancedStatusCode? = null
+    val enhancedStatusCode: EnhancedStatusCode? = null,
 ) : MessagingException(
     buildErrorMessage(replyCode, replyText),
-    isPermanentSmtpError(replyCode)
+    isPermanentSmtpError(replyCode),
 )
 
 private fun buildErrorMessage(replyCode: Int, replyText: String): String {
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponse.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponse.kt
index 4fd8bfaeae5..4598558f263 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponse.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/SmtpResponse.kt
@@ -3,7 +3,7 @@ package com.fsck.k9.mail.transport.smtp
 internal data class SmtpResponse(
     val replyCode: Int,
     val enhancedStatusCode: EnhancedStatusCode?,
-    val texts: List<String>
+    val texts: List<String>,
 ) {
     val isNegativeResponse = replyCode >= 400
 
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 5428e12b7e4..8d9b313fb7e 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
@@ -23,7 +23,7 @@ private const val END_OF_STREAM = -1
  */
 internal class SmtpResponseParser(
     private val logger: SmtpLogger,
-    private val input: PeekableInputStream
+    private val input: PeekableInputStream,
 ) {
     private val logBuffer = Buffer()
 
@@ -56,7 +56,7 @@ internal class SmtpResponseParser(
 
                 return SmtpHelloResponse.Hello(
                     response = SmtpResponse(replyCode, enhancedStatusCode = null, texts = listOf(text)),
-                    keywords = emptyMap()
+                    keywords = emptyMap(),
                 )
             }
             DASH -> {
@@ -95,7 +95,7 @@ internal class SmtpResponseParser(
 
                     return SmtpHelloResponse.Hello(
                         response = SmtpResponse(replyCode, enhancedStatusCode = null, texts),
-                        keywords = keywords
+                        keywords = keywords,
                     )
                 }
                 DASH -> {
@@ -171,7 +171,7 @@ internal class SmtpResponseParser(
             if (!isFirstLine && enhancedStatusCode != currentStatusCode) {
                 parserError(
                     "Multi-line response with enhanced status codes not matching: " +
-                        "$enhancedStatusCode != $currentStatusCode"
+                        "$enhancedStatusCode != $currentStatusCode",
                 )
             }
             isFirstLine = false
@@ -224,7 +224,7 @@ internal class SmtpResponseParser(
                     val currentReplyCode = readReplyCode()
                     if (currentReplyCode != replyCode) {
                         parserError(
-                            "Multi-line response with reply codes not matching: $replyCode != $currentReplyCode"
+                            "Multi-line response with reply codes not matching: $replyCode != $currentReplyCode",
                         )
                     }
                 }
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 790fb569cc4..f8e6605d603 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
@@ -48,7 +48,7 @@ private const val SMTP_AUTHENTICATION_FAILURE_ERROR_CODE = 535
 class SmtpTransport(
     serverSettings: ServerSettings,
     private val trustedSocketFactory: TrustedSocketFactory,
-    private val oauthTokenProvider: OAuth2TokenProvider?
+    private val oauthTokenProvider: OAuth2TokenProvider?,
 ) {
     private val host = serverSettings.host
     private val port = serverSettings.port
@@ -114,7 +114,7 @@ class SmtpTransport(
                         socket,
                         host,
                         port,
-                        clientCertificateAlias
+                        clientCertificateAlias,
                     )
                     this.socket = tlsSocket
                     inputStream = PeekableInputStream(BufferedInputStream(tlsSocket.getInputStream(), 1024))
@@ -191,7 +191,7 @@ class SmtpTransport(
                             // So, we treat it is an error to not offer AUTH EXTERNAL when using client certificates.
                             // That way, the user can be notified of a problem during account setup.
                             throw CertificateValidationException(
-                                CertificateValidationException.Reason.MissingCapability
+                                CertificateValidationException.Reason.MissingCapability,
                             )
                         }
                     }
@@ -216,7 +216,7 @@ class SmtpTransport(
                                 // setting.
                                 throw MessagingException(
                                     "Update your outgoing server authentication setting. " +
-                                        "AUTOMATIC authentication is unavailable."
+                                        "AUTOMATIC authentication is unavailable.",
                                 )
                             }
                         }
@@ -415,8 +415,8 @@ class SmtpTransport(
             val msgOut = EOLConvertingOutputStream(
                 LineWrapOutputStream(
                     SmtpDataStuffing(outputStream),
-                    1000
-                )
+                    1000,
+                ),
             )
 
             message.writeTo(msgOut)
@@ -518,7 +518,7 @@ class SmtpTransport(
         return NegativeSmtpReplyException(
             replyCode = response.replyCode,
             replyText = response.joinedText,
-            enhancedStatusCode = response.enhancedStatusCode
+            enhancedStatusCode = response.enhancedStatusCode,
         )
     }
 
@@ -618,7 +618,7 @@ class SmtpTransport(
     private fun handleTemporaryFailure(
         method: OAuthMethod,
         username: String,
-        negativeResponseFromOldToken: NegativeSmtpReplyException
+        negativeResponseFromOldToken: NegativeSmtpReplyException,
     ) {
         // Token was invalid. We could avoid this double check if we had a reasonable chance of knowing if a token was
         // invalid before use (e.g. due to expiry). But we don't. This is the intended behaviour per AccountManager.
@@ -683,7 +683,8 @@ private enum class OAuthMethod {
         override fun buildInitialClientResponse(username: String, token: String): String {
             return buildOAuthBearerInitialClientResponse(username, token)
         }
-    };
+    },
+    ;
 
     abstract val command: String
     abstract fun buildInitialClientResponse(username: String, token: String): String
diff --git a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/StatusCodeClass.kt b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/StatusCodeClass.kt
index 2fe00975b7d..7e954dbb30e 100644
--- a/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/StatusCodeClass.kt
+++ b/mail/protocols/smtp/src/main/java/com/fsck/k9/mail/transport/smtp/StatusCodeClass.kt
@@ -3,5 +3,5 @@ package com.fsck.k9.mail.transport.smtp
 enum class StatusCodeClass(val codeClass: Int) {
     SUCCESS(2),
     PERSISTENT_TRANSIENT_FAILURE(4),
-    PERMANENT_FAILURE(5);
+    PERMANENT_FAILURE(5),
 }
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 75923e5f1b7..bf82b8ac3c8 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
@@ -64,7 +64,7 @@ class SmtpResponseParserTest {
                 "SIZE",
                 "DELIVERBY",
                 "AUTH",
-                "HELP"
+                "HELP",
             )
             assertThat(hello.keywords["PIPELINING"]).isEmpty()
             assertThat(hello.keywords["SIZE"]).containsExactly("104857600")
@@ -115,8 +115,8 @@ class SmtpResponseParserTest {
                 message = """
                     SMTP response data on parser error:
                     250
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -139,8 +139,8 @@ class SmtpResponseParserTest {
                     SMTP response data on parser error:
                     250-smtp.domain.example
                     220
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -164,17 +164,17 @@ class SmtpResponseParserTest {
                 "SIZE",
                 "8BITMIME",
                 "PIPELINING",
-                "HELP"
+                "HELP",
             )
         }
 
         assertThat(logger.logEntries.map { it.message }).containsExactly(
             "Ignoring EHLO keyword line: PIPE_CONNECT",
-            "Ignoring EHLO keyword line: AUTH=PLAIN"
+            "Ignoring EHLO keyword line: AUTH=PLAIN",
         )
         assertThat(logger.logEntries.map { it.throwable?.message }).containsExactly(
             "EHLO keyword contains invalid character",
-            "EHLO keyword contains invalid character"
+            "EHLO keyword contains invalid character",
         )
     }
 
@@ -238,8 +238,8 @@ class SmtpResponseParserTest {
                 message = """
                     SMTP response data on parser error:
                     I
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -298,7 +298,7 @@ class SmtpResponseParserTest {
 
         assertThat(response.replyCode).isEqualTo(250)
         assertThat(response.enhancedStatusCode).isEqualTo(
-            EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0)
+            EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0),
         )
         assertThat(response.texts).containsExactly("Originator <sender@domain.example> ok")
         assertInputExhausted(input)
@@ -378,7 +378,7 @@ class SmtpResponseParserTest {
 
         assertThat(response.replyCode).isEqualTo(250)
         assertThat(response.enhancedStatusCode).isEqualTo(
-            EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0)
+            EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0),
         )
         assertThat(response.texts).containsExactly("Sender <sender@domain.example>", "OK")
         assertInputExhausted(input)
@@ -425,8 +425,8 @@ class SmtpResponseParserTest {
                     SMTP response data on parser error:
                     200-Line one
                     500
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -467,7 +467,7 @@ class SmtpResponseParserTest {
         assertThat(response.enhancedStatusCode).isNull()
         assertThat(response.texts).containsExactly("Something")
         assertThat(logger.logEntries).containsExactly(
-            LogEntry(throwable = null, message = "2nd digit of reply code outside of specified range (0..5): 8")
+            LogEntry(throwable = null, message = "2nd digit of reply code outside of specified range (0..5): 8"),
         )
     }
 
@@ -486,8 +486,8 @@ class SmtpResponseParserTest {
                 message = """
                     SMTP response data on parser error:
                     20x
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -506,8 +506,8 @@ class SmtpResponseParserTest {
                 message = """
                     SMTP response data on parser error:
                     200
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -536,8 +536,8 @@ class SmtpResponseParserTest {
                 message = """
                     SMTP response data on parser error:
                     200
-                """.trimIndent()
-            )
+                """.trimIndent(),
+            ),
         )
     }
 
@@ -553,7 +553,7 @@ class SmtpResponseParserTest {
         assertThat(response.texts).isEmpty()
         assertInputExhausted(input)
         assertThat(logger.logEntries).containsExactly(
-            LogEntry(throwable = null, message = "'textstring' expected, but CR found instead")
+            LogEntry(throwable = null, message = "'textstring' expected, but CR found instead"),
         )
     }
 
@@ -569,7 +569,7 @@ class SmtpResponseParserTest {
         assertThat(response.texts).containsExactly("über")
         assertInputExhausted(input)
         assertThat(logger.logEntries).containsExactly(
-            LogEntry(throwable = null, message = "Text contains characters not allowed in 'textstring'")
+            LogEntry(throwable = null, message = "Text contains characters not allowed in 'textstring'"),
         )
     }
 
@@ -656,7 +656,7 @@ class SmtpResponseParserTest {
 
         assertFailsWithMessage(
             "Multi-line response with enhanced status codes not matching: " +
-                "EnhancedStatusCode(statusClass=PERMANENT_FAILURE, subject=2, detail=1) != null"
+                "EnhancedStatusCode(statusClass=PERMANENT_FAILURE, subject=2, detail=1) != null",
         ) {
             parser.readResponse(enhancedStatusCodes = true)
         }
diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseTest.kt b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseTest.kt
index 4cfc6ecf955..6122b2fb2ce 100644
--- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseTest.kt
+++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpResponseTest.kt
@@ -9,7 +9,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = null,
-            texts = emptyList()
+            texts = emptyList(),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -22,7 +22,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = null,
-            texts = emptyList()
+            texts = emptyList(),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
@@ -35,7 +35,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = null,
-            texts = listOf("OK")
+            texts = listOf("OK"),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -48,7 +48,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 250,
             enhancedStatusCode = null,
-            texts = listOf("Sender <sender@domain.example> OK")
+            texts = listOf("Sender <sender@domain.example> OK"),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
@@ -61,7 +61,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 0, detail = 0),
-            texts = emptyList()
+            texts = emptyList(),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -74,7 +74,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 0, detail = 0),
-            texts = emptyList()
+            texts = emptyList(),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
@@ -87,7 +87,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 0, detail = 0),
-            texts = listOf("OK")
+            texts = listOf("OK"),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -100,7 +100,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 200,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 0, detail = 0),
-            texts = listOf("OK")
+            texts = listOf("OK"),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
@@ -113,7 +113,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 250,
             enhancedStatusCode = null,
-            texts = listOf("Sender <sender@domain.example>", "OK")
+            texts = listOf("Sender <sender@domain.example>", "OK"),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -122,7 +122,7 @@ class SmtpResponseTest {
             """
             SMTP <<< 250-Sender <sender@domain.example>
             SMTP <<< 250 OK
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 
@@ -131,7 +131,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 250,
             enhancedStatusCode = null,
-            texts = listOf("Sender <sender@domain.example>", "OK")
+            texts = listOf("Sender <sender@domain.example>", "OK"),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
@@ -144,7 +144,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 250,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0),
-            texts = listOf("Sender <sender@domain.example>", "OK")
+            texts = listOf("Sender <sender@domain.example>", "OK"),
         )
 
         val output = response.toLogString(omitText = false, linePrefix = "SMTP <<< ")
@@ -153,7 +153,7 @@ class SmtpResponseTest {
             """
             SMTP <<< 250-2.1.0 Sender <sender@domain.example>
             SMTP <<< 250 2.1.0 OK
-            """.trimIndent()
+            """.trimIndent(),
         )
     }
 
@@ -162,7 +162,7 @@ class SmtpResponseTest {
         val response = SmtpResponse(
             replyCode = 250,
             enhancedStatusCode = EnhancedStatusCode(statusClass = StatusCodeClass.SUCCESS, subject = 1, detail = 0),
-            texts = listOf("Sender <sender@domain.example>", "OK")
+            texts = listOf("Sender <sender@domain.example>", "OK"),
         )
 
         val output = response.toLogString(omitText = true, linePrefix = "SMTP <<< ")
diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.kt b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.kt
index bc8cd8840d8..38ffc2c3112 100644
--- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.kt
+++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/SmtpTransportTest.kt
@@ -247,7 +247,7 @@ class SmtpTransportTest {
         } catch (e: AuthenticationFailedException) {
             assertThat(e).hasMessageThat().isEqualTo(
                 "5.7.1 Username and Password not accepted. Learn more at " +
-                    "5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68"
+                    "5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68",
             )
         }
 
@@ -372,7 +372,7 @@ class SmtpTransportTest {
         } catch (e: AuthenticationFailedException) {
             assertThat(e).hasMessageThat().isEqualTo(
                 "5.7.1 Username and Password not accepted. Learn more at " +
-                    "5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68"
+                    "5.7.1 http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68",
             )
         }
 
@@ -485,7 +485,7 @@ class SmtpTransportTest {
         val transport = startServerAndCreateSmtpTransport(
             server,
             authenticationType = AuthType.AUTOMATIC,
-            connectionSecurity = ConnectionSecurity.NONE
+            connectionSecurity = ConnectionSecurity.NONE,
         )
 
         transport.open()
@@ -506,7 +506,7 @@ class SmtpTransportTest {
         val transport = startServerAndCreateSmtpTransport(
             server,
             authenticationType = AuthType.AUTOMATIC,
-            connectionSecurity = ConnectionSecurity.NONE
+            connectionSecurity = ConnectionSecurity.NONE,
         )
 
         try {
@@ -514,7 +514,7 @@ class SmtpTransportTest {
             fail("Exception expected")
         } catch (e: MessagingException) {
             assertThat(e).hasMessageThat().isEqualTo(
-                "Update your outgoing server authentication setting. AUTOMATIC authentication is unavailable."
+                "Update your outgoing server authentication setting. AUTOMATIC authentication is unavailable.",
             )
         }
 
@@ -562,7 +562,7 @@ class SmtpTransportTest {
         } catch (e: AuthenticationFailedException) {
             assertThat(e).hasMessageThat().isEqualTo(
                 "Username and Password not accepted. " +
-                    "Learn more at http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68"
+                    "Learn more at http://support.google.com/mail/bin/answer.py?answer=14257 hx9sm5317360pbc.68",
             )
         }
 
@@ -618,7 +618,7 @@ class SmtpTransportTest {
         val transport = startServerAndCreateSmtpTransport(
             server,
             authenticationType = AuthType.PLAIN,
-            connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED
+            connectionSecurity = ConnectionSecurity.STARTTLS_REQUIRED,
         )
 
         transport.open()
@@ -930,7 +930,7 @@ class SmtpTransportTest {
         server: MockSmtpServer,
         authenticationType: AuthType = AuthType.PLAIN,
         connectionSecurity: ConnectionSecurity = ConnectionSecurity.NONE,
-        password: String? = PASSWORD
+        password: String? = PASSWORD,
     ): SmtpTransport {
         server.start()
         val host = server.host
@@ -943,7 +943,7 @@ class SmtpTransportTest {
             authenticationType,
             USERNAME,
             password,
-            CLIENT_CERTIFICATE_ALIAS
+            CLIENT_CERTIFICATE_ALIAS,
         )
 
         return SmtpTransport(serverSettings, socketFactory, oAuth2TokenProvider)
diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/TestSmtpLogger.kt b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/TestSmtpLogger.kt
index ca3e2631665..aa1549bf747 100644
--- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/TestSmtpLogger.kt
+++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/smtp/TestSmtpLogger.kt
@@ -11,5 +11,5 @@ class TestSmtpLogger(override val isRawProtocolLoggingEnabled: Boolean = true) :
 
 data class LogEntry(
     val throwable: Throwable?,
-    val message: String
+    val message: String,
 )
diff --git a/settings.gradle.kts b/settings.gradle.kts
index b7b946b38c1..45e3d5dd76c 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -35,17 +35,17 @@ include(
     ":app:autodiscovery:providersxml",
     ":app:autodiscovery:srvrecords",
     ":app:autodiscovery:thunderbird",
-    ":app:html-cleaner"
+    ":app:html-cleaner",
 )
 
 include(
-    ":core:ui:compose:demo"
+    ":core:ui:compose:demo",
 )
 
 include(
     ":ui-utils:LinearLayoutManager",
     ":ui-utils:ItemTouchHelper",
-    ":ui-utils:ToolbarBottomSheet"
+    ":ui-utils:ToolbarBottomSheet",
 )
 
 include(
@@ -54,7 +54,7 @@ include(
     ":mail:protocols:imap",
     ":mail:protocols:pop3",
     ":mail:protocols:webdav",
-    ":mail:protocols:smtp"
+    ":mail:protocols:smtp",
 )
 
 include(
@@ -64,7 +64,7 @@ include(
     ":backend:pop3",
     ":backend:webdav",
     ":backend:jmap",
-    ":backend:demo"
+    ":backend:demo",
 )
 
 include(":plugins:openpgp-api-lib:openpgp-api")
diff --git a/ui-utils/ToolbarBottomSheet/src/main/java/app/k9mail/ui/utils/bottomsheet/ToolbarBottomSheetDialog.kt b/ui-utils/ToolbarBottomSheet/src/main/java/app/k9mail/ui/utils/bottomsheet/ToolbarBottomSheetDialog.kt
index 159f74ce477..365e52bd612 100644
--- a/ui-utils/ToolbarBottomSheet/src/main/java/app/k9mail/ui/utils/bottomsheet/ToolbarBottomSheetDialog.kt
+++ b/ui-utils/ToolbarBottomSheet/src/main/java/app/k9mail/ui/utils/bottomsheet/ToolbarBottomSheetDialog.kt
@@ -257,7 +257,7 @@ class ToolbarBottomSheetDialog internal constructor(context: Context, @StyleRes
 
                     return super.performAccessibilityAction(host, action, args)
                 }
-            }
+            },
         )
 
         bottomSheet.setOnTouchListener { _, _ ->
@@ -303,7 +303,7 @@ class ToolbarBottomSheetDialog internal constructor(context: Context, @StyleRes
         private val windowInsetsController: WindowInsetsControllerCompat,
         private val toolbar: Toolbar,
         private val topInset: Int,
-        private val behavior: BottomSheetBehavior<FrameLayout>
+        private val behavior: BottomSheetBehavior<FrameLayout>,
     ) : LayoutAwareBottomSheetCallback() {
 
         private val lightStatusBar: Boolean = windowInsetsController.isAppearanceLightStatusBars
@@ -409,7 +409,7 @@ class ToolbarBottomSheetDialog internal constructor(context: Context, @StyleRes
             val wasAttributeResolved = context.theme.resolveAttribute(
                 com.google.android.material.R.attr.bottomSheetDialogTheme,
                 outValue,
-                true
+                true,
             )
 
             return if (wasAttributeResolved) {