User Docs: Update Message Templates help

1 files changed, 15 insertions, 4 deletions

diff --git a/help/C/mail-composer-message-templates.page b/help/C/mail-composer-message-templates.page
index 01afc1b19a..90a120279c 100644
--- a/help/C/mail-composer-message-templates.page
+++ b/help/C/mail-composer-message-templates.page
@@ -6,7 +6,7 @@ type="topic" id="mail-composer-message-templates">
 
  <link type="guide" xref="index#mail-composing-advanced" />
 
- <revision pkgversion="2.32.2" version="0.1" date="2011-07-21" status="stub"/>
+ <revision pkgversion="3.5.2" version="0.2" date="2012-06-09" status="draft"/>
  <credit type="author">
    <name its:translate="no">Andre Klapper</name>
    <email its:translate="no">ak-47@gmx.net</email>
@@ -24,8 +24,7 @@ type="topic" id="mail-composer-message-templates">
 <p>A message template is a standard message that you can use at any time to send mail with the same pattern.</p>
 <p>To enable the Message Template Plugin, click <guiseq><gui>Edit</gui><gui>Plugins</gui></guiseq> and enable <gui>Templates</gui>.</p>
 
-<!-- TODO: Check correctness of all these steps in 3.1. --> 
-<!-- TODO:POST-3-2: Split this into subpages maybe, and turn this into a guide page! -->
+<!-- TODO:POST-3-4: Split this into subpages maybe, and turn this into a guide page! -->
 
 <section id="create">
 <title>Creating a Message Template from an existing Message</title>
@@ -54,7 +53,7 @@ type="topic" id="mail-composer-message-templates">
  </steps>
 </section>
 
-<section id="reply">
+<section id="reply-templates">
  <title>Using a Message Template as a Reply</title>
  <steps>
   <item>
@@ -96,4 +95,16 @@ type="topic" id="mail-composer-message-templates">
  </steps>
 </section>
 
+<section id="reply-variables">
+<!-- as per https://bugzilla.gnome.org/show_bug.cgi?id=641845 - available since 3.2-->
+<title>Reusing message elements when replying</title>
+<p>Templates can contain more than just the predefined set of <link xref="#configure">key-value pairs</link>. You can also get any message header values from the email that you are applying the template on, plus the complete message body.</p>
+
+<!-- TRANSLATORS: Do NOT translate "$ORIG[subject]" and "$ORIG[body]" in this sentence. -->
+<p its:locNote="TO TRANSLATORS: Do NOT translate $ORIG[subject] and $ORIG[body] in this sentence!">In order to do this, use the format <code>$ORIG[header_name]</code> and replace the variable <code>header_name</code> by the actual header. For example, if you would like to insert the subject line of the message that you reply to, use <code>$ORIG[subject]</code>. To insert the complete body, use <code>$ORIG[body]</code>.</p>
+
+<p>If no replacement for a variable is found, the variable is not removed (except for <code>$ORIG[body]</code>) but left in place so that you see that something went wrong. This could happen when trying to use headers that are not necessarily always available in the original message (for example <code>$ORIG[reply-to]</code>).</p>
+
+</section>
+
 </page>