diff --git a/app/src/main/java/eu/faircode/email/EntityFolder.java b/app/src/main/java/eu/faircode/email/EntityFolder.java
index f87f363ff0..cd6e76aaa7 100644
--- a/app/src/main/java/eu/faircode/email/EntityFolder.java
+++ b/app/src/main/java/eu/faircode/email/EntityFolder.java
@@ -290,7 +290,9 @@ public class EntityFolder implements Serializable {
 
     public static EntityFolder fromJSON(JSONObject json) throws JSONException {
         EntityFolder folder = new EntityFolder();
-        folder.id = json.getLong("id");
+        if (json.has("id"))
+            folder.id = json.getLong("id");
+
         folder.name = json.getString("name");
         folder.type = json.getString("type");