Small fixes

app/src/main/java/eu/faircode/email/EntityAccount.java

@@ -205,6 +205,7 @@ public class EntityAccount implements Serializable {
                     Objects.equals(this.realm, other.realm) &&
                     Objects.equals(this.name, other.name) &&
                     Objects.equals(this.color, other.color) &&
+                    Objects.equals(this.order, other.order) &&
                     this.synchronize.equals(other.synchronize) &&
                     this.primary.equals(other.primary) &&
                     this.notify.equals(other.notify) &&

app/src/main/java/eu/faircode/email/EntityIdentity.java

@@ -78,7 +78,7 @@ public class EntityIdentity {
     @NonNull
     public Boolean primary;
     @NonNull
-    public boolean sender_extra = false;
+    public Boolean sender_extra = false;
     public String replyto;
     public String bcc;
     @NonNull
@@ -124,6 +124,7 @@ public class EntityIdentity {
 
         json.put("synchronize", synchronize);
         json.put("primary", primary);
+        json.put("sender_extra", sender_extra);
 
         json.put("replyto", replyto);
         json.put("bcc", bcc);
@@ -164,6 +165,8 @@ public class EntityIdentity {
 
         identity.synchronize = json.getBoolean("synchronize");
         identity.primary = json.getBoolean("primary");
+        if (json.has("sender_extra"))
+            identity.sender_extra = json.getBoolean("sender_extra");
 
         if (json.has("replyto") && !json.isNull("replyto"))
             identity.replyto = json.getString("replyto");
@@ -206,6 +209,7 @@ public class EntityIdentity {
                     this.use_ip == other.use_ip &&
                     this.synchronize.equals(other.synchronize) &&
                     this.primary.equals(other.primary) &&
+                    this.sender_extra.equals(sender_extra) &&
                     Objects.equals(this.replyto, other.replyto) &&
                     Objects.equals(this.bcc, other.bcc) &&
                     this.plain_only.equals(other.plain_only) &&

app/src/main/java/eu/faircode/email/EntityMessage.java

@@ -260,11 +260,17 @@ public class EntityMessage implements Serializable {
                     Objects.equals(this.deliveredto, other.deliveredto) &&
                     Objects.equals(this.inreplyto, other.inreplyto) &&
                     Objects.equals(this.thread, other.thread) &&
+                    Objects.equals(this.receipt_request, other.receipt_request) &&
+                    MessageHelper.equal(this.receipt_to, other.receipt_to) &&
+                    Objects.equals(this.dkim, other.dkim) &&
+                    Objects.equals(this.spf, other.spf) &&
+                    Objects.equals(this.dmarc, other.dmarc) &&
                     MessageHelper.equal(this.from, other.from) &&
                     MessageHelper.equal(this.to, other.to) &&
                     MessageHelper.equal(this.cc, other.cc) &&
                     MessageHelper.equal(this.bcc, other.bcc) &&
                     MessageHelper.equal(this.reply, other.reply) &&
+                    MessageHelper.equal(this.list_post, other.list_post) &&
                     Objects.equals(this.headers, other.headers) &&
                     Objects.equals(this.raw, other.raw) &&
                     Objects.equals(this.subject, other.subject) &&
@@ -287,6 +293,8 @@ public class EntityMessage implements Serializable {
                     this.ui_ignored.equals(other.ui_ignored) &&
                     this.ui_browsed.equals(other.ui_browsed) &&
                     Objects.equals(this.ui_snoozed, other.ui_snoozed) &&
+                    Objects.equals(this.revision, other.revision) &&
+                    Objects.equals(this.revisions, other.revisions) &&
                     Objects.equals(this.warning, other.warning) &&
                     Objects.equals(this.error, other.error));
         }