diff --git a/build.xml b/build.xml
index 6d1d7faa..cb69f466 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,7 @@
         <jar basedir="target/classes" destfile="dist/davmail.jar"/>
         <copy todir="dist/lib">
             <fileset dir="lib">
-                <include name="**/*.jar"/>
+                <include name="*.jar"/>
             </fileset>
         </copy>
         <copy todir="dist">
diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 7fdd2256..99317d9e 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -44,7 +44,7 @@
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "davmail-${PRODUCT_VERSION}-setup.exe"
+OutFile "dist\davmail-${PRODUCT_VERSION}-setup.exe"
 InstallDir "$PROGRAMFILES\DavMail"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
@@ -79,6 +79,7 @@ Section "SectionPrincipale" SEC01
   File "dist\davmail.exe"
   CreateDirectory "$SMPROGRAMS\DavMail"
   CreateShortCut "$SMPROGRAMS\DavMail\DavMail.lnk" "$INSTDIR\davmail.exe"
+  CreateShortCut "$SMPROGRAMS\DavMail\DavMail Console.lnk" "$INSTDIR\davmailconsole.exe"
   CreateShortCut "$DESKTOP\DavMail.lnk" "$INSTDIR\davmail.exe"
   File "dist\davmail.jar"
   File "dist\davmailconsole.exe"
diff --git a/davmail.jsmooth b/davmail.jsmooth
new file mode 100644
index 00000000..73e3d007
--- /dev/null
+++ b/davmail.jsmooth
@@ -0,0 +1,50 @@
+<?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>src\jsmooth\davmail.jar</classPath>
+<classPath>src\jsmooth\lib\activation-1.0.2.jar</classPath>
+<classPath>src\jsmooth\lib\commons-httpclient-2.0.2.jar</classPath>
+<classPath>src\jsmooth\lib\commons-logging-1.0.4.jar</classPath>
+<classPath>src\jsmooth\lib\jaxen-1.0-FCS-full.jar</classPath>
+<classPath>src\jsmooth\lib\jdom-1.0.jar</classPath>
+<classPath>src\jsmooth\lib\jtidy-4aug2000r7-dev.jar</classPath>
+<classPath>src\jsmooth\lib\log4j-1.2.8.jar</classPath>
+<classPath>src\jsmooth\lib\mail-1.3.2.jar</classPath>
+<classPath>src\jsmooth\lib\saxpath-1.0-FCS.jar</classPath>
+<classPath>src\jsmooth\lib\slide-webdavlib-2.1.jar</classPath>
+<embeddedJar>false</embeddedJar>
+<executableName>src\jsmooth\davmail.exe</executableName>
+<iconLocation>src\java\tray.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</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>Debug</key>
+<value>0</value>
+</skeletonProperties>
+</jsmoothproject>
diff --git a/src/jsmooth/davmailconsole.jsmooth b/davmailconsole.jsmooth
similarity index 57%
rename from src/jsmooth/davmailconsole.jsmooth
rename to davmailconsole.jsmooth
index be443966..302dbe3a 100644
--- a/src/jsmooth/davmailconsole.jsmooth
+++ b/davmailconsole.jsmooth
@@ -7,19 +7,19 @@
 <JVMSearchPath>exepath</JVMSearchPath>
 <JVMSearchPath>jview</JVMSearchPath>
 <arguments></arguments>
-<classPath>davmail.jar</classPath>
-<classPath>lib\activation-1.0.2.jar</classPath>
-<classPath>lib\commons-httpclient-2.0.2.jar</classPath>
-<classPath>lib\commons-logging-1.0.4.jar</classPath>
-<classPath>lib\jaxen-1.0-FCS-full.jar</classPath>
-<classPath>lib\jdom-1.0.jar</classPath>
-<classPath>lib\jtidy-4aug2000r7-dev.jar</classPath>
-<classPath>lib\log4j-1.2.8.jar</classPath>
-<classPath>lib\mail-1.3.2.jar</classPath>
-<classPath>lib\saxpath-1.0-FCS.jar</classPath>
-<classPath>lib\slide-webdavlib-2.1.jar</classPath>
+<classPath>src\jsmooth\davmail.jar</classPath>
+<classPath>src\jsmooth\lib\activation-1.0.2.jar</classPath>
+<classPath>src\jsmooth\lib\commons-httpclient-2.0.2.jar</classPath>
+<classPath>src\jsmooth\lib\commons-logging-1.0.4.jar</classPath>
+<classPath>src\jsmooth\lib\jaxen-1.0-FCS-full.jar</classPath>
+<classPath>src\jsmooth\lib\jdom-1.0.jar</classPath>
+<classPath>src\jsmooth\lib\jtidy-4aug2000r7-dev.jar</classPath>
+<classPath>src\jsmooth\lib\log4j-1.2.8.jar</classPath>
+<classPath>src\jsmooth\lib\mail-1.3.2.jar</classPath>
+<classPath>src\jsmooth\lib\saxpath-1.0-FCS.jar</classPath>
+<classPath>src\jsmooth\lib\slide-webdavlib-2.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
-<executableName>davmailconsole.exe</executableName>
+<executableName>src\jsmooth\davmailconsole.exe</executableName>
 <iconLocation>src\java\tray.png</iconLocation>
 <initialMemoryHeap>-1</initialMemoryHeap>
 <javaProperties>
@@ -29,7 +29,7 @@
 <mainClassName>davmail.DavGateway</mainClassName>
 <maximumMemoryHeap>268435456</maximumMemoryHeap>
 <maximumVersion></maximumVersion>
-<minimumVersion>1.5</minimumVersion>
+<minimumVersion>1.4</minimumVersion>
 <skeletonName>Console Wrapper</skeletonName>
 <skeletonProperties>
 <key>Message</key>
diff --git a/src/java/tray.ico b/src/java/tray.ico
new file mode 100644
index 00000000..37416c32
Binary files /dev/null and b/src/java/tray.ico differ
diff --git a/src/jsmooth/davmail.exe b/src/jsmooth/davmail.exe
index 6ca95429..e29fe099 100644
Binary files a/src/jsmooth/davmail.exe and b/src/jsmooth/davmail.exe differ
diff --git a/src/jsmooth/davmailconsole.exe b/src/jsmooth/davmailconsole.exe
index aeb15c12..2815e229 100644
Binary files a/src/jsmooth/davmailconsole.exe and b/src/jsmooth/davmailconsole.exe differ