X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=etc%2Fcomponents;h=64a033752231d66855bb0bd8338263d7ad0554f6;hb=b0b7ee58c482bf36063e6158f610dd337f3ca568;hp=95be90cf19ebe199fa599bf28e654f08e420dd7d;hpb=4877596410e850f2295f1015738bd8ca6e86ee0f;p=mmh

diff --git a/etc/components b/etc/components
index 95be90c..64a0337 100644
--- a/etc/components
+++ b/etc/components
@@ -1,6 +1,25 @@
-From: %(localmbox)
-To:
-cc:
-Fcc: +outbox
+%;
+%; Our default components file.  Used by `comp'
+%;
+%;
+%; This line creates our From: header based on the following ordering:
+%;
+%; - Use a -from switch if it exists ({from})
+%; - Use our local mailbox identity; first from the Local-Mailbox profile
+%;   entry, otherwise gets the information from the local system
+%;
+%<{from}%|%(void(localmbox))%>%(void(width))%(putaddr From: )
+%;
+%; Here we include an address list if one or more "-to" arguments were
+%; given, otherwise just output a blank header.  We do the same for the
+%; "cc" header as well.
+%;
+%<{to}%(void(width))%(putaddr To: )%|To:%>
+%<{cc}%(void(width))%(putaddr cc: )%|cc:%>
+%;
+%; Slight difference here: if we're not given "-fcc" on the command line,
+%; make the default mailbox +outbox
+%;
+Fcc: %<{fcc}%(putstr)%|+outbox%>
 Subject:
 --------