diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java
index 86b343cfac..09f5d8e87f 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessageViewer.java
@@ -51,9 +51,7 @@ import org.openide.util.Exceptions;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle.Messages;
 import org.sleuthkit.autopsy.communications.ModifiableProxyLookup;
-import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
 import org.sleuthkit.autopsy.coreutils.Logger;
-import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 
 /**
  * The main panel for the messages tab of the RelationshipViewer
@@ -115,12 +113,9 @@ public class MessageViewer extends JPanel implements RelationshipsViewer {
         };
 
         rootTablePane.getExplorerManager().setRootContext(
-                new TableFilterNode(
-                        new DataResultFilterNode(
-                                new AbstractNode(
-                                        Children.create(rootMessageFactory, true)),
-                                rootTablePane.getExplorerManager()),
-                        true));
+                new AbstractNode(Children.create(rootMessageFactory, true)));
+        
+        rootTablePane.getOutlineView().setPopupAllowed(false);
 
         Outline outline = rootTablePane.getOutlineView().getOutline();
         rootTablePane.getOutlineView().setPropertyColumns(
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java
index d185b1a374..726fba4341 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesChildNodeFactory.java
@@ -33,7 +33,8 @@ import org.sleuthkit.datamodel.Content;
 import org.sleuthkit.datamodel.TskCoreException;
 
 /**
- *
+ * A ChildFactory subclass for creating MessageNodes from a set of 
+ * BlackboardArtifact objects.
  *
  */
 public class MessagesChildNodeFactory extends ChildFactory<BlackboardArtifact>{
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.java
index 366d6ee43b..44f412ca30 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/MessagesPanel.java
@@ -38,7 +38,8 @@ import org.sleuthkit.autopsy.directorytree.DataResultFilterNode;
 
 /**
  *
- * 
+ * General Purpose class for panels that need OutlineView of message nodes at 
+ * the top with a MessageContentViewer at the bottom.
  */
 public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider {
 
@@ -47,7 +48,7 @@ public class MessagesPanel extends javax.swing.JPanel implements Lookup.Provider
     private final PropertyChangeListener focusPropertyListener;
     
     /**
-     * Creates new form ThreadMessagesPanel
+     * Creates new form MessagesPanel
      */
     public MessagesPanel() {
         initComponents();
diff --git a/Core/src/org/sleuthkit/autopsy/communications/relationships/ThreadNode.java b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThreadNode.java
index a3730df69c..f398b94757 100755
--- a/Core/src/org/sleuthkit/autopsy/communications/relationships/ThreadNode.java
+++ b/Core/src/org/sleuthkit/autopsy/communications/relationships/ThreadNode.java
@@ -1,7 +1,20 @@
 /*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
+ * Autopsy Forensic Browser
+ *
+ * Copyright 2019 Basis Technology Corp.
+ * Contact: carrier <at> sleuthkit <dot> org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.sleuthkit.autopsy.communications.relationships;
 
@@ -12,8 +25,9 @@ import org.openide.nodes.Sheet;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 
 /**
- *
- * @author kelly
+ * An AbstractNode subclass which wraps a MessagNode object.  Doing this allows
+ * for the reuse of the createSheet and other function from MessageNode, but
+ * also some customizing of how a ThreadNode is shown.
  */
 final class ThreadNode extends AbstractNode{