diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 9c6dccb..682a42e 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -1332,6 +1332,15 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
   ;;      ,(my-make-mu4e-context "example2" "user@example1.com" "user@example2.com" "Johnny" "Example Organization" "John Doe\nThis is my other signature" "Personal.p")
   ;;    ))
   ;;(mu4e-context-switch t "example1")
+
+  (org-msg-mode 0)
+
+  ;; https://emacs.stackexchange.com/questions/3061/how-to-stop-mu4e-from-inserting-line-breaks
+  (defun no-auto-fill ()
+    "Turn off auto-fill-mode."
+    (auto-fill-mode -1))
+  (add-hook 'mu4e-compose-mode-hook #'no-auto-fill)
+
 )
 
 ;; TODO fix my make-mu4e-context wrapper
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index 5403d51..1259ae5 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1556,6 +1556,15 @@ I don't have this active right now since it's kinda weird with pgtk...
   ;;      ,(my-make-mu4e-context "example2" "user@example1.com" "user@example2.com" "Johnny" "Example Organization" "John Doe\nThis is my other signature" "Personal.p")
   ;;    ))
   ;;(mu4e-context-switch t "example1")
+
+  (org-msg-mode 0)
+
+  ;; https://emacs.stackexchange.com/questions/3061/how-to-stop-mu4e-from-inserting-line-breaks
+  (defun no-auto-fill ()
+    "Turn off auto-fill-mode."
+    (auto-fill-mode -1))
+  (add-hook 'mu4e-compose-mode-hook #'no-auto-fill)
+
 )
 
 ;; TODO fix my make-mu4e-context wrapper