diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index af2c869b..e69c8d8e 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -338,10 +338,10 @@ Have fun!
                   type="" url="http://www.ldap-account-manager.org/">LAM
                   homepage</ulink>. The packages can be installed with these
                   commands:<para><emphasis role="bold">rpm -e
-                  ldap-account-manager ldap-account-manager-lamdaemon</emphasis> (if an
-                  older version is installed)</para><para><emphasis
-                  role="bold">rpm -i &lt;path to LAM
-                  package&gt;</emphasis></para></entry>
+                  ldap-account-manager
+                  ldap-account-manager-lamdaemon</emphasis> (if an older
+                  version is installed)</para><para><emphasis role="bold">rpm
+                  -i &lt;path to LAM package&gt;</emphasis></para></entry>
                 </row>
               </tbody>
             </tgroup>
@@ -2335,6 +2335,14 @@ Have fun!
 
         <para>ldap_user_sendas_relation_attribute = uid</para>
 
+        <para> <literallayout>
+</literallayout><literallayout>
+</literallayout></para>
+
+        <para><emphasis role="bold">Features:</emphasis> Zarafa 7 allows to
+        enable IMAP/POP3 for each user. Please hide this option if you use
+        Zarafa 6.x.</para>
+
         <screenshot>
           <mediaobject>
             <imageobject>
@@ -2352,6 +2360,10 @@ Have fun!
           and capacity for meeting rooms and equipment. The Zarafa extension
           can be added and removed at any time for every user.</para>
 
+          <para>Please note that the option "Features" requires Zarafa 7.
+          Please hide this option in the LAM server profile if you run Zarafa
+          6.x.</para>
+
           <screenshot>
             <mediaobject>
               <imageobject>
diff --git a/lam/docs/manual-sources/images/zarafa2.png b/lam/docs/manual-sources/images/zarafa2.png
index 3bba69c2..1ad8e9ba 100644
Binary files a/lam/docs/manual-sources/images/zarafa2.png and b/lam/docs/manual-sources/images/zarafa2.png differ
diff --git a/lam/docs/manual-sources/images/zarafa3.png b/lam/docs/manual-sources/images/zarafa3.png
index 4b2444c9..d6eef662 100644
Binary files a/lam/docs/manual-sources/images/zarafa3.png and b/lam/docs/manual-sources/images/zarafa3.png differ