1 files changed, 5 insertions, 6 deletions
diff --git a/lib/guile/mail-tools.scm b/lib/guile/mail-tools.scm
index b158d93..1186306 100644
--- a/lib/guile/mail-tools.scm
+++ b/lib/guile/mail-tools.scm
@@ -41,14 +41,13 @@
                  file-name-separator-string)))
 
 (define (tags-with-new rule new)
-  (if new (string-append (car rule) " -new") (car rule)))
+  (string-append (car rule) (if new " -new" "")))
 
 (define (query-with-new rule new)
-  (if new
-      (if (string=? (cadr rule) "*")
-          "tag:new"
-          (simple-format #f "(~a) and ~a" (cadr rule) "tag:new"))
-      (cadr rule)))
+  (cond
+   ((and new (string=? (cadr rule) "*")) "tag:new")
+   (new (simple-format #f "(~a) and ~a" (cadr rule) "tag:new"))
+   (else (cadr rule))))
 
 ;; NOTMUCH interface
 (define (nm-open-database path mode)