From 8fa5e63b07d0772c5d7d167881bfd5d7ca4f35d2 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 4 Jul 2019 12:52:43 +0200
Subject: [PATCH] Fix issue: reply to e2e event does not contain the base
 message

---
 .../android/internal/session/room/send/LocalEchoEventFactory.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
index ce2d6e4c..4e7e8eed 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/send/LocalEchoEventFactory.kt
@@ -254,7 +254,7 @@ internal class LocalEchoEventFactory @Inject constructor(private val credentials
 //            </blockquote>
 //        </mx-reply>
 //        This is where the reply goes.
-        val body = bodyForReply(eventReplied.content.toModel<MessageContent>())
+        val body = bodyForReply(eventReplied.getClearContent().toModel<MessageContent>())
         val replyFallbackTemplateFormatted = """
            <mx-reply><blockquote><a href="%s">${stringProvider.getString(R.string.message_reply_to_prefix)}</a><a href="%s">%s</a><br />%s</blockquote></mx-reply>%s
         """.trimIndent().format(permalink, userLink, userId, body.second ?: body.first, replyText)