diff --git a/NEWS.org b/NEWS.org
index 1489dfd5..547a7ff1 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -78,7 +78,10 @@
       ~mu4e-personal-address-p~ to check whether a given string matches a personal
       address.
 
-    - Completion for writing ~mu~ queries
+    - TAB-Completion for writing ~mu~ queries
+
+    - Switch the context for existing draft messages using
+      ~mu4e-compose-context-switch~ or ~C-c C-;~ in ~mu4e-compose-mode~.
 
 * 1.4 (released, as of April 18 2020)
 
diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index cba19e08..1f64d734 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -446,6 +446,7 @@ removing the In-Reply-To header."
   (setq mu4e-compose-mode-map
         (let ((map (make-sparse-keymap)))
           (define-key map (kbd "C-S-u")   'mu4e-update-mail-and-index)
+          (define-key map (kbd "C-c C-;") 'mu4e-compose-context-switch)
           (define-key map (kbd "C-c C-u") 'mu4e-update-mail-and-index)
           (define-key map (kbd "C-c C-k") 'mu4e-message-kill-buffer)
           (define-key map (kbd "M-q")     'mu4e-fill-paragraph)
@@ -790,6 +791,42 @@ tempfile)."
         ;; if all else fails, back to the main view
         (when (fboundp 'mu4e) (mu4e))))))
 
+(defun mu4e-compose-context-switch (&optional force name)
+  "Change the context for the current draft message.
+
+Same as `mu4e-context-switch' but does two things after switching
+when the buffer is in `mu4e-compose-mode':
+- Changes the \"From\" field to the email address of the new context
+- Moves the current message to the draft folder of the new context"
+  (interactive "P")
+  (if (derived-mode-p 'mu4e-compose-mode)
+      (let ((old-context (mu4e-context-current))
+            (has-file (file-exists-p (buffer-file-name))))
+        (unless (and name (not force) (eq old-context name))
+          (when (or (not has-file)
+                    (not (buffer-modified-p))
+                    (y-or-n-p "Draft must be saved before switching context. Save?"))
+            (unless (and (not force) (eq old-context (mu4e-context-switch nil name)))
+              ;; Change From field to user-mail-address
+              (message-replace-header "From" (or (mu4e~draft-from-construct) ""))
+              ;; Move message to mu4e-draft-folder
+              (if has-file
+                  (progn (save-buffer)
+                         (let ((msg-id (message-fetch-field "Message-ID"))
+                               (buf (current-buffer)))
+                           ;; Remove the <>
+                           (when (and msg-id (string-match "<\\(.*\\)>" msg-id))
+                             (save-window-excursion
+                               (mu4e~proc-move (match-string 1 msg-id) mu4e-drafts-folder nil t)
+                               (kill-buffer buf))))) ;; Kill previous buffer which points to wrong file
+                ;; No file, just change the buffer file name
+                (setq buffer-file-name
+                      (format "%s/%s/cur/%s"
+                              (mu4e-root-maildir) (mu4e-get-drafts-folder)
+                              (file-name-nondirectory (buffer-file-name)))))))))
+    ;; Just do the standad switch
+    (mu4e-context-switch force name)))
+
 (defun mu4e-sent-handler (docid path)
   "Handler called with DOCID and PATH for the just-sent message.
 For Forwarded ('Passed') and Replied messages, try to set the
diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi
index 836cab3f..68cd12ce 100644
--- a/mu4e/mu4e.texi
+++ b/mu4e/mu4e.texi
@@ -1879,6 +1879,7 @@ C-c C-c      send message
 C-c C-d      save to drafts and leave
 C-c C-k      kill the message buffer (the message remains in the draft folder)
 C-c C-a      attach a file (pro-tip: drag & drop works as well)
+C-c C-;      switch the context
 
 (mu4e-specific)
 C-S-u        update mail & reindex