diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index e1869a440c..985fcf8512 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -234,7 +234,7 @@ class Core {
                                 Long newid = null;
 
                                 if (EntityOperation.MOVE.equals(op.name) &&
-                                        jargs.length() > 2)
+                                        jargs.length() > 2 && !jargs.isNull(2))
                                     newid = jargs.getLong(2);
 
                                 if ((EntityOperation.ADD.equals(op.name) ||