diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 34d3a067..e103e633 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -12,7 +12,7 @@ cache-blobs = true
 # Identity stuff
 from = Daniel Fichtinger <daniel@ficd.ca>
 signature-file       = /home/fic/mail/daniel@ficd.ca.sig
-aliases = Daniel Fichtinger <notdaf@ficcdaf.ca>, Daniel Fichtinger <*@ficd.ca>, Daniel Fichtinger <*@ficcdaf.ca>
+aliases = Daniel Fichtinger <notdaf@ficcdaf.ca>, Daniel Fichtinger <*@ficd.ca>, Daniel Fichtinger <*@ficcdaf.ca>, Daniel Fichtinger <notdaniel@ficcdaf.ca>
 use-envelope-from = true
 pgp-auto-sign               = true
 pgp-self-encrypt            = true
@@ -25,7 +25,7 @@ carddav-source = https://daniel%40ficd.ca@carddav.fastmail.com/dav/addressbooks/
 carddav-source-cred-cmd = pass show fastmail/carddav
 address-book-cmd = carddav-query -S fastmail %s
 
-[School-IMAP]
+[Outlook]
 source               = imaps+xoauth2://18daf3%40queensu.ca@outlook.office365.com?token_endpoint=https://login.microsoftonline.com/common/oauth2/v2.0/token&client_id=9e5f94bc-e8a4-4e73-b8be-63364c29d753
 # source-cred-cmd      = /home/fic/tools/mutt_oauth2.py /home/fic/tools/tokenfile-test
 source-cred-cmd =  gpg --decrypt --quiet /home/fic/tools/tokenfile-test | jq -r '.refresh_token'
diff --git a/.config/aerc/aerc.conf b/.config/aerc/aerc.conf
index f7cb5204..2b808cac 100644
--- a/.config/aerc/aerc.conf
+++ b/.config/aerc/aerc.conf
@@ -119,7 +119,7 @@ index-columns=flags:4,labels<=,name<20%,subject,date>=
 #   column-name={{if match .Folder "^(Gesendet|Sent)$"}}{{index (.To | names) 0}}{{else}}{{index (.From | names) 0}}{{end}}
 #
 # Default settings
-column-flags= {{.StyleMap .Flags (case `^!$` "important-flag") (case `r|a` "reply-flag") (default "flags") | join ""}}
+column-flags= {{$flags := map .Flags (case "O" "U")}}{{.StyleMap $flags (case `^!$` "important-flag") (case `r|a` "reply-flag") (default "flags") | join ""}}
 column-name= {{.Style (index (.From | names) 0) "name"}}
 column-subject= {{.Style (printf "%s%s" .ThreadPrefix .Subject) "subject"}}
 column-date= {{.Style (.DateAutoFormat .Date.Local) "date"}}
@@ -131,7 +131,7 @@ column-labels = {{$labels := map .Labels (exclude .Folder) | join "," | replace
 # width will be fully available for the column contents).
 #
 # Default: "  "
-#column-separator="  "
+# column-separator="  "
 
 #
 # See time.Time#Format at https://godoc.org/time#Time.Format