diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index 17c50e9432..e263baca1a 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -276,6 +276,8 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                                     db.beginTransaction();
 
                                     EntityMessage message = db.message().getMessage(mid);
+                                    if (message == null)
+                                        continue;
 
                                     if (rule.matches(context, message, null))
                                         if (rule.execute(context, message))
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index 2dcc0a0346..62679ddbd1 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -1160,6 +1160,8 @@ public class FragmentRule extends FragmentBase {
                             db.message().getMessageIdsByFolder(rule.folder, null, null, null);
                     for (long id : ids) {
                         EntityMessage message = db.message().getMessage(id);
+                        if (message == null)
+                            continue;
 
                         if (rule.matches(context, message, null))
                             matching.add(message);