diff --git a/.idea/icon.png b/.idea/icon.png
index a73d1d3aefc74bc35f117cd50a4ee1e35e91d4f0..8e22a94699015afa7422e7a4bf77f7eeeec27d0c 100644
Binary files a/.idea/icon.png and b/.idea/icon.png differ
diff --git a/app-feature-preview/build.gradle.kts b/app-feature-preview/build.gradle.kts
index 53b5803c206ace93c4d8b2f2112a4c954c4272a2..301099ddba57c241302da4e10746c732e50654a2 100644
--- a/app-feature-preview/build.gradle.kts
+++ b/app-feature-preview/build.gradle.kts
@@ -66,7 +66,7 @@ android {
 dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
 
     implementation(projects.feature.onboarding)
     implementation(projects.feature.account.setup)
diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts
index 7ba0b6816e508ff0ed1401c84ba9ca5db701d231..8dfe33e30e9b649264cfc885cb0ca96db0ae3147 100644
--- a/app/core/build.gradle.kts
+++ b/app/core/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
     api(projects.backend.api)
     api(projects.app.htmlCleaner)
     api(projects.core.android.common)
@@ -29,9 +29,9 @@ dependencies {
 
     testApi(projects.core.testing)
     testApi(projects.core.android.testing)
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(projects.backend.imap)
-    testImplementation(projects.mail.protocols.smtp)
+    testImplementation(projects.mailcore.protocols.smtp)
     testImplementation(projects.app.storage)
     testImplementation(projects.app.testing)
 
diff --git a/app/storage/build.gradle.kts b/app/storage/build.gradle.kts
index 977e38388148f80ca3336a323b1724d73dcc5381..222b87beeb5c28f83d555b14a4bfeabfe20e032d 100644
--- a/app/storage/build.gradle.kts
+++ b/app/storage/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(libs.commons.io)
     implementation(libs.moshi)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(projects.app.testing)
     testImplementation(libs.robolectric)
     testImplementation(libs.commons.io)
diff --git a/app/ui/legacy/build.gradle.kts b/app/ui/legacy/build.gradle.kts
index d03fdd116c956e08ab0e8a81318989364f45feea..b5c9681538d7f1ed66bf99cbf9a0787c3f4eafef 100644
--- a/app/ui/legacy/build.gradle.kts
+++ b/app/ui/legacy/build.gradle.kts
@@ -8,7 +8,7 @@ dependencies {
     implementation(projects.app.core)
     implementation(projects.feature.autodiscovery.api)
     implementation(projects.feature.autodiscovery.providersxml)
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
     implementation(projects.uiUtils.toolbarBottomSheet)
 
     implementation(projects.core.featureflags)
@@ -16,7 +16,7 @@ dependencies {
     // TODO: Remove AccountOauth dependency
     implementation(projects.feature.account.oauth)
 
-    compileOnly(projects.mail.protocols.imap)
+    compileOnly(projects.mailcore.protocols.imap)
 
     implementation(projects.plugins.openpgpApiLib.openpgpApi)
 
@@ -71,7 +71,7 @@ dependencies {
 
 
     testImplementation(projects.core.testing)
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(projects.app.storage)
     testImplementation(projects.app.testing)
     testImplementation(libs.robolectric)
diff --git a/backend/api/build.gradle.kts b/backend/api/build.gradle.kts
index 2aa9cf93c5a9d68133963fbb1cecaeeb510cacba..829ec12a60ac9fde05d3a8c2f30eff20f0703d57 100644
--- a/backend/api/build.gradle.kts
+++ b/backend/api/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
 }
diff --git a/backend/demo/build.gradle.kts b/backend/demo/build.gradle.kts
index f969cb13fc53055c5a634fa01298d17531d8cf7e..5e5159025fe86082dadd3b1252dbb1e4cc29de5d 100644
--- a/backend/demo/build.gradle.kts
+++ b/backend/demo/build.gradle.kts
@@ -11,5 +11,5 @@ dependencies {
     implementation(libs.moshi)
     ksp(libs.moshi.kotlin.codegen)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
 }
diff --git a/backend/imap/build.gradle.kts b/backend/imap/build.gradle.kts
index 3c342a1550c3208d974e47bb6076de725ce6505e..d6c4a39d66c453dc538984bd0d2a1111cd3723c4 100644
--- a/backend/imap/build.gradle.kts
+++ b/backend/imap/build.gradle.kts
@@ -5,12 +5,12 @@ plugins {
 
 dependencies {
     api(projects.backend.api)
-    api(projects.mail.protocols.imap)
-    api(projects.mail.protocols.smtp)
+    api(projects.mailcore.protocols.imap)
+    api(projects.mailcore.protocols.smtp)
 
     implementation(libs.kotlinx.coroutines.core)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(projects.backend.testing)
     testImplementation(libs.mime4j.dom)
 }
diff --git a/backend/jmap/build.gradle.kts b/backend/jmap/build.gradle.kts
index 112fae7fe565faed156819607ffb478a697f2aad..685bfcf4c5a30acf6904cd0cca29d089d40741b9 100644
--- a/backend/jmap/build.gradle.kts
+++ b/backend/jmap/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(libs.moshi)
     ksp(libs.moshi.kotlin.codegen)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(projects.backend.testing)
     testImplementation(libs.okhttp.mockwebserver)
 }
diff --git a/backend/pop3/build.gradle.kts b/backend/pop3/build.gradle.kts
index 4df78de333edb6244c625b0aa77dd2b758ff1539..df503a32c149dc5c6583362a1a7d58f7df568e0d 100644
--- a/backend/pop3/build.gradle.kts
+++ b/backend/pop3/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 
 dependencies {
     api(projects.backend.api)
-    api(projects.mail.protocols.pop3)
-    api(projects.mail.protocols.smtp)
+    api(projects.mailcore.protocols.pop3)
+    api(projects.mailcore.protocols.smtp)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
 }
diff --git a/feature/account/common/build.gradle.kts b/feature/account/common/build.gradle.kts
index aa32047961973077506685ae710e33513f0a1624..56f1106f125eac6b356464b682a8c78c18a0882a 100644
--- a/feature/account/common/build.gradle.kts
+++ b/feature/account/common/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
 
     testImplementation(projects.core.ui.compose.testing)
 }
diff --git a/feature/account/edit/build.gradle.kts b/feature/account/edit/build.gradle.kts
index 5ef5291d048fb4efd41f663bb559077368ceb059..16ff0341feb36f591cb26e66ff91cacb01f4865a 100644
--- a/feature/account/edit/build.gradle.kts
+++ b/feature/account/edit/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
 
     implementation(projects.feature.account.common)
     implementation(projects.feature.account.oauth)
diff --git a/feature/account/oauth/build.gradle.kts b/feature/account/oauth/build.gradle.kts
index 7c4b986d811e4f42ff2ff582cb258f5e1614b8a4..f52033d231280ff179b2215e45a488b2a24b8f83 100644
--- a/feature/account/oauth/build.gradle.kts
+++ b/feature/account/oauth/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
     implementation(projects.core.common)
     implementation(projects.core.android.common)
 
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
 
     implementation(projects.feature.account.common)
 
diff --git a/feature/account/server/certificate/build.gradle.kts b/feature/account/server/certificate/build.gradle.kts
index a392d2994314fdd4903a1955ef95cecfac6e2b51..d576a45c9851a8fddd7e9f4905c84e7d1961066c 100644
--- a/feature/account/server/certificate/build.gradle.kts
+++ b/feature/account/server/certificate/build.gradle.kts
@@ -12,7 +12,7 @@ dependencies {
     implementation(projects.core.common)
     implementation(projects.feature.account.common)
 
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
 
     testImplementation(projects.core.ui.compose.testing)
 }
diff --git a/feature/account/server/settings/build.gradle.kts b/feature/account/server/settings/build.gradle.kts
index 5e9c127b1874a05768d2cefb616a339ab037f2a5..95dd1cc9618f95bb6ec9e3b6380c97db246c4b00 100644
--- a/feature/account/server/settings/build.gradle.kts
+++ b/feature/account/server/settings/build.gradle.kts
@@ -20,8 +20,8 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
-    implementation(projects.mail.common)
-    implementation(projects.mail.protocols.imap)
+    implementation(projects.mailcore.common)
+    implementation(projects.mailcore.protocols.imap)
 
     implementation(projects.feature.account.common)
 
diff --git a/feature/account/server/validation/build.gradle.kts b/feature/account/server/validation/build.gradle.kts
index 75c9d1be0ea6356a4fd50ea84b7f6be3856b224e..f868cf17f3da83b61ceaca155161a83ec2a37b7c 100644
--- a/feature/account/server/validation/build.gradle.kts
+++ b/feature/account/server/validation/build.gradle.kts
@@ -20,10 +20,10 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
-    implementation(projects.mail.common)
-    implementation(projects.mail.protocols.imap)
-    implementation(projects.mail.protocols.pop3)
-    implementation(projects.mail.protocols.smtp)
+    implementation(projects.mailcore.common)
+    implementation(projects.mailcore.protocols.imap)
+    implementation(projects.mailcore.protocols.pop3)
+    implementation(projects.mailcore.protocols.smtp)
 
     implementation(projects.feature.account.common)
     implementation(projects.feature.account.oauth)
diff --git a/feature/account/setup/build.gradle.kts b/feature/account/setup/build.gradle.kts
index 29072b8e41c7e74b5e6e50c02652780a13b67710..8579a57422fa0747e29bfffd967bd3d325468933 100644
--- a/feature/account/setup/build.gradle.kts
+++ b/feature/account/setup/build.gradle.kts
@@ -20,10 +20,10 @@ dependencies {
     implementation(projects.core.ui.compose.designsystem)
     implementation(projects.core.common)
 
-    implementation(projects.mail.common)
-    implementation(projects.mail.protocols.imap)
-    implementation(projects.mail.protocols.pop3)
-    implementation(projects.mail.protocols.smtp)
+    implementation(projects.mailcore.common)
+    implementation(projects.mailcore.protocols.imap)
+    implementation(projects.mailcore.protocols.pop3)
+    implementation(projects.mailcore.protocols.smtp)
 
     implementation(projects.feature.autodiscovery.service)
 
diff --git a/feature/autodiscovery/api/build.gradle.kts b/feature/autodiscovery/api/build.gradle.kts
index 350629b443f54587fa127fe32e746d65219d03f5..fa722a61b72a081714767222d85a5fda559b0d68 100644
--- a/feature/autodiscovery/api/build.gradle.kts
+++ b/feature/autodiscovery/api/build.gradle.kts
@@ -4,6 +4,6 @@ plugins {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
     api(projects.core.common)
 }
diff --git a/feature/autodiscovery/providersxml/build.gradle.kts b/feature/autodiscovery/providersxml/build.gradle.kts
index 32288d6a8d5fadab2e13a96195295fef837f7a39..5c67c49841ec4f9a1f17709f1813ec8e38db61ed 100644
--- a/feature/autodiscovery/providersxml/build.gradle.kts
+++ b/feature/autodiscovery/providersxml/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     implementation(projects.core.common)
-    implementation(projects.mail.common)
+    implementation(projects.mailcore.common)
     implementation(projects.feature.autodiscovery.api)
 
     implementation(libs.timber)
diff --git a/mail/common/build.gradle.kts b/mail/common/build.gradle.kts
index 5c3e86dcb98a34d441aad61ea1bcb2b4d80ace5f..971f4982906318225c5982a80afd06453373bae1 100644
--- a/mail/common/build.gradle.kts
+++ b/mail/common/build.gradle.kts
@@ -20,6 +20,6 @@ dependencies {
     // We're only using this for its DefaultHostnameVerifier
     implementation(libs.apache.httpclient5)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(libs.icu4j.charset)
 }
diff --git a/mail/protocols/imap/build.gradle.kts b/mail/protocols/imap/build.gradle.kts
index 1c9366ef0bf0480d2a63eac8312a8f02fa83188a..3024b3a6f2d1ae89b1b3d8f34753c8cae91c9208 100644
--- a/mail/protocols/imap/build.gradle.kts
+++ b/mail/protocols/imap/build.gradle.kts
@@ -9,14 +9,14 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
 
     implementation(libs.jzlib)
     implementation(libs.jutf7)
     implementation(libs.commons.io)
     implementation(libs.okio)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(libs.okio)
     testImplementation(libs.mime4j.core)
 }
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java
index a547ed0be9bc97c45e5e00a5bc77f19cfa51e5f9..3a8d7f492377a81beb755e9fd5f725bafb109d38 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/mockserver/MockImapServer.java
@@ -157,7 +157,7 @@ public class MockImapServer {
         checkServerRunning();
 
         try {
-            waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS);
+            waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS);
         } catch (InterruptedException ignored) {
         }
 
diff --git a/mail/protocols/pop3/build.gradle.kts b/mail/protocols/pop3/build.gradle.kts
index 9bb46751bec204cc3ffa6b9f223b8ded927b09d0..cf51cb6818f0e3369d95049e1ead0ddc00076075 100644
--- a/mail/protocols/pop3/build.gradle.kts
+++ b/mail/protocols/pop3/build.gradle.kts
@@ -9,9 +9,9 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(libs.okio)
     testImplementation(libs.jzlib)
     testImplementation(libs.commons.io)
diff --git a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java
index 36b0e48ac4700c6a6c19a0565110aff4df37fdcd..fa289f0b87674376c6e7889220622188508bfcc1 100644
--- a/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java
+++ b/mail/protocols/pop3/src/test/java/com/fsck/k9/mail/store/pop3/MockPop3Server.java
@@ -157,7 +157,7 @@ public class MockPop3Server {
         checkServerRunning();
 
         try {
-            waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS);
+            waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS);
         } catch (InterruptedException ignored) {
         }
 
diff --git a/mail/protocols/smtp/build.gradle.kts b/mail/protocols/smtp/build.gradle.kts
index 56f180588310275ae6858e15faa60e533af5705b..c67df78c9c20faa181b6b906d89993b680f50443 100644
--- a/mail/protocols/smtp/build.gradle.kts
+++ b/mail/protocols/smtp/build.gradle.kts
@@ -9,12 +9,12 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
 
     implementation(libs.commons.io)
     implementation(libs.okio)
 
-    testImplementation(projects.mail.testing)
+    testImplementation(projects.mailcore.testing)
     testImplementation(libs.okio)
     testImplementation(libs.jzlib)
 }
diff --git a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java
index b8fb14aefc20d66a160b09a973095b6e25f526d7..2c2545f09d9bddacc16a9301168ad78db06fbf6c 100644
--- a/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java
+++ b/mail/protocols/smtp/src/test/java/com/fsck/k9/mail/transport/mockServer/MockSmtpServer.java
@@ -160,7 +160,7 @@ public class MockSmtpServer {
         checkServerRunning();
 
         try {
-            waitForConnectionClosed.await(300L, TimeUnit.MILLISECONDS);
+            waitForConnectionClosed.await(5000L, TimeUnit.MILLISECONDS);
         } catch (InterruptedException ignored) {
         }
 
diff --git a/mail/testing/build.gradle.kts b/mail/testing/build.gradle.kts
index 38ff9537928898f5b6ef6270e44dd307e8794d1d..81c3c91459ff54651e943acf34b4fa77931ce245 100644
--- a/mail/testing/build.gradle.kts
+++ b/mail/testing/build.gradle.kts
@@ -9,7 +9,7 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    api(projects.mail.common)
+    api(projects.mailcore.common)
 
     api(libs.okio)
     api(libs.junit)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e12eb2c6acc049e42e2460d70de976ada05d84b3..3e7cb4d6907af5bf76b7e49a9b418e51f609c259 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -18,7 +18,7 @@ dependencyResolutionManagement {
 
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
-rootProject.name = "k-9"
+rootProject.name = "Mail"
 
 includeBuild("build-plugin")
 
@@ -81,13 +81,19 @@ include(
 )
 
 include(
-    ":mail:common",
-    ":mail:testing",
-    ":mail:protocols:imap",
-    ":mail:protocols:pop3",
-    ":mail:protocols:smtp",
+    ":mailcore:common",
+    ":mailcore:testing",
+    ":mailcore:protocols:imap",
+    ":mailcore:protocols:pop3",
+    ":mailcore:protocols:smtp",
 )
 
+project(":mailcore:common").projectDir = file("mail/common")
+project(":mailcore:testing").projectDir = file("mail/testing")
+project(":mailcore:protocols:imap").projectDir = file("mail/protocols/imap")
+project(":mailcore:protocols:pop3").projectDir = file("mail/protocols/pop3")
+project(":mailcore:protocols:smtp").projectDir = file("mail/protocols/smtp")
+
 include(
     ":backend:api",
     ":backend:testing",