diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
index 30b8a97b3..7f851cf12 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt
@@ -146,10 +146,10 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) :
                 binding.messageAuthor.visibility = View.GONE
             }
             binding.messageText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize)
-            // binding.messageText.text = processedMessageText
+            binding.messageText.text = processedMessageText
             // just for debugging:
-            binding.messageText.text =
-                SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
+            // binding.messageText.text =
+            //     SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
         } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
index 7782508ce..0b8814bfd 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt
@@ -160,10 +160,10 @@ class OutcomingTextMessageViewHolder(itemView: View) :
 
             binding.messageTime.layoutParams = layoutParams
             viewThemeUtils.platform.colorTextView(binding.messageText, ColorRole.ON_SURFACE_VARIANT)
-            // binding.messageText.text = processedMessageText
+            binding.messageText.text = processedMessageText
             // just for debugging:
-            binding.messageText.text =
-                SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
+            // binding.messageText.text =
+            //     SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")")
         } else {
             binding.messageText.visibility = View.GONE
             binding.checkboxContainer.visibility = View.VISIBLE
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 5a886c816..4b35f0fc6 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
@@ -145,7 +145,6 @@ class OfflineFirstChatRepository @Inject constructor(
             Log.d(TAG, "conversationModel.internalId: " + conversationModel.internalId)
             Log.d(TAG, "conversationModel.lastReadMessage:" + conversationModel.lastReadMessage)
 
-            // var newestMessageIdFromDb = chatDao.getNewestMessageId(internalConversationId, threadId)
             var newestMessageIdFromDb = chatBlocksDao.getNewestMessageIdFromChatBlocks(internalConversationId, threadId)
             Log.d(TAG, "newestMessageIdFromDb: $newestMessageIdFromDb")
 
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt
index ee22ee043..7c80cb8b9 100644
--- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt
@@ -20,33 +20,6 @@ interface ChatBlocksDao {
     @Delete
     fun deleteChatBlocks(blocks: List<ChatBlockEntity>)
 
-    // @Query(
-    //     """
-    //     SELECT *
-    //     FROM ChatBlocks
-    //     WHERE internalConversationId in (:internalConversationId)
-    //     ORDER BY newestMessageId ASC
-    //     """
-    // )
-    // fun getChatBlocks(
-    //     internalConversationId: String
-    // ): Flow<List<ChatBlockEntity>>
-
-    // @Query(
-    //     """
-    //     SELECT *
-    //     FROM ChatBlocks
-    //     WHERE internalConversationId in (:internalConversationId)
-    //     AND newestMessageId >= :messageId
-    //     ORDER BY newestMessageId ASC
-    //     """
-    // )
-    // fun getChatBlocksThatReachMessageId(
-    //     internalConversationId: String,
-    //     messageId: Long
-    // ):
-    //     Flow<List<ChatBlockEntity>>
-
     @Query(
         """
         SELECT *
diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
index 5e0e87f3b..86c3f94c3 100644
--- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
+++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt
@@ -18,20 +18,6 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 @Suppress("Detekt.TooManyFunctions")
 interface ChatMessagesDao {
-    // @Query(
-    //     """
-    //     SELECT MAX(id) as max_items
-    //     FROM ChatMessages
-    //     WHERE internalConversationId = :internalConversationId
-    //     AND isTemporary = 0
-    //     AND (:threadId IS NULL OR threadId = :threadId)
-    //     """
-    // )
-    // fun getNewestMessageId(
-    //     internalConversationId: String,
-    //     threadId: Long?
-    // ): Long
-
     @Query(
         """
         SELECT *
diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt
index d07c2baa0..962466a8a 100644
--- a/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt
@@ -267,19 +267,3 @@ fun ErrorView(message: String) {
         Text(text = message, color = MaterialTheme.colorScheme.error)
     }
 }
-
-// @Preview(showBackground = true)
-// @Composable
-// fun PreviewLoadingIndicator() {
-//     MaterialTheme {
-//         LoadingIndicator()
-//     }
-// }
-//
-// @Preview(showBackground = true)
-// @Composable
-// fun PreviewErrorView() {
-//     MaterialTheme {
-//         ErrorView("This is a preview error message.")
-//     }
-// }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
index 1deb099fd..435445774 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
@@ -23,11 +23,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flowOf
 
 class DummyChatMessagesDaoImpl : ChatMessagesDao {
-    // override fun getNewestMessageId(
-    //     internalConversationId: String,
-    //     threadId: Long?
-    // ): Long = 0L
-
     override fun getMessagesForConversation(internalConversationId: String): Flow<List<ChatMessageEntity>> = flowOf()
 
     override fun getTempMessagesForConversation(internalConversationId: String): Flow<List<ChatMessageEntity>> =
@@ -209,10 +204,6 @@ class DummyConversationDaoImpl : ConversationsDao {
 class DummyChatBlocksDaoImpl : ChatBlocksDao {
     override fun deleteChatBlocks(blocks: List<ChatBlockEntity>) { /* */ }
 
-    // override fun getChatBlocks(
-    //     internalConversationId: String
-    // ): Flow<List<ChatBlockEntity>> = flowOf()
-
     override fun getChatBlocksContainingMessageId(
         internalConversationId: String,
         threadId: Long?,
@@ -230,7 +221,5 @@ class DummyChatBlocksDaoImpl : ChatBlocksDao {
 
     override suspend fun upsertChatBlock(chatBlock: ChatBlockEntity) { /* */ }
 
-    // override fun clearChatBlocksForUser(pattern: String) { /* */ }
-
     override fun deleteChatBlocksOlderThan(internalConversationId: String, messageId: Long) { /* */ }
 }