diff --git a/lam/HISTORY b/lam/HISTORY
index 50399b73..e9a71a62 100644
--- a/lam/HISTORY
+++ b/lam/HISTORY
@@ -2,7 +2,7 @@ September 2016
   - Windows: allow to show effective members of a group
   - LAM Pro:
    -> Group of names/members + roles: allow to show effective members of a group
-   -> Cron jobs: Move or delete expired accounts (Shadow, FreeRadius)
+   -> Cron jobs: Move or delete expired accounts (Shadow, qmail, FreeRadius)
 
 
 21.06.2016 5.4
diff --git a/lam/docs/manual-sources/howto.xml b/lam/docs/manual-sources/howto.xml
index 3d06a8b1..65d5c780 100644
--- a/lam/docs/manual-sources/howto.xml
+++ b/lam/docs/manual-sources/howto.xml
@@ -2000,11 +2000,13 @@ mysql> GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
           <title>Adding jobs</title>
 
           <para>To add a new job just click on the "Add job" button and select
-          the job type you need. Depending on the job type jobs may be added
-          multiple times with different configurations.</para>
+          the job type you need. The list of available jobs depends on your
+          active account modules. E.g. the PPolicy job will only be available
+          if you activated PPolicy user module.</para>
 
-          <para>For descriptions about the available job types see next
-          chapters.</para>
+          <para>Depending on the job type jobs may be added multiple times
+          with different configurations. For descriptions about the available
+          job types see next chapters.</para>
 
           <screenshot>
             <mediaobject>
@@ -2419,6 +2421,55 @@ mysql&gt; GRANT ALL PRIVILEGES ON lam_cron.* TO 'lam_cron'@'localhost';
             </tgroup>
           </table>
         </section>
+
+        <section>
+          <title>Qmail: Delete or move expired accounts</title>
+
+          <para>You can automatically delete or move expired accounts. The job
+          reads the qmail deletion date of user accounts.</para>
+
+          <screenshot>
+            <mediaobject>
+              <imageobject>
+                <imagedata fileref="images/jobs_qmailCleanup1.png" />
+              </imageobject>
+            </mediaobject>
+          </screenshot>
+
+          <table>
+            <title>Options</title>
+
+            <tgroup cols="2">
+              <tbody>
+                <row>
+                  <entry><emphasis role="bold">Option</emphasis></entry>
+
+                  <entry><emphasis role="bold">Description</emphasis></entry>
+                </row>
+
+                <row>
+                  <entry>Delay</entry>
+
+                  <entry>Number of days to wait after the account is
+                  expired.</entry>
+                </row>
+
+                <row>
+                  <entry>Action</entry>
+
+                  <entry>Delete or move accounts</entry>
+                </row>
+
+                <row>
+                  <entry>Target DN</entry>
+
+                  <entry>Move only: specifies the DN where accounts are
+                  moved</entry>
+                </row>
+              </tbody>
+            </tgroup>
+          </table>
+        </section>
       </section>
 
       <section id="confTypicalScenarios">
diff --git a/lam/docs/manual-sources/images/jobs2.png b/lam/docs/manual-sources/images/jobs2.png
index cb2e23bd..818bb368 100644
Binary files a/lam/docs/manual-sources/images/jobs2.png and b/lam/docs/manual-sources/images/jobs2.png differ
diff --git a/lam/docs/manual-sources/images/jobs_qmailCleanup1.png b/lam/docs/manual-sources/images/jobs_qmailCleanup1.png
new file mode 100644
index 00000000..29135738
Binary files /dev/null and b/lam/docs/manual-sources/images/jobs_qmailCleanup1.png differ