diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a86e424054..a09c6ca559 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -6764,10 +6764,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                                         db.message().setMessageNotes(message.id, notes);
 
-                                        if (TextUtils.isEmpty(message.hash))
+                                        if (TextUtils.isEmpty(message.msgid))
                                             return null;
 
-                                        List<EntityMessage> messages = db.message().getMessagesByHash(message.account, message.hash);
+                                        List<EntityMessage> messages = db.message().getMessagesByMsgId(message.account, message.msgid);
                                         if (messages == null)
                                             return null;
 
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 95719953fb..318400b476 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -401,11 +401,6 @@ public interface DaoMessage {
             " AND (id = :id OR msgid = :msgid)")
     List<EntityMessage> getMessagesBySimilarity(long account, long id, String msgid);
 
-    @Query("SELECT * FROM message" +
-            " WHERE account = :account" +
-            " AND hash = :hash")
-    List<EntityMessage> getMessagesByHash(long account, String hash);
-
     @Query("SELECT COUNT(*) FROM message" +
             " WHERE folder = :folder" +
             " AND msgid = :msgid")