diff --git a/users/misterio/home/neomutt.nix b/users/misterio/home/neomutt.nix
index b2a844a6..79261274 100644
--- a/users/misterio/home/neomutt.nix
+++ b/users/misterio/home/neomutt.nix
@@ -32,6 +32,11 @@
         key = "K";
         map = [ "index" "pager" ];
       }
+      {
+        action = ":set confirmappend=no\\n<tag-prefix><save-message>+Archive<enter>:set confirmappend=yes\\n";
+        key = "A";
+        map = [ "index" "pager" ];
+      }
     ];
     extraConfig = ''
       alternates "eu@misterio.me|gabriel.fontes@uget.express|g.fontes@usp.br"
diff --git a/users/misterio/home/nvim.nix b/users/misterio/home/nvim.nix
index f58cb6c0..e738a250 100644
--- a/users/misterio/home/nvim.nix
+++ b/users/misterio/home/nvim.nix
@@ -110,7 +110,7 @@ in {
       autocmd FileType json,html,nix,scss,typescript setlocal ts=2 sts=2 sw=2
 
       "Options when composing mutt mail
-      autocmd FileType mail set noautoindent wrapmargin=0 textwidth=0 linebreak wrap
+      autocmd FileType mail set noautoindent wrapmargin=0 textwidth=0 linebreak wrap formatoptions +=w
 
       "Clipboard
       set clipboard=unnamedplus