diff --git a/help/C/exchange-connectors-overview.page b/help/C/exchange-connectors-overview.page
index e7da0c982b..c9d95e2d88 100644
--- a/help/C/exchange-connectors-overview.page
+++ b/help/C/exchange-connectors-overview.page
@@ -8,7 +8,7 @@
 
     <link type="guide" xref="exchange-placeholder"/>
 
-    <revision pkgversion="3.1.5" version="0.4" date="2012-03-07" status="final"/>
+    <revision pkgversion="3.5.1" version="0.5" date="2012-04-25" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -24,31 +24,31 @@
 <p>Depending on the version of the Microsoft Exchange server that you would like to connect to it is required to make sure that an additional package is installed that provides this functionality.</p>
 
 <p>For Microsoft Exchange 2000 and 2003 (and possibly earlier versions of Exchange that use Outlook Web Access) it is recommended to use the package <sys>evolution-exchange</sys>.</p>
-<note style="info package">
-  <if:choose>
-    <if:when test="if:supports('action:install')">
+<if:choose>
+  <if:when test="if:supports('action:install')">
+    <note style="info package">
       <p><link action="install:evolution-exchange" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-exchange</link></p>
-    </if:when>
-  </if:choose>
-</note>
+    </note>
+  </if:when>
+</if:choose>
 
 <p>For Microsoft Exchange 2007 and 2010 (and possibly earlier versions that support MAPI) it is recommended to use the package <sys>evolution-mapi</sys>.</p>
-<note style="info package">
-  <if:choose>
-    <if:when test="if:supports('action:install')">
+<if:choose>
+  <if:when test="if:supports('action:install')">
+    <note style="info package">
       <p><link action="install:evolution-mapi" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-mapi</link></p>
-    </if:when>
-  </if:choose>
-</note>
+    </note>
+  </if:when>
+</if:choose>
 
 <p>For Microsoft Exchange 2007 and 2010 the package <sys>evolution-ews</sys> is currently under development and will replace <sys>evolution-mapi</sys> in the future. It might not be available yet for your distribution.</p>
-<note style="info package">
-  <if:choose>
-    <if:when test="if:supports('action:install')">
+<if:choose>
+  <if:when test="if:supports('action:install')">
+    <note style="info package">
       <p><link action="install:evolution-ews" href="http://projects.gnome.org/evolution/download" style="button">Install evolution-ews</link></p>
-    </if:when>
-  </if:choose>
-</note>
+    </note>
+  </if:when>
+</if:choose>
 
 <note style="tip"><p>If you are unsure which Microsoft Exchange server version is used, you may want to contact your system administrator for more information.</p></note>
 
diff --git a/help/C/mail-composer-spellcheck.page b/help/C/mail-composer-spellcheck.page
index 3e058c45d6..a1d5fdb971 100644
--- a/help/C/mail-composer-spellcheck.page
+++ b/help/C/mail-composer-spellcheck.page
@@ -8,7 +8,7 @@
     
     <link type="guide" xref="index#mail-composing" />
 
-    <revision pkgversion="3.0.2" version="0.5" date="2012-03-07" status="final"/>
+    <revision pkgversion="3.5.1" version="0.6" date="2012-04-25" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -28,7 +28,7 @@
 <p>To use spell checking for the emails that you write you first need to make sure that the <sys>hunspell</sys> package for your specific language and the <sys>enchant</sys> package are installed via the software management tool of your distribution.</p>
 
 <note style="info package">
-  <p>You might need to install one of these packages to perform these steps.</p>
+  <p>You might need to install <sys>hunspell</sys> and/or <sys>enchant</sys> to perform these steps.</p>
   <if:choose>
     <if:when test="if:supports('action:install')">
       <p><link action="install:hunspell" href="http://hunspell.sourceforge.net/" style="button">Install hunspell</link></p>
diff --git a/help/C/mail-spam-settings.page b/help/C/mail-spam-settings.page
index 026e95e951..d66cdbe2fe 100644
--- a/help/C/mail-spam-settings.page
+++ b/help/C/mail-spam-settings.page
@@ -9,7 +9,7 @@
     <link type="guide" xref="mail-spam" />
     <link type="seealso" xref="mail-spam-marking"/>
 
-    <revision pkgversion="3.3.91" version="0.6" date="2012-03-07" status="final"/>
+    <revision pkgversion="3.5.1" version="0.7" date="2012-04-25" status="final"/>
     <credit type="author">
       <name its:translate="no">Andre Klapper</name>
       <email its:translate="no">ak-47@gmx.net</email>
@@ -40,7 +40,7 @@
 <p><app>Evolution</app> lets you check for unwanted junk or spam emails by using the <app>Bogofilter</app> or <app>SpamAssassin</app> tools. To use these tools, you need to make sure that they are installed via the software management tool of your distribution.</p>
 
 <note style="info package">
-  <p>You might need to install one of these packages to perform these steps.</p>
+  <p>You might need to install <app>Bogofilter</app> or <app>SpamAssassin</app> to perform these steps.</p>
   <if:choose>
     <if:when test="if:supports('action:install')">
       <p><link action="install:bogofilter" href="http://bogofilter.sourceforge.net/" style="button">Install bogofilter</link></p>