diff --git a/src/mail/filtertypes.xml.in b/src/mail/filtertypes.xml.in
index 94678c9296..a6360b3aa7 100644
--- a/src/mail/filtertypes.xml.in
+++ b/src/mail/filtertypes.xml.in
@@ -772,13 +772,13 @@
    <option value="is completed">
     <_title>is Completed</_title>
     <code>
-       (match-all (not (= (user-tag "completed-on") "")))
+       (match-all (and (not (= (user-tag "follow-up") "")) (not (= (user-tag "completed-on") ""))))
     </code>
    </option>
    <option value="is not completed">
     <_title>is not Completed</_title>
     <code>
-       (match-all (= (user-tag "completed-on") ""))
+       (match-all (and (not (= (user-tag "follow-up") "")) (= (user-tag "completed-on") "")))
     </code>
    </option>
   </input>
diff --git a/src/mail/searchtypes.xml.in b/src/mail/searchtypes.xml.in
index 998f593761..fbdb0d6121 100644
--- a/src/mail/searchtypes.xml.in
+++ b/src/mail/searchtypes.xml.in
@@ -857,13 +857,13 @@
    <option value="is completed">
     <_title>is Completed</_title>
     <code>
-       (match-all (not (= (user-tag "completed-on") "")))
+       (match-all (and (not (= (user-tag "follow-up") "")) (not (= (user-tag "completed-on") ""))))
     </code>
    </option>
    <option value="is not completed">
     <_title>is not Completed</_title>
     <code>
-       (match-all (= (user-tag "completed-on") ""))
+       (match-all (and (not (= (user-tag "follow-up") "")) (= (user-tag "completed-on") "")))
     </code>
    </option>
   </input>
diff --git a/src/mail/vfoldertypes.xml.in b/src/mail/vfoldertypes.xml.in
index e3d7d0e49c..e56f752a42 100644
--- a/src/mail/vfoldertypes.xml.in
+++ b/src/mail/vfoldertypes.xml.in
@@ -856,13 +856,13 @@
    <option value="is completed">
     <_title>is Completed</_title>
     <code>
-       (match-all (not (= (user-tag "completed-on") "")))
+       (match-all (and (not (= (user-tag "follow-up") "")) (not (= (user-tag "completed-on") ""))))
     </code>
    </option>
    <option value="is not completed">
     <_title>is not Completed</_title>
     <code>
-       (match-all (= (user-tag "completed-on") ""))
+       (match-all (and (not (= (user-tag "follow-up") "")) (= (user-tag "completed-on") "")))
     </code>
    </option>
   </input>