diff --git a/README.md b/README.md
index 9e26deb32..5b01b2fa8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![APACHE v2 License](https://img.shields.io/badge/license-apachev2-blue.svg?style=flat)](modules/simple-java-mail/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%20v%3A%226.3.0%22) 
-[![Javadocs](https://img.shields.io/badge/javadoc-6.3.0-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project) 
+[![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%20v%3A%226.3.1%22) 
+[![Javadocs](https://img.shields.io/badge/javadoc-6.3.1-brightgreen.svg?color=brightgreen)](https://www.javadoc.io/doc/org.simplejavamail/maven-master-project) 
 [![Codacy](https://img.shields.io/codacy/grade/c7506663a4ab41e49b9675d87cd900b7.svg?style=flat)](https://www.codacy.com/app/b-bottema/simple-java-mail)
 ![Java 1.7+](https://img.shields.io/badge/java-1.7+-lightgray.svg)
 
@@ -18,12 +18,17 @@ Simple Java Mail is also available in [Maven Central](https://search.maven.org/#
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>6.3.0</version>
+    <version>6.3.1</version>
 </dependency>
 ```
 
 ### Latest Progress ###
 
+[v6.3.1](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.3.1%7Cjar) (12-July-2020)
+
+- [#248](https://github.com/bbottema/simple-java-mail/issues/248) Bugfix: MimeMessageHelper: use complete filename as resource name 
+
+
 [v6.3.0](https://search.maven.org/#artifactdetails%7Corg.simplejavamail%7Csimple-java-mail%7C6.3.0%7Cjar) (11-July-2020)
 
 - [#279](https://github.com/bbottema/simple-java-mail/issues/279) Allow extra Session properties configured through simplejavamail.properties
diff --git a/RELEASE.txt b/RELEASE.txt
index bb2af2eee..7745234a9 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -3,9 +3,14 @@ http://www.simplejavamail.org
 <dependency>
     <groupId>org.simplejavamail</groupId>
     <artifactId>simple-java-mail</artifactId>
-    <version>6.3.0</version>
+    <version>6.3.1</version>
 </dependency>
 
+v6.3.1 (12-July-2020)
+
+- #248: Bugfix: MimeMessageHelper: use complete filename as resource name
+
+
 v6.3.0 (11-July-2020)
 
 - #279: Allow extra Session properties configured through simplejavamail.properties
diff --git a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java
index d740b5855..1c14d7aee 100644
--- a/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java
+++ b/modules/cli-module/src/main/java/org/simplejavamail/internal/clisupport/CliCommandLineProducer.java
@@ -38,7 +38,7 @@ static CommandLine configurePicoCli(List<CliDeclaredOptionSpec> declaredOptions,
                         "%n" +
                         "Note: All the regular functionality regarding properties and config files work with the CLI so you can provide defaults in a " +
                         "property file as long as it is visible (on class path) or as system environment variables.")
-                .version("Simple Java Mail 6.3.0");
+                .version("Simple Java Mail 6.3.1");
         
         rootCommandsHolder.usageMessage()
                 .customSynopsis("",