11 files changed, 37 insertions, 13 deletions
diff --git a/help/C/figures/color-000000.png b/help/C/figures/color-000000.png
new file mode 100644
index 0000000000..cfb678b3bc
--- /dev/null
+++ b/help/C/figures/color-000000.png
diff --git a/help/C/figures/html-composer-insert-image.png b/help/C/figures/html-composer-insert-image.png
new file mode 100644
index 0000000000..caa07ef1c8
--- /dev/null
+++ b/help/C/figures/html-composer-insert-image.png
diff --git a/help/C/figures/html-composer-insert-link.png b/help/C/figures/html-composer-insert-link.png
new file mode 100644
index 0000000000..6dbd5b0b84
--- /dev/null
+++ b/help/C/figures/html-composer-insert-link.png
diff --git a/help/C/figures/html-composer-insert-rule.png b/help/C/figures/html-composer-insert-rule.png
new file mode 100644
index 0000000000..a67762f339
--- /dev/null
+++ b/help/C/figures/html-composer-insert-rule.png
diff --git a/help/C/figures/html-composer-insert-table.png b/help/C/figures/html-composer-insert-table.png
new file mode 100644
index 0000000000..21344caea6
--- /dev/null
+++ b/help/C/figures/html-composer-insert-table.png
diff --git a/help/C/mail-composer-html-image.page b/help/C/mail-composer-html-image.page
index 293ba46a55..f7eeb315d9 100644
--- a/help/C/mail-composer-html-image.page
+++ b/help/C/mail-composer-html-image.page
@@ -5,7 +5,7 @@
     <desc>Embed a picture in the mail composer.</desc>
     <link type="guide" xref="mail-composer-html#formatting-options" />
 
-    <revision pkgversion="3.1.5" version="0.3" date="2011-07-28" status="final"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -27,7 +27,7 @@
 <item><p>Click <gui>Open</gui>.</p></item>
 </steps>
 
-<p>Alternately, you can also drag an image into the text area of the message composer.</p>
+<p>Alternately, you can also use the <media type="image" src="./figures/html-composer-insert-image.png" /> icon in the second bar below the <gui>Subject</gui> line, or drag an image into the text area of the message composer.</p>
 
 </page>
 
diff --git a/help/C/mail-composer-html-link.page b/help/C/mail-composer-html-link.page
index 32a144e22d..310a04c82a 100644
--- a/help/C/mail-composer-html-link.page
+++ b/help/C/mail-composer-html-link.page
@@ -5,7 +5,7 @@
     <desc>Insert a link to a website in the mail composer.</desc>
     <link type="guide" xref="mail-composer-html#formatting-options" />
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <revision pkgversion="3.5.90" version="0.3" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -29,6 +29,8 @@
 <item><p>Click <gui>Close</gui>.</p></item>
 </steps>
 
+<p>Alternately, you can also use the <media type="image" src="./figures/html-composer-insert-link.png" /> icon in the second bar below the <gui>Subject</gui> line.</p>
+
 <p>If you do not want a special link text you can just enter the address of the link directly. It will be automatically recognized as a link.</p>
 </page>
 
diff --git a/help/C/mail-composer-html-rule.page b/help/C/mail-composer-html-rule.page
index f3b635b9a6..3bdf6d3d82 100644
--- a/help/C/mail-composer-html-rule.page
+++ b/help/C/mail-composer-html-rule.page
@@ -5,7 +5,7 @@
     <desc>Insert a horizontal line in the mail composer.</desc>
     <link type="guide" xref="mail-composer-html#formatting-options" />
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <revision pkgversion="3.5.90" version="0.3" date="2011-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -28,5 +28,7 @@
 <item><p>Click <gui>Close</gui>.</p></item>
 </steps>
 
+<p>Alternately, you can also use the <media type="image" src="./figures/html-composer-insert-rule.png" /> icon in the second bar below the <gui>Subject</gui> line.</p>
+
 </page>
 
diff --git a/help/C/mail-composer-html-table.page b/help/C/mail-composer-html-table.page
index ae2b5e5bb2..cbb571df4c 100644
--- a/help/C/mail-composer-html-table.page
+++ b/help/C/mail-composer-html-table.page
@@ -5,7 +5,7 @@
     <desc>Insert a table in the mail composer.</desc>
     <link type="guide" xref="mail-composer-html#formatting-options" />
 
-    <revision pkgversion="3.1.5" version="0.2" date="2011-07-29" status="final"/>
+    <revision pkgversion="3.5.90" version="0.3" date="2011-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -29,5 +29,7 @@
 <item><p>Click <gui>Close</gui>.</p></item>
 </steps>
 
+<p>Alternately, you can also use the <media type="image" src="./figures/html-composer-insert-table.png" /> icon in the second bar below the <gui>Subject</gui> line.</p>
+
 </page>
 
diff --git a/help/C/mail-composer-html-text.page b/help/C/mail-composer-html-text.page
index 729b3f50b5..ee91cf945c 100644
--- a/help/C/mail-composer-html-text.page
+++ b/help/C/mail-composer-html-text.page
@@ -5,7 +5,7 @@
     <desc>Format Text in the mail composer.</desc>
     <link type="guide" xref="mail-composer-html#formatting-options" />
 
-    <revision pkgversion="3.0.2" version="0.3" date="2011-08-01" status="draft"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="draft"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -20,11 +20,14 @@
 
 <title>Formatting Text in HTML</title>
 
-<!-- TODO: These instructions are partially WRONG in 3.0.2 as the tool bar has been split into two. Needs an update. Maybe we also need a way to describe the non-HTML-only functions for plain text mail somewhere. -->
+<!-- TODO: We need a way to describe the non-HTML-only functions for plain text mail somewhere else (first bar). -->
 
      <p>HTML formatting tools are located in the two tool bars just above the area where you actually write the message. They also appear in the <gui>Insert</gui> and <gui>Format</gui> menus.</p>
      <p>The icons in the tool bar are explained in tooltips which appear when you hold your mouse pointer over the buttons. The buttons fall into five categories:</p>
 
+<section id="first-bar">
+<title>First bar</title>
+
 <section id="headers-and-lists">
  <title>Headers and Lists:</title>
  <p>At the left of the upper tool bar, you can choose <gui>Normal</gui> for a default text style or <gui>Header 1</gui> through <gui>Header 6</gui> for varying sizes of header from large (1) to tiny (6). Other styles include <gui>Preformat</gui>, to use the HTML tag for preformatted blocks of text, and three types of bullet points for lists.</p>
@@ -41,6 +44,12 @@
       <p>The button with the arrow pointing left decreases a paragraph's indentation, and the right arrow increases its indentation.</p>
 </section>
 
+</section>
+
+
+<section id="first-bar">
+<title>Second bar</title>
+
 <section id="text-styles">
       <title>Text Styles:</title>
       <p>Use these buttons in the lower tool bar to determine the way your email looks. If you have text selected, the style applies to the selected text. If you do not have text selected, the style applies to whatever you type next.</p>
@@ -51,6 +60,14 @@
     <td><p>Description</p></td>
   </tr>
   <tr>
+    <td><p>+0</p></td>
+    <td><p>Font size.</p></td>
+  </tr>
+  <tr>
+    <td><p><media type="image" src="./figures/color-000000.png" /></p></td>
+    <td><p>Color chooser for text. The box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting <guiseq><gui>Style</gui><gui>Page Style</gui></guiseq>.</p></td>
+  </tr>
+  <tr>
     <td><p>TT</p></td>
     <td><p>Typewriter text, which is similar to a monospace font.</p></td>
   </tr>
@@ -71,11 +88,11 @@
     <td><p>Marks a line through the text.</p></td>
   </tr>
 </table>
+
+<p>The other buttons are explained under <link xref="mail-composer-html#formatting-options" />.</p>
+
 </section>
 
-<section id="color-selection">
-      <title>Color Selection:</title>
-      <p>At the left in the lower tool bar is the color section tool, where a box displays the current text color. To choose a new color, click the arrow button to the right. If you have text selected, the color applies to the selected text. If you do not have text selected, the color applies to whatever you type next. You can select a background color or image by right-clicking the message background, then selecting <guiseq><gui>Style</gui><gui>Page Style</gui></guiseq>.</p>
 </section>
 
 </page>
diff --git a/help/C/mail-composer-html.page b/help/C/mail-composer-html.page
index 8caae154d0..a0b305cb1c 100644
--- a/help/C/mail-composer-html.page
+++ b/help/C/mail-composer-html.page
@@ -5,7 +5,7 @@
     <desc>Format emails by using HTML instead of plain text.</desc>
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.3.91" version="0.3" date="2012-02-19" status="final"/>
+    <revision pkgversion="3.5.90" version="0.4" date="2012-08-16" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -20,11 +20,12 @@
 
 <title>Using HTML format to enhance emails</title>
 
-<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email applications can display images and text styles in addition to basic alignment and paragraph formatting. They do this with HTML, just like web pages do.</p>
+<p>Normally, you cannot set text styles or insert pictures in email. However, most newer email applications can display images and text styles in addition to basic alignment and paragraph formatting. This is done with HTML, which is the format that also web pages use.</p>
 
-<p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, Evolution sends plain text unless you explicitly ask for HTML.</p>
+<p>Some people do not have HTML-capable mail clients, or prefer not to receive HTML-enhanced mail because it is slower to download and display. Because of this, <app>Evolution</app> sends plain text unless you explicitly ask for HTML.</p>
 
 <p>You can change the format of an email message from plain text to HTML in the email composer by choosing <guiseq><gui>Format</gui><gui>HTML</gui></guiseq> from the menu bar.</p>
+<p>Alternately, you also can change the first dropdown list below the <gui>Subject</gui> line from <gui>Plain Text</gui> to <gui>HTML</gui>.</p>
 <p>To send all your mail as HTML by default, enable <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Composer Preferences</gui><gui>Default Behavior</gui><gui>Format messages in HTML</gui></guiseq>.</p>
 
   <section id="formatting-options" style="2column">