diff --git a/src/java/davmail/ui/tray/AwtGatewayTray.java b/src/java/davmail/ui/tray/AwtGatewayTray.java
index 967cba2c..516c9b20 100644
--- a/src/java/davmail/ui/tray/AwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/AwtGatewayTray.java
@@ -43,7 +43,7 @@ public class AwtGatewayTray implements DavGatewayTrayInterface {
         isActive = true;
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                if (trayIcon.getImage() == image) {
+                if (trayIcon.getImage().equals(image)) {
                     trayIcon.setImage(image2);
                 } else {
                     trayIcon.setImage(image);
@@ -78,11 +78,11 @@ public class AwtGatewayTray implements DavGatewayTrayInterface {
             public void run() {
                 if (trayIcon != null) {
                     TrayIcon.MessageType messageType = null;
-                    if (priority == Priority.INFO) {
+                    if (priority.equals(Priority.INFO)) {
                         messageType = TrayIcon.MessageType.INFO;
-                    } else if (priority == Priority.WARN) {
+                    } else if (priority.equals(Priority.WARN)) {
                         messageType = TrayIcon.MessageType.WARNING;
-                    } else if (priority == Priority.ERROR) {
+                    } else if (priority.equals(Priority.ERROR)) {
                         messageType = TrayIcon.MessageType.ERROR;
                     }
                     if (messageType != null) {
diff --git a/src/java/davmail/ui/tray/FrameGatewayTray.java b/src/java/davmail/ui/tray/FrameGatewayTray.java
index 236f7e0c..41ab2def 100644
--- a/src/java/davmail/ui/tray/FrameGatewayTray.java
+++ b/src/java/davmail/ui/tray/FrameGatewayTray.java
@@ -41,7 +41,7 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
         isActive = true;
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-                if (mainFrame.getIconImage() == image) {
+                if (mainFrame.getIconImage().equals(image)) {
                     mainFrame.setIconImage(image2);
                 } else {
                     mainFrame.setIconImage(image);
@@ -75,13 +75,13 @@ public class FrameGatewayTray implements DavGatewayTrayInterface {
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
                 if (mainFrame != null) {
-                    if (priority == Priority.INFO) {
+                    if (priority.equals(Priority.INFO)) {
                         errorLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
                         errorArea.setText(message);
-                    } else if (priority == Priority.WARN) {
+                    } else if (priority.equals(Priority.WARN)) {
                         errorLabel.setIcon(UIManager.getIcon("OptionPane.warningIcon"));
                         errorArea.setText(message);
-                    } else if (priority == Priority.ERROR) {
+                    } else if (priority.equals(Priority.ERROR)) {
                         errorLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
                         errorArea.setText(message);
                     } else {
diff --git a/src/java/davmail/ui/tray/SwtGatewayTray.java b/src/java/davmail/ui/tray/SwtGatewayTray.java
index 4e27a70a..43014c0d 100644
--- a/src/java/davmail/ui/tray/SwtGatewayTray.java
+++ b/src/java/davmail/ui/tray/SwtGatewayTray.java
@@ -44,7 +44,7 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
         isActive = true;
         display.syncExec(new Runnable() {
             public void run() {
-                if (trayItem.getImage() == image) {
+                if (trayItem.getImage().equals(image)) {
                     trayItem.setImage(image2);
                 } else {
                     trayItem.setImage(image);
@@ -80,11 +80,11 @@ public class SwtGatewayTray implements DavGatewayTrayInterface {
             display.asyncExec(new Runnable() {
                 public void run() {
                     int messageType = 0;
-                    if (priority == Priority.INFO) {
+                    if (priority.equals(Priority.INFO)) {
                         messageType = SWT.ICON_INFORMATION;
-                    } else if (priority == Priority.WARN) {
+                    } else if (priority.equals(Priority.WARN)) {
                         messageType = SWT.ICON_WARNING;
-                    } else if (priority == Priority.ERROR) {
+                    } else if (priority.equals(Priority.ERROR)) {
                         messageType = SWT.ICON_ERROR;
                     }
                     if (messageType != 0) {