diff --git a/home/common/aerc.nix b/home/common/aerc.nix
index ee52443..fb86cf5 100644
--- a/home/common/aerc.nix
+++ b/home/common/aerc.nix
@@ -14,10 +14,10 @@
           {{- (map .Labels (exclude .Folder) (exclude "replied|passed|attachment|flagged|unread|draft") | join ",") -}}'';
       };
 
-      hooks = {
-        aerc-startup =
-          "aerc :terminal ikhal && aerc :terminal domailtask.sh && aerc :next-tab";
-      };
+      # hooks = {
+      #   aerc-startup =
+      #     "aerc :terminal ikhal && aerc :terminal domailtask.sh && aerc :next-tab";
+      # };
 
       viewer = {
         alternatives = "text/html,text/plain";
diff --git a/home/common/files/aerc/binds.conf b/home/common/files/aerc/binds.conf
index 2969d74..553700e 100644
--- a/home/common/files/aerc/binds.conf
+++ b/home/common/files/aerc/binds.conf
@@ -60,8 +60,10 @@ zb = :align bottom<Enter>
 # d = :choose -o y 'Really delete this message' delete-message<Enter>
 S = :move SPAM<space>
 @ = :move Inbox<Enter>
-D = :read<Enter>:move Trash<Enter>
-d = :read<Enter>:move Trash<Enter>
+# D = :read<Enter>:move Trash<Enter>
+# d = :read<Enter>:move Trash<Enter>
+D = :modify-labels +deleted<Enter>:read<Enter>:move Trash<Enter>
+d = :modify-labels +deleted<Enter>:read<Enter>:move Trash<Enter>
 y = :move All-Mail<Enter>
 a = :archive flat<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
@@ -111,8 +113,10 @@ o = :pipe urlscan --run-safe myweb --pipe -c -d<Enter>
 A = :archive flat<Enter>
 S = :move SPAM<space>
 @ = :move Inbox<Enter>
-D = :read<Enter>:move Trash<Enter>
-d = :read<Enter>:move Trash<Enter>
+# D = :read<Enter>:move Trash<Enter>
+# d = :read<Enter>:move Trash<Enter>
+D = :modify-labels +deleted<Enter>:read<Enter>:move Trash<Enter>
+d = :modify-labels +deleted<Enter>:read<Enter>:move Trash<Enter>
 y = :move All-Mail<Enter>
 
 <C-l> = :open-link <space>
diff --git a/home/common/mail.nix b/home/common/mail.nix
index 5df5151..3340928 100644
--- a/home/common/mail.nix
+++ b/home/common/mail.nix
@@ -13,7 +13,7 @@
   programs.notmuch = {
     enable = true;
     new = {
-      tags = [ "unread" "inbox" ];
+      tags = [ "new" "unread" "inbox" ];
       ignore = [
         ".mbsyncstate"
         ".uidvalidity"
@@ -22,6 +22,7 @@
         ".mbsyncstate.lock"
       ];
     };
+    maildir.synchronizeFlags = true;
     extraConfig = {
       database = {
         path = "/home/don/Mail";