diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index a2ec9ed9..f425539f 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -579,6 +579,12 @@ tempfile)."
   (mu4e~compose-hide-headers)
   ;; switch on the mode
   (mu4e-compose-mode)
+
+  ;; set mu4e-compose-type once more for this buffer,
+  ;; we loose it after the mode-change, it seems
+  (set (make-local-variable 'mu4e-compose-type) compose-type)
+  (put 'mu4e-compose-type 'permanent-local t)
+
   (when mu4e-compose-in-new-frame
     ;; make sure to close the frame when we're done with the message these are
     ;; all buffer-local;