diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el index 64652502..dd0c6e12 100644 --- a/mu4e/mu4e-compose.el +++ b/mu4e/mu4e-compose.el @@ -368,8 +368,9 @@ tempfile)." (set (make-local-variable 'mu4e-compose-parent-message) original-msg) (put 'mu4e-compose-parent-message 'permanent-local t) (let ((context (mu4e-context-determine mu4e-compose-parent-message))) - (when context - (mu4e-context-switch (mu4e-context-name context)))) + (if context + (mu4e-context-switch (mu4e-context-name context)) + (when mu4e-contexts (mu4e-context-switch)))) (run-hooks 'mu4e-compose-pre-hook) ;; this opens (or re-opens) a messages with all the basic headers set.