diff --git a/notmuch/usr/bin/notmuch-collect-tasks b/notmuch/usr/bin/notmuch-collect-tasks
index 4eff658..0315971 100755
--- a/notmuch/usr/bin/notmuch-collect-tasks
+++ b/notmuch/usr/bin/notmuch-collect-tasks
@@ -6,7 +6,9 @@ exec scsh -e main -s "$0" "$@"
 
 (define message-query
   '(from:fidobill@fidomobile.ca
-    and "subject:Your Fido bill is ready"))
+    and "subject:Your Fido bill is ready"
+    or "subject:[alwaysdata] Negative balance to settle"
+    or "subject:[alwaysdata] Automatic renewal of domains impossible"))
 
 (define processed-tag-name "processed")
 
@@ -28,7 +30,7 @@ exec scsh -e main -s "$0" "$@"
   (let ((output-file (cadr args))
         (messages (run/sexp
                    (notmuch search --format=sexp
-                            ,@message-query
+                            "(" ,@message-query ")"
                             and not ,(format #f "tag:~a" processed-tag-name)))))
     (with-current-output-port
      (open-output-file output-file (file-options create append))