diff --git a/src/java/davmail/tray/AwtGatewayTray.java b/src/java/davmail/tray/AwtGatewayTray.java
index 54a61bb6..b21b2666 100644
--- a/src/java/davmail/tray/AwtGatewayTray.java
+++ b/src/java/davmail/tray/AwtGatewayTray.java
@@ -1,5 +1,7 @@
 package davmail.tray;
 
+import davmail.Settings;
+import davmail.SettingsFrame;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.apache.log4j.lf5.LF5Appender;
@@ -12,11 +14,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.net.URL;
 
-import davmail.tray.DavGatewayTrayInterface;
-import davmail.tray.DavGatewayTray;
-import davmail.SettingsFrame;
-import davmail.Settings;
-
 /**
  * Tray icon handler based on java 1.6
  */
diff --git a/src/java/davmail/tray/DavGatewayTray.java b/src/java/davmail/tray/DavGatewayTray.java
index 5eba9ccf..22b57518 100644
--- a/src/java/davmail/tray/DavGatewayTray.java
+++ b/src/java/davmail/tray/DavGatewayTray.java
@@ -2,11 +2,7 @@ package davmail.tray;
 
 import org.apache.log4j.Priority;
 
-import java.awt.SystemTray;
-
-import davmail.tray.AwtGatewayTray;
-import davmail.tray.DavGatewayTrayInterface;
-import davmail.tray.SwtGatewayTray;
+import java.awt.*;
 
 
 /**
diff --git a/src/java/davmail/tray/SwtGatewayTray.java b/src/java/davmail/tray/SwtGatewayTray.java
index 2baa2fa6..c11a21b4 100644
--- a/src/java/davmail/tray/SwtGatewayTray.java
+++ b/src/java/davmail/tray/SwtGatewayTray.java
@@ -1,5 +1,7 @@
 package davmail.tray;
 
+import davmail.Settings;
+import davmail.SettingsFrame;
 import org.apache.log4j.Logger;
 import org.apache.log4j.Priority;
 import org.apache.log4j.lf5.LF5Appender;
@@ -13,14 +15,9 @@ import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
 
 import javax.swing.*;
+import java.awt.*;
 import java.io.IOException;
 import java.net.URL;
-import java.awt.*;
-
-import davmail.tray.DavGatewayTray;
-import davmail.tray.DavGatewayTrayInterface;
-import davmail.SettingsFrame;
-import davmail.Settings;
 
 /**
  * Tray icon handler based on SWT