diff --git a/mu4e/mu4e-context.el b/mu4e/mu4e-context.el
index 2db45753..0a111ad3 100644
--- a/mu4e/mu4e-context.el
+++ b/mu4e/mu4e-context.el
@@ -106,7 +106,8 @@ to the first whose :match-func return non-nil. If none of them
 match, return the first. For MSG and POLICY, see `mu4e-context-determine'."
   (when mu4e-contexts
     (let ((context (mu4e-context-determine msg policy)))
-      (when context (mu4e-context-switch (mu4e-context-name context))))))
+      (when context (mu4e-context-switch
+		      nil (mu4e-context-name context))))))
 
 (defun mu4e-context-determine (msg &optional policy)
   "Return the first context with a match-func that returns t. MSG
diff --git a/mu4e/mu4e-utils.el b/mu4e/mu4e-utils.el
index 1b2ae551..4005acb8 100644
--- a/mu4e/mu4e-utils.el
+++ b/mu4e/mu4e-utils.el
@@ -738,8 +738,7 @@ If mu4e is already running, execute function FUNC (if non-nil).
 Otherwise, check various requirements, then start mu4e. When
 successful, call FUNC (if non-nil) afterwards."
   ;; maybe switch the context
-  (mu4e~context-autoswitch mu4e-compose-parent-message
-  mu4e-compose-context-policy)
+  (mu4e~context-autoswitch nil mu4e-context-policy)
   ;; if we're already running, simply go to the main view
   (if (mu4e-running-p)   ;; already running?
     (when func                 ;; yes! run func if defined
diff --git a/mu4e/mu4e-vars.el b/mu4e/mu4e-vars.el
index 350f28c8..676b2985 100644
--- a/mu4e/mu4e-vars.el
+++ b/mu4e/mu4e-vars.el
@@ -217,7 +217,7 @@ Suggested possible values are:
   :options '(completing-read ido-completing-read)
   :group 'mu4e)
 
-(defcustom mu4e-context-policy 'ask
+(defcustom mu4e-context-policy 'pick-first
   "Determines how mu4e should determine the context when starting up.
 
 If POLICY is 'always-ask, we ask the user unconditionally.