diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index 6d19eee3..3318e524 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -799,10 +799,12 @@ subject,~Git(hub|lab)=lolcat -f
 #
 # Examples:
 # x-scheme-handler/irc=hexchat
-# x-scheme-handler/http*=printf '%s' {} | wl-copy
+x-scheme-handler/http*=printf '%s' {} | wl-copy
 # text/html=surf -dfgms
+text/html=firefox
+text/plain=hx
 # text/plain=gvim {} +125
-# message/rfc822=thunderbird
+message/rfc822=betterbird
 
 [hooks]
 #
@@ -810,19 +812,21 @@ subject,~Git(hub|lab)=lolcat -f
 
 #
 # Executed when a new email arrives in the selected folder
-#mail-received=notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] New mail from $AERC_FROM_NAME" "$AERC_SUBJECT"
+mail-received=notify-send "[$AERC_ACCOUNT/$AERC_FOLDER] New mail from $AERC_FROM_NAME" "$AERC_SUBJECT"
 
 #
 # Executed when mail is deleted from a folder
-#mail-deleted=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" &
-
+# mail-deleted=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" &
+mail-deleted=/home/fic/.config/mail/mail-sync.sh &
 #
 # Executed when aerc adds mail to a folder
 #mail-added=mbsync "$AERC_ACCOUNT:$AERC_FOLDER" &
+mail-added=/home/fic/.config/mail/mail-sync.sh &
 
 #
 # Executed when aerc starts
 #aerc-startup=aerc :terminal calcurse && aerc :next-tab
+aerc-startup=/home/fic/.config/mail/mail-sync.sh &
 
 #
 # Executed when aerc shuts down.
diff --git a/.config/aerc/templates/forward_as_body b/.config/aerc/templates/forward_as_body
index e8d15dcb..137da763 100644
--- a/.config/aerc/templates/forward_as_body
+++ b/.config/aerc/templates/forward_as_body
@@ -1,8 +1,20 @@
 X-Mailer: aerc {{version}}
 
-Forwarded message from {{.OriginalFrom | names | join ", "}} on {{dateFormat .OriginalDate "Mon Jan 2, 2006 at 3:04 PM"}}:
-{{.OriginalText}}
-{{- with .Signature }}
+{{ 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 -}}
 
-{{.}}
-{{- end }}
+{{.Signature -}}
diff --git a/.config/aerc/templates/forward_as_body.bak b/.config/aerc/templates/forward_as_body.bak
new file mode 100644
index 00000000..e8d15dcb
--- /dev/null
+++ b/.config/aerc/templates/forward_as_body.bak
@@ -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/quoted_reply b/.config/aerc/templates/quoted_reply
index cec62c56..137da763 100644
--- a/.config/aerc/templates/quoted_reply
+++ b/.config/aerc/templates/quoted_reply
@@ -1,4 +1,4 @@
-
+X-Mailer: aerc {{version}}
 
 {{ if or
 	(eq .OriginalMIMEType "text/html")
diff --git a/.notmuch/hooks/post-new b/.notmuch/hooks/post-new
index 6e2886ab..735f39ab 100755
--- a/.notmuch/hooks/post-new
+++ b/.notmuch/hooks/post-new
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-afew --tag --new
+# afew --tag --new