diff --git a/iped-engine/src/main/java/iped/engine/task/leappbridge/ArtifactJavaReport.java b/iped-engine/src/main/java/iped/engine/task/leappbridge/ArtifactJavaReport.java
index 8bcf0d9989..075073f219 100644
--- a/iped-engine/src/main/java/iped/engine/task/leappbridge/ArtifactJavaReport.java
+++ b/iped-engine/src/main/java/iped/engine/task/leappbridge/ArtifactJavaReport.java
@@ -6,9 +6,11 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.Date;
 import java.util.HashMap;
 
 import org.apache.tika.metadata.Metadata;
+import org.apache.tika.metadata.Property;
 import org.apache.tika.mime.MediaType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +24,7 @@
 import iped.engine.util.Util;
 import iped.parsers.python.PythonParser;
 import iped.properties.ExtraProperties;
+import iped.utils.DateUtil;
 import jep.Jep;
 
 public class ArtifactJavaReport {
@@ -41,6 +44,9 @@ public class ArtifactJavaReport {
     private MediaType currentReportMediaType;
     private File reportPath;
 
+    static private String KEY_PROPERTY_NAME = "Key";
+    private String lastKeyValue = null;
+
     static private Logger LOGGER = LoggerFactory.getLogger(ArtifactJavaReport.class);
 
 
@@ -111,6 +117,7 @@ public void write_artifact_data_table(Object headers, Object data_list, String f
         if (data_list != null) {
             if (data_list instanceof Collection) {
                 for (Object data_fields : (Collection) data_list) {
+                    lastKeyValue = null;
                     write_artifact_data_item(headers, data_fields, file);
                 }
             }
@@ -232,6 +239,25 @@ private void addMetadata(Item subItem, String property, String value) throws IOE
             }
         }
 
+        if (property.toLowerCase().contains(KEY_PROPERTY_NAME)) {
+            // some htmls are formated as key value pairs. So keep the last read key value
+            // to name following properties. This is used mainly to better
+            // name some timestamps event types.
+            lastKeyValue = value;
+        }
+
+        Date d = DateUtil.tryToParseDate(value);
+        if (d != null) {
+            Property p;
+            if (property.toLowerCase().contains("value") && lastKeyValue != null) {
+                p = Property.internalDate("aleapp:" + pluginName + "_" + lastKeyValue);
+            } else {
+                p = Property.internalDate("aleapp:" + pluginName + "_ts");
+            }
+            m.set(p, d);
+            return;
+        }
+
         m.add("aleapp:" + property, value);
     }