diff --git a/docs/manual/CoreTasks/mail.html b/docs/manual/CoreTasks/mail.html
index afca074e1..750300b84 100644
--- a/docs/manual/CoreTasks/mail.html
+++ b/docs/manual/CoreTasks/mail.html
@@ -9,8 +9,11 @@
 
 <h2><a name="mail">Mail</a></h2>
 <h3>Description</h3>
-<p>A task to send SMTP email. This task can send mail using either plain
-text, UU encoding, or MIME format mail, depending on what is available.
+<p>A task to send SMTP email.<br/><br/>
+This task can send mail using either plain
+text, UU encoding, or MIME format mail, depending on what is available.<br/>
+<br/>
+If you need SMTP auth, you have to use MIME (and therefore to install JavaMail).<br/><br/>
 Attachments may be sent using nested
 <a href="../CoreTypes/fileset.html">fileset</a> elements.</p>
 <p><strong>Note:</strong> This task may depend on external libraries
@@ -98,11 +101,24 @@ Library Dependencies</a> for more information.
     <td valign="top">TCP port of the SMTP server.  The default value is 25.</td>
     <td align="center" valign="top">No</td>
   </tr>
+  <tr>
+    <td valign="top">user</td>
+    <td valign="top">user name for SMTP auth</td>
+    <td valign="center">Yes, if SMTP auth is required on your SMTP server<br/>
+    the email message will be then sent using Mime and requires JavaMail</td>
+  </tr>
+  <tr>
+    <td valign="top">password</td>
+    <td valign="top">password for SMTP auth</td>
+    <td valign="center">Yes, if SMTP auth is required on your SMTP server<br/>
+    the email message will be then sent using Mime and requires JavaMail</td>
+  </tr>
   <tr>
     <td valign="top">encoding</td>
     <td valign="top">Specifies the encoding to use for the content of the email.
     Values are <code>mime</code>, <code>uu</code>, <code>plain</code>, or
-      <code>auto</code>.  The default value is <code>auto</code>.</td>
+      <code>auto</code>.  The default value is <code>auto</code>.
+      <code>uu</code> or <code>plain</code> are not compatible with SMTP auth</td>
     <td align="center" valign="top">No</td>
   </tr>
   <tr>
diff --git a/docs/manual/listeners.html b/docs/manual/listeners.html
index ede7ff28a..7861c7475 100644
--- a/docs/manual/listeners.html
+++ b/docs/manual/listeners.html
@@ -125,6 +125,18 @@ control for turning off success or failure messages individually.</p>
     <td width="63%">SMTP Port for the Mail server</td>
     <td width="63%">No, default &quot;25&quot;</td>
   </tr>
+  <tr>
+    <td width="337">MailLogger.user</td>
+    <td width="63%">user name for SMTP auth</td>
+    <td width="63%">Yes, if SMTP auth is required on your SMTP server<br/>
+    the email message will be then sent using Mime and requires JavaMail</td>
+  </tr>
+  <tr>
+    <td width="337">MailLogger.password</td>
+    <td width="63%">password for SMTP auth</td>
+    <td width="63%">Yes, if SMTP auth is required on your SMTP server<br/>
+    the email message will be then sent using Mime and requires JavaMail</td>
+  </tr>
   <tr>
     <td width="337">MailLogger.from</td>
     <td width="63%">Mail &quot;from&quot; address</td>