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 b86c7b44c..2e4624532 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -1294,7 +1294,7 @@ class ChatActivity :
         }
 
         runOnUiThread {
-            binding.typingIndicator.text = typingString.append("\nTESTING LINE 2\nTESTING LINE 3\nTESTING LINE 4")
+            binding.typingIndicator.text = typingString
 
             if (participantNames.size > 0) {
                 binding.typingIndicatorWrapper.visibility = View.VISIBLE
@@ -1305,20 +1305,6 @@ class ChatActivity :
             } else {
                 binding.typingIndicatorWrapper.visibility = View.GONE
                 binding.typingIndicatorWrapper.y += DisplayUtils.convertDpToPixel(18f, context)
-                // if (binding.typingIndicator.lineCount == 1) { // FIXME ???? Seems like some weird formatting code
-                //     binding.typingIndicatorWrapper.animate()
-                //         .translationY(binding.fragmentContainerActivityChat.y)
-                //         .setInterpolator(AccelerateDecelerateInterpolator())
-                //         .duration = TYPING_INDICATOR_ANIMATION_DURATION
-                // } else if (binding.typingIndicator.lineCount == 2) {
-                //     binding.typingIndicatorWrapper.animate()
-                //         .translationY(
-                //             binding.fragmentContainerActivityChat.y +
-                //                 DisplayUtils.convertDpToPixel(15f, context)
-                //         )
-                //         .setInterpolator(AccelerateDecelerateInterpolator())
-                //         .duration = TYPING_INDICATOR_ANIMATION_DURATION
-                // }
             }
         }
     }
@@ -3299,7 +3285,7 @@ class ChatActivity :
             val lon = data["longitude"]!!
             metaData =
                 "{\"type\":\"geo-location\",\"id\":\"geo:$lat,$lon\",\"latitude\":\"$lat\"," +
-                "\"longitude\":\"$lon\",\"name\":\"$name\"}"
+                    "\"longitude\":\"$lon\",\"name\":\"$name\"}"
         }
 
         when (type) {
@@ -3387,10 +3373,12 @@ class ChatActivity :
         val messageTemp = message as ChatMessage
         messageTemp.lastEditTimestamp = message.lastEditTimestamp
 
-        // val index = adapter?.getMessagePositionById(messageTemp.id) ?: 0
-        // val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
+        val index = adapter?.getMessagePositionById(messageTemp.id)!!
+        if (index > 0) {
+            val adapterMsg = adapter?.items?.get(index)?.item as ChatMessage
+            messageTemp.parentMessage = adapterMsg.parentMessage
+        }
 
-        // messageTemp.parentMessage = adapterMsg.parentMessage
         messageTemp.isOneToOneConversation =
             currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL
         messageTemp.activeUser = conversationUser