diff --git a/home-manager/linux/services/email.nix b/home-manager/linux/services/email.nix
index 6678523..a8353ee 100644
--- a/home-manager/linux/services/email.nix
+++ b/home-manager/linux/services/email.nix
@@ -86,7 +86,7 @@ with lib; {
     # For fun reasons this requires enabling the program and the service
     programs.mbsync = { enable = true; };
     services.mbsync = {
-      enable = true;
+      enable = !config.nathan.programs.emacs.service;
       frequency = "*:0/5";
       # Index manually with mu if we don't have emacs setup, but if we have the emacs service setup,
       # run through emacsclient, as it will have the lock
diff --git a/scripts/update-mu4e.sh b/scripts/update-mu4e.sh
index ac0f32a..eb0825c 100755
--- a/scripts/update-mu4e.sh
+++ b/scripts/update-mu4e.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 # Tell emacs to update mu4e
-emacsclient --eval "(mu4e-update-index)" || true
+emacsclient --eval "(mu4e-update-mail-and-index)" || true