diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MimeJ4MessageParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MimeJ4MessageParser.java
index ba5b24842f..b73a062e12 100755
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MimeJ4MessageParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/MimeJ4MessageParser.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.logging.Level;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.james.mime4j.dom.Body;
 import org.apache.james.mime4j.dom.Entity;
 import org.apache.james.mime4j.dom.Message;
@@ -136,7 +137,7 @@ class MimeJ4MessageParser implements AutoCloseable{
         email.setCc(getAddresses(msg.getCc()));
         email.setSubject(msg.getSubject());
         email.setSentDate(msg.getDate());
-        email.setLocalPath(localPath);
+        email.setLocalPath(FilenameUtils.getBaseName(localPath));
         email.setMessageID(msg.getMessageId());
 
         Field field = msg.getHeader().getField("in-reply-to"); //NON-NLS
diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
index 358c67a8a5..fd5eac40c9 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/PstParser.java
@@ -35,6 +35,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Scanner;
 import java.util.logging.Level;
+import java.util.stream.Stream;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.openide.util.NbBundle;
 import org.sleuthkit.autopsy.casemodule.NoCurrentCaseException;
@@ -151,7 +152,7 @@ class PstParser  implements AutoCloseable{
         Iterable<EmailMessage> iterable = null;
 
         try {
-            iterable = getEmailMessageIterator(pstFile.getRootFolder(), "\\", fileID, true);
+            iterable = getEmailMessageIterator(pstFile.getRootFolder(), "", fileID, true);
         } catch (PSTException | IOException ex) {
             logger.log(Level.WARNING, String.format("Exception thrown while parsing fileID: %d", fileID), ex);
         }
@@ -254,7 +255,7 @@ class PstParser  implements AutoCloseable{
         if (folder.hasSubfolders()) {
             List<PSTFolder> subFolders = folder.getSubFolders();
             for (PSTFolder subFolder : subFolders) {
-                String newpath = path + "\\" + subFolder.getDisplayName();
+                String newpath = path + "/" + subFolder.getDisplayName();
                 Iterable<EmailMessage> subIterable = getEmailMessageIterator(subFolder, newpath, fileID, wholeMsg);
                 if (subIterable == null) {
                     continue;