diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 57608743..1aa27ad5 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -92,6 +92,7 @@ Section "MainSection" SEC01
   File "dist\lib\commons-logging-1.0.4.jar"
   File "dist\lib\htmlcleaner-2.1.jar"
   File "dist\lib\jackrabbit-webdav-1.4.jar"
+  File "dist\lib\jcharset-1.3.jar"
   File "dist\lib\jcifs-1.3.14.jar"
   File "dist\lib\jdom-1.0.jar"
   File "dist\lib\log4j-1.2.15.jar"
@@ -163,6 +164,7 @@ no_quest:
   Delete "$INSTDIR\lib\commons-logging-1.0.4.jar"
   Delete "$INSTDIR\lib\htmlcleaner-2.1.jar"
   Delete "$INSTDIR\lib\jackrabbit-webdav-1.4.jar"
+  Delete "$INSTDIR\lib\jcharset-1.3.jar"
   Delete "$INSTDIR\lib\jcifs-1.3.14.jar"
   Delete "$INSTDIR\lib\jdom-1.0.jar"
   Delete "$INSTDIR\lib\log4j-1.2.15.jar"
diff --git a/davmail.jsmooth b/davmail.jsmooth
index 7dd12219..e00990f8 100644
--- a/davmail.jsmooth
+++ b/davmail.jsmooth
@@ -15,6 +15,7 @@
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.1.jar</classPath>
 <classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>
 <classPath>dist/lib/log4j-1.2.15.jar</classPath>
diff --git a/davmailconsole.jsmooth b/davmailconsole.jsmooth
index 1a8ac440..65e7013d 100644
--- a/davmailconsole.jsmooth
+++ b/davmailconsole.jsmooth
@@ -15,6 +15,7 @@
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.1.jar</classPath>
 <classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>
 <classPath>dist/lib/log4j-1.2.15.jar</classPath>
diff --git a/davmailservice.jsmooth b/davmailservice.jsmooth
index fd077239..bd7af1eb 100644
--- a/davmailservice.jsmooth
+++ b/davmailservice.jsmooth
@@ -15,6 +15,7 @@
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.1.jar</classPath>
 <classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>
 <classPath>dist/lib/log4j-1.2.15.jar</classPath>
diff --git a/lib/jcharset-1.3.jar b/lib/jcharset-1.3.jar
new file mode 100644
index 00000000..53dc9501
Binary files /dev/null and b/lib/jcharset-1.3.jar differ
diff --git a/pom.xml b/pom.xml
index 40573b91..0010ec1c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,6 +250,11 @@
             <artifactId>jcifs</artifactId>
             <version>1.3.14</version>
         </dependency>
+        <dependency>
+            <groupId>net.freeutils.charset</groupId>
+            <artifactId>jcharset</artifactId>
+            <version>1.3</version>
+        </dependency>
     </dependencies>
     <pluginRepositories>
         <pluginRepository>