diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 3438c8fe..0d2d1ee1 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -727,7 +727,7 @@ no-attachment-warning=^[^>]*attach(ed|ment)
 #
 # Example (obviously, this requires that you write your main text/plain body
 # using the markdown syntax):
-# text/html=pandoc -f markdown -t html --standalone
+text/html=pandoc -f markdown -t html --standalone
 
 [filters]
 #
diff --git a/.config/aerc/binds.conf b/.config/aerc/binds.conf
index d7c5a9eb..143c5c75 100644
--- a/.config/aerc/binds.conf
+++ b/.config/aerc/binds.conf
@@ -180,6 +180,7 @@ q = :choose -o d discard abort -o p postpone postpone<Enter> # Abort or postpone
 e = :edit<Enter> # Edit (body and headers)
 a = :attach<space> # Add attachment
 d = :detach<space> # Remove attachment
+H = :multipart text/html<Enter>
 
 [terminal]
 $noinherit = true
diff --git a/.config/aerc/templates/forward_as_body b/.config/aerc/templates/forward_as_body
new file mode 100644
index 00000000..e8d15dcb
--- /dev/null
+++ b/.config/aerc/templates/forward_as_body
@@ -0,0 +1,8 @@
+X-Mailer: aerc {{version}}
+
+Forwarded message from {{.OriginalFrom | names | join ", "}} on {{dateFormat .OriginalDate "Mon Jan 2, 2006 at 3:04 PM"}}:
+{{.OriginalText}}
+{{- with .Signature }}
+
+{{.}}
+{{- end }}
diff --git a/.config/aerc/templates/new_message b/.config/aerc/templates/new_message
new file mode 100644
index 00000000..8ff5f46e
--- /dev/null
+++ b/.config/aerc/templates/new_message
@@ -0,0 +1,5 @@
+X-Mailer: aerc {{version}}
+{{- with .Signature }}
+
+{{.}}
+{{- end -}}
diff --git a/.config/aerc/templates/quoted_reply b/.config/aerc/templates/quoted_reply
new file mode 100644
index 00000000..cec62c56
--- /dev/null
+++ b/.config/aerc/templates/quoted_reply
@@ -0,0 +1,20 @@
+
+
+{{ if or
+	(eq .OriginalMIMEType "text/html")
+	(contains (toLower .OriginalText) "<html")
+}}
+	{{- $text := exec `/usr/lib/aerc/filters/html` .OriginalText | replace `\r` `` -}}
+	{{- range split "\n" $text -}}
+		{{- if eq . "References:" }}{{break}}{{end}}
+		{{- if or
+			(eq (len .) 0)
+			(match `^\[.+\]\s*$` .)
+		}}{{continue}}{{end}}
+		{{- printf "%s\n" . | replace `^[\s]+` "" | quote}}
+	{{- end -}}
+{{- else }}
+	{{- trimSignature .OriginalText | quote -}}
+{{- end -}}
+
+{{.Signature -}}
diff --git a/.config/helix/languages.toml b/.config/helix/languages.toml
index 9c6c9984..d8059039 100644
--- a/.config/helix/languages.toml
+++ b/.config/helix/languages.toml
@@ -67,6 +67,7 @@ command = "iwes"
 
 [[language]]
 name = "markdown"
+file-types = ["md", "livemd", "markdown", "mdx", "mkd", "mkdn", "mdwn", "mdown", "markdn", "mdtxt", "mdtext", "workbook", { glob = "PULLREQ_EDITMSG" }, { glob = "/tmp/aerc-compose-*.eml" }]
 # language-servers = ["ltex-ls-plus", "marksman", "scls"]
 language-servers = ["harper-ls", "marksman", "scls"]
 formatter = { command = "dprint", args = ["fmt", "--stdin", "md"] }
@@ -91,6 +92,9 @@ onSave = true
 name = "mail"
 # scope = "text.mail"
 # file-types = ["eml"]
+# file-types = [
+#   "eml"
+# ]
 language-servers = ["harper-ls"]
 # injection-regex = "mail|eml|email"