4 files changed, 9 insertions, 11 deletions

diff --git a/etc/profile-a-l/geary.profile b/etc/profile-a-l/geary.profile
index 0bd0bfd9c..a6491fd10 100644
--- a/etc/profile-a-l/geary.profile
+++ b/etc/profile-a-l/geary.profile
@@ -31,6 +31,7 @@ mkdir ${HOME}/.config/evolution
 mkdir ${HOME}/.config/geary
 mkdir ${HOME}/.local/share/evolution
 mkdir ${HOME}/.local/share/geary
+whitelist ${DOWNLOADS}
 whitelist ${HOME}/.cache/evolution
 whitelist ${HOME}/.cache/folks
 whitelist ${HOME}/.cache/geary
@@ -39,7 +40,6 @@ whitelist ${HOME}/.config/geary
 whitelist ${HOME}/.local/share/evolution
 whitelist ${HOME}/.local/share/geary
 whitelist ${HOME}/.mozilla/firefox/profiles.ini
-whitelist ${DOWNLOADS}
 whitelist /usr/share/geary
 include whitelist-common.inc
 include whitelist-runuser-common.inc
@@ -76,11 +76,11 @@ private-tmp
 dbus-user filter
 dbus-user.own org.gnome.Geary
 dbus-user.talk ca.desrt.dconf
+dbus-user.talk org.freedesktop.secrets
 dbus-user.talk org.gnome.Contacts
 dbus-user.talk org.gnome.OnlineAccounts
 dbus-user.talk org.gnome.evolution.dataserver.AddressBook10
 dbus-user.talk org.gnome.evolution.dataserver.Sources5
-dbus-user.talk org.freedesktop.secrets
 dbus-system none
 
 read-only ${HOME}/.mozilla/firefox/profiles.ini
diff --git a/etc/profile-m-z/mutt.profile b/etc/profile-m-z/mutt.profile
index 592a69599..e9367ab49 100644
--- a/etc/profile-m-z/mutt.profile
+++ b/etc/profile-m-z/mutt.profile
@@ -71,10 +71,11 @@ mkfile ${HOME}/.msmtprc
 mkfile ${HOME}/.muttrc
 mkfile ${HOME}/.nanorc
 mkfile ${HOME}/.signature
-mkfile ${HOME}/.vimrc
 mkfile ${HOME}/.viminfo
 mkfile ${HOME}/.vimrc
 mkfile ${HOME}/.w3m
+whitelist ${DOCUMENTS}
+whitelist ${DOWNLOADS}
 whitelist ${HOME}/.Mail
 whitelist ${HOME}/.bogofilter
 whitelist ${HOME}/.cache/mutt
@@ -99,8 +100,6 @@ whitelist ${HOME}/Mail
 whitelist ${HOME}/mail
 whitelist ${HOME}/postponed
 whitelist ${HOME}/sent
-whitelist ${DOCUMENTS}
-whitelist ${DOWNLOADS}
 whitelist /usr/share/gnupg
 whitelist /usr/share/gnupg2
 whitelist /usr/share/mutt
diff --git a/etc/profile-m-z/neomutt.profile b/etc/profile-m-z/neomutt.profile
index 9d90afadb..2798f1307 100644
--- a/etc/profile-m-z/neomutt.profile
+++ b/etc/profile-m-z/neomutt.profile
@@ -7,8 +7,6 @@ include neomutt.local
 # Persistent global definitions
 include globals.local
 
-noblacklist /var/mail
-noblacklist /var/spool/mail
 noblacklist ${DOCUMENTS}
 noblacklist ${HOME}/.Mail
 noblacklist ${HOME}/.bogofilter
@@ -36,6 +34,8 @@ noblacklist ${HOME}/Mail
 noblacklist ${HOME}/mail
 noblacklist ${HOME}/postponed
 noblacklist ${HOME}/sent
+noblacklist /var/mail
+noblacklist /var/spool/mail
 
 blacklist /tmp/.X11-unix
 blacklist ${RUNUSER}/wayland-*
@@ -73,10 +73,11 @@ mkfile ${HOME}/.muttrc
 mkfile ${HOME}/.nanorc
 mkfile ${HOME}/.neomuttrc
 mkfile ${HOME}/.signature
-mkfile ${HOME}/.vimrc
 mkfile ${HOME}/.viminfo
 mkfile ${HOME}/.vimrc
 mkfile ${HOME}/.w3m
+whitelist ${DOCUMENTS}
+whitelist ${DOWNLOADS}
 whitelist ${HOME}/.Mail
 whitelist ${HOME}/.bogofilter
 whitelist ${HOME}/.config/mutt
@@ -103,8 +104,6 @@ whitelist ${HOME}/Mail
 whitelist ${HOME}/mail
 whitelist ${HOME}/postponed
 whitelist ${HOME}/sent
-whitelist ${DOCUMENTS}
-whitelist ${DOWNLOADS}
 whitelist /usr/share/gnupg
 whitelist /usr/share/gnupg2
 whitelist /usr/share/neomutt
diff --git a/etc/profile-m-z/sylpheed.profile b/etc/profile-m-z/sylpheed.profile
index 39d3befd2..da69208f5 100644
--- a/etc/profile-m-z/sylpheed.profile
+++ b/etc/profile-m-z/sylpheed.profile
@@ -17,8 +17,8 @@ whitelist /usr/share/sylpheed
 
 dbus-user filter
 dbus-user.talk ca.desrt.dconf
-dbus-user.talk org.gnome.keyring.SystemPrompter
 dbus-user.talk org.freedesktop.secrets
+dbus-user.talk org.gnome.keyring.SystemPrompter
 # Uncomment below for notifications (or put them in your sylpheed.local)
 # dbus-user.talk org.freedesktop.Notifications
 dbus-system none