diff --git a/symlinks/config/.gitignore b/symlinks/config/.gitignore
index a8fb881..e336f29 100644
--- a/symlinks/config/.gitignore
+++ b/symlinks/config/.gitignore
@@ -62,3 +62,6 @@
 !/khard/
 !/khal/**
 !/khal/
+!/systemd/**
+!/systemd/
+/systemd/user/*.wants
diff --git a/symlinks/config/aerc/aerc.conf b/symlinks/config/aerc/aerc.conf
index f2e1ec7..e74377b 100644
--- a/symlinks/config/aerc/aerc.conf
+++ b/symlinks/config/aerc/aerc.conf
@@ -265,6 +265,8 @@ reply-to-self=true
 # against (non-case-sensitive) and a comma, e.g. subject,text will match a
 # subject which contains "text". Use header,~regex to match against a regex.
 #subject,~^\[PATCH=colordiff
+subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff
+subject,~^\[RFC=awk -f /usr/share/aerc/filters/hldiff
 text/plain=sed 's/^>\+.*/\x1b[36m&\x1b[0m/'
 text/html=pandoc -f html -t plain
 image/*=catimg -w $(tput cols) -
diff --git a/symlinks/config/systemd/user/mbsync.service b/symlinks/config/systemd/user/mbsync.service
new file mode 100644
index 0000000..03beacf
--- /dev/null
+++ b/symlinks/config/systemd/user/mbsync.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Mailbox synchronization service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/mbsync -Va
+
+[Install]
+WantedBy=default.target
diff --git a/symlinks/config/systemd/user/mbsync.timer b/symlinks/config/systemd/user/mbsync.timer
new file mode 100644
index 0000000..82ebb83
--- /dev/null
+++ b/symlinks/config/systemd/user/mbsync.timer
@@ -0,0 +1,10 @@
+[Unit]
+Description=Mailbox synchronization timer
+
+[Timer]
+OnBootSec=2m
+OnUnitActiveSec=5m
+Unit=mbsync.service
+
+[Install]
+WantedBy=timers.target
diff --git a/symlinks/config/systemd/user/vdirsyncer.service b/symlinks/config/systemd/user/vdirsyncer.service
new file mode 100644
index 0000000..48fa325
--- /dev/null
+++ b/symlinks/config/systemd/user/vdirsyncer.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Sync calendars and addressbooks with vdirsyncer
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+ExecStart=/usr/bin/vdirsyncer sync
diff --git a/symlinks/config/systemd/user/vdirsyncer.timer b/symlinks/config/systemd/user/vdirsyncer.timer
new file mode 100644
index 0000000..5e2b399
--- /dev/null
+++ b/symlinks/config/systemd/user/vdirsyncer.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Run vdirsyncer hourly
+
+[Timer]
+OnCalendar=hourly
+Persistent=true
+
+[Install]
+WantedBy=timers.target