diff --git a/app/src/main/java/eu/faircode/email/Core.java b/app/src/main/java/eu/faircode/email/Core.java
index ff407c3384..9683c5b14a 100644
--- a/app/src/main/java/eu/faircode/email/Core.java
+++ b/app/src/main/java/eu/faircode/email/Core.java
@@ -578,7 +578,7 @@ class Core {
         }
 
         Log.i(folder.name + " moved uid=" + uid);
-        if (jargs.length() > 2) {
+        if (jargs.length() > 2 && !jargs.isNull(2)) {
             long tmpid = jargs.getLong(2);
             try {
                 db.beginTransaction();