diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 3be666c37d..385904445d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1477,8 +1477,21 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             // Message text
             tvNoInternetBody.setVisibility(suitable || message.content ? View.GONE : View.VISIBLE);
             grpDownloading.setVisibility(message.content ? View.GONE : View.VISIBLE);
-            tvBody.setVisibility(View.GONE);
-            wvBody.setVisibility(View.GONE);
+
+            int height = properties.getHeight(message.id, 0);
+            if (height == 0) {
+                tvBody.setVisibility(View.GONE);
+                wvBody.setVisibility(View.GONE);
+            } else {
+                boolean show_full = properties.getValue("full", message.id);
+                if (show_full) {
+                    wvBody.setVisibility(View.INVISIBLE);
+                    wvBody.setMinimumHeight(height);
+                } else {
+                    tvBody.setVisibility(View.INVISIBLE);
+                    tvBody.setMinHeight(height);
+                }
+            }
             pbBody.setVisibility(View.GONE);
             grpAction.setVisibility(View.GONE);
             clearActions();