diff --git a/lam/docs/manual-sources/appendix-email.xml b/lam/docs/manual-sources/appendix-email.xml
deleted file mode 100644
index 6f8429f3..00000000
--- a/lam/docs/manual-sources/appendix-email.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-  <appendix id="mailSetup">
-    <title>Setup of email (SMTP) server</title>
-
-    <para>LAM always uses a local SMTP email server on the machine where LAM
-    is installed. Therefore, there is no need to configure any SMTP settings
-    inside LAM itself.</para>
-
-    <para>The local email server should be configured to forward all emails to
-    your company mail server (so-called smarthost). You can use any SMTP
-    software that ships with a Sendmail wrapper (e.g. Exim, Postfix, QMail or
-    Sendmail itself).</para>
-
-    <literallayout>
-
-</literallayout>
-
-    <screenshot>
-      <mediaobject>
-        <imageobject>
-          <imagedata fileref="images/lam_mail.png" />
-        </imageobject>
-      </mediaobject>
-    </screenshot>
-  </appendix>
- 
diff --git a/lam/docs/manual-sources/chapter-accessLevel.xml b/lam/docs/manual-sources/chapter-accessLevel.xml
index 033fcdbd..e69f0136 100644
--- a/lam/docs/manual-sources/chapter-accessLevel.xml
+++ b/lam/docs/manual-sources/chapter-accessLevel.xml
@@ -93,9 +93,7 @@
           <para>If the user account has set the mail attribute then LAM can
           send your user a mail with the new password. You can change the mail
           template to fit your needs. Please configure your LAM server profile
-          to setup the sender address, subject and mail body. Please see <link
-          linkend="mailEOL">email format option</link> in case of broken
-          mails. See <link linkend="mailSetup">here</link> for setting up your
+          to setup the sender address, subject and mail body. See <link linkend="mailSetup">here</link> for setting up your
           SMTP server.</para>
 
           <para>Using this method will prevent that your support staff knows
diff --git a/lam/docs/manual-sources/chapter-configuration.xml b/lam/docs/manual-sources/chapter-configuration.xml
index 18b46ff9..4e79ebd4 100644
--- a/lam/docs/manual-sources/chapter-configuration.xml
+++ b/lam/docs/manual-sources/chapter-configuration.xml
@@ -237,18 +237,22 @@
       </screenshot>
     </section>
 
-    <section>
-      <title>Additional options</title>
+    <section id="mailSetup">
+      <title>Mail options (LAM Pro)</title>
+
+      <para>Here you can configure the mail server settings. If you do not set
+      a mail server then LAM will try to use a locally installed one (e.g.
+      postfix, exim, sendmail).</para>
+
+      <para>SMTP setup:</para>
 
-      <para id="mailEOL"><emphasis role="bold">Email format</emphasis></para>
+      <para>Mail server: enter name + port separated by ":". E.g. "server:25"
+      will use "server" on port 25.</para>
 
-      <para>Some email servers are not standards compatible. If you receive
-      mails that look broken you can change the line endings for sent mails
-      here. Default is to use "\r\n".</para>
+      <para>User name: enter the user name if your SMTP server requires
+      authentication</para>
 
-      <para>At the moment, this option is only available in LAM Pro as there
-      is no mail sending in the free version. See <link
-      linkend="mailSetup">here</link> for setting up your SMTP server.</para>
+      <para>Password: enter the password for the user above</para>
 
       <screenshot>
         <mediaobject>
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
index e688ab25..08b42e04 100644
--- a/lam/docs/manual-sources/chapter-installation.xml
+++ b/lam/docs/manual-sources/chapter-installation.xml
@@ -613,6 +613,14 @@
       version. Unless explicitly noticed there is no need to install an
       intermediate release.</para>
 
+      <section>
+        <title>7.1 -&gt; 7.2</title>
+
+        <para>LAM Pro: All emails need a specified FROM address. This affects
+        password email, self registration, password self reset and cron
+        emails.</para>
+      </section>
+
       <section>
         <title>6.7 -&gt; 7.1</title>
 
diff --git a/lam/docs/manual-sources/chapter-selfService.xml b/lam/docs/manual-sources/chapter-selfService.xml
index 0e1975a2..7bd9d843 100644
--- a/lam/docs/manual-sources/chapter-selfService.xml
+++ b/lam/docs/manual-sources/chapter-selfService.xml
@@ -1195,8 +1195,7 @@
       The mail can include the new password by using the special wildcard
       "@@newPassword@@". Additionally, you may want to insert other wildcards
       that are replaced by the corresponding LDAP attributes. E.g. "@@uid@@"
-      will be replaced by the user name. Please see <link
-      linkend="mailEOL">email format option</link> in case of broken mails.
+      will be replaced by the user name.
       See <link linkend="mailSetup">here</link> for setting up your SMTP
       server.</para>
 
@@ -1576,9 +1575,6 @@
       valid for 24 hours. When he clicks on this link then the account will be
       created in the self service user suffix. The DN will look like this:
       <emphasis>uid=&lt;user name&gt;,...</emphasis></para>
-
-      <para>Please see <link linkend="mailEOL">email format option</link> in
-      case of broken mails.</para>
     </section>
 
     <section>
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 3190212c..c991df2e 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -15,7 +15,6 @@
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-schema.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-security.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-ldapConfig.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-email.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-lamdaemon.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-selfResetSchema.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="appendix-design.xml"/>
diff --git a/lam/docs/manual-sources/images/configGeneral6.png b/lam/docs/manual-sources/images/configGeneral6.png
index 65f311ec..b8fa737c 100644
Binary files a/lam/docs/manual-sources/images/configGeneral6.png and b/lam/docs/manual-sources/images/configGeneral6.png differ