diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
index a4c3ca1ff2..ea813ac189 100644
--- a/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
+++ b/Core/src/org/sleuthkit/autopsy/datamodel/EmailExtracted.java
@@ -173,6 +173,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
         @Override
         protected boolean createKeys(List<BlackboardArtifact> list) {
             //flatten all emails            
+            List<BlackboardArtifact> tempList = new ArrayList<>();
             for (String account : accounts.keySet()) {
                 Map<String, List<Long>> folders = accounts.get(account);
                 for (String folder : folders.keySet()) {
@@ -180,7 +181,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
                     for (long l : messages) {
                         try {
                             //TODO: bulk artifact gettings
-                            list.add(skCase.getBlackboardArtifact(l));
+                            tempList.add(skCase.getBlackboardArtifact(l));
                         } catch (TskException ex) {
                             logger.log(Level.WARNING, "Error creating mail messages nodes", ex);
                         }
@@ -189,7 +190,7 @@ public class EmailExtracted implements AutopsyVisitableItem {
             }
 
 
-
+            list.addAll(tempList);
             return true;
         }
 
@@ -383,14 +384,16 @@ public class EmailExtracted implements AutopsyVisitableItem {
 
         @Override
         protected boolean createKeys(List<BlackboardArtifact> list) {
+            List<BlackboardArtifact> tempList = new ArrayList<>();
             for (long l : messages) {
                 try {
                     //TODO: bulk artifact gettings
-                    list.add(skCase.getBlackboardArtifact(l));
+                    tempList.add(skCase.getBlackboardArtifact(l));
                 } catch (TskException ex) {
                     logger.log(Level.WARNING, "Error creating mail messages nodes", ex);
                 }
             }
+            list.addAll(tempList);
             return true;
         }