diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index cb38626bf3..3e9af8e11f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -557,16 +557,11 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
-
         TupleAccountEx account = items.get(position);
-        holder.bindTo(account);
+        holder.powner.recreate(account == null ? null : account.id);
 
+        holder.unwire();
+        holder.bindTo(account);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterAnswer.java b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
index d2acb7dd10..7a9baab874 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAnswer.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAnswer.java
@@ -320,14 +320,10 @@ public class AdapterAnswer extends RecyclerView.Adapter<AdapterAnswer.ViewHolder
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         EntityAnswer answer = items.get(position);
+        holder.powner.recreate(answer == null ? null : answer.id);
 
         holder.unwire();
         holder.bindTo(answer);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterCertificate.java b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
index 0f73ff4d8d..aca967db15 100644
--- a/app/src/main/java/eu/faircode/email/AdapterCertificate.java
+++ b/app/src/main/java/eu/faircode/email/AdapterCertificate.java
@@ -247,16 +247,11 @@ public class AdapterCertificate extends RecyclerView.Adapter<AdapterCertificate.
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
-
         EntityCertificate certificate = items.get(position);
-        holder.bindTo(certificate);
+        holder.powner.recreate(certificate == null ? null : certificate.id);
 
+        holder.unwire();
+        holder.bindTo(certificate);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterContact.java b/app/src/main/java/eu/faircode/email/AdapterContact.java
index 70b8cc7561..04670f71b6 100644
--- a/app/src/main/java/eu/faircode/email/AdapterContact.java
+++ b/app/src/main/java/eu/faircode/email/AdapterContact.java
@@ -466,17 +466,14 @@ public class AdapterContact extends RecyclerView.Adapter<AdapterContact.ViewHold
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
         TupleContactEx contact = selected.get(position);
+        holder.powner.recreate(contact == null ? null : contact.id);
+
+        holder.unwire();
         holder.bindTo(contact);
         holder.wire();
     }
 
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
-
     public static class FragmentEditName extends FragmentDialogBase {
         @NonNull
         @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index ec8a71a4e3..c9ceda993f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -1146,19 +1146,14 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
-
         TupleFolderEx folder = items.get(position);
+        holder.powner.recreate(folder == null ? null : folder.id);
+
+        holder.unwire();
         holder.bindTo(folder);
-
         holder.wire();
     }
 
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
-
     interface IFolderSelectedListener {
         void onFolderSelected(TupleFolderEx folder);
     }
diff --git a/app/src/main/java/eu/faircode/email/AdapterIdentity.java b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
index 46302befeb..e45462c1db 100644
--- a/app/src/main/java/eu/faircode/email/AdapterIdentity.java
+++ b/app/src/main/java/eu/faircode/email/AdapterIdentity.java
@@ -467,16 +467,11 @@ public class AdapterIdentity extends RecyclerView.Adapter<AdapterIdentity.ViewHo
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
-
         TupleIdentityEx identity = items.get(position);
-        holder.bindTo(identity);
+        holder.powner.recreate(identity == null ? null : identity.id);
 
+        holder.unwire();
+        holder.bindTo(identity);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index beaa8640e3..56ee8d7e4e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -5779,6 +5779,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
     private void _onBindViewHolder(@NonNull ViewHolder holder, int position) {
         TupleMessageEx message = differ.getItem(position);
+        holder.powner.recreate(message == null ? null : message.id);
 
         if (message == null || context == null)
             return;
@@ -5837,7 +5838,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     @Override
     public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
         holder.cowner.stop();
-        holder.powner.recreate();
     }
 
     @Override
diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index 774725c8ee..b2682c1740 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -349,16 +349,11 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
-
         TupleOperationEx operation = items.get(position);
-        holder.bindTo(operation);
+        holder.powner.recreate(operation == null ? null : operation.id);
 
+        holder.unwire();
+        holder.bindTo(operation);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index 823b466683..9274e7ee80 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -533,14 +533,11 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
 
     @Override
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
-        holder.unwire();
         TupleRuleEx rule = selected.get(position);
+        holder.powner.recreate(rule == null ? null : rule.id);
+
+        holder.unwire();
         holder.bindTo(rule);
         holder.wire();
     }
-
-    @Override
-    public void onViewDetachedFromWindow(@NonNull ViewHolder holder) {
-        holder.powner.recreate();
-    }
 }
diff --git a/app/src/main/java/eu/faircode/email/TwoStateOwner.java b/app/src/main/java/eu/faircode/email/TwoStateOwner.java
index f13e7773f5..ead29f83d1 100644
--- a/app/src/main/java/eu/faircode/email/TwoStateOwner.java
+++ b/app/src/main/java/eu/faircode/email/TwoStateOwner.java
@@ -26,10 +26,13 @@ import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.LifecycleRegistry;
 import androidx.lifecycle.OnLifecycleEvent;
 
+import java.util.Objects;
+
 // This class can be used as an externally controlled standalone or child life cycle owner
 
 public class TwoStateOwner implements LifecycleOwner {
     private String name;
+    private Object condition;
     private LifecycleRegistry registry;
 
     // https://developer.android.com/topic/libraries/architecture/lifecycle#lc
@@ -87,6 +90,13 @@ public class TwoStateOwner implements LifecycleOwner {
         create();
     }
 
+    void recreate(Object condition) {
+        if (!Objects.equals(this.condition, condition)) {
+            this.condition = condition;
+            recreate();
+        }
+    }
+
     void destroy() {
         Lifecycle.State state = registry.getCurrentState();
         if (!state.equals(Lifecycle.State.DESTROYED)) {