Fix: Use AND matching for match-rules

Signed-off-by: Knut Ahlers <knut@ahlers.me>

handler.go

@@ -21,12 +21,20 @@ type mailHandler struct {
 }
 
 func (m mailHandler) Handles(msg *enmime.Envelope) bool {
-	for _, ma := range m.Match {
+	if len(m.Match) == 0 {
-		if ma.Match(msg) {
+		// No matcher available: Should not match anything
-			return true
-		}
-	}
 		return false
+	}
+
+	// Do an AND matching: As soon as one matcher fails the whole match fails
+	for _, ma := range m.Match {
+		if !ma.Match(msg) {
+			return false
+		}
+	}
+
+	// None has failed: It matches
+	return true
 }
 
 func (m mailHandler) Process(imapClient *client.Client, msg *imap.Message, envelope *enmime.Envelope) error {