diff --git a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailInboxPanel.java b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailInboxPanel.java
index 256b898e..4441e5ca 100755
--- a/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailInboxPanel.java
+++ b/j-lawyer-client/src/com/jdimension/jlawyer/client/mail/EmailInboxPanel.java
@@ -1749,7 +1749,7 @@ private void treeFoldersMouseReleased(java.awt.event.MouseEvent evt) {//GEN-FIRS
                 this.mnuRemoveFolder.setEnabled(true);
             }
 
-            this.mnuEmptyTrash.setEnabled(CommonMailUtils.TRASH.equalsIgnoreCase(f.getName()));
+            this.mnuEmptyTrash.setEnabled(CommonMailUtils.TRASH.equalsIgnoreCase(f.getName()) || CommonMailUtils.isTrash(f.getName()));
 
             if (f instanceof POP3Folder) {
                 this.mnuNewFolder.setEnabled(false);
@@ -1815,7 +1815,7 @@ private void treeFoldersMousePressed(java.awt.event.MouseEvent evt) {//GEN-FIRST
                 this.mnuRemoveFolder.setEnabled(true);
             }
 
-            this.mnuEmptyTrash.setEnabled(CommonMailUtils.TRASH.equalsIgnoreCase(f.getName()));
+            this.mnuEmptyTrash.setEnabled(CommonMailUtils.TRASH.equalsIgnoreCase(f.getName()) || CommonMailUtils.isTrash(f.getName()) || CommonMailUtils.isTrash(f.getName()));
             
             if (f instanceof POP3Folder) {
                 this.mnuNewFolder.setEnabled(false);