diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 73567defad..1b02907b62 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1490,16 +1490,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
             int height = properties.getHeight(message.id, 0);
             if (height == 0) {
+                tvBody.setMinHeight(0);
                 tvBody.setVisibility(View.GONE);
+                wvBody.setMinimumHeight(0);
                 wvBody.setVisibility(View.GONE);
             } else {
                 boolean show_full = properties.getValue("full", message.id);
                 if (show_full) {
-                    wvBody.setVisibility(View.INVISIBLE);
                     wvBody.setMinimumHeight(height);
+                    wvBody.setVisibility(View.INVISIBLE);
                 } else {
-                    tvBody.setVisibility(View.INVISIBLE);
                     tvBody.setMinHeight(height);
+                    tvBody.setVisibility(View.INVISIBLE);
                 }
             }
             pbBody.setVisibility(View.GONE);