From 8313f18dabc1498d5ab7f5cbb0c63a29fdbc3661 Mon Sep 17 00:00:00 2001
From: Jeff Wallace <jwallace@basistech.com>
Date: Thu, 31 Oct 2013 14:44:55 -0400
Subject: [PATCH] Replace Thunderbird Parser with MBox Parser while loading
 ingest properties.

---
 .../sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
index 75c0c1c75f..3d4f792e87 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
@@ -65,6 +65,9 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
         String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
         List<IngestModuleAbstract> enabledModules = new ArrayList<>();
         for (String moduleName : enabledModuleNames) {
+            if (moduleName.equals("Thunderbird Parser")) {
+                moduleName = "MBox Parser";
+            }
             IngestModuleAbstract moduleFound =  null;
             for (IngestModuleAbstract module : allModules) {
                 if (moduleName.equals(module.getName())) {
@@ -76,7 +79,7 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
                 enabledModules.add(moduleFound);
             }
             else {
-                messages.add("Unable to load " + moduleName + " module");
+                messages.add("Unable to enable ingest module: " + moduleName);
             }
         }        
         ingestDialogPanel.setEnabledIngestModules(enabledModules);