Merge remote-tracking branch 'remotes/origin/hotfix-5.0.5'

Author: bbottema

README.md

@@ -1,4 +1,4 @@
-[![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](LICENSE-2.0.txt) [![Latest Release](https://img.shields.io/maven-central/v/org.simplejavamail/simple-java-mail.svg?style=flat)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.simplejavamail%22%20AND%20a%3A%22simple-java-mail%22) [![Javadocs](https://img.shields.io/badge/javadoc-5.0.0-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/simple-java-mail) [![Build Status](https://img.shields.io/travis/bbottema/simple-java-mail.svg?style=flat)](https://travis-ci.org/bbottema/simple-java-mail) [![Codacy](https://img.shields.io/codacy/9f142ca8c8c640c984835a8ae02d29f3.svg?style=flat)](https://www.codacy.com/app/b-bottema/simple-java-mail)
+[![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](LICENSE-2.0.txt) [![Latest Release](https://img.shields.io/maven-central/v/org.simplejavamail/simple-java-mail.svg?style=flat)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.simplejavamail%22%20AND%20a%3A%22simple-java-mail%22) [![Javadocs](https://img.shields.io/badge/javadoc-5.0.5-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/simple-java-mail) [![Build Status](https://img.shields.io/travis/bbottema/simple-java-mail.svg?style=flat)](https://travis-ci.org/bbottema/simple-java-mail) [![Codacy](https://img.shields.io/codacy/9f142ca8c8c640c984835a8ae02d29f3.svg?style=flat)](https://www.codacy.com/app/b-bottema/simple-java-mail)
 
 # Simple Java Mail #
 
@@ -64,36 +64,24 @@ Simple Java Mail is available in [Maven Central](https://search.maven.org/#searc
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>5.0.4</version>
+    <version>5.0.5</version>
 </dependency>
 ```
 
 ### Latest Progress ###
 
-v5.0.4 (22-September-2018)
+v5.0.1 - [v5.0.5](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C5.0.5%7Cjar)
 
-- [#168](https://github.com/bbottema/simple-java-mail/issues/168) Properties aquired through ConfigLoader should be typed explicitly and converted if necessary
+- v5.0.5 (3-Oktober-2018): [#137](https://github.com/bbottema/simple-java-mail/issues/137) When replying to an email with HTML, the result body is 
+empty
+- v5.0.4 (22-September-2018): [#168](https://github.com/bbottema/simple-java-mail/issues/168) Properties aquired through ConfigLoader should be typed explicitly and converted if necessary
+- v5.0.3 (11-April-2018): [#136](https://github.com/bbottema/simple-java-mail/issues/136) ServerConfig class should be public API
+- v5.0.2 (7-April-2018): [#135](https://github.com/bbottema/simple-java-mail/issues/135) trustingAllHosts should be public on the Builder API
+- v5.0.2 (7-April-2018): [#131](https://github.com/bbottema/simple-java-mail/issues/131) NamedDataSource should implement EncodingAware
+- v5.0.1 (10-March-2018): [#130](https://github.com/bbottema/simple-java-mail/issues/130) java.lang.ClassNotFoundException: net.markenwerk.utils.mail.dkim.DkimMessage. Solves the issue of missing optional class DKIM even when not used
+ 
 
-
-v5.0.3 (11-April-2018)
-
-- [#136](https://github.com/bbottema/simple-java-mail/issues/136) ServerConfig class should be public API
-
-
-v5.0.2 (7-April-2018)
-
-- [#135](https://github.com/bbottema/simple-java-mail/issues/135) trustingAllHosts should be public on the Builder API
-- [#131](https://github.com/bbottema/simple-java-mail/issues/131) NamedDataSource should implement EncodingAware
-
-
-v5.0.1 (10-March-2018)
-
-- [#130](https://github.com/bbottema/simple-java-mail/issues/130) java.lang.ClassNotFoundException: net.markenwerk.utils.mail.dkim.DkimMessage
-
-Solves the issue of missing optional class DKIM even when not used 
-
-
-v5.0.0 (14-Februari-2018)
+[v5.0.0](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C5.0.0%7Cjar) (14-Februari-2018)
 
 Also see the [migration notes](http://www.simplejavamail.org/#/migrate500)
 

RELEASE.txt

@@ -6,27 +6,14 @@ http://www.simplejavamail.org
     <version>5.0.4</version>
 </dependency>
 
-v5.0.4 (22-September-2018)
-
-- #168: Properties aquired through ConfigLoader should be typed explicitly and converted if necessary
-
-
-v5.0.3 (11-April-2018)
-
-- #136: ServerConfig class should be public API
-
-
-v5.0.2 (7-April-2018)
-
-- #135: trustingAllHosts should be public on the Builder API
-- #131: NamedDataSource should implement EncodingAware
-
-
-v5.0.1 (10-March-2018)
-
-- #130 java.lang.ClassNotFoundException: net.markenwerk.utils.mail.dkim.DkimMessage
-
-Solves the issue of missing optional class DKIM even when not used
+v5.0.1 - v5.0.5
+
+- v5.0.5 (3-Oktober-2018): #137: When replying to an email with HTML, the result body is empty
+- v5.0.4 (22-September-2018): #168: Properties aquired through ConfigLoader should be typed explicitly and converted if necessary
+- v5.0.3 (11-April-2018): #136: ServerConfig class should be public API
+- v5.0.2 (7-April-2018): #135: trustingAllHosts should be public on the Builder API
+- v5.0.2 (7-April-2018): #131: NamedDataSource should implement EncodingAware
+- v5.0.1 (10-March-2018): #130 java.lang.ClassNotFoundException: net.markenwerk.utils.mail.dkim.DkimMessage. Solves the issue of missing optional class DKIM even when not used
 
 
 v5.0.0 (14-Februari-2018)

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>simple-java-mail</artifactId>
     <packaging>jar</packaging>
     <name>Simple Java Mail</name>
-    <version>5.0.5-SNAPSHOT</version>
+    <version>5.0.6-SNAPSHOT</version>
     <description>Simple API, Complex Emails. A light weight wrapper for the JavaMail SMTP API</description>
     <url>http://http://www.simplejavamail.org/</url>
 

src/main/java/org/simplejavamail/email/EmailBuilder.java

@@ -306,7 +306,7 @@ public EmailPopulatingBuilder replyingTo(@Nonnull final MimeMessage emailMessage
 					.withSubject(generatedReply.getSubject())
 					.to(generatedReply.getRecipients())
 					.withPlainText(LINE_START_PATTERN.matcher(defaultTo(repliedTo.getPlainText(), "")).replaceAll("> "))
-					.withHTMLText(format(htmlTemplate, defaultTo(repliedTo.getPlainText(), "")))
+					.withHTMLText(format(htmlTemplate, defaultTo(repliedTo.getHTMLText(), "")))
 					.withHeaders(generatedReply.getHeaders())
 					.withEmbeddedImages(repliedTo.getEmbeddedImages());
 		}