Allow larger user message size

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

@@ -900,15 +900,7 @@ public class FragmentIdentity extends FragmentBase {
                     identity.sign_key_alias = null;
                     identity.error = null;
                     identity.last_connected = last_connected;
-
-                    if (user_max_size == null)
-                        identity.max_size = server_max_size;
-                    else {
-                        if (server_max_size == null)
-                            identity.max_size = user_max_size;
-                        else
-                            identity.max_size = Math.min(user_max_size, server_max_size);
-                    }
+                    identity.max_size = (user_max_size == null ? server_max_size : user_max_size);
 
                     if (identity.primary)
                         db.identity().resetPrimary(account);

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

@@ -556,9 +556,11 @@ public class ServiceSend extends ServiceBase {
                 throw new IOException("Test");
             db.identity().setIdentityState(ident.id, "connected");
 
-            Long max_size = iservice.getMaxSize();
-            if (max_size != null)
-                db.identity().setIdentityMaxSize(ident.id, max_size);
+            if (ident.max_size == null) {
+                Long max_size = iservice.getMaxSize();
+                if (max_size != null)
+                    db.identity().setIdentityMaxSize(ident.id, max_size);
+            }
 
             Address[] to = imessage.getAllRecipients();
             String via = "via " + ident.host + "/" + ident.user +