X-Git-Url: https://git.madduck.net/etc/offlineimap.git/blobdiff_plain/0490c97e999ccc41ff6fb82db2b744ba1c928417..40e7dafa71657f7b38555d02195ee00b324caa16:/.offlineimap/helper.py

diff --git a/.offlineimap/helper.py b/.offlineimap/helper.py
index 32f4631..454d1e6 100644
--- a/.offlineimap/helper.py
+++ b/.offlineimap/helper.py
@@ -2,7 +2,7 @@
 
 import re
 
-base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox']
+base_excludes = ['delayed', 'outgoing', 'Trash', 'Queue', 'inbox', 'Spam', 'Sent', 'Drafts']
 base_excludes_re = [ '[Ss]ent.*' ]
 full_excludes_re = ['discard', 'spool', 'spam', 'store/.+']
 prioritised = ['resubmit','drafts','inbox','ardex','kbkg','toni','tahi','debian','mtfk','admin','retrain']
@@ -49,6 +49,6 @@ def py_folderfilter_bulk(x):
     return False
 
 def py_folderfilter_mbnames(acct, x):
-    full_excludes_re_mbnames = ['retrain/(sp|h)am'] + full_excludes_re
+    full_excludes_re_mbnames = ['retrain(/(sp|h)am)?$'] + full_excludes_re
     return acct in ['madduck.net', 'madduck.net_bulk'] \
             and not re.search('^(' + '|'.join(full_excludes_re_mbnames) + ')', x)