Update

4 files changed, 40 insertions, 36 deletions

diff --git a/.config/env b/.config/env
index 41162e3..e74ea0d 100644
--- a/.config/env
+++ b/.config/env
@@ -11,6 +11,7 @@
 # ==     =====   ====   ==
 # ========================
 
+unset MAILCHECK
 # xdg
 export XDG_DATA_HOME="$HOME"/.local/share
 export XDG_CONFIG_HOME="$HOME"/.config
diff --git a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
index d936bf1..ba64e56 100644
--- a/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
+++ b/.config/mutt/accounts/1-bousset.rudy@gmail.com.muttrc
@@ -17,23 +17,24 @@ bind index gg first-entry
 macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc bousset.rudy@gmail.com<enter>" "run mbsync to sync bousset.rudy@gmail.com"
 unmailboxes *
 
-mailboxes "=INBOX" "=[Gmail].Sent\ Mail" "=[Gmail].Drafts" "=[Gmail].Spam" "=[Gmail].Trash"
+mailboxes "=INBOX" "=Sent" "=Trash" "=[Gmail]/Drafts" "=[Gmail]/Sent" "=[Gmail]/Sent Mail" "=[Gmail]/Spam" "=[Gmail]/Trash"
+
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox" # mw-autogenerated
 set spoolfile = "+INBOX" # mw-autogenerated
-set postponed = "+[Gmail].Drafts" # mw-autogenerated
-macro index,pager gd "<change-folder>=[Gmail].Drafts<enter>" "go to drafts" # mw-autogenerated
-macro index,pager Md ";<save-message>=[Gmail].Drafts<enter>" "move mail to drafts" # mw-autogenerated
-macro index,pager Cd ";<copy-message>=[Gmail].Drafts<enter>" "copy mail to drafts" # mw-autogenerated
-set record = "+[Gmail].Sent" # mw-autogenerated
-macro index,pager gs "<change-folder>=[Gmail].Sent\ Mail<enter>" "go to sent" # mw-autogenerated
-macro index,pager Ms ";<save-message>=[Gmail].Sent\ Mail<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager Cs ";<copy-message>=[Gmail].Sent\ Mail<enter>" "copy mail to sent" # mw-autogenerated
-macro index,pager gS "<change-folder>=[Gmail].Spam<enter>" "go to spam" # mw-autogenerated
-macro index,pager MS ";<save-message>=[Gmail].Spam<enter>" "move mail to spam" # mw-autogenerated
-macro index,pager CS ";<copy-message>=[Gmail].Spam<enter>" "copy mail to spam" # mw-autogenerated
-macro index,pager gt "<change-folder>=[Gmail].Trash<enter>" "go to trash" # mw-autogenerated
-macro index,pager Mt ";<save-message>=[Gmail].Trash<enter>" "move mail to trash" # mw-autogenerated
-macro index,pager Ct ";<copy-message>=[Gmail].Trash<enter>" "copy mail to trash" # mw-autogenerated
-set trash = "+[Gmail].Trash" # mw-autogenerated
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts" # mw-autogenerated
+macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts" # mw-autogenerated
+macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts" # mw-autogenerated
+set postponed = "+[Gmail]/Drafts" # mw-autogenerated
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent" # mw-autogenerated
+macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent" # mw-autogenerated
+macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent" # mw-autogenerated
+set record = "+[Gmail]/Sent Mail" # mw-autogenerated
+macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam" # mw-autogenerated
+macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam" # mw-autogenerated
+macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam" # mw-autogenerated
+macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash" # mw-autogenerated
+macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash" # mw-autogenerated
+macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash" # mw-autogenerated
+set trash = "+[Gmail]/Trash" # mw-autogenerated
diff --git a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
index fece17f..36e49aa 100644
--- a/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
+++ b/.config/mutt/accounts/2-olsen.oyvind.nor@gmail.com.muttrc
@@ -17,23 +17,24 @@ bind index gg first-entry
 macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc olsen.oyvind.nor@gmail.com<enter>" "run mbsync to sync olsen.oyvind.nor@gmail.com"
 unmailboxes *
 
-mailboxes "=INBOX" "=[Gmail].Sent\ Mail" "=[Gmail].Drafts" "=[Gmail].Spam" "=[Gmail].Trash"
+mailboxes "=INBOX" "=[Gmail]/Drafts" "=[Gmail]/Sent" "=[Gmail]/Sent Mail" "=[Gmail]/Spam" "=[Gmail]/Trash"
+
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox" # mw-autogenerated
 set spoolfile = "+INBOX" # mw-autogenerated
-set postponed = "+[Gmail].Drafts" # mw-autogenerated
-macro index,pager gd "<change-folder>=[Gmail].Drafts<enter>" "go to drafts" # mw-autogenerated
-macro index,pager Md ";<save-message>=[Gmail].Drafts<enter>" "move mail to drafts" # mw-autogenerated
-macro index,pager Cd ";<copy-message>=[Gmail].Drafts<enter>" "copy mail to drafts" # mw-autogenerated
-set record = "+[Gmail].Sent" # mw-autogenerated
-macro index,pager gs "<change-folder>=[Gmail].Sent\ Mail<enter>" "go to sent" # mw-autogenerated
-macro index,pager Ms ";<save-message>=[Gmail].Sent\ Mail<enter>" "move mail to sent" # mw-autogenerated
-macro index,pager Cs ";<copy-message>=[Gmail].Sent\ Mail<enter>" "copy mail to sent" # mw-autogenerated
-macro index,pager gS "<change-folder>=[Gmail].Spam<enter>" "go to spam" # mw-autogenerated
-macro index,pager MS ";<save-message>=[Gmail].Spam<enter>" "move mail to spam" # mw-autogenerated
-macro index,pager CS ";<copy-message>=[Gmail].Spam<enter>" "copy mail to spam" # mw-autogenerated
-macro index,pager gt "<change-folder>=[Gmail].Trash<enter>" "go to trash" # mw-autogenerated
-macro index,pager Mt ";<save-message>=[Gmail].Trash<enter>" "move mail to trash" # mw-autogenerated
-macro index,pager Ct ";<copy-message>=[Gmail].Trash<enter>" "copy mail to trash" # mw-autogenerated
-set trash = "+[Gmail].Trash" # mw-autogenerated
+macro index,pager gd "<change-folder>=[Gmail]/Drafts<enter>" "go to drafts" # mw-autogenerated
+macro index,pager Md ";<save-message>=[Gmail]/Drafts<enter>" "move mail to drafts" # mw-autogenerated
+macro index,pager Cd ";<copy-message>=[Gmail]/Drafts<enter>" "copy mail to drafts" # mw-autogenerated
+set postponed = "+[Gmail]/Drafts" # mw-autogenerated
+macro index,pager gs "<change-folder>=[Gmail]/Sent Mail<enter>" "go to sent" # mw-autogenerated
+macro index,pager Ms ";<save-message>=[Gmail]/Sent Mail<enter>" "move mail to sent" # mw-autogenerated
+macro index,pager Cs ";<copy-message>=[Gmail]/Sent Mail<enter>" "copy mail to sent" # mw-autogenerated
+set record = "+[Gmail]/Sent Mail" # mw-autogenerated
+macro index,pager gS "<change-folder>=[Gmail]/Spam<enter>" "go to spam" # mw-autogenerated
+macro index,pager MS ";<save-message>=[Gmail]/Spam<enter>" "move mail to spam" # mw-autogenerated
+macro index,pager CS ";<copy-message>=[Gmail]/Spam<enter>" "copy mail to spam" # mw-autogenerated
+macro index,pager gt "<change-folder>=[Gmail]/Trash<enter>" "go to trash" # mw-autogenerated
+macro index,pager Mt ";<save-message>=[Gmail]/Trash<enter>" "move mail to trash" # mw-autogenerated
+macro index,pager Ct ";<copy-message>=[Gmail]/Trash<enter>" "copy mail to trash" # mw-autogenerated
+set trash = "+[Gmail]/Trash" # mw-autogenerated
diff --git a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
index 2d3bc37..1df9d79 100644
--- a/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
+++ b/.config/mutt/accounts/5-rbousset@secuserve.com.muttrc
@@ -17,23 +17,24 @@ bind index gg first-entry
 macro index o "<shell-escape>mbsync -c /usr/home/jozan/.config/mbsync/mbsyncrc rbousset@secuserve.com<enter>" "run mbsync to sync rbousset@secuserve.com"
 unmailboxes *
 
-mailboxes "=INBOX" "=Sent" "=Drafts" "=Trash" "=NEWS"
+mailboxes "=INBOX" "=Calendrier" "=Drafts" "=NEWS" "=Sent" "=Trash"
+
 macro index,pager gi "<change-folder>=INBOX<enter>" "go to inbox" # mw-autogenerated
 macro index,pager Mi ";<save-message>=INBOX<enter>" "move mail to inbox" # mw-autogenerated
 macro index,pager Ci ";<copy-message>=INBOX<enter>" "copy mail to inbox" # mw-autogenerated
 set spoolfile = "+INBOX" # mw-autogenerated
-set postponed = "+Drafts" # mw-autogenerated
 macro index,pager gd "<change-folder>=Drafts<enter>" "go to drafts" # mw-autogenerated
 macro index,pager Md ";<save-message>=Drafts<enter>" "move mail to drafts" # mw-autogenerated
 macro index,pager Cd ";<copy-message>=Drafts<enter>" "copy mail to drafts" # mw-autogenerated
-set record = "+Sent" # mw-autogenerated
+set postponed = "+Drafts" # mw-autogenerated
 macro index,pager gs "<change-folder>=Sent<enter>" "go to sent" # mw-autogenerated
 macro index,pager Ms ";<save-message>=Sent<enter>" "move mail to sent" # mw-autogenerated
 macro index,pager Cs ";<copy-message>=Sent<enter>" "copy mail to sent" # mw-autogenerated
+set record = "+Sent" # mw-autogenerated
 macro index,pager gt "<change-folder>=Trash<enter>" "go to trash" # mw-autogenerated
 macro index,pager Mt ";<save-message>=Trash<enter>" "move mail to trash" # mw-autogenerated
 macro index,pager Ct ";<copy-message>=Trash<enter>" "copy mail to trash" # mw-autogenerated
+set trash = "+Trash" # mw-autogenerated
 macro index,pager gn "<change-folder>=NEWS<enter>" "go to sent" # mw-autogenerated
 macro index,pager Mn ";<save-message>=NEWS<enter>" "move mail to sent" # mw-autogenerated
 macro index,pager Cn ";<copy-message>=NEWS<enter>" "copy mail to sent" # mw-autogenerated
-set trash = "+Trash" # mw-autogenerated