diff --git a/src/java/davmail/ui/tray/AwtGatewayTray.java b/src/java/davmail/ui/tray/AwtGatewayTray.java
index 6b194bfd..b1a865ee 100644
--- a/src/java/davmail/ui/tray/AwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/AwtGatewayTray.java
@@ -197,6 +197,8 @@ public class AwtGatewayTray implements DavGatewayTrayInterface {
                 if (logBrokerMonitor != null) {
                     logBrokerMonitor.dispose();
                 }
+                // make sure we do exit
+                System.exit(0);
             }
         };
         // create menu item for the exit action
diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java
index 4eeecd66..e2e38abc 100644
--- a/src/java/davmail/ui/tray/FrameGatewayTray.java
+++ b/src/java/davmail/ui/tray/FrameGatewayTray.java
@@ -184,6 +184,8 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
                 if (logBrokerMonitor != null) {
                     logBrokerMonitor.dispose();
                 }
+                // make sure we do exit
+                System.exit(0);
             }
         };
         // create menu item for the exit action
diff --git a/src/java/davmail/ui/tray/SwtGatewayTray.java b/src/java/davmail/ui/tray/SwtGatewayTray.java
index ba9734b6..e18022d4 100644
--- a/src/java/davmail/ui/tray/SwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/SwtGatewayTray.java
@@ -266,6 +266,7 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
 
                     if (trayItem != null) {
                         trayItem.dispose();
+                        trayItem = null;
                     }
 
                     if (image != null) {
@@ -281,6 +282,8 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
                     if (logBrokerMonitor != null) {
                         logBrokerMonitor.dispose();
                     }
+                    // make sure we do exit
+                    System.exit(0);
                 }
             }
         }.start();