From 96995e3a42fe5bb034a1c5e244512d587c358dbd Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Tue, 11 May 2021 05:47:57 +0200
Subject: [PATCH] mutt: no preconnect to IMAP

---
 homes/julm/mutt/autogeree.net/julm.imap.conf   | 7 ++++---
 homes/julm/mutt/sourcephile.fr/julm.imap.conf  | 8 ++++----
 homes/julm/mutt/sourcephile.fr/mails.imap.conf | 8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/homes/julm/mutt/autogeree.net/julm.imap.conf b/homes/julm/mutt/autogeree.net/julm.imap.conf
index c31c7bf..b5c09cc 100644
--- a/homes/julm/mutt/autogeree.net/julm.imap.conf
+++ b/homes/julm/mutt/autogeree.net/julm.imap.conf
@@ -1,11 +1,13 @@
 set my_pass_autogeree_julm = "`pass autogeree/mail/julm`"
 ## Only connection related stuffs in account-hook
 account-hook imaps://julm@autogeree.net@mail.autogeree.net:993/ ' \
+  unset certificate_file; \
   set imap_user = julm@autogeree.net; \
   set imap_pass = $my_pass_autogeree_julm; \
   set imap_check_subscribed = no; \
   set imap_list_subscribed = no; \
-  set imap_passive = yes \
+  set imap_passive = yes; \
+  unset preconnect \
 '
 folder-hook imaps://julm@autogeree.net@mail.autogeree.net:993/ ' \
   set hostname="autogeree.net"; \
@@ -23,8 +25,7 @@ folder-hook imaps://julm@autogeree.net@mail.autogeree.net:993/ ' \
   set smtp_authenticators = plain; \
   set smtp_pass = $my_pass_autogeree_julm; \
   set smtp_url = smtp://julm@autogeree.net@mail.autogeree.net:465; \
-  set spoolfile = =INBOX; \
-  unset preconnect \
+  set spoolfile = =INBOX \
 '
 mailboxes imaps://julm@autogeree.net@mail.autogeree.net:993/
 # vim: ft=muttrc
diff --git a/homes/julm/mutt/sourcephile.fr/julm.imap.conf b/homes/julm/mutt/sourcephile.fr/julm.imap.conf
index aa70d9e..40d47f4 100644
--- a/homes/julm/mutt/sourcephile.fr/julm.imap.conf
+++ b/homes/julm/mutt/sourcephile.fr/julm.imap.conf
@@ -1,12 +1,13 @@
 set my_pass_sourcephile_julm = "`pass sourcephile/mail/julm`"
 ## Only connection related stuffs in account-hook
 account-hook imaps://julm@sourcephile.fr@mail.sourcephile.fr:993/ ' \
+  unset certificate_file; \
   set imap_user = julm@sourcephile.fr; \
   set imap_pass = $my_pass_sourcephile_julm; \
-  unset certificate_file; \
   set imap_check_subscribed = no; \
   set imap_list_subscribed = no; \
-  set imap_passive = yes \
+  set imap_passive = yes; \
+  unset preconnect \
 '
 folder-hook imaps://julm@sourcephile.fr@mail.sourcephile.fr:993/ ' \
   unalternates *; \
@@ -23,8 +24,7 @@ folder-hook imaps://julm@sourcephile.fr@mail.sourcephile.fr:993/ ' \
   set smtp_authenticators = plain; \
   set smtp_pass = $my_pass_sourcephile_julm; \
   set smtp_url = "smtps://julm@sourcephile.fr@mail.sourcephile.fr:465"; \
-  set spoolfile = =INBOX; \
-  unset preconnect \
+  set spoolfile = =INBOX \
 '
 mailboxes imaps://julm@sourcephile.fr@mail.sourcephile.fr:993/
 # vim: ft=muttrc
diff --git a/homes/julm/mutt/sourcephile.fr/mails.imap.conf b/homes/julm/mutt/sourcephile.fr/mails.imap.conf
index 376f424..32038ab 100644
--- a/homes/julm/mutt/sourcephile.fr/mails.imap.conf
+++ b/homes/julm/mutt/sourcephile.fr/mails.imap.conf
@@ -1,13 +1,14 @@
 set my_pass_sourcephile_julm = "`pass sourcephile/mail/julm`"
 ## Only connection related stuffs in account-hook
 account-hook imaps://mails.sourcephile.fr:1993/ ' \
+  unset certificate_file; \
   set imap_user = anonymous; \
   set imap_pass = anonymous; \
   set imap_authenticators = ANONYMOUS; \
-  unset certificate_file; \
   set imap_check_subscribed = no; \
   set imap_list_subscribed = no; \
-  set imap_passive = yes \
+  set imap_passive = yes; \
+  unset preconnect \
 '
 folder-hook imaps://mails.sourcephile.fr:1993/ ' \
   unalternates *; \
@@ -24,8 +25,7 @@ folder-hook imaps://mails.sourcephile.fr:1993/ ' \
   set smtp_authenticators = plain; \
   set smtp_pass = anonymous; \
   set smtp_url = "smtps://julm@sourcephile.fr@mail.sourcephile.fr:465"; \
-  set spoolfile = =0; \
-  unset preconnect \
+  set spoolfile = =0 \
 '
 mailboxes imaps://mails.sourcephile.fr:1993/inbox.comp.sourcephile.bar.0
 mailboxes imaps://mails.sourcephile.fr:1993/inbox.comp.sourcephile.ecole.0
-- 
2.47.2