diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index e9beb0e..99da253 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -1,6 +1,6 @@
                          Commons Email Package
-                              Version 1.3.3
-                              Release Notes
+                              Version 1.4
+                             Release Notes
 
 INTRODUCTION:
 -------------
@@ -15,8 +15,55 @@
 
 http://commons.apache.org/email/
 
-This is a maintenance release which fixes several bugs present in the 1.3.2
-release. All current users are encouraged to upgrade.
+This is a minor release which adds some new features and fixes several bugs
+present in the 1.3.3 release. All current users are encouraged to upgrade.
+
+CHANGES FROM 1.3.3:
+-----------------
+
+== Compatibility ==
+
+* Java 5 or later is required (unchanged since 1.3).
+
+* JavaMail dependency has been upgraded to version 1.5.2,
+  as a consequence, the maven dependency has changed to:
+
+  <dependency>
+    <groupId>com.sun.mail</groupId>
+    <artifactId>javax.mail</artifactId>
+    <version>1.5.2</version>
+  </dependency>
+
+== New Features ==
+
+* Added getter for the bounce address of an email to class Email.
+  Issue: EMAIL-146. Thanks to Alexander Lehmann.
+
+* Added support for mapping of content-ids to DataSource in "MimeMessageParser".
+  Issue: EMAIL-141. Thanks to Stephen Kruger.
+
+== Updates ==
+
+* Update Oracle JavaMail dependency from 1.4.5 to 1.5.2.
+  Issue: EMAIL-144.
+
+== Fixed Bugs ==
+
+* "Email" threw an "EmailException" when trying to send the email if neither a from
+  nor bounce address was specified, although a "mail.from" property was set in the mail session.
+  Issue: EMAIL-149. Thanks to Richard DiCroce.
+
+* "ImageHtmlEmail" failed to embed attachments if their data source name was null.
+  Issue: EMAIL-151. Thanks to Andreas Kohn.
+
+* Html emails did not have the correct content-type set when using the Apache Geronimo
+  JavaMail implementation v1.8.x.
+  Issue: EMAIL-147. Thanks to Can Eskikaya.
+
+* An "HtmlEmail" with both, an html and plain text content but no attachments or embedded
+  images will now be created with mimetype "multipart/alternative" instead of "multipart/mixed".
+  Issue: EMAIL-142. Thanks to Marcin Tomiak.
+
 
 CHANGES FROM 1.3.2:
 -----------------
@@ -196,62 +243,15 @@
   Issue: EMAIL-91. Thanks to Kevin Lester. 
 
 
-CHANGES FROM 1.1:
------------------
-
-== Compatibility ==
-
-* Java 1.4 or later is now required. Earlier versions are no longer
-  supported by Sun.
-
-* JavaMail 1.4 or later and JavaBeans Activation Framework 1.1 or later are now
-  required.
-
-== New Features ==
-
-* Email.setFrom and Email.addTo are using Email.charset to properly encode 
-  the name.
-  
-* SimpleEmail#setMsg() with UTF-8 content honors correct charset in header 
-  and does encode the content correctly now.
-  
-* Created additional methods to support timeouts.
-
-* Create an overridable method in Email.java to create the MimeMessage instance.
-
-* Add getTo and getReplyTo to Email class. 
-
-== Fixed Bugs ==
-
-* If setHostName() has not been called, getHostName() tries to return
-  this.session.getProperty(MAIL_HOST). If mail session has not been
-  created yet, this will throw a NullPointerException. Now getHostName()
-  checks that this.session is not null before trying to access it. 
-
-* Provide better diagnostics when attaching  documents fail. 
-
-* When mail authentication is required and no username/password is supplied
-  than the provided mail session is used. If a username/password is found
-  the implementation creates a new mail session and a DefaultAuthenticator
-  as convenience implementation. 
-
-* Using Kenneth's implementation of HtmlEmail.buildMimeMessage() to fix a
-  couple of HtmlEmail layout issues. Also thanks to Martin Lau and Morten
-  Hattesen for providing in-depth analysis of the problem. 
-
-* During regression tests write out the generated MimeMessage instead of
-  WiserEmail.toString(). 
-
-
 REQUIREMENTS:
 
 J2SE environments
 -----------------
 
-Commons Email requires JavaMail 1.4.1 or later. The Oracle implementation
+Commons Email requires JavaMail 1.5.2 or later. The reference implementation
 is available at:
 
-http://www.oracle.com/technetwork/java/javamail/
+https://java.net/projects/javamail/pages/Home
 
 However, the Apache Geronimo project (http://geronimo.apache.org)
 provides a J2EE-certified implementation of the JavaMail 1.4
@@ -266,7 +266,7 @@
 Apache Geronimo likewise provides an implementation under the Apache
 Software License.
 
-Commons Email has been tested with JDK 1.5 and 1.6.
+Commons Email has been tested with JDK 1.6 and 1.7.
 
 J2EE environments
 -----------------
diff --git a/conf/checkstyle.xml b/conf/checkstyle.xml
index 520e91a..119017f 100644
--- a/conf/checkstyle.xml
+++ b/conf/checkstyle.xml
@@ -43,6 +43,7 @@
     <!-- See http://checkstyle.sf.net/config_header.html -->
     <module name="Header">
         <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="fileExtensions" value="java"/>
     </module>
     <module name="FileLength"/>
     <module name="FileTabCharacter"/>
diff --git a/pom.xml b/pom.xml
index 0dee920..d1bcb31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.commons</groupId>
     <artifactId>commons-email</artifactId>
-    <version>1.4.0-SNAPSHOT</version>
+    <version>1.4</version>
     <name>Apache Commons Email</name>
 
     <inceptionYear>2001</inceptionYear>
@@ -297,8 +297,8 @@
         <commons.componentid>email</commons.componentid>
         <commons.jira.id>EMAIL</commons.jira.id>
         <commons.jira.pid>12310474</commons.jira.pid>
-        <commons.release.version>1.3.3</commons.release.version>
-        <commons.rc.version>RC2</commons.rc.version>
+        <commons.release.version>1.4</commons.release.version>
+        <commons.rc.version>RC1</commons.rc.version>
         <commons.binary.suffix>-bin</commons.binary.suffix>
 
         <!-- override the default commons encoding property -->
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 04146e0..5bc17a3 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -22,7 +22,7 @@
   </properties>
 
   <body>
-    <release version="1.4.0" date="2014-??-??">
+    <release version="1.4" date="2015-05-25">
       <action dev="tn" type="fix" issue="EMAIL-149" date="2015-03-10" due-to="Richard DiCroce">
         "Email" threw an "EmailException" when trying to send the email if neither a from
         nor bounce address was specified, although a "mail.from" property was set in the
diff --git a/src/site/site.xml b/src/site/site.xml
index 522dfe0..89d2e33 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -28,7 +28,8 @@
             <item name="Download"                      href="http://commons.apache.org/email/download_email.cgi"/>
             <item name="User guide"                    href="/userguide.html"/>
             <item name="Latest API docs (development)" href="/apidocs/index.html"/>
-            <item name="Javadoc (1.3.3 release)"       href="/javadocs/api-release/index.html"/>
+            <item name="Javadoc (1.4 release)"         href="/javadocs/api-release/index.html"/>
+            <item name="Javadoc (1.3.3 release)"       href="/javadocs/api-1.3.3/index.html"/>
             <item name="Javadoc (1.2 release)"         href="/javadocs/api-1.2/index.html"/>
         </menu>
     
diff --git a/src/site/xdoc/download_email.xml b/src/site/xdoc/download_email.xml
index 1f160ac..98c72d2 100644
--- a/src/site/xdoc/download_email.xml
+++ b/src/site/xdoc/download_email.xml
@@ -95,32 +95,32 @@
       </p>
     </subsection>
     </section>
-    <section name="Apache Commons Email 1.3.3 ">
+    <section name="Apache Commons Email 1.4 ">
       <subsection name="Binaries">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.3-bin.tar.gz">commons-email-1.3.3-bin.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.4-bin.tar.gz">commons-email-1.4-bin.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/binaries/commons-email-1.3.3-bin.zip">commons-email-1.3.3-bin.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.3.3-bin.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/binaries/commons-email-1.4-bin.zip">commons-email-1.4-bin.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/binaries/commons-email-1.4-bin.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
       <subsection name="Source">
         <table>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.3.3-src.tar.gz">commons-email-1.3.3-src.tar.gz</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.tar.gz.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.tar.gz.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.4-src.tar.gz">commons-email-1.4-src.tar.gz</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.tar.gz.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.tar.gz.asc">pgp</a></td>
           </tr>
           <tr>
-              <td><a href="[preferred]/commons/email/source/commons-email-1.3.3-src.zip">commons-email-1.3.3-src.zip</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.zip.md5">md5</a></td>
-              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.3.3-src.zip.asc">pgp</a></td>
+              <td><a href="[preferred]/commons/email/source/commons-email-1.4-src.zip">commons-email-1.4-src.zip</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.zip.md5">md5</a></td>
+              <td><a href="http://www.apache.org/dist/commons/email/source/commons-email-1.4-src.zip.asc">pgp</a></td>
           </tr>
         </table>
       </subsection>
diff --git a/src/site/xdoc/index.xml b/src/site/xdoc/index.xml
index 61d134b..00901e6 100644
--- a/src/site/xdoc/index.xml
+++ b/src/site/xdoc/index.xml
@@ -77,10 +77,10 @@
             </p>
             <ul>
                 <li>The
-                    <a href="javadocs/api-release/index.html">current release 1.3.3</a>
+                    <a href="javadocs/api-release/index.html">current release 1.4</a>
                 </li>
                 <li>The
-                    <a href="javadocs/api-1.3/index.html">previous version 1.3</a>
+                    <a href="javadocs/api-1.3.3/index.html">previous version 1.3.3</a>
                 </li>
                 <li>The
                     <a href="javadocs/api-1.2/index.html">previous version 1.2</a>
@@ -99,7 +99,7 @@
         <!-- ================================================== -->
         <section name="Releases">
             <p>
-                The latest version 1.3.3, requires Java 5 -
+                The latest version 1.4, requires Java 5 -
                 <a href="http://commons.apache.org/email/download_email.cgi">Download now!</a>
                 <br/>
                 The full