diff --git a/app-common/README.md b/app-common/README.md
new file mode 100644
index 0000000000..0f7a3a4f84
--- /dev/null
+++ b/app-common/README.md
@@ -0,0 +1,7 @@
+# App Common
+
+# App Common
+
+This is the central integration point for shared code among the K-9 Mail and Thunderbird for Android applications. Its purpose is to collect and organize the individual feature modules that contain the actual functionality, as well as the "glue code" and configurations that tie them together.
+
+By keeping the shared code focused on these boundaries, we can ensure that it remains lean and avoids unnecessary dependencies. This approach allows us to maintain a clean and modular architecture, making it easier to maintain and update the codebase.
diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
new file mode 100644
index 0000000000..9b00174d6a
--- /dev/null
+++ b/app-common/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    id(ThunderbirdPlugins.Library.android)
+}
+
+dependencies {
+    api(projects.app.common)
+}
+
+android {
+    namespace = "app.k9mail.common"
+}
diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
index 6198e2cc7b..630982468e 100644
--- a/app-k9mail/build.gradle.kts
+++ b/app-k9mail/build.gradle.kts
@@ -10,7 +10,7 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    implementation(projects.app.common)
+    implementation(projects.appCommon)
     implementation(projects.core.ui.compose.theme2.k9mail)
     implementation(projects.core.ui.legacy.theme2.k9mail)
     implementation(projects.feature.launcher)
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index 212ee9a6df..e68dac3b40 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -10,7 +10,7 @@ if (testCoverageEnabled) {
 }
 
 dependencies {
-    implementation(projects.app.common)
+    implementation(projects.appCommon)
     implementation(projects.core.ui.compose.theme2.thunderbird)
     implementation(projects.core.ui.legacy.theme2.thunderbird)
     implementation(projects.feature.launcher)
diff --git a/settings.gradle.kts b/settings.gradle.kts
index e743aea59e..ad68dc75d2 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -26,6 +26,10 @@ include(
     ":app-ui-catalog",
 )
 
+include(
+    ":app-common",
+)
+
 include(
     ":app:common",
     ":app:ui:base",