diff --git a/mozilla/grendel/ui/FolderCombo.java b/mozilla/grendel/ui/FolderCombo.java
index 30563b8e7e8..3394656be15 100644
--- a/mozilla/grendel/ui/FolderCombo.java
+++ b/mozilla/grendel/ui/FolderCombo.java
@@ -150,7 +150,7 @@ public class FolderCombo extends JComboBox {
         setText("");
       }
 
-      setEnabled(isEnabled);
+      this.setEnabled(isEnabled);
 
       if (aIsSelected) {
         setBackground(fHighlightColor);
diff --git a/mozilla/grendel/ui/FolderPanel.java b/mozilla/grendel/ui/FolderPanel.java
index 0b0310ddc34..2939b11e601 100644
--- a/mozilla/grendel/ui/FolderPanel.java
+++ b/mozilla/grendel/ui/FolderPanel.java
@@ -755,7 +755,7 @@ public class FolderPanel extends GeneralPanel {
 
     DeleteMessageAction() {
       super("msgDelete");
-      setEnabled(false);
+      this.setEnabled(false);
     }
 
     public void actionPerformed(ActionEvent aEvent) {
@@ -866,7 +866,7 @@ public class FolderPanel extends GeneralPanel {
     boolean replyall;
     public ReplyAction(String aAction, boolean r) {
       super(aAction);
-      setEnabled(false);
+      this.setEnabled(false);
 
       replyall = r;
     }
@@ -895,7 +895,7 @@ public class FolderPanel extends GeneralPanel {
       super(aName);
       fScope = aScope;
 
-      setEnabled(aScope == kAll);
+      this.setEnabled(aScope == kAll);
     }
 
     public void actionPerformed(ActionEvent aEvent) {
diff --git a/mozilla/grendel/ui/UnifiedMessageDisplayManager.java b/mozilla/grendel/ui/UnifiedMessageDisplayManager.java
index 1c7be7908e6..020a3b00cbd 100644
--- a/mozilla/grendel/ui/UnifiedMessageDisplayManager.java
+++ b/mozilla/grendel/ui/UnifiedMessageDisplayManager.java
@@ -300,7 +300,6 @@ class UnifiedMessageFrame extends GeneralFrame {
 
       //      fStackedLayoutAction.setSelected(IUICmd.kSelected);
     } else if (layout.equals(UnifiedMessageDisplayManager.SPLIT_LEFT)) {
-      System.out.println("Foo");
       splitter1.setOrientation(JSplitPane.HORIZONTAL_SPLIT);
       splitter2.setOrientation(JSplitPane.VERTICAL_SPLIT);
       
@@ -482,7 +481,7 @@ class UnifiedMessageFrame extends GeneralFrame {
     String action;
     public LayoutAction(String aAction) {
       super(aAction);
-      setEnabled(true);
+      this.setEnabled(true);
       action = aAction;
       fIcon = new ImageIcon(getClass().getResource("images/" +
                                                    aAction + ".gif"));