                 :dyn-target (lambda (target msg) (mu4e-get-trash-folder msg))
                 :action
                 (lambda (docid msg target)
-                  (mu4e~proc-move docid (mu4e~mark-check-target target) "+S-u-N")))
+                  (mu4e~proc-move docid (mu4e~mark-check-target target) "-N")))
         mu4e-marks)
 
   ;; Refile will set mail to All Mail (basically archiving them). I want this to

                 :dyn-target (lambda (target msg) (mu4e-get-refile-folder msg))
                 :action
                 (lambda (docid msg target)
                   (mu4e~proc-move docid (mu4e~mark-check-target target) "+S-u-N")))
        mu4e-marks)

  ;; This hook correctly modifies the \Inbox and \Starred flags on email when

          (:from . 25)
          (:subject)))

  (let ((inbox-query (mapconcat (lambda (arg) (format " maildir:/%s/Inbox " arg))
                                (mapcar #'car +email--accounts) " OR ")))
    (setq mu4e-bookmarks `((,inbox-query "Inbox" ?i)
                           (,(format "flag:unread AND (%s)" inbox-query)
                            "Unread messages" ?u)
                           ("flag:flagged" "Starred messages" ?s)
                           ("date:today..now" "Today's messages" ?t)
                           ("date:7d..now" "Last 7 days" ?w)
                           ("mime:image/*" "Messages with images" ?p))))

  (push '(:account
          :name "Account"
