Adjust MDA filters

.mailfilter

@@ -8,7 +8,7 @@ VERBOSE=9
 logfile "/home/manu/var/logs/maildrop/maildrop.log"
 
 
-### Rmll Lists (2009 and previous)
+### RMLL Lists (2009 and previous)
 if (/^X-BeenThere:\s*(.*)@rmll\.info/)
 {
     exception {
@@ -23,6 +23,28 @@ if (/^From:.*reservation@rmll\.info/)
     to $MAILDIR/.rmll.09.resa
 }
 
+### RMLL lists - 2010
+if (/^List-Id:.*<(.*)\.listes20(.*)\.rmll\.info>/)
+{
+    exception {
+        `test -d $MAILDIR/.rmll.$MATCH2.$MATCH1`
+        if( $RETURNCODE == 1 )
+            `$MAILDIRMAKE $MAILDIR/.rmll.$MATCH2.$MATCH1`
+        to $MAILDIR/.rmll.$MATCH2.$MATCH1
+    }
+}
+
+if (/^To:.*benevoles@rmll\.info/)
+{
+    to $MAILDIR/.rmll.10
+}
+
+### RMLL 2011
+if (/^List-Id:.*org2011.2011.rmll.info/)
+{
+    to $MAILDIR/.rmll.11.org
+}
+
 ### Debian Lists
 if (/^List-Id:\s*<debian-(.*)\.lists\.debian\.org>/)
 {
@@ -96,17 +118,6 @@ if (/^List-Id:.*<(.*)\.abul\.org>/)
     }
 }
 
-### Liste RMLL 2010
-if (/^List-Id:.*<(.*)\.listes20(.*)\.rmll\.info>/)
-{
-    exception {
-        `test -d $MAILDIR/.rmll.$MATCH2.$MATCH1`
-        if( $RETURNCODE == 1 )
-            `$MAILDIRMAKE $MAILDIR/.rmll.$MATCH2.$MATCH1`
-        to $MAILDIR/.rmll.$MATCH2.$MATCH1
-    }
-}
-
 ### Aquitaine libre lists
 if (/^List-Id:.*<(.*)\.listes\.aquitaine-libre\.info>/)
 {
@@ -167,6 +178,10 @@ if (/^From:.*(mailandgo\.fr|optingo\.net|refleximmo\.com).*$/)
 {
     to $MAILDIR/.Trash
 }
+if (/^X-Bounce-Tracking-Info:.*/)
+{
+    to $MAILDIR/.Trash
+}
 
 ########### INBOX ###############
 to $MAILDIR/