From 4702a217bc1f00fba3ecf47e7fb0bdf1b31e068c Mon Sep 17 00:00:00 2001
From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 29 Apr 2019 21:32:38 -0700
Subject: [PATCH] fix message mode wrapping

---
 emacs_el/configuration/don-configuration.org | 85 ++++++++++----------
 1 file changed, 43 insertions(+), 42 deletions(-)

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index 89ac4d3..a8a6fc5 100644
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -1367,49 +1367,50 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Mutt
 *** Message-mode
 #+BEGIN_SRC emacs-lisp
-  (use-package message
-    :ensure f
-    :diminish (message "✉")
-    :mode ("muttng-[a-z0-9]+-[0-9]+-" . message-mode)
-    :mode ("mutt-[a-z0-9]+-[0-9]+-" . message-mode)
-    :hook 'my/message-mode-settings
-    :hook 'turn-on-flyspell
-    :bind (:map message-mode-map
-        ("C-c C-a" . my/post-attach-file))
-    :delight (message-mode "✉")
-    :config
-    (defun my/message-mode-settings ()
-      (font-lock-add-keywords nil
-                  '(("^[ \t]*>[ \t]*>[ \t]*>.*$"
-                 (0 'message-multiply-quoted-text-face))
-                ("^[ \t]*>[ \t]*>.*$"
-                 (0 'message-double-quoted-text-face))))
-      )
+(use-package message
+  :ensure f
+  :diminish (message "✉")
+  :mode ("muttng-[a-z0-9]+-[0-9]+-" . message-mode)
+  :mode ("mutt-[a-z0-9]+-[0-9]+-" . message-mode)
+  :hook 'my/message-mode-settings
+  :hook 'turn-on-flyspell
+  :bind (:map message-mode-map
+      ("C-c C-a" . my/post-attach-file))
+  :delight (message-mode "✉")
+  :config
+  (defun my/message-mode-settings ()
+    (font-lock-add-keywords nil
+                '(("^[ \t]*>[ \t]*>[ \t]*>.*$"
+               (0 'message-multiply-quoted-text-face))
+              ("^[ \t]*>[ \t]*>.*$"
+               (0 'message-double-quoted-text-face))))
+    )
 
-    (defun my/post-attach-file ()
-      "Prompt for an attachment."
-      (interactive)
-      (let ((file (read-file-name "Attach file: " nil nil t nil)))
-        (my/header-attach-file file "")))
-
-    (defun my/header-attach-file (file description)
-      "Attach a FILE to the current message (works with Mutt).
-    Argument DESCRIPTION MIME description."
-      (interactive "fAttach file: \nsDescription: ")
-      (when (> (length file) 0)
-    (save-excursion
-      (save-match-data
-        (save-restriction
-          (widen)
-          (goto-char (point-min))
-          (search-forward-regexp "^$")
-          (insert (concat "Attach: " (replace-regexp-in-string "\\([[:space:]\\]\\)" "\\\\\\1" (file-truename file)) " "
-                  description "\n"))
-          (message (concat "Attached '" file "'."))
-          (setq post-has-attachment t))))))
-
-    (setq mail-yank-prefix "> ")
-  )
+  (defun my/post-attach-file ()
+    "Prompt for an attachment."
+    (interactive)
+    (let ((file (read-file-name "Attach file: " nil nil t nil)))
+      (my/header-attach-file file "")))
+
+  (defun my/header-attach-file (file description)
+    "Attach a FILE to the current message (works with Mutt).
+  Argument DESCRIPTION MIME description."
+    (interactive "fAttach file: \nsDescription: ")
+    (when (> (length file) 0)
+  (save-excursion
+    (save-match-data
+      (save-restriction
+        (widen)
+        (goto-char (point-min))
+        (search-forward-regexp "^$")
+        (insert (concat "Attach: " (replace-regexp-in-string "\\([[:space:]\\]\\)" "\\\\\\1" (file-truename file)) " "
+                description "\n"))
+        (message (concat "Attached '" file "'."))
+        (setq post-has-attachment t))))))
+
+  (setq mail-yank-prefix "> ")
+  (setq mail-header-separator "") ; fix broken header detection
+)
 #+END_SRC
 *** Muttrc mode
 #+BEGIN_SRC emacs-lisp
-- 
2.39.2