From 58ea822110b0a87852d955b5a423100e91d509d0 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 23 Apr 2019 08:32:21 +0200
Subject: [PATCH] Simplification

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 +++---
 app/src/main/res/layout/item_message_normal.xml         | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3dc61d4c7f..85b000ad4d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1395,9 +1395,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 WebView webView = new WebView(context) {
                     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
                         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-                        int height = getMeasuredHeight();
-                        if (height < tvBody.getMinHeight())
-                            setMeasuredDimension(getMeasuredWidth(), tvBody.getMinHeight());
+                        setMeasuredDimension(
+                                getMeasuredWidth(),
+                                Math.max(tvBody.getMinHeight(), getMeasuredHeight()));
                     }
                 };
 
diff --git a/app/src/main/res/layout/item_message_normal.xml b/app/src/main/res/layout/item_message_normal.xml
index 588b50772d..ecc36ab1ae 100644
--- a/app/src/main/res/layout/item_message_normal.xml
+++ b/app/src/main/res/layout/item_message_normal.xml
@@ -569,7 +569,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHeight_min="60dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvBody" />