diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
index e3bad44705..df28377d6c 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/BlackboardArtifactNode.java
@@ -43,6 +43,7 @@ import org.apache.commons.lang3.tuple.Pair;
 import org.openide.nodes.Sheet;
 import org.openide.util.Lookup;
 import org.openide.util.NbBundle;
+import org.openide.util.NbBundle.Messages;
 import org.openide.util.WeakListeners;
 import org.openide.util.lookup.Lookups;
 import org.sleuthkit.autopsy.casemodule.Case;
@@ -81,6 +82,7 @@ import org.sleuthkit.autopsy.texttranslation.TextTranslationService;
 import org.sleuthkit.autopsy.datamodel.utils.FileNameTransTask;
 import org.sleuthkit.datamodel.AnalysisResult;
 import org.sleuthkit.datamodel.BlackboardArtifact.Category;
+import org.sleuthkit.datamodel.DataArtifact;
 import org.sleuthkit.datamodel.Score;
 
 /**
@@ -229,7 +231,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         super(artifact, createLookup(artifact, false));
         this.artifact = artifact;
         this.artifactType = getType(artifact);
-                        
+
         for (Content lookupContent : this.getLookup().lookupAll(Content.class)) {
             if ((lookupContent != null) && (!(lookupContent instanceof BlackboardArtifact))) {
                 srcContent = lookupContent;
@@ -272,7 +274,7 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         super(artifact, createLookup(artifact, lookupIsAssociatedFile));
         this.artifact = artifact;
         this.artifactType = getType(artifact);
-        
+
         try {
             //The lookup for a file may or may not exist so we define the srcContent as the parent.
             srcContent = artifact.getParent();
@@ -312,10 +314,12 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
     public BlackboardArtifactNode(BlackboardArtifact artifact) {
         this(artifact, IconsUtil.getIconFilePath(artifact.getArtifactTypeID()));
     }
-    
+
     /**
      * Returns the artifact type of the artifact.
+     *
      * @param artifact The artifact.
+     *
      * @return The artifact type or null if no type could be retrieved.
      */
     private static BlackboardArtifact.Type getType(BlackboardArtifact artifact) {
@@ -437,6 +441,19 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
         return this.artifact;
     }
 
+    /**
+     * Returns the source content of the artifact.
+     *
+     * @return The source content of the artifact.
+     */
+    @Beta
+    public Content getSourceContent() {
+        return this.srcContent;
+    }
+
+    @NbBundle.Messages({
+        "BlackboardArtifactNode_getActions_viewSourceDataArtifact=View Source Data Artifact in Timeline... "
+    })
     @Override
     public Action[] getActions(boolean context) {
         List<Action> actionsList = new ArrayList<>();
@@ -447,10 +464,10 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
          * action to view it in the timeline.
          */
         try {
-            if (ViewArtifactInTimelineAction.hasSupportedTimeStamp(artifact) &&
-                    // don't show ViewArtifactInTimelineAction for AnalysisResults.
+            if (ViewArtifactInTimelineAction.hasSupportedTimeStamp(artifact)
+                    && // don't show ViewArtifactInTimelineAction for AnalysisResults.
                     (!(this.artifact instanceof AnalysisResult))) {
-                
+
                 actionsList.add(new ViewArtifactInTimelineAction(artifact));
             }
         } catch (TskCoreException ex) {
@@ -476,10 +493,17 @@ public class BlackboardArtifactNode extends AbstractContentNode<BlackboardArtifa
          * If the source content of the artifact represented by this node is a
          * file, add an action to view the file in the data source tree.
          */
-        AbstractFile file = getLookup().lookup(AbstractFile.class
-        );
-        if (null != file) {
-            actionsList.add(ViewFileInTimelineAction.createViewSourceFileAction(file));
+        if (this.srcContent instanceof AbstractFile) {
+            actionsList.add(ViewFileInTimelineAction.createViewSourceFileAction((AbstractFile) this.srcContent));
+        } else if (this.srcContent instanceof DataArtifact) {
+            try {
+                if (ViewArtifactInTimelineAction.hasSupportedTimeStamp((DataArtifact) this.srcContent)) {
+                    actionsList.add(new ViewArtifactInTimelineAction((DataArtifact) this.srcContent,
+                            Bundle.BlackboardArtifactNode_getActions_viewSourceDataArtifact()));
+                }
+            } catch (TskCoreException ex) {
+                logger.log(Level.SEVERE, MessageFormat.format("Error getting source data artifact timestamp (artifact objID={0})", this.srcContent.getId()), ex); //NON-NLS
+            }
         }
 
         return actionsList.toArray(new Action[actionsList.size()]);
diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
index 6dd6851b03..d91c934022 100755
--- a/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/Bundle.properties-MERGED
@@ -78,6 +78,7 @@ BlackboardArtifactNode.createSheet.srcFile.origDisplayName=Original Name
 BlackboardArtifactNode.createSheet.srcFile.origName=Original Name
 BlackboardArtifactNode.createSheet.taggedItem.description=Result or associated file has been tagged.
 BlackboardArtifactNode.createSheet.tags.displayName=Tags
+BlackboardArtifactNode_getActions_viewSourceDataArtifact=View Source Data Artifact in Timeline... 
 BlackboardArtifactTagNode.createSheet.userName.text=User Name
 BlackboardArtifactTagNode.viewSourceArtifact.text=View Source Result
 Category.five=CAT-5: Non-pertinent
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
index 0ab883cbd4..970a1d04fe 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties-MERGED
@@ -5,6 +5,12 @@ CSVWriter.progress.cancelling=Cancelling
 CSVWriter.progress.extracting=Exporting to CSV file
 CTL_DirectoryTreeTopComponent=Directory Tree
 DataResultFilterNode.viewSourceArtifact.text=View Source Result
+# {0} - contentType
+DataResultFilterNode_getViewSourceDisplayName_baseMessage=View Source {0}
+DataResultFilterNode_getViewSourceDisplayName_type_DataArtifact=Data Artifact
+DataResultFilterNode_getViewSourceDisplayName_type_File=File
+DataResultFilterNode_getViewSourceDisplayName_type_OSAccount=OS Account
+DataResultFilterNode_getViewSourceDisplayName_type_Unknown=Content
 # {0} - dataSourceCount
 DirectoryTreeTopComponent.componentOpened.groupDataSources.text=This case contains {0} data sources. Would you like to group by data source for faster loading?
 DirectoryTreeTopComponent.componentOpened.groupDataSources.title=Group by data source?
diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
index 51fffee37f..9d8249ef59 100644
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
@@ -63,9 +63,9 @@ import org.sleuthkit.autopsy.datamodel.Reports;
 import org.sleuthkit.autopsy.datamodel.SlackFileNode;
 import org.sleuthkit.autopsy.commonpropertiessearch.CaseDBCommonAttributeInstanceNode;
 import org.sleuthkit.autopsy.datamodel.VirtualDirectoryNode;
-import static org.sleuthkit.autopsy.directorytree.Bundle.DataResultFilterNode_viewSourceArtifact_text;
 import org.sleuthkit.autopsy.modules.embeddedfileextractor.ExtractArchiveWithPasswordAction;
 import org.sleuthkit.datamodel.AbstractFile;
+import org.sleuthkit.datamodel.AnalysisResult;
 import org.sleuthkit.datamodel.BlackboardArtifact;
 import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.sleuthkit.datamodel.Content;
@@ -80,6 +80,7 @@ import org.sleuthkit.datamodel.TskException;
 import org.sleuthkit.datamodel.VirtualDirectory;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.DataArtifact;
+import org.sleuthkit.datamodel.OsAccount;
 import org.sleuthkit.datamodel.Report;
 import org.sleuthkit.datamodel.TskCoreException;
 
@@ -98,8 +99,8 @@ public class DataResultFilterNode extends FilterNode {
     // Assumptions are made in GetPreferredActionsDisplayableItemNodeVisitor that
     // sourceEm is the directory tree explorer manager.
     private final ExplorerManager sourceEm;
-    
-       /**
+
+    /**
      * Constructs a node used to wrap another node before passing it to the
      * result viewers. The wrapper node defines the actions associated with the
      * wrapped node and may filter out some of its children.
@@ -107,7 +108,7 @@ public class DataResultFilterNode extends FilterNode {
      * @param node The node to wrap.
      */
     public DataResultFilterNode(Node node) {
-       this(node, null);
+        this(node, null);
     }
 
     /**
@@ -240,22 +241,54 @@ public class DataResultFilterNode extends FilterNode {
         protected Node[] createNodes(Node key) {
             // if displaying the results from the Data Source tree
             // filter out artifacts
-          
+
             // In older versions of Autopsy,  attachments were children of email/message artifacts
             // and hence email/messages with attachments are shown in the tree data source tree,
             BlackboardArtifact art = key.getLookup().lookup(BlackboardArtifact.class);
             if (art != null && filterArtifacts
                     && ((FilterNodeUtils.showMessagesInDatasourceTree() == false)
-                         || (FilterNodeUtils.showMessagesInDatasourceTree()
-                                && art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()
-                                && art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()))) {
+                    || (FilterNodeUtils.showMessagesInDatasourceTree()
+                    && art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID()
+                    && art.getArtifactTypeID() != BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID()))) {
                 return new Node[]{};
             }
-                
+
             return new Node[]{new DataResultFilterNode(key, sourceEm)};
         }
     }
 
+    /**
+     * Get the menu action for view source X (file, data artifact, os account)
+     * for an analysis result.
+     *
+     * @param content The content to navigate to.
+     *
+     * @return The ViewContextAction that will navigate to the specified content
+     *         in the results / tree view to be used with an analysis result.
+     */
+    @NbBundle.Messages({
+        "# {0} - contentType",
+        "DataResultFilterNode_getViewSourceDisplayName_baseMessage=View Source {0}",
+        "DataResultFilterNode_getViewSourceDisplayName_type_File=File",
+        "DataResultFilterNode_getViewSourceDisplayName_type_DataArtifact=Data Artifact",
+        "DataResultFilterNode_getViewSourceDisplayName_type_OSAccount=OS Account",
+        "DataResultFilterNode_getViewSourceDisplayName_type_Unknown=Content"
+    })
+    private static ViewContextAction getResultViewContext(Content content) {
+        String type = Bundle.DataResultFilterNode_getViewSourceDisplayName_type_Unknown();
+        if (content instanceof AbstractFile) {
+            type = Bundle.DataResultFilterNode_getViewSourceDisplayName_type_File();
+        } else if (content instanceof DataArtifact) {
+            type = Bundle.DataResultFilterNode_getViewSourceDisplayName_type_DataArtifact();
+        } else if (content instanceof OsAccount) {
+            type = Bundle.DataResultFilterNode_getViewSourceDisplayName_type_OSAccount();
+        }
+
+        String menuDisplayName = Bundle.DataResultFilterNode_getViewSourceDisplayName_baseMessage(type);
+
+        return new ViewContextAction(menuDisplayName, content);
+    }
+
     @NbBundle.Messages("DataResultFilterNode.viewSourceArtifact.text=View Source Result")
     /**
      * Uses the default nodes actions per node, adds some custom ones and
@@ -276,33 +309,9 @@ public class DataResultFilterNode extends FilterNode {
             for (Action a : ban.getActions(true)) {
                 actionsList.add(a);
             }
-            
-            //Add seperator between the decorated actions and the actions from the node itself.
-            actionsList.add(null);
-            BlackboardArtifact ba = ban.getLookup().lookup(BlackboardArtifact.class);
-            final int artifactTypeID = ba.getArtifactTypeID();
 
-            if (artifactTypeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_HASHSET_HIT.getTypeID()
-                    || artifactTypeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_KEYWORD_HIT.getTypeID()) {
-                if (ban.getLookup().lookup(AbstractFile.class) != null) {
-                    // We only want the "View File in Directory" actions if we have a file...it is
-                    // possible that we have a keyword hit on a Report.
-                    actionsList.add(new ViewContextAction(
-                            NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewFileInDir.text"), ban));
-                }
-            } else if (artifactTypeID == BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_ARTIFACT_HIT.getTypeID()) {
-                try {
-                    if (ba.getAttribute(BlackboardAttribute.Type.TSK_ASSOCIATED_ARTIFACT) != null) {
-                        //action to go to the source artifact
-                        actionsList.add(new ViewSourceArtifactAction(DataResultFilterNode_viewSourceArtifact_text(), ba));
-                        
-                        // action to go to the source file of the artifact
-                        actionsList.add(new ViewContextAction(
-                                NbBundle.getMessage(this.getClass(), "DataResultFilterNode.action.viewSrcFileInDir.text"), ban));
-                    }
-                } catch (TskCoreException ex) {
-                    LOGGER.log(Level.WARNING, "Error looking up attributes for artifact with ID=" + ba.getId());
-                }
+            if (ban.getArtifact() instanceof AnalysisResult) {
+                actionsList.add(getResultViewContext(ban.getSourceContent()));
             } else {
                 // if the artifact links to another file, add an action to go to
                 // that file
@@ -366,12 +375,12 @@ public class DataResultFilterNode extends FilterNode {
                 actionsList.add(ExtractAction.getInstance());
                 actionsList.add(ExportCSVAction.getInstance());
                 actionsList.add(null); // creates a menu separator
-                
+
                 // don't show AddContentTagAction for data artifacts.
                 if (!(ban.getArtifact() instanceof DataArtifact)) {
                     actionsList.add(AddContentTagAction.getInstance());
                 }
-                
+
                 actionsList.add(AddBlackboardArtifactTagAction.getInstance());
 
                 // don't show DeleteFileContentTagAction for data artifacts.
@@ -488,12 +497,12 @@ public class DataResultFilterNode extends FilterNode {
 
         @Override
         public AbstractAction visit(BlackboardArtifactNode ban) {
-            
+
             Action preferredAction = ban.getPreferredAction();
-            if(preferredAction instanceof AbstractAction) {
+            if (preferredAction instanceof AbstractAction) {
                 return (AbstractAction) preferredAction;
             }
-            
+
             BlackboardArtifact artifact = ban.getArtifact();
             try {
                 if ((artifact.getArtifactTypeID() == ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID())
@@ -567,7 +576,7 @@ public class DataResultFilterNode extends FilterNode {
             // is a DirectoryTreeFilterNode that wraps the dataModelNode. We need
             // to set that wrapped node as the selection and root context of the 
             // directory tree explorer manager (sourceEm)
-            if(sourceEm == null || sourceEm.getSelectedNodes().length == 0) {
+            if (sourceEm == null || sourceEm.getSelectedNodes().length == 0) {
                 return null;
             }
             final Node currentSelectionInDirectoryTree = sourceEm.getSelectedNodes()[0];
@@ -610,7 +619,7 @@ public class DataResultFilterNode extends FilterNode {
          * @return
          */
         private AbstractAction openParent(AbstractNode node) {
-            if(sourceEm == null) {
+            if (sourceEm == null) {
                 return null;
             }
             // @@@ Why do we ignore node?
diff --git a/Core/src/org/sleuthkit/autopsy/timeline/actions/ViewArtifactInTimelineAction.java b/Core/src/org/sleuthkit/autopsy/timeline/actions/ViewArtifactInTimelineAction.java
index 69f998dc9b..ba25b0eb2f 100755
--- a/Core/src/org/sleuthkit/autopsy/timeline/actions/ViewArtifactInTimelineAction.java
+++ b/Core/src/org/sleuthkit/autopsy/timeline/actions/ViewArtifactInTimelineAction.java
@@ -40,9 +40,22 @@ public final class ViewArtifactInTimelineAction extends AbstractAction {
 
     private final BlackboardArtifact artifact;
 
+    /**
+     * Constructor.
+     * @param artifact The artifact to navigate to in the timeline.
+     */
     @NbBundle.Messages({"ViewArtifactInTimelineAction.displayName=View Result in Timeline... "})
     public ViewArtifactInTimelineAction(BlackboardArtifact artifact) {
-        super(Bundle.ViewArtifactInTimelineAction_displayName());
+        this(artifact, Bundle.ViewArtifactInTimelineAction_displayName());
+    }
+
+        /**
+     * Constructor.
+     * @param artifact The artifact to navigate to in the timeline.
+     * @param displayName The display name for the action.
+     */
+    public ViewArtifactInTimelineAction(BlackboardArtifact artifact, String displayName) {
+        super(displayName);
         this.artifact = artifact;
         // If timeline functionality is not available this action is disabled.
         if ("false".equals(ModuleSettings.getConfigSetting("timeline", "enable_timeline"))) {