diff --git a/README.org b/README.org
index f0bb92ef..d30fc83e 100644
--- a/README.org
+++ b/README.org
@@ -2341,7 +2341,8 @@ Ledger mode
         mu4e-update-interval (* 15 60)
         mu4e-attachment-dir "/home/chris/nextcloud/home/Documents/attachments"
         mu4e-completing-read-function #'completing-read
-        mu4e-mu-binary "/etc/profiles/per-user/chris/bin/mu")
+        mu4e-mu-binary "/etc/profiles/per-user/chris/bin/mu"
+        mu4e-compose-signature-auto-include nil)
 
   :config
   (setq mail-user-agent 'mu4e-user-agent)
@@ -2502,9 +2503,25 @@ Let's add org-msg to write emails in org-mode
   :hook (mu4e-compose-mode . org-msg-edit-mode)
   :config
   (org-msg-mode)
-  (setq org-msg-startup "inlineimages"
-        org-msg-greeting-name-limit 3
-        org-msg-default-alternatives '(html text)))
+  (setq mail-user-agent 'mu4e-user-agent
+        org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil \\n:t"
+	org-msg-startup "hidestars indent inlineimages"
+	org-msg-greeting-fmt "\nHi%s,\n\n"
+	org-msg-recipient-names '(("chris@tfcconnection.org" . "Chris Cochrun"))
+	org-msg-greeting-name-limit 3
+	org-msg-default-alternatives '((new		. (text html))
+				       (reply-to-html	. (text html))
+				       (reply-to-text	. (text)))
+	org-msg-convert-citation t
+	org-msg-signature "
+
+ Regards,
+
+ #+begin_signature
+ --
+ *Chris*
+ /Praising God in all things!/
+ #+end_signature"))
 #+end_src
 ** Calendar
 #+begin_src emacs-lisp
diff --git a/init.el b/init.el
index 0565ed0b..31018860 100644
--- a/init.el
+++ b/init.el
@@ -1553,7 +1553,8 @@ targets."
         mu4e-update-interval (* 15 60)
         mu4e-attachment-dir "/home/chris/nextcloud/home/Documents/attachments"
         mu4e-completing-read-function #'completing-read
-        mu4e-mu-binary "/etc/profiles/per-user/chris/bin/mu")
+        mu4e-mu-binary "/etc/profiles/per-user/chris/bin/mu"
+        mu4e-compose-signature-auto-include nil)
 
   :config
   (setq mail-user-agent 'mu4e-user-agent)
@@ -1707,9 +1708,25 @@ targets."
   :hook (mu4e-compose-mode . org-msg-edit-mode)
   :config
   (org-msg-mode)
-  (setq org-msg-startup "inlineimages"
-        org-msg-greeting-name-limit 3
-        org-msg-default-alternatives '(html text)))
+  (setq mail-user-agent 'mu4e-user-agent
+        org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil \\n:t"
+	org-msg-startup "hidestars indent inlineimages"
+	org-msg-greeting-fmt "\nHi%s,\n\n"
+	org-msg-recipient-names '(("chris@tfcconnection.org" . "Chris Cochrun"))
+	org-msg-greeting-name-limit 3
+	org-msg-default-alternatives '((new		. (text html))
+				       (reply-to-html	. (text html))
+				       (reply-to-text	. (text)))
+	org-msg-convert-citation t
+	org-msg-signature "
+
+ Regards,
+
+ #+begin_signature
+ --
+ *Chris*
+ /Praising God in all things!/
+ #+end_signature"))
 
 (use-package calfw
   :commands chris/calfw-calendar-open