diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 0f0a0c28..771d0472 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -369,7 +369,7 @@ styleset-name=ashen
 # replies on top.
 #
 # Default: false
-#reverse-thread-order=false
+reverse-thread-order=true
 
 # Positions the cursor on the last message in the message list (at the
 # bottom of the view) when opening a new folder.
@@ -397,7 +397,7 @@ styleset-name=ashen
 # (IMAP server or notmuch), threads will be built by the client.
 #
 # Default: false
-#threading-enabled=false
+threading-enabled=true
 
 # Force client-side thread building
 #
diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml
index 914b73d9..a0b656b7 100644
--- a/.config/helix/languages.toml
+++ b/.config/helix/languages.toml
@@ -71,6 +71,7 @@ file-types = ["md", "livemd", "markdown", "mdx", "mkd", "mkdn", "mdwn", "mdown",
 # language-servers = ["ltex-ls-plus", "marksman", "scls"]
 language-servers = ["harper-ls", "marksman", "scls"]
 formatter = { command = "dprint", args = ["fmt", "--stdin", "md", "-c", "~/.dprint.jsonc"] }
+# depends on aerc
 auto-format = false
 
 
@@ -98,6 +99,19 @@ name = "mail"
 language-servers = ["harper-ls"]
 # injection-regex = "mail|eml|email"
 
+[[language]]
+name = "aerc"
+scope = "text.aerc"
+file-types = []
+shebangs = []
+roots = []
+auto-format = true
+formatter = { command = "/usr/lib/aerc/filters/wrap", args = ["-w", "74"] }
+
+[[grammar]]
+name = "aerc"
+source = { git = "https://github.com/tree-sitter-grammars/tree-sitter-markdown", rev = "62516e8c78380e3b51d5b55727995d2c511436d8", subpath = "tree-sitter-markdown" }
+
 [[grammar]]
 name = "ini"
 source = { git = "https://github.com/justinmk/tree-sitter-ini", rev = "32b31863f222bf22eb43b07d4e9be8017e36fb31" }