diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index a6fdb350..839f693c 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -29,6 +29,7 @@
 
 (require 'mu4e-helpers)
 (require 'mu4e-modeline)
+(require 'mu4e-query-items)
 
 
 ;;; Configuration
@@ -144,9 +145,13 @@ non-nil."
                 (set (car cell) (cdr cell)))
               (mu4e-context-vars context)))
       (setq mu4e--context-current context)
-
       (run-hooks 'mu4e-context-changed-hook)
-      (mu4e--modeline-update)
+
+      ;; refresh our remember query items; we have have
+      ;; different bookmarks/maildirs now.
+      (mu4e--query-items-reset-baseline)
+      (mu4e--query-items-refresh)
+
       (mu4e-message "Switched context to %s" (mu4e-context-name context)))
     context))
 
diff --git a/mu4e/mu4e-modeline.el b/mu4e/mu4e-modeline.el
index 4b799b0e..87a840a1 100644
--- a/mu4e/mu4e-modeline.el
+++ b/mu4e/mu4e-modeline.el
@@ -88,7 +88,6 @@ the buffer-local one."
     (setq mu4e--modeline-string-cached nil)
     (force-mode-line-update)))
 
-
 (provide 'mu4e-modeline)
 
 ;;; mu4e-modeline.el ends here