diff --git a/app/src/main/java/eu/faircode/email/EntityAccount.java b/app/src/main/java/eu/faircode/email/EntityAccount.java
index 97def23a51..74a9f136b6 100644
--- a/app/src/main/java/eu/faircode/email/EntityAccount.java
+++ b/app/src/main/java/eu/faircode/email/EntityAccount.java
@@ -221,6 +221,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
         json.put("browse", browse);
         json.put("leave_on_server", leave_on_server);
         json.put("leave_on_device", leave_on_device);
+        json.put("max_messages", max_messages);
         json.put("auto_seen", auto_seen);
         // not separator
 
@@ -291,6 +292,8 @@ public class EntityAccount extends EntityOrder implements Serializable {
             account.leave_on_server = json.getBoolean("leave_on_server");
         if (json.has("leave_on_device"))
             account.leave_on_device = json.getBoolean("leave_on_device");
+        if (json.has("max_messages"))
+            account.max_messages = json.getInt("max_messages");
         if (json.has("auto_seen"))
             account.auto_seen = json.getBoolean("auto_seen");
 
@@ -333,6 +336,7 @@ public class EntityAccount extends EntityOrder implements Serializable {
                     this.browse.equals(other.browse) &&
                     this.leave_on_server.equals(other.leave_on_server) &&
                     this.leave_on_device.equals(other.leave_on_device) &&
+                    Objects.equals(this.max_messages, other.max_messages) &&
                     this.auto_seen.equals(other.auto_seen) &&
                     Objects.equals(this.swipe_left, other.swipe_left) &&
                     Objects.equals(this.swipe_right, other.swipe_right) &&