diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index c92ca2e4a..4b441e6c3 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -307,12 +307,7 @@ class ChatActivity :
                 runBlocking {
                     val id = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_MESSAGE_ID)
                     id?.let {
-                        val isSaved = chatViewModel.isMessageSaved(id.toLong())
-                        if (isSaved) {
-                            onMessageSearchResult(intent)
-                        } else {
-                            startContextChatWindowForMessage(id)
-                        }
+                        startContextChatWindowForMessage(id)
                     }
                 }
             }
@@ -2297,13 +2292,6 @@ class ChatActivity :
         }
     }
 
-    private fun onMessageSearchResult(intent: Intent?) {
-        val messageId = intent?.getStringExtra(MessageSearchActivity.RESULT_KEY_MESSAGE_ID)
-        messageId?.let { id ->
-            scrollToAndCenterMessageWithId(id)
-        }
-    }
-
     private fun executeIfResultOk(result: ActivityResult, onResult: (intent: Intent?) -> Unit) {
         if (result.resultCode == Activity.RESULT_OK) {
             onResult(result.data)
@@ -2319,7 +2307,7 @@ class ChatActivity :
         if (position != null && position >= 0) {
             binding.messagesListView.scrollToPosition(position)
         } else {
-            startContextChatWindowForMessage(messageId)
+            Log.d(TAG, "message $messageId that should be scrolled to was not found (scrollToMessageWithId)")
         }
     }
 
@@ -2332,10 +2320,12 @@ class ChatActivity :
                     binding.messagesListView.height / 2
                 )
             } else {
-                startContextChatWindowForMessage(messageId)
+                Log.d(
+                    TAG,
+                    "message $messageId that should be scrolled " +
+                        "to was not found (scrollToAndCenterMessageWithId)"
+                )
             }
-        } ?: run {
-            startContextChatWindowForMessage(messageId)
         }
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt
index 3c7b7cf20..8e2e3f3ed 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt
@@ -76,8 +76,6 @@ interface ChatMessageRepository : LifecycleAwareManager {
      */
     suspend fun getMessage(messageId: Long, bundle: Bundle): Flow<ChatMessage>
 
-    suspend fun checkIfMessageIsSaved(messageId: Long): Boolean
-
     @Suppress("LongParameterList")
     suspend fun sendChatMessage(
         credentials: String,
diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
index 5e693604d..1fc1f9235 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt
@@ -475,15 +475,6 @@ class OfflineFirstChatRepository @Inject constructor(
             .map(ChatMessageEntity::asModel)
     }
 
-    override suspend fun checkIfMessageIsSaved(messageId: Long): Boolean {
-        try {
-            chatDao.getChatMessageForConversation(internalConversationId, messageId)
-            return true
-        } catch (_: Exception) {
-            return false
-        }
-    }
-
     @Suppress("UNCHECKED_CAST", "MagicNumber", "Detekt.TooGenericExceptionCaught")
     private fun getMessagesFromServer(bundle: Bundle): Pair<Int, List<ChatMessageJson>>? {
         val fieldMap = bundle.getSerializable(BundleKeys.KEY_FIELD_MAP) as HashMap<String, Int>
diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
index 124d81cdb..2e45755d0 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -285,10 +285,6 @@ class ChatViewModel @Inject constructor(
         conversationRepository.getRoom(token)
     }
 
-    suspend fun isMessageSaved(messageId: Long): Boolean {
-        return chatRepository.checkIfMessageIsSaved(messageId)
-    }
-
     fun getCapabilities(user: User, token: String, conversationModel: ConversationModel) {
         Log.d(TAG, "Remote server ${conversationModel.remoteServer}")
         if (conversationModel.remoteServer.isNullOrEmpty()) {