diff -Nru a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
--- a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java	2013-02-27 22:23:14.000000000 +0100
+++ b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java	2017-02-03 19:49:36.976098920 +0100
@@ -24,19 +24,21 @@
 import java.util.regex.Pattern;
 
 /**
- * Small wrapper class on top of HtmlEmail which encapsulates the required logic
+ * <p>Small wrapper class on top of HtmlEmail which encapsulates the required logic
  * to retrieve images that are contained in "&lt;img src=../&gt;" elements in the HTML
  * code. This is done by replacing all img-src-elements with "cid:"-entries and
  * embedding images in the email.
- * </br>
+ * </p>
+ * <p>
  * For local files the class tries to either load them via an absolute path or -
  * if available - use a relative path starting from a base directory. For files
  * that are not found locally, the implementation tries to download
  * the element and link it in.
- * </br>
+ * </p>
+ * <p>
  * The image loading is done by an instance of <code>DataSourceResolver</code>
  * which has to be provided by the caller.
- * </br>
+ * </p>
  *
  * @since 1.3
  * @version $Id: ImageHtmlEmail.java 1448981 2013-02-22 10:40:34Z tn $
@@ -48,11 +50,11 @@
     // including newlines on any place, HTML is not case sensitive and there
     // can be arbitrary text between "IMG" and "SRC" like IDs and other things.
 
-    /** regexp for extracting <img> tags */
+    /** Regexp for extracting {@code <img>} tags */
     public static final String REGEX_IMG_SRC =
             "(<[Ii][Mm][Gg]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
 
-    /** regexp for extracting <script> tags */
+    /** regexp for extracting {@code <script>} tags */
     public static final String REGEX_SCRIPT_SRC =
             "(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*.*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
 
diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail/Email.java
index d451d45..63d9346 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -397,7 +397,7 @@ public abstract class Email
     }
 
     /**
-     * Set the content & contentType
+     * Set the content &amp; contentType
      *
      * @param   aObject aObject
      * @param   aContentType aContentType
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index 4bcefe5..a7d85c2 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -72,6 +72,7 @@ import javax.mail.internet.MimeMultipart;
  * he.setHtmlMsg(msg.toString());
  * // code to set the other email fields (not shown)
  * </pre></code>
+ * </p>
  *
  * <p>Embedded entities are tracked by their name, which for <code>File</code>s is
  * the filename itself and for <code>URL</code>s is the canonical path. It is
@@ -113,7 +114,7 @@ public class HtmlEmail extends MultiPartEmail
     protected List<InlineImage> inlineImages;
 
     /**
-     * Embedded images Map<String, InlineImage> where the key is the
+     * Embedded images {@code Map<String, InlineImage>} where the key is the
      * user-defined image name.
      */
     protected Map<String, InlineImage> inlineEmbeds = new HashMap<String, InlineImage>();
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index b7c72a8..9af6cbc 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -60,7 +60,6 @@ import javax.mail.internet.MimeMultipart;
  *
  * <p>It is also possible to embed URLs, files, or arbitrary
  * <code>DataSource</code>s directly into the body of the mail:
- * <pre><code>
  * HtmlEmail he = new HtmlEmail();
  * File img = new File("my/image.gif");
  * PNGDataSource png = new PNGDataSource(decodedPNGOutputStream); // a custom class
@@ -71,8 +70,6 @@ import javax.mail.internet.MimeMultipart;
  * msg.append("&lt;/body&gt;&lt;/html&gt;");
  * he.setHtmlMsg(msg.toString());
  * // code to set the other email fields (not shown)
- * </pre></code>
- * </p>
  *
  * <p>Embedded entities are tracked by their name, which for <code>File</code>s is
  * the filename itself and for <code>URL</code>s is the canonical path. It is