diff --git a/home/common/aerc.nix b/home/common/aerc.nix
index 301c3e5..fdd1344 100644
--- a/home/common/aerc.nix
+++ b/home/common/aerc.nix
@@ -19,7 +19,7 @@
           "aerc :terminal ikhal && aerc :terminal domailtask.sh && aerc :next-tab";
       };
 
-      # viewer = { alternatives = "text/html,text/plain"; };
+      viewer = { alternatives = "text/html,text/plain"; };
 
       compose = {
         focus-body = "false";
diff --git a/home/common/files/aerc/binds.conf b/home/common/files/aerc/binds.conf
index 34510c7..59c3cd7 100644
--- a/home/common/files/aerc/binds.conf
+++ b/home/common/files/aerc/binds.conf
@@ -58,8 +58,11 @@ zb = :align bottom<Enter>
 
 <Enter> = :view<Enter>
 # d = :choose -o y 'Really delete this message' delete-message<Enter>
-d = :delete<Enter>
-D = :delete<Enter>
+S = :move SPAM<space>
+@ = :move Inbox<Enter>
+D = :read<Enter>:move Trash<Enter>
+d = :read<Enter>:move Trash<Enter>
+y = :move All-Mail<Enter>
 a = :archive flat<Enter>
 A = :unmark -a<Enter>:mark -T<Enter>:archive flat<Enter>
 
@@ -104,12 +107,13 @@ q = :close<Enter>
 O = :open<Enter>
 # o = :open<Enter>
 o = :pipe urlscan --run-safe myweb --pipe -c -d<Enter>
-S = :save<space>
 | = :pipe<space>
-D = :delete<Enter>
-d = :delete<Enter>
 A = :archive flat<Enter>
-y = :archive flat<Enter>
+S = :move SPAM<space>
+@ = :move Inbox<Enter>
+D = :read<Enter>:move Trash<Enter>
+d = :read<Enter>:move Trash<Enter>
+y = :move All-Mail<Enter>
 
 <C-l> = :open-link <space>