diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6c34adf3a9..d9ebe8f8c8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6151,8 +6151,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         void refresh();
 
         void finish();
-
-        void clear(long id);
     }
 
     public static class FragmentDialogLink extends FragmentDialogBase {
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 90a0cf6d68..2cf2c29bcd 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1397,14 +1397,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         }
         pgpService = null;
 
-        if (viewType == AdapterMessage.ViewType.THREAD) {
-            PagedList<TupleMessageEx> list = adapter.getCurrentList();
-            if (list != null)
-                for (TupleMessageEx message : list)
-                    if (message != null)
-                        iProperties.clear(message.id);
-        }
-
         super.onDestroyView();
     }
 
@@ -1842,37 +1834,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         public void finish() {
             FragmentMessages.this.finish();
         }
-
-        @Override
-        public void clear(long id) {
-            for (String name : values.keySet())
-                if (!"selected".equals(name))
-                    values.get(name).remove(id);
-
-            for (int i = 0; i < sizes.size(); i++)
-                if (sizes.keyAt(i) == id) {
-                    sizes.removeAt(i);
-                    break;
-                }
-
-            for (int i = 0; i < heights.size(); i++)
-                if (heights.keyAt(i) == id) {
-                    heights.removeAt(i);
-                    break;
-                }
-
-            for (int i = 0; i < positions.size(); i++)
-                if (positions.keyAt(i) == id) {
-                    positions.removeAt(i);
-                    break;
-                }
-
-            for (int i = 0; i < attachments.size(); i++)
-                if (attachments.keyAt(i) == id) {
-                    attachments.removeAt(i);
-                    break;
-                }
-        }
     };
 
     private ItemTouchHelper.Callback touchHelper = new ItemTouchHelper.Callback() {