Purge local messages

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

@@ -116,6 +116,14 @@ public class FragmentDialogContactGroup extends FragmentDialogBase {
 
             @Override
             protected void onExecuted(Bundle args, Cursor cursor) {
+                if (cursor == null)
+                    EntityLog.log(getContext(), "MMM cursor is null");
+                else {
+                    EntityLog.log(getContext(), "MMM cursor count=" + cursor.getCount());
+                    for (int col = 0; col < cursor.getColumnCount(); col++)
+                        EntityLog.log(getContext(), "MMM " + col + "=" + cursor.getColumnName(col));
+                }
+
                 SimpleCursorAdapter adapter = new SimpleCursorAdapter(
                         context,
                         R.layout.spinner_contact_group,

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

@@ -11160,8 +11160,14 @@ public class FragmentMessages extends FragmentBase
                             if (message == null)
                                 continue;
 
-                            if (message.uid != null || account.protocol == EntityAccount.TYPE_POP)
+                            if (account.protocol == EntityAccount.TYPE_POP)
                                 db.message().setMessageUiHide(message.id, true);
+                            else {
+                                if (message.uid == null)
+                                    db.message().deleteMessage(id);
+                                else
+                                    db.message().setMessageUiHide(message.id, true);
+                            }
                         }
 
                         EntityOperation.queue(context, folder, EntityOperation.PURGE);