diff --git a/app/core/build.gradle.kts b/app/core/build.gradle.kts
index 428c4f780d..3f99465f5e 100644
--- a/app/core/build.gradle.kts
+++ b/app/core/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 dependencies {
     api(projects.mail.common)
     api(projects.backend.api)
-    api(projects.app.htmlCleaner)
+    api(projects.library.htmlCleaner)
     api(projects.core.android.common)
 
     implementation(projects.plugins.openpgpApiLib.openpgpApi)
diff --git a/cli/html-cleaner-cli/build.gradle.kts b/cli/html-cleaner-cli/build.gradle.kts
index 7b3f122451..9f8b4e20d9 100644
--- a/cli/html-cleaner-cli/build.gradle.kts
+++ b/cli/html-cleaner-cli/build.gradle.kts
@@ -9,7 +9,7 @@ application {
 }
 
 dependencies {
-    implementation(projects.app.htmlCleaner)
+    implementation(projects.library.htmlCleaner)
 
     implementation(libs.clikt)
     implementation(libs.okio)
diff --git a/app/html-cleaner/build.gradle.kts b/library/html-cleaner/build.gradle.kts
similarity index 100%
rename from app/html-cleaner/build.gradle.kts
rename to library/html-cleaner/build.gradle.kts
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt b/library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/BodyCleaner.kt
similarity index 100%
rename from app/html-cleaner/src/main/java/app/k9mail/html/cleaner/BodyCleaner.kt
rename to library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/BodyCleaner.kt
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt b/library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HeadCleaner.kt
similarity index 100%
rename from app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HeadCleaner.kt
rename to library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HeadCleaner.kt
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlHeadProvider.kt b/library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlHeadProvider.kt
similarity index 100%
rename from app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlHeadProvider.kt
rename to library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlHeadProvider.kt
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlProcessor.kt b/library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlProcessor.kt
similarity index 100%
rename from app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlProcessor.kt
rename to library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlProcessor.kt
diff --git a/app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlSanitizer.kt b/library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlSanitizer.kt
similarity index 100%
rename from app/html-cleaner/src/main/java/app/k9mail/html/cleaner/HtmlSanitizer.kt
rename to library/html-cleaner/src/main/kotlin/app/k9mail/html/cleaner/HtmlSanitizer.kt
diff --git a/app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt b/library/html-cleaner/src/test/kotlin/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
similarity index 100%
rename from app/html-cleaner/src/test/java/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
rename to library/html-cleaner/src/test/kotlin/app/k9mail/html/cleaner/HtmlSanitizerTest.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2db6d467e6..3f091fb7c8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -34,7 +34,6 @@ include(
     ":app:storage",
     ":app:crypto-openpgp",
     ":app:testing",
-    ":app:html-cleaner",
 )
 
 include(
@@ -110,3 +109,7 @@ include(
     ":cli:html-cleaner-cli",
     ":cli:translation-cli",
 )
+
+include(
+    ":library:html-cleaner",
+)