diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 7b86558a22..d8490886db 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -875,24 +875,15 @@ public class MessageHelper {
 
         String thread = null;
         DB db = DB.getInstance(context);
-        try {
-            db.beginTransaction();
-
-            for (String ref : refs) {
-                List<EntityMessage> messages = db.message().getMessagesByMsgId(account, ref);
-                for (EntityMessage message : messages) {
-                    if (thread == null)
-                        thread = message.thread;
-                    if (thread != null && !thread.equals(message.thread))
-                        db.message().setMessageThread(message.id, thread);
-                }
+        for (String ref : refs) {
+            List<EntityMessage> messages = db.message().getMessagesByMsgId(account, ref);
+            for (EntityMessage message : messages) {
+                if (thread == null)
+                    thread = message.thread;
+                if (thread != null && !thread.equals(message.thread))
+                    db.message().setMessageThread(message.id, thread);
             }
-
-            db.setTransactionSuccessful();
-        } finally {
-            db.endTransaction();
         }
-
         if (thread != null)
             return thread;