diff --git a/services/mailsync/run b/services/mailsync/run
index 6d0360e..6fdf9d9 100755
--- a/services/mailsync/run
+++ b/services/mailsync/run
@@ -16,6 +16,9 @@ ip route ls | grep -q '.'
 # check if the gpg-agent is running
 pgrep gpg-agent > /dev/null
 
+# Don't sync mails while composing
+if pgrep -f mcom > /dev/null; then exit 1; fi
+
 # Sync email
 mbsync -a -q || true
 
diff --git a/zshrc b/zshrc
index a74e379..923910f 100644
--- a/zshrc
+++ b/zshrc
@@ -78,10 +78,9 @@ alias agent='eval "$(ssh-agent)" && ssh-add'
 alias unlock='gpg-connect-agent <<<bye'
 
 alias weechat="ssh -t weechat@Hetzner abduco -A weechat"
-alias ncspot="abduco -A ncspot ncspot"
 
 function agenda() {
-	khal calendar --format '{calendar-color}{cancelled}{start-end-time-style}{repeat-symbol} {title}{reset}' ${@:-today 2d}
+	khal calendar --format '{calendar-color}{cancelled}{start-end-time-style}{repeat-symbol} {title}{reset}' ${@:-now 2d}
 }
 
 # Ledger