diff --git a/container/Mail.nix b/container/Mail.nix
index 10646f6..9d6e44e 100644
--- a/container/Mail.nix
+++ b/container/Mail.nix
@@ -129,21 +129,31 @@ in {
 					dkimKeyDirectory = "/var/dkim";
 
 					mailboxes = {
+						All = {
+							auto       = "subscribe";
+							specialUse = "All";
+						};
+						Archive = {
+							auto       = "subscribe";
+							specialUse = "Archive";
+						};
 						Drafts = {
 							auto       = "subscribe";
 							specialUse = "Drafts";
 						};
 						Junk = {
-							auto       = "subscribe";
-							specialUse = "Junk";
+							auto        = "subscribe";
+							specialUse  = "Junk";
+							autoexpunge = "7d";
 						};
 						Sent = {
 							auto       = "subscribe";
 							specialUse = "Sent";
 						};
 						Trash = {
-							auto       = "no";
-							specialUse = "Trash";
+							auto        = "subscribe";
+							specialUse  = "Trash";
+							autoexpunge = "30d";
 						};
 					};