diff --git a/roles/neomutt/templates/account.neomuttrc.j2 b/roles/neomutt/templates/account.neomuttrc.j2
index 4d5a5d2..d3f27a6 100644
--- a/roles/neomutt/templates/account.neomuttrc.j2
+++ b/roles/neomutt/templates/account.neomuttrc.j2
@@ -13,13 +13,10 @@ set use_from = yes
 set hostname = "{{ account.fulladdress.split('@') | last }}"
 
 # IMAP
-{% if account.imap %}
 set imap_user = "{{ account.imap.login }}"
 set imap_pass = "`pass {{ account.passlocation }}`"
-set folder = "{{ account.imap.proto }}://{{ account.imap.login }}@{{ account.imap.server }}:{{ account.imap.port }}"
-{% else %}
+#set folder = "{{ account.imap.proto }}://{{ account.imap.login }}@{{ account.imap.server }}:{{ account.imap.port }}"
 set folder = "~/.local/share/mail/{{ account.fulladdress }}"
-{% endif %}
 set header_cache = "~/.cache/neomutt/{{ account.fulladdress }}/headers"
 set mbox_type = Maildir
 {% if neomutt_version | int >= 20211015 %}
@@ -30,9 +27,8 @@ set spoolfile = "{{ account.other_vars.spool_file | default('+INBOX') }}"
 set record = "{{ account.other_vars.record | default('+Sent') }}"
 set postponed = "{{ account.other_vars.postponed | default('+Drafts') }}"
 set trash = "{{ account.other_vars.trash | default('+Trash') }}"
-set imap_check_subscribed
 unmailboxes *
-mailboxes "{{ account.other_vars.spool_file | default('=INBOX') }}"
+mailboxes `find ~/.local/share/mail/{{ account.fulladdress }} -type d -name cur | xargs dirname | sort | xargs`
 {% for folder, hook in account.other_vars.folder_hook.items() %}
 folder-hook {{ folder }} "{{ hook }}"
 {% endfor %}
diff --git a/roles/neomutt/templates/mbsyncrc.j2 b/roles/neomutt/templates/mbsyncrc.j2
index dcf796b..b5fe811 100644
--- a/roles/neomutt/templates/mbsyncrc.j2
+++ b/roles/neomutt/templates/mbsyncrc.j2
@@ -1,5 +1,5 @@
 {% for account in accounts %}
-IMAPStore {{ account.fulladdress }}-remote
+IMAPAccount {{ account.fulladdress }}
 Host {{ account.imap.server }}
 Port {{ account.imap.port }}
 User {{ account.imap.login }}
@@ -8,6 +8,11 @@ AuthMechs LOGIN
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
+IMAPStore {{ account.fulladdress }}-remote
+Account {{ account.fulladdress }}
+UseNamespace no
+SubscribedOnly yes
+
 MaildirStore {{ account.fulladdress }}-local
 Subfolders Verbatim
 Path ~/.local/share/mail/{{ account.fulladdress }}/
@@ -22,7 +27,7 @@ Slave :{{ account.fulladdress }}-local:
 Far :{{ account.fulladdress }}-remote:
 Near :{{ account.fulladdress }}-local:
 {% endif %}
-Patterns *
+Patterns * INBOX
 Expunge Both
 Create Both
 SyncState *