From df15743c04ac935d3defc4f8bcbdc23bc8c50c6d Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Fri, 7 Aug 2020 15:13:08 +1000
Subject: [PATCH] fix text got cut off when sending an image with a text
 message

---
 .../thoughtcrime/securesms/conversation/ConversationItem.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index fb56fbca52..74dc63dd15 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -290,6 +290,10 @@ public class ConversationItem extends LinearLayout
       }
     }
 
+    if (hasThumbnail(messageRecord) && messageRecord.getDisplayBody(context).length() > 0) {
+      ViewUtil.updateLayoutParams(bodyText, getAvailableMessageBubbleWidth(bodyText), ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
     ConversationItemFooter activeFooter   = getActiveFooter(messageRecord);
     int                    availableWidth = getAvailableMessageBubbleWidth(footer);