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 db6cef6d..4216b2c3 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/ThreadActivity.kt
@@ -146,7 +146,6 @@ class ThreadActivity : SimpleActivity() {
         }
 
         updateMenuItemColors(menu)
-        checkPinBtnVisibility(menu)
         return true
     }
 
@@ -160,8 +159,6 @@ class ThreadActivity : SimpleActivity() {
             R.id.delete -> askConfirmDelete()
             R.id.manage_people -> managePeople()
             R.id.mark_as_unread -> markAsUnread()
-            R.id.pin_conversation -> pinConversation(true)
-            R.id.unpin_conversation -> pinConversation(false)
             else -> return super.onOptionsItemSelected(item)
         }
         return true
@@ -855,24 +852,6 @@ class ThreadActivity : SimpleActivity() {
         return participants
     }
 
-    private fun pinConversation(pin: Boolean) {
-        if (pin) {
-            config.addPinnedConversationByThreadId(threadId)
-        } else {
-            config.removePinnedConversationByThreadId(threadId)
-        }
-
-        runOnUiThread {
-            refreshMessages()
-        }
-    }
-
-    private fun checkPinBtnVisibility(menu: Menu) {
-        val pinnedConversations = config.pinnedConversations
-        menu.findItem(R.id.pin_conversation).isVisible = !pinnedConversations.contains(threadId.toString())
-        menu.findItem(R.id.unpin_conversation).isVisible = pinnedConversations.contains(threadId.toString())
-    }
-
     @SuppressLint("MissingPermission")
     @Subscribe(threadMode = ThreadMode.ASYNC)
     fun refreshMessages(event: Events.RefreshMessages) {
diff --git a/app/src/main/res/menu/menu_thread.xml b/app/src/main/res/menu/menu_thread.xml
index cdd76bf8..dd4d0bd2 100644
--- a/app/src/main/res/menu/menu_thread.xml
+++ b/app/src/main/res/menu/menu_thread.xml
@@ -19,12 +19,4 @@
         android:id="@+id/mark_as_unread"
         android:title="@string/mark_as_unread"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/pin_conversation"
-        android:title="@string/pin_conversation"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/unpin_conversation"
-        android:title="@string/unpin_conversation"
-        app:showAsAction="never" />
 </menu>