diff --git a/build.xml b/build.xml
index 1f44fd40..56ab8015 100644
--- a/build.xml
+++ b/build.xml
@@ -266,6 +266,7 @@
         <jsmoothgen project="davmail.jsmooth" skeletonroot="src/jsmooth/skeletons"/>
         <jsmoothgen project="davmailconsole.jsmooth" skeletonroot="src/jsmooth/skeletons"/>
         <jsmoothgen project="davmailservice.jsmooth" skeletonroot="src/jsmooth/skeletons"/>
+        <jsmoothgen project="davmail64.jsmooth" skeletonroot="src/jsmooth/skeletons"/>
         <zip file="dist/davmail-${release-name}.zip">
             <fileset dir="dist">
                 <include name="lib/*.jar"/>
@@ -306,7 +307,7 @@
                 <include name="lib/swt-*-gtk-linux-x86.jar"/>
                 <exclude name="lib/swt-*-gtk-linux-x86_64.jar"/>
                 <exclude name="lib/swt-*-carbon-macosx.jar"/>
-                <exclude name="lib/swt-*-win32-x86.jar"/>
+                <exclude name="lib/swt-*-win32-*.jar"/>
                 <exclude name="lib/libgrowl-*.jar"/>
             </tarfileset>
         </tar>
@@ -321,7 +322,7 @@
                 <include name="lib/swt-*-gtk-linux-x86_64.jar"/>
                 <exclude name="lib/swt-*-gtk-linux-x86.jar"/>
                 <exclude name="lib/swt-*-carbon-macosx.jar"/>
-                <exclude name="lib/swt-*-win32-x86.jar"/>
+                <exclude name="lib/swt-*-win32-*.jar"/>
                 <exclude name="lib/libgrowl-*.jar"/>
             </tarfileset>
         </tar>
diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index c1ad3e28..17bc59f0 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -3,7 +3,7 @@
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "DavMail"
 !define PRODUCT_VERSION "${VERSION}"
-!define PRODUCT_PUBLISHER "Mickaël Guessant"
+!define PRODUCT_PUBLISHER "Mickaël Guessant"
 !define PRODUCT_WEB_SITE "http://sourceforge.net/projects/davmail"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\davmail.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
@@ -84,6 +84,7 @@ Section "MainSection" SEC01
   File "dist\davmail.jar"
   File "dist\davmailconsole.exe"
   File "dist\davmailservice.exe"
+  File "dist\davmail64.exe"
   SetOutPath "$INSTDIR\lib"
   File "dist\lib\activation-1.1.1.jar"
   File "dist\lib\commons-codec-1.3.jar"
@@ -102,6 +103,7 @@ Section "MainSection" SEC01
   File "dist\lib\stax-api-1.0.1.jar"
   File "dist\lib\stax2-api-3.0.3.jar"
   File "dist\lib\swt-3.6-win32-x86.jar"
+  File "dist\lib\swt-3.6.2-win32-x86_64.jar"
   File "dist\lib\woodstox-core-asl-4.0.9.jar"
   File "dist\lib\xercesImpl-2.8.1.jar"
 
@@ -175,9 +177,11 @@ no_quest:
   Delete "dist\lib\stax-api-1.0.1.jar"
   Delete "$INSTDIR\lib\stax2-api-3.0.3.jar"
   Delete "$INSTDIR\lib\swt-3.6-win32-x86.jar"
+  Delete "$INSTDIR\lib\swt-3.6.2-win32-x86_64.jar"  
   Delete "$INSTDIR\lib\woodstox-core-asl-4.0.9.jar"
   Delete "$INSTDIR\lib\xercesImpl-2.8.1.jar"
 
+  Delete "$INSTDIR\davmail64.exe"
   Delete "$INSTDIR\davmailservice.exe"
   Delete "$INSTDIR\davmailconsole.exe"
   Delete "$INSTDIR\davmail.log"
diff --git a/davmail.jsmooth b/davmail.jsmooth
index 57221410..094e48d5 100644
--- a/davmail.jsmooth
+++ b/davmail.jsmooth
@@ -29,7 +29,7 @@
 <classPath>dist/lib/xercesImpl-2.8.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
 <executableName>dist/davmail.exe</executableName>
-<iconLocation>src/java/tray32.png</iconLocation>
+<iconLocation>src/java/tray48.png</iconLocation>
 <initialMemoryHeap>-1</initialMemoryHeap>
 <javaProperties>
 <name>sun.net.inetaddr.ttl</name>
diff --git a/davmail64.jsmooth b/davmail64.jsmooth
new file mode 100644
index 00000000..1fdeef6d
--- /dev/null
+++ b/davmail64.jsmooth
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jsmoothproject>
+<JVMSearchPath>registry</JVMSearchPath>
+<JVMSearchPath>javahome</JVMSearchPath>
+<JVMSearchPath>jrepath</JVMSearchPath>
+<JVMSearchPath>jdkpath</JVMSearchPath>
+<JVMSearchPath>exepath</JVMSearchPath>
+<JVMSearchPath>jview</JVMSearchPath>
+<arguments></arguments>
+<classPath>dist\davmail.jar</classPath>
+<classPath>dist\lib\activation-1.1.1.jar</classPath>
+<classPath>dist\lib\commons-codec-1.3.jar</classPath>
+<classPath>dist\lib\commons-collections-3.1.jar</classPath>
+<classPath>dist\lib\commons-httpclient-3.1.jar</classPath>
+<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>
+<classPath>dist\lib\mail-1.4.3.jar</classPath>
+<classPath>dist\lib\slf4j-api-1.3.1.jar</classPath>
+<classPath>dist\lib\slf4j-log4j12-1.3.1.jar</classPath>
+<classPath>dist\lib\stax-api-1.0.1.jar</classPath>
+<classPath>dist\lib\stax2-api-3.0.3.jar</classPath>
+<classPath>dist\lib\swt-3.6.2-win32-x86_64.jar</classPath>
+<classPath>dist\lib\woodstox-core-asl-4.0.9.jar</classPath>
+<classPath>dist\lib\xercesImpl-2.8.1.jar</classPath>
+<embeddedJar>false</embeddedJar>
+<executableName>dist\davmail64.exe</executableName>
+<iconLocation>src\java\tray48.png</iconLocation>
+<initialMemoryHeap>-1</initialMemoryHeap>
+<javaProperties>
+<name>sun.net.inetaddr.ttl</name>
+<value>60</value>
+</javaProperties>
+<mainClassName>davmail.DavGateway</mainClassName>
+<maximumMemoryHeap>268435456</maximumMemoryHeap>
+<maximumVersion></maximumVersion>
+<minimumVersion>1.6</minimumVersion>
+<skeletonName>Windowed Wrapper x64</skeletonName>
+<skeletonProperties>
+<key>Message</key>
+<value>Java has not been found on your computer. Do you want to download it?</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>URL</key>
+<value>http://www.java.com</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>SingleProcess</key>
+<value>1</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>SingleInstance</key>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>JniSmooth</key>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<key>Debug</key>
+<value>0</value>
+</skeletonProperties>
+</jsmoothproject>
diff --git a/lib/jsmoothgen-ant-0.9.9-7-mgu1.jar b/lib/jsmoothgen-ant-0.9.9-7-mgu2.jar
similarity index 79%
rename from lib/jsmoothgen-ant-0.9.9-7-mgu1.jar
rename to lib/jsmoothgen-ant-0.9.9-7-mgu2.jar
index b5cb9b03..8229e441 100644
Binary files a/lib/jsmoothgen-ant-0.9.9-7-mgu1.jar and b/lib/jsmoothgen-ant-0.9.9-7-mgu2.jar differ
diff --git a/lib/swt-3.6.2-win32-x86_64.jar b/lib/swt-3.6.2-win32-x86_64.jar
new file mode 100644
index 00000000..4f3d5c27
Binary files /dev/null and b/lib/swt-3.6.2-win32-x86_64.jar differ
diff --git a/src/jsmooth/skeletons/windowed-wrapper64/description64.skel b/src/jsmooth/skeletons/windowed-wrapper64/description64.skel
new file mode 100644
index 00000000..67722448
--- /dev/null
+++ b/src/jsmooth/skeletons/windowed-wrapper64/description64.skel
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<jsmoothskeleton>
+<debug>false</debug>
+<description>SKEL_SIMPLEWRAPPER_DESCRIPTION</description>
+<executableName>windowed-wrapper64.exe</executableName>
+<resourceCategory>JAVA</resourceCategory>
+<resourceJarId>102</resourceJarId>
+<resourcePropsId>103</resourcePropsId>
+<shortName>Windowed Wrapper x64</shortName>
+<skeletonProperties>
+<description>SKEL_SIMPLEWRAPPER_PROPERTY_MESSAGE_DESCRIPTION</description>
+<idName>Message</idName>
+<label>SKEL_SIMPLEWRAPPER_PROPERTY_MESSAGE_LABEL</label>
+<type>textarea</type>
+<value>Java has not been found on your computer. Do you want to download it?</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>SKEL_SIMPLEWRAPPER_PROPERTY_URL_DESCRIPTION</description>
+<idName>URL</idName>
+<label>SKEL_SIMPLEWRAPPER_PROPERTY_URL_LABEL</label>
+<type>string</type>
+<value>http://www.java.com</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>SKEL_GENERIC_PROPERTY_SINGLEPROCESS_DESCRIPTION</description>
+<idName>SingleProcess</idName>
+<label>SKEL_GENERIC_PROPERTY_SINGLEPROCESS_LABEL</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>SKEL_GENERIC_SINGLEINSTANCE_DESCRIPTION</description>
+<idName>SingleInstance</idName>
+<label>SKEL_GENERIC_SINGLEINSTANCE</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>SKEL_GENERIC_JNISMOOTH_DESCRIPTION</description>
+<idName>JniSmooth</idName>
+<label>SKEL_GENERIC_JNISMOOTH</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+<skeletonProperties>
+<description>SKEL_GENERIC_PROPERTY_DEBUG_DESCRIPTION</description>
+<idName>Debug</idName>
+<label>SKEL_GENERIC_PROPERTY_DEBUG_LABEL</label>
+<type>boolean</type>
+<value>0</value>
+</skeletonProperties>
+</jsmoothskeleton>
diff --git a/src/jsmooth/skeletons/windowed-wrapper64/windowed-wrapper64.exe b/src/jsmooth/skeletons/windowed-wrapper64/windowed-wrapper64.exe
new file mode 100644
index 00000000..3078cb97
Binary files /dev/null and b/src/jsmooth/skeletons/windowed-wrapper64/windowed-wrapper64.exe differ