diff --git a/davmail-setup.nsi b/davmail-setup.nsi
index 0cb9825e..9f77839d 100644
--- a/davmail-setup.nsi
+++ b/davmail-setup.nsi
@@ -99,7 +99,7 @@ Section "MainSection" SEC01
   File "dist\lib\slf4j-api-1.3.1.jar"
   File "dist\lib\slf4j-log4j12-1.3.1.jar"
   File "dist\lib\stax-api-1.0.1.jar"
-  File "dist\lib\swt-3.5-win32-x86.jar"
+  File "dist\lib\swt-3.6-win32-x86.jar"
   File "dist\lib\wstx-asl-3.2.7.jar"
   File "dist\lib\xercesImpl-2.8.1.jar"
 
@@ -170,7 +170,7 @@ no_quest:
   Delete "$INSTDIR\lib\slf4j-api-1.3.1.jar"
   Delete "$INSTDIR\lib\slf4j-log4j12-1.3.1.jar"
   Delete "$INSTDIR\lib\stax-api-1.0.1.jar"
-  Delete "$INSTDIR\lib\swt-3.5-win32-x86.jar"
+  Delete "$INSTDIR\lib\swt-3.6-win32-x86.jar"
   Delete "$INSTDIR\lib\wstx-asl-3.2.7.jar"
   Delete "$INSTDIR\lib\xercesImpl-2.8.1.jar"
 
diff --git a/davmail.jsmooth b/davmail.jsmooth
index 97f77c17..f366c238 100644
--- a/davmail.jsmooth
+++ b/davmail.jsmooth
@@ -22,7 +22,7 @@
 <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/swt-3.5-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.6-win32-x86.jar</classPath>
 <classPath>dist/lib/wstx-asl-3.2.7.jar</classPath>
 <classPath>dist/lib/xercesImpl-2.8.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
diff --git a/davmailconsole.jsmooth b/davmailconsole.jsmooth
index f171c8ac..a1021970 100644
--- a/davmailconsole.jsmooth
+++ b/davmailconsole.jsmooth
@@ -22,7 +22,7 @@
 <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/swt-3.5-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.6-win32-x86.jar</classPath>
 <classPath>dist/lib/wstx-asl-3.2.7.jar</classPath>
 <classPath>dist/lib/xercesImpl-2.8.1.jar</classPath>
 <embeddedJar>false</embeddedJar>
diff --git a/davmailservice.jsmooth b/davmailservice.jsmooth
index 400e746f..cbfd0908 100644
--- a/davmailservice.jsmooth
+++ b/davmailservice.jsmooth
@@ -22,7 +22,7 @@
 <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/swt-3.5-win32-x86.jar</classPath>
+<classPath>dist/lib/swt-3.6-win32-x86.jar</classPath>
 <classPath>dist/lib/wstx-asl-3.2.7.jar</classPath>
 <classPath>dist/lib/xercesImpl-2.8.1.jar</classPath>
 <currentDirectory>${EXECUTABLEPATH}</currentDirectory>
diff --git a/lib/swt-3.5-gtk-linux-x86.jar b/lib/swt-3.5-gtk-linux-x86.jar
deleted file mode 100644
index 5c94f6ef..00000000
Binary files a/lib/swt-3.5-gtk-linux-x86.jar and /dev/null differ
diff --git a/lib/swt-3.5-gtk-linux-x86_64.jar b/lib/swt-3.5-gtk-linux-x86_64.jar
deleted file mode 100644
index 4ce079fe..00000000
Binary files a/lib/swt-3.5-gtk-linux-x86_64.jar and /dev/null differ
diff --git a/lib/swt-3.5-win32-x86.jar b/lib/swt-3.5-win32-x86.jar
deleted file mode 100644
index 5eb6d90e..00000000
Binary files a/lib/swt-3.5-win32-x86.jar and /dev/null differ
diff --git a/lib/swt-3.6-gtk-linux-x86.jar b/lib/swt-3.6-gtk-linux-x86.jar
new file mode 100644
index 00000000..3aa20342
Binary files /dev/null and b/lib/swt-3.6-gtk-linux-x86.jar differ
diff --git a/lib/swt-3.6-gtk-linux-x86_64.jar b/lib/swt-3.6-gtk-linux-x86_64.jar
new file mode 100644
index 00000000..c67dd274
Binary files /dev/null and b/lib/swt-3.6-gtk-linux-x86_64.jar differ
diff --git a/lib/swt-3.6-win32-x86.jar b/lib/swt-3.6-win32-x86.jar
new file mode 100644
index 00000000..7784382c
Binary files /dev/null and b/lib/swt-3.6-win32-x86.jar differ