diff --git a/home/common/aerc.nix b/home/common/aerc.nix
index 0d0f8c8..b9dc46a 100644
--- a/home/common/aerc.nix
+++ b/home/common/aerc.nix
@@ -83,6 +83,10 @@
     source = ./files/aerc/binds.conf;
     target = "aerc/binds.conf";
   };
+  xdg.configFile."aerc/map.conf" = {
+    source = ./files/aerc/binds.conf;
+    target = "aerc/map.conf";
+  };
   xdg.configFile."aerc/stylesets" = {
     source = ./files/aerc/stylesets;
     recursive = true;
diff --git a/home/common/files/aerc/binds.conf b/home/common/files/aerc/binds.conf
index b33c237..c264d7b 100644
--- a/home/common/files/aerc/binds.conf
+++ b/home/common/files/aerc/binds.conf
@@ -64,7 +64,7 @@ S = :move SPAM<space>
 # 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>
+y = :modify-labels +archive<Enter>:move All-Mail<Enter>
 a = :archive flat<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 
@@ -119,7 +119,7 @@ S = :move SPAM<space>
 # 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>
+y = :modify-labels +archive<Enter>:move All-Mail<Enter>
 
 <C-l> = :open-link <space>
 
@@ -130,15 +130,16 @@ rr = :reply<Enter>
 rq = :reply -q<Enter>
 
 H = :toggle-headers<Enter>
-<C-k> = :prev-part<Enter>
+<C-o> = :prev-part<Enter>
 <C-Up> = :prev-part<Enter>
-<C-j> = :next-part<Enter>
+<C-i> = :next-part<Enter>
 <C-Down> = :next-part<Enter>
 J = :next<Enter>
 j = :next<Enter>
 <C-Right> = :next<Enter>
 K = :prev<Enter>
 k = :prev<Enter>
+O = :open<Enter>
 <C-Left> = :prev<Enter>
 
 [view::passthrough]
diff --git a/home/common/files/aerc/map.conf b/home/common/files/aerc/map.conf
new file mode 100644
index 0000000..c6f4326
--- /dev/null
+++ b/home/common/files/aerc/map.conf
@@ -0,0 +1,6 @@
+Inbox=tag:inbox and not tag:archived and not tag:deleted and not tag:archive
+news=tag:news and not tag:archived and not tag:deleted and not tag:archive
+pen=tag:pen and not tag:archived and not tag:deleted and not tag:archive
+mailing-lists=tag:mailing-lists and not tag:archived and not tag:deleted and not tag:archive
+development=tag:development and not tag:archived and not tag:deleted and not tag:archive
+SPAM=tag:SPAM and not tag:archived and not tag:deleted
diff --git a/home/common/files/notmuch/post-new b/home/common/files/notmuch/post-new
index aa0b073..bd71677 100755
--- a/home/common/files/notmuch/post-new
+++ b/home/common/files/notmuch/post-new
@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-exit
-
 addtag() {
   tags="${1}"
   field="${2}"