diff --git a/mu4e/mu4e-compose.el b/mu4e/mu4e-compose.el
index cd032d5d..3998b3f3 100644
--- a/mu4e/mu4e-compose.el
+++ b/mu4e/mu4e-compose.el
@@ -340,15 +340,6 @@ simply executes `fill-paragraph'."
 	(fill-paragraph nil region))
     (fill-paragraph nil region)))
 
-(define-key-after
-  (lookup-key text-mode-map [menu-bar text])
-  [mu4e-hard-newlines]
-  '(menu-item "Format=flowed" mu4e-toggle-use-hard-newlines
-	      :button (:toggle . use-hard-newlines)
-	      :help "Toggle format=flowed"
-	      :visible (eq major-mode 'mu4e-compose-mode))
-  'sep)
-
 (defun mu4e-toggle-use-hard-newlines ()
   (interactive)
   (setq use-hard-newlines (not use-hard-newlines))
@@ -396,6 +387,15 @@ simply executes `fill-paragraph'."
 	   '(left-curly-arrow right-curly-arrow))
       (visual-line-mode t))
 
+    (define-key-after
+      (lookup-key message-mode-map [menu-bar text])
+      [mu4e-hard-newlines]
+      '(menu-item "Format=flowed" mu4e-toggle-use-hard-newlines
+		  :button (:toggle . use-hard-newlines)
+		  :help "Toggle format=flowed"
+		  :visible (eq major-mode 'mu4e-compose-mode))
+      'sep)
+
     ;; setup the fcc-stuff, if needed
     (add-hook 'message-send-hook
       (lambda () ;; mu4e~compose-save-before-sending