diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 69c95abe..34e159f9 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -83,14 +83,7 @@ class MainActivity : SimpleActivity() {
             }
         }
 
-        // fix a glitch at enabling Release version minifying from 5.12.3
-        // reset messages in 5.14.3 again, as PhoneNumber is no longer minified
-        if (!config.wasDbCleared) {
-            ensureBackgroundThread {
-                messagesDB.deleteAll()
-            }
-            config.wasDbCleared = true
-        }
+        clearAllMessagesIfNeeded()
     }
 
     override fun onResume() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
index 60b6284d..b4f96cff 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -92,6 +92,7 @@ class ThreadActivity : SimpleActivity() {
             return
         }
 
+        clearAllMessagesIfNeeded()
         threadId = intent.getLongExtra(THREAD_ID, 0L)
         intent.getStringExtra(THREAD_TITLE)?.let {
             supportActionBar?.title = it
diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
index cf6b2292..218b8b3b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/extensions/Context.kt
@@ -982,3 +982,14 @@ fun Context.getSendMessageSettings(): Settings {
     settings.group = config.sendGroupMessageMMS
     return settings
 }
+
+// fix a glitch at enabling Release version minifying from 5.12.3
+// reset messages in 5.14.3 again, as PhoneNumber is no longer minified
+fun Context.clearAllMessagesIfNeeded() {
+    if (!config.wasDbCleared) {
+        ensureBackgroundThread {
+            messagesDB.deleteAll()
+        }
+        config.wasDbCleared = true
+    }
+}