diff --git a/azos-core b/azos-core
index 51e8d56..d646af0 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit 51e8d56f0cdd676c25c5b9ccb04654ac80da021f
+Subproject commit d646af08b9d77182a7da8703d7438041d54054c2
diff --git a/features/mail/default.nix b/features/mail/default.nix
index 5c26c75..b1c082a 100644
--- a/features/mail/default.nix
+++ b/features/mail/default.nix
@@ -10,6 +10,8 @@
       mbsync = {
         enable = true;
         create = "maildir";
+        remove = "both";
+        expunge = "both";
       };
       msmtp.enable = true;
     };