diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 17bc59f0..85ef0294 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -102,8 +102,8 @@ Section "MainSection" SEC01
   File "dist\lib\slf4j-log4j12-1.3.1.jar"
   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\swt-3.7-win32-x86.jar"
+  File "dist\lib\swt-3.7-win32-x86_64.jar"
   File "dist\lib\woodstox-core-asl-4.0.9.jar"
   File "dist\lib\xercesImpl-2.8.1.jar"
 
@@ -176,8 +176,8 @@ no_quest:
   Delete "$INSTDIR\lib\slf4j-log4j12-1.3.1.jar"
   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\swt-3.7-win32-x86.jar"
+  Delete "$INSTDIR\lib\swt-3.7-win32-x86_64.jar"  
   Delete "$INSTDIR\lib\woodstox-core-asl-4.0.9.jar"
   Delete "$INSTDIR\lib\xercesImpl-2.8.1.jar"
 
diff --git a/davmail.jsmooth b/davmail.jsmooth
index 094e48d5..75e9eb47 100644
--- a/davmail.jsmooth
+++ b/davmail.jsmooth
@@ -24,7 +24,7 @@
 <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-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.7-win32-x86.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>
diff --git a/davmail64.jsmooth b/davmail64.jsmooth
index 1fdeef6d..c1fc6d43 100644
--- a/davmail64.jsmooth
+++ b/davmail64.jsmooth
@@ -24,7 +24,7 @@
 <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\swt-3.7-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>
diff --git a/davmailconsole.jsmooth b/davmailconsole.jsmooth
index 2530234a..5987afec 100644
--- a/davmailconsole.jsmooth
+++ b/davmailconsole.jsmooth
@@ -24,7 +24,7 @@
 <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-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.7-win32-x86.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>
diff --git a/davmailservice.jsmooth b/davmailservice.jsmooth
index 93a90843..3a138480 100644
--- a/davmailservice.jsmooth
+++ b/davmailservice.jsmooth
@@ -24,7 +24,7 @@
 <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-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.7-win32-x86.jar</classPath>
 <classPath>dist/lib/woodstox-core-asl-4.0.9.jar</classPath>
 <classPath>dist/lib/xercesImpl-2.8.1.jar</classPath>
 <currentDirectory>${EXECUTABLEPATH}</currentDirectory>
diff --git a/lib/swt-3.6-gtk-linux-x86.jar b/lib/swt-3.6-gtk-linux-x86.jar
deleted file mode 100644
index 3aa20342..00000000
Binary files a/lib/swt-3.6-gtk-linux-x86.jar and /dev/null differ
diff --git a/lib/swt-3.6-gtk-linux-x86_64.jar b/lib/swt-3.6-gtk-linux-x86_64.jar
deleted file mode 100644
index c67dd274..00000000
Binary files a/lib/swt-3.6-gtk-linux-x86_64.jar and /dev/null differ
diff --git a/lib/swt-3.6-win32-x86.jar b/lib/swt-3.6-win32-x86.jar
deleted file mode 100644
index 7784382c..00000000
Binary files a/lib/swt-3.6-win32-x86.jar and /dev/null differ
diff --git a/lib/swt-3.7-gtk-linux-x86.jar b/lib/swt-3.7-gtk-linux-x86.jar
new file mode 100644
index 00000000..dc48467c
Binary files /dev/null and b/lib/swt-3.7-gtk-linux-x86.jar differ
diff --git a/lib/swt-3.7-gtk-linux-x86_64.jar b/lib/swt-3.7-gtk-linux-x86_64.jar
new file mode 100644
index 00000000..bd6be993
Binary files /dev/null and b/lib/swt-3.7-gtk-linux-x86_64.jar differ
diff --git a/lib/swt-3.7-win32-x86.jar b/lib/swt-3.7-win32-x86.jar
new file mode 100644
index 00000000..01403f0e
Binary files /dev/null and b/lib/swt-3.7-win32-x86.jar differ
diff --git a/lib/swt-3.6.2-win32-x86_64.jar b/lib/swt-3.7-win32-x86_64.jar
similarity index 51%
rename from lib/swt-3.6.2-win32-x86_64.jar
rename to lib/swt-3.7-win32-x86_64.jar
index 4f3d5c27..46cdd1bc 100644
Binary files a/lib/swt-3.6.2-win32-x86_64.jar and b/lib/swt-3.7-win32-x86_64.jar differ
diff --git a/releaseguide.txt b/releaseguide.txt
index b9fdfb9d..22b349da 100644
--- a/releaseguide.txt
+++ b/releaseguide.txt
@@ -5,7 +5,7 @@ Release guide :
 - launch ant release, check generated packages
 - upload packages: ant upload-release
 - make sure swt and jcifs are available in local maven repository:
-mvn install:install-file -DgroupId=org.eclipse -DartifactId=swt -Dversion=3.6.0 -Dpackaging=jar -Dfile=lib/swt-3.6-win32-x86.jar
+mvn install:install-file -DgroupId=org.eclipse -DartifactId=swt -Dversion=3.7.0 -Dpackaging=jar -Dfile=lib/swt-3.7-win32-x86.jar
 mvn install:install-file -DgroupId=org.samba.jcifs -DartifactId=jcifs -Dversion=1.3.14 -Dpackaging=jar -Dfile=lib/jcifs-1.3.14.jar
 mvn install:install-file -DgroupId=javax.mail -DartifactId=mail -Dversion=1.4.3 -Dpackaging=jar -Dfile=lib/mail-1.4.3.jar
 mvn install:install-file -DgroupId=net.freeutils.charset -DartifactId=jcharset -Dversion=1.3 -Dpackaging=jar -Dfile=lib/jcharset-1.3.jar