diff --git a/modules/programs/neomutt.nix b/modules/programs/neomutt.nix
index 968036f27..fa9c2624a 100644
--- a/modules/programs/neomutt.nix
+++ b/modules/programs/neomutt.nix
@@ -224,7 +224,6 @@ let
       set certificate_file=${toString config.accounts.email.certificatesFile}
 
       # GPG section
-      set crypt_use_gpgme = yes
       set crypt_autosign = ${lib.hm.booleans.yesNo (gpg.signByDefault or false)}
       set crypt_opportunistic_encrypt = ${
         lib.hm.booleans.yesNo (gpg.encryptByDefault or false)
@@ -351,6 +350,7 @@ in {
         set message_cachedir = "${config.xdg.cacheHome}/neomutt/messages/"
         set editor = "${cfg.editor}"
         set implicit_autoview = yes
+        set crypt_use_gpgme = yes
 
         alternative_order text/enriched text/plain text
 
diff --git a/tests/modules/programs/neomutt/hm-example.com-expected b/tests/modules/programs/neomutt/hm-example.com-expected
index 51fdcc6ec..e31f0d01a 100644
--- a/tests/modules/programs/neomutt/hm-example.com-expected
+++ b/tests/modules/programs/neomutt/hm-example.com-expected
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf b/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
index 576064243..f37710719 100644
--- a/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
+++ b/tests/modules/programs/neomutt/hm-example.com-gpg-expected.conf
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = yes
 set crypt_opportunistic_encrypt = yes
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf b/tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf
index 354cc43ee..6d4a845d0 100644
--- a/tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf
+++ b/tests/modules/programs/neomutt/hm-example.com-msmtp-expected.conf
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf b/tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf
index e5dee0616..44def8ae7 100644
--- a/tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf
+++ b/tests/modules/programs/neomutt/hm-example.com-no-folder-change-expected.conf
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-signature-command-expected b/tests/modules/programs/neomutt/hm-example.com-signature-command-expected
index c3b350670..57825af4e 100644
--- a/tests/modules/programs/neomutt/hm-example.com-signature-command-expected
+++ b/tests/modules/programs/neomutt/hm-example.com-signature-command-expected
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-signature-expected b/tests/modules/programs/neomutt/hm-example.com-signature-expected
index 66e941c18..c17314ed5 100644
--- a/tests/modules/programs/neomutt/hm-example.com-signature-expected
+++ b/tests/modules/programs/neomutt/hm-example.com-signature-expected
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/hm-example.com-starttls-expected b/tests/modules/programs/neomutt/hm-example.com-starttls-expected
index 1e5b15cac..59aa3d1cd 100644
--- a/tests/modules/programs/neomutt/hm-example.com-starttls-expected
+++ b/tests/modules/programs/neomutt/hm-example.com-starttls-expected
@@ -3,7 +3,6 @@ set ssl_force_tls = yes
 set certificate_file=/etc/ssl/certs/ca-certificates.crt
 
 # GPG section
-set crypt_use_gpgme = yes
 set crypt_autosign = no
 set crypt_opportunistic_encrypt = no
 set pgp_use_gpg_agent = yes
diff --git a/tests/modules/programs/neomutt/neomutt-expected.conf b/tests/modules/programs/neomutt/neomutt-expected.conf
index 7c0e5d28a..94c13b298 100644
--- a/tests/modules/programs/neomutt/neomutt-expected.conf
+++ b/tests/modules/programs/neomutt/neomutt-expected.conf
@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 
diff --git a/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf b/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
index 4a583a02d..cffdace6f 100644
--- a/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
+++ b/tests/modules/programs/neomutt/neomutt-not-primary-expected.conf
@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 
diff --git a/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf b/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
index 8b4bb7bce..64ea68909 100644
--- a/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
+++ b/tests/modules/programs/neomutt/neomutt-with-binds-expected.conf
@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text
 
diff --git a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
index e58660fc7..a166b3553 100644
--- a/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
+++ b/tests/modules/programs/neomutt/neomutt-with-named-mailboxes-expected.conf
@@ -3,6 +3,7 @@ set header_cache = "/home/hm-user/.cache/neomutt/headers/"
 set message_cachedir = "/home/hm-user/.cache/neomutt/messages/"
 set editor = "$EDITOR"
 set implicit_autoview = yes
+set crypt_use_gpgme = yes
 
 alternative_order text/enriched text/plain text