diff --git a/mozilla/grendel/sources/grendel/ui/GeneralPanel.java b/mozilla/grendel/sources/grendel/ui/GeneralPanel.java
index a937b6d2feb..e1d718ed979 100644
--- a/mozilla/grendel/sources/grendel/ui/GeneralPanel.java
+++ b/mozilla/grendel/sources/grendel/ui/GeneralPanel.java
@@ -51,7 +51,7 @@ import javax.swing.JPanel;
 import javax.swing.JButton;
 
 public class GeneralPanel extends JPanel {
-  private final boolean DEBUG = true;
+  private final boolean DEBUG = false;
   static ResourceBundle fLabels = ResourceBundle.getBundle("grendel.ui.Labels",
                                                          Locale.getDefault());
 
diff --git a/mozilla/grendel/sources/grendel/ui/MessageDisplayManager.java b/mozilla/grendel/sources/grendel/ui/MessageDisplayManager.java
index 9b46defb5b4..35994feaaec 100644
--- a/mozilla/grendel/sources/grendel/ui/MessageDisplayManager.java
+++ b/mozilla/grendel/sources/grendel/ui/MessageDisplayManager.java
@@ -55,7 +55,7 @@ public abstract class MessageDisplayManager {
   static volatile MessageDisplayManager fManager;
 
   static {
-    System.out.println("MessageDisplayManager.<clinit>");
+   // System.out.println("MessageDisplayManager.<clinit>");
   }
 
   /**
@@ -65,7 +65,7 @@ public abstract class MessageDisplayManager {
   public static synchronized void SetDefaultManager(MessageDisplayManager
                                                     aManager) {
     fManager = aManager;
-    System.out.println("Setting manager: " + aManager);
+//    System.out.println("Setting manager: " + aManager);
   }
 
   /**
@@ -73,7 +73,7 @@ public abstract class MessageDisplayManager {
    */
 
   public static synchronized MessageDisplayManager GetDefaultManager() {
-    System.out.println("Getting manager: " + fManager);
+//    System.out.println("Getting manager: " + fManager);
     return fManager;
   }
 
diff --git a/mozilla/grendel/sources/grendel/ui/MessagePanel.java b/mozilla/grendel/sources/grendel/ui/MessagePanel.java
index 8b4865048e9..50c83482a13 100644
--- a/mozilla/grendel/sources/grendel/ui/MessagePanel.java
+++ b/mozilla/grendel/sources/grendel/ui/MessagePanel.java
@@ -39,7 +39,7 @@ import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
 import java.io.PrintStream;
-import java.io.StringBufferInputStream;
+import java.io.StringReader;
 import java.net.URL;
 import java.net.MalformedURLException;
 import java.util.Locale;
@@ -137,8 +137,14 @@ public class MessagePanel extends GeneralPanel {
   public void dispose() {
     synchronized (fPanel) {
       if (fMessageLoadThread != null) {
-        System.out.println("Killing msg thread");
-        fMessageLoadThread.stop();
+     //   System.out.println("Killing msg thread");
+        fMessageLoadThread.interrupt();
+				try {
+					fMessageLoadThread.join();
+				}
+				catch ( InterruptedException ie ) {
+					// ignore
+				}
         fMessageLoadThread = null;
       }
     }
@@ -159,8 +165,14 @@ public class MessagePanel extends GeneralPanel {
 
   public synchronized void setMessage(Message aMessage) {
     if (fMessageLoadThread != null) {
-      System.out.println("Killing msg thread");
-      fMessageLoadThread.stop();
+  //    System.out.println("Killing msg thread");
+      fMessageLoadThread.interrupt();
+			try {
+				fMessageLoadThread.join();
+			}
+			catch ( InterruptedException ie ) {
+				// ignore
+			}
       notifyStatus(fLabels.getString("messageLoadedStatus"));
     }
     fMessageLoadThread =
@@ -296,8 +308,7 @@ public class MessagePanel extends GeneralPanel {
               throw new Error("Can't get the input stream???  " + e);
             }
           } else {
-            // Love them deprecated classes.  Oh, well, this is just a temp hack.
-            in = new StringBufferInputStream("This space intentionally left blank");
+            fTextArea.setText("This space intentionally left blank");
           }
 
           // synchronized (fViewer) {
diff --git a/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java b/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
index 9ddb15eede7..034c7653238 100644
--- a/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
+++ b/mozilla/grendel/sources/grendel/ui/UnifiedMessageDisplayManager.java
@@ -138,7 +138,7 @@ public class UnifiedMessageDisplayManager extends MessageDisplayManager {
 }
 
 class UnifiedMessageFrame extends GeneralFrame {
-  private final boolean DEBUG = true;
+  private final boolean DEBUG = false;
   MasterPanel   fFolders = null;
   FolderPanel   fThreads = null;
   MessagePanel  fMessage = null;
diff --git a/mozilla/grendel/sources/grendel/ui/Util.java b/mozilla/grendel/sources/grendel/ui/Util.java
index b8fc03bc41c..6d48e2571b0 100644
--- a/mozilla/grendel/sources/grendel/ui/Util.java
+++ b/mozilla/grendel/sources/grendel/ui/Util.java
@@ -54,7 +54,7 @@ import grendel.ui.UIAction;
 import grendel.widgets.GrendelToolBar;
 
 public class Util {
-  static final boolean DEBUG = true;
+  static final boolean DEBUG = false;
   public static final int LEFT = 0;
   public static final int CENTER = 0;
   public static final int RIGHT = 0;