diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 834a08557d..bb2ed1fa75 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2625,8 +2625,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 onShowImagesConfirmed(message);
             }
 
-            properties.setSize(message.id, 0);
-            properties.setHeight(message.id, 0);
+            properties.setSize(message.id, null);
+            properties.setHeight(message.id, null);
+            properties.setPosition(message.id, null);
 
             bindBody(message);
         }
@@ -4155,11 +4156,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
         boolean getValue(String name, long id);
 
-        void setSize(long id, float size);
+        void setSize(long id, Float size);
 
         float getSize(long id, float defaultSize);
 
-        void setHeight(long id, int height);
+        void setHeight(long id, Integer height);
 
         int getHeight(long id, int defaultHeight);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 78651e97d9..af941040ee 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1238,8 +1238,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         @Override
-        public void setSize(long id, float size) {
-            sizes.put(id, size);
+        public void setSize(long id, Float size) {
+            if (size == null)
+                sizes.remove(id);
+            else
+                sizes.put(id, size);
         }
 
         @Override
@@ -1248,8 +1251,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         @Override
-        public void setHeight(long id, int height) {
-            heights.put(id, height);
+        public void setHeight(long id, Integer height) {
+            if (height == null)
+                heights.remove(id);
+            else
+                heights.put(id, height);
         }
 
         @Override
@@ -1258,8 +1264,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
 
         public void setPosition(long id, Pair<Integer, Integer> position) {
-            Log.i("Position=" + position);
-            positions.put(id, position);
+            if (position == null)
+                positions.remove(id);
+            else
+                positions.put(id, position);
         }
 
         public Pair<Integer, Integer> getPosition(long id) {