From d472d15a6bac6c582bbe42ef47ee97c83aa6dbfa Mon Sep 17 00:00:00 2001
From: Alex Ebadirad <aebadirad@42six.com>
Date: Thu, 21 Jun 2012 16:43:19 -0700
Subject: [PATCH] Fixed situation where mbox files exist outside thunderbird
 directory

---
 .../ThunderbirdMboxFileIngestService.java                  | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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;