diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index bcb56634..33dc0c9e 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -121,10 +121,8 @@ index-columns=flags:4,labels<=,name<20%,subject,date>=
 # Default settings
 column-flags={{.StyleMap .Flags (case `^!$` "important-flag") (case `r|a` "reply-flag") (default "flags") | join ""}}
 column-name={{.Style (index (.From | names) 0) "name"}}
-# column-subject={{.Style (.ThreadPrefix) "style-name"}}{{.Subject}}
 column-subject={{.Style (printf "%s%s" .ThreadPrefix .Subject) "subject"}}
 column-date={{.Style (.DateAutoFormat .Date.Local) "date"}}
-# column-labels = ({{.Style (.Labels | join " ") "labels"}})
 column-labels = {{if match .Folder "Inbox"}}{{.StyleMap (.Labels | join "," | replace `\bArchive(/|$|,)` `A$1` | replace `\bLists(/|$|,)` `L$1` | replace `Sourcehut` `Srht` | replace `Recipt` `Rcpt` | replace `Inbox` `I` | replace `Sent` `S` | replace `Draft(s)?` `Dr` | replace `Snoozed` `Snz` | split "," ) (exclude `I`) (case `^A(/)?.*` "archive") (case `^L(/)?.*` "lists") (default "labels") | join ","}}{{else}}{{.StyleMap (.Labels | join "," | replace `\bArchive(/|$|,)` `A$1` | replace `\bLists(/|$|,)` `L$1` | replace `Sourcehut` `Srht` | replace `Recipt` `Rcpt` | replace `Inbox` `I` | replace `Sent` `S` | replace `Draft(s)?` `Dr` | replace `Snoozed` `Snz` | split "," ) (case `^A(/)?.*` "archive") (case `^L(/)?.*` "lists") (default "labels") | join ","}}{{end}}
 # column-labels = {{.StyleMap (.Labels | join "," | replace `\bArchive(/|$|,)` `A$1` | replace `\bLists(/|$|,)` `L$1` | replace `Sourcehut` `Srht` | replace `Recipt` `Rcpt` | replace `Inbox` `I` | replace `Sent` `S` | replace `Draft(s)?` `Dr` | replace `Snoozed` `Snz` | split "," ) (exclude `I`) (case `^A(/)?.*` "archive") (case `^L(/)?.*` "lists") (default "labels") | join ","}}