From befa419f64c643dc20e173cd1634e92bd2ebe1bd Mon Sep 17 00:00:00 2001
From: Yiqun Ding <yiqunding@zju.edu.cn>
Date: Thu, 15 Oct 2020 14:22:19 +0800
Subject: [PATCH 1/3] add mail server setting for Zhejiang University

---
 share/domains.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/domains.csv b/share/domains.csv
index 5119d76..45edcca 100644
--- a/share/domains.csv
+++ b/share/domains.csv
@@ -278,5 +278,6 @@ yahoo.*,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587
 yandex.*,imap.yandex.com,993,smtp.yandex.com,587
 ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465
 zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465
+zju.edu.cn,imap.zju.edu.cn,993,smtp.zju.edu.cn,994
 zoho.com,imap.zoho.com,993,smtp.zoho.com,465
 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465

From 27dc2f9be66388530007a71148a5f70571077d72 Mon Sep 17 00:00:00 2001
From: Julian Marcos <julianjar08@gmail.com>
Date: Sun, 18 Oct 2020 19:22:32 +0200
Subject: [PATCH 2/3] Added e.email service

---
 share/domains.csv | 1 +
 1 file changed, 1 insertion(+)

diff --git a/share/domains.csv b/share/domains.csv
index 45edcca..d982ee8 100644
--- a/share/domains.csv
+++ b/share/domains.csv
@@ -281,3 +281,4 @@ zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465
 zju.edu.cn,imap.zju.edu.cn,993,smtp.zju.edu.cn,994
 zoho.com,imap.zoho.com,993,smtp.zoho.com,465
 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465
+e.email,mail.ecloud.global,993.00,mail.ecloud.global,587.00

From e7180e1b570532c18613106c5786c1172d22831b Mon Sep 17 00:00:00 2001
From: Yiqun Ding <yiqunding@zju.edu.cn>
Date: Wed, 28 Oct 2020 11:25:51 +0800
Subject: [PATCH 3/3] fix macro for sync all accounts

the macro for sync all accounts uses 'mbsync -a' command, which
failed to run for users who have moved their ~/.mbsyncrc somewhere
else.

we should use mw -Y instead, which can detect the MBSYNCRC env
---
 share/mutt-wizard.muttrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc
index de169db..ac4883e 100644
--- a/share/mutt-wizard.muttrc
+++ b/share/mutt-wizard.muttrc
@@ -70,7 +70,7 @@ bind editor <Tab> complete-query
 
 macro index,pager a "<enter-command>set my_pipe_decode=\$pipe_decode pipe_decode<return><pipe-message>abook --add-email<return><enter-command>set pipe_decode=\$my_pipe_decode; unset my_pipe_decode<return>" "add the sender address to abook"
 macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-macro index O "<shell-escape>mbsync -a<enter>" "run mbsync to sync all mail"
+macro index O "<shell-escape>mw -Y<enter>" "run mw -Y to sync all mail"
 macro index \Cf "<enter-command>unset wait_key<enter><shell-escape>printf 'Enter a search term to find with notmuch: '; read x; echo \$x >~/.cache/mutt_terms<enter><limit>~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"<enter>" "show only messages matching a notmuch pattern"
 macro index A "<limit>all\n" "show all messages (undo limit)"