diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93c9eb09f..affdf6e87 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reordered menu options throughout the app
 
 ### Fixed
+- Fixed keyword blocking for MMS messages ([#99])
 - Fixed contact number selection when adding members to a group ([#456])
 - Fixed a glitch in pattern lock after incorrect attempts
 
@@ -138,6 +139,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#13]: https://github.com/FossifyOrg/Messages/issues/13
 [#70]: https://github.com/FossifyOrg/Messages/issues/70
 [#75]: https://github.com/FossifyOrg/Messages/issues/75
+[#99]: https://github.com/FossifyOrg/Messages/issues/99
 [#115]: https://github.com/FossifyOrg/Messages/issues/115
 [#135]: https://github.com/FossifyOrg/Messages/issues/135
 [#153]: https://github.com/FossifyOrg/Messages/issues/153
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index aa6ec39f4..8517ec8c3 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -141,7 +141,7 @@ dependencies {
     implementation(libs.fossify.commons)
     implementation(libs.eventbus)
     implementation(libs.indicator.fast.scroll)
-    implementation(libs.android.smsmms)
+    implementation(libs.mmslib)
     implementation(libs.androidx.swiperefreshlayout)
     implementation(libs.androidx.constraintlayout)
     implementation(libs.androidx.lifecycle.process)
diff --git a/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
index 4d961a4bf..ece60b34f 100644
--- a/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
+++ b/app/src/main/kotlin/org/fossify/messages/receivers/MmsReceiver.kt
@@ -24,7 +24,6 @@ import org.fossify.messages.helpers.ReceiverUtils.isMessageFilteredOut
 import org.fossify.messages.helpers.refreshMessages
 import org.fossify.messages.models.Message
 
-// more info at https://github.com/klinker41/android-smsmms
 class MmsReceiver : MmsReceivedReceiver() {
 
     override fun isAddressBlocked(context: Context, address: String): Boolean {
@@ -32,6 +31,10 @@ class MmsReceiver : MmsReceivedReceiver() {
         return context.isNumberBlocked(normalizedAddress)
     }
 
+    override fun isContentBlocked(context: Context, content: String): Boolean {
+        return isMessageFilteredOut(context, content)
+    }
+
     override fun onMessageReceived(context: Context, messageUri: Uri) {
         val mms = context.getLatestMMS() ?: return
         val address = mms.getSender()?.phoneNumbers?.first()?.normalizedNumber ?: ""
@@ -62,10 +65,6 @@ class MmsReceiver : MmsReceivedReceiver() {
         size: Int,
         address: String
     ) {
-        if (isMessageFilteredOut(context, mms.body)) {
-            return
-        }
-
         val glideBitmap = try {
             Glide.with(context)
                 .asBitmap()
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 070474576..be830e7be 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -17,7 +17,7 @@ eventbus = "3.3.1"
 room = "2.8.1"
 #Fossify
 commons = "5.2.0"
-android-smsmms = "c3e678befd"
+mmslib = "1.0.0"
 indicator-fast-scroll = "4524cd0b61"
 #Gradle
 gradlePlugins-agp = "8.11.1"
@@ -43,7 +43,7 @@ compose-detekt = { module = "io.nlopez.compose.rules:detekt", version.ref = "det
 #Fossify
 fossify-commons = { module = "org.fossify:commons", version.ref = "commons" }
 indicator-fast-scroll = { module = "org.fossify:IndicatorFastScroll", version.ref = "indicator-fast-scroll" }
-android-smsmms = { module = "org.fossify:android-smsmms", version.ref = "android-smsmms" }
+mmslib = { module = "org.fossify:mmslib", version.ref = "mmslib" }
 #EventBus
 eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }
 #Helpers