Simplification

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

@@ -2457,12 +2457,9 @@ class Core {
             int expunge = 0;
             for (int i = 0; i < imessages.length && state.isRunning() && state.isRecoverable(); i++)
                 try {
-                    if (imessages[i].isSet(Flags.Flag.DELETED)) {
+                    if (perform_expunge && imessages[i].isSet(Flags.Flag.DELETED))
-                        if (perform_expunge)
+                        expunge++;
-                            expunge++;
+                    else
-                        else
-                            uids.remove(ifolder.getUID(imessages[i]));
-                    } else
                         uids.remove(ifolder.getUID(imessages[i]));
                 } catch (MessageRemovedException ex) {
                     Log.w(folder.name, ex);