diff --git a/aerc/aerc.conf b/aerc/aerc.conf
index 5044d44..be9a323 100644
--- a/aerc/aerc.conf
+++ b/aerc/aerc.conf
@@ -32,6 +32,7 @@ alternatives=text/plain,text/html
 show-headers=false
 
 [compose]
+header-layout=To|From,Cc|Bcc,Subject
 editor=nvim
 address-book-cmd=khard email --parsable --remove-first-line %s
 
diff --git a/systemd/user/mbsync.service b/systemd/user/mbsync.service
index 33f507a..29de2c7 100644
--- a/systemd/user/mbsync.service
+++ b/systemd/user/mbsync.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/mbsync --all
+ExecStart=/usr/bin/mbsync %i
 ExecStartPost=/home/oliver/Dokumente/Coding/scripts/mail-notify.py -v
 TimeoutStartSec=1min30s
 StandardOutput=syslog
diff --git a/systemd/user/mbsync.timer b/systemd/user/mbsync.timer
index 95c6014..126f655 100644
--- a/systemd/user/mbsync.timer
+++ b/systemd/user/mbsync.timer
@@ -1,10 +1,9 @@
 [Unit]
-Description=mbsync sync timer
-Conflicts=mbsync9to5.timer
+Description=mbsync sync timer (suru)
 
 [Timer]
 OnCalendar=*:0/5
-Unit=mbsync.service
+Unit=mbsync@suru.service
 
 [Install]
 WantedBy=default.target