diff --git a/vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt b/vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
index 0ce77a02f8..2eef37e742 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/WrapWidthTextView.kt
@@ -9,6 +9,7 @@ import android.text.Layout
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatTextView
 import kotlin.math.ceil
+import kotlin.math.max
 
 class WrapWidthTextView @JvmOverloads constructor(
         context: Context,
@@ -28,9 +29,7 @@ class WrapWidthTextView @JvmOverloads constructor(
         var maxWidth = 0.0f
         val lines = layout.lineCount
         for (i in 0 until lines) {
-            if (layout.getLineWidth(i) > maxWidth) {
-                maxWidth = layout.getLineWidth(i)
-            }
+            maxWidth = max(maxWidth, layout.getLineWidth(i))
         }
         return maxWidth
     }