diff --git a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestService.java b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestService.java
index 8cde54d9f4..d7e4ed2cc7 100644
--- a/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestService.java
+++ b/thunderbirdparser/src/org/sleuthkit/autopsy/thunderbirdparser/ThunderbirdMboxFileIngestService.java
@@ -127,17 +127,22 @@ public class ThunderbirdMboxFileIngestService implements IngestServiceAbstractFi
             }
            int index = 0;
            String replace = "";
+           boolean a = mboxPath.indexOf("/ImapMail/") > 0;
             boolean b = mboxPath.indexOf("/Mail/") > 0;
             if(b == true)
             {
              index = mboxPath.indexOf("/Mail/");
              replace = "/Mail";
             }
-            else
+            else if(a == true)
             {
              index = mboxPath.indexOf("/ImapMail/");   
              replace = "/ImapMail";
             }
+            else{
+             replace = "";
+                
+            }
             String folderPath = mboxPath.substring(index);
             folderPath = folderPath.replaceAll(replace, "");
             folderPath = folderPath+mboxName;