diff --git a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
index f6e3b2560..447c06789 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessageViewHolder.java
@@ -125,11 +125,6 @@ public class ChatMessageViewHolder extends RecyclerView.ViewHolder implements Vi
         }
     }
 
-    private boolean isTooLarge(TextView text, String newText) {
-        float textWidth = text.getPaint().measureText(newText);
-        return (textWidth >= text.getMeasuredWidth());
-    }
-
     public void bindMessage(final ChatMessage message, LinphoneContact contact) {
         eventLayout.setVisibility(View.GONE);
         securityEventLayout.setVisibility(View.GONE);
diff --git a/app/src/main/java/org/linphone/views/MultiLineWrapContentWidthTextView.java b/app/src/main/java/org/linphone/views/MultiLineWrapContentWidthTextView.java
index 6dab5e7f0..402f495b4 100644
--- a/app/src/main/java/org/linphone/views/MultiLineWrapContentWidthTextView.java
+++ b/app/src/main/java/org/linphone/views/MultiLineWrapContentWidthTextView.java
@@ -27,8 +27,8 @@ import android.widget.TextView;
 import androidx.annotation.Nullable;
 
 /**
- * The purpose of this class is to have a TextView declared with wrap_content
- * as width that won't fill it's parent if it is multi line
+ * The purpose of this class is to have a TextView declared with wrap_content as width that won't
+ * fill it's parent if it is multi line
  */
 @SuppressLint("AppCompatCustomView")
 public class MultiLineWrapContentWidthTextView extends TextView {
@@ -55,8 +55,8 @@ public class MultiLineWrapContentWidthTextView extends TextView {
             if (layout != null) {
                 int maxWidth =
                         (int) Math.ceil(getMaxLineWidth(layout))
-                                + getCompoundPaddingLeft()
-                                + getCompoundPaddingRight();
+                                + getTotalPaddingLeft()
+                                + getTotalPaddingRight();
                 widthSpec = MeasureSpec.makeMeasureSpec(maxWidth, MeasureSpec.AT_MOST);
             }
         }
diff --git a/app/src/main/res/layout/chat_bubble.xml b/app/src/main/res/layout/chat_bubble.xml
index eeacac9ec..2350f288b 100644
--- a/app/src/main/res/layout/chat_bubble.xml
+++ b/app/src/main/res/layout/chat_bubble.xml
@@ -88,7 +88,8 @@
             android:paddingTop="5dp"
             android:paddingBottom="5dp">
 
-            <com.google.android.flexbox.FlexboxLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+            <com.google.android.flexbox.FlexboxLayout
+                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:id="@+id/pictures"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"