4 files changed, 22 insertions, 5 deletions
diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc
index dd76270478..aecccbf82e 100644
--- a/include/delphi/m_database.inc
+++ b/include/delphi/m_database.inc
@@ -28,6 +28,12 @@ const
   DBEF_RTL       =  8; // event contains the right-to-left aligned text
   DBEF_UTF       = 16; // event contains a text in utf-8
   DBEF_ENCRYPTED = 32; // event is encrypted (never reported outside a driver)
+  DBEF_HAS_ID    = 64;
+  DBEF_SECURE    = 128;    
+  DBEF_STRONG    = 256;
+  DBEF_BOOKMARK  = 512;
+  DBEF_JSON      = 1024;
+  DBEF_MSEC      = 2048;
 
 const
   EVENTTYPE_MESSAGE     = 0;
diff --git a/plugins/HistoryPlusPlus/hpp_events.pas b/plugins/HistoryPlusPlus/hpp_events.pas
index f1ca2ddf0b..2436cff13a 100644
--- a/plugins/HistoryPlusPlus/hpp_events.pas
+++ b/plugins/HistoryPlusPlus/hpp_events.pas
@@ -209,7 +209,7 @@ begin
   begin
     ZeroMemory(@RecentEventInfo, SizeOf(RecentEventInfo));
     RecentEventInfo.cbBlob := 0;
-    db_event_get(hDBEvent, @RecentEventInfo);
+    my_event_get(hDBEvent, @RecentEventInfo);
     RecentEvent := hDBEvent;
   end;
   Result := RecentEventInfo.timestamp;
@@ -223,7 +223,7 @@ begin
   begin
     ZeroMemory(@RecentEventInfo, SizeOf(RecentEventInfo));
     RecentEventInfo.cbBlob := 0;
-    db_event_get(hDBEvent, @RecentEventInfo);
+    my_event_get(hDBEvent, @RecentEventInfo);
     RecentEvent := hDBEvent;
   end;
   Result := GetMessageType(RecentEventInfo,EventIndex);
@@ -393,7 +393,7 @@ begin
     BlobSize := 0;
 
   Result.cbBlob := BlobSize;
-  if db_event_get(hDBEvent, @Result) = 0 then
+  if my_event_get(hDBEvent, @Result) = 0 then
   begin
     Result.cbBlob := BlobSize;
     if BlobSize > 0 then
@@ -423,7 +423,7 @@ begin
 
   dbei.cbBlob := BlobSize;
   dbei.pBlob := Result.pBlob;
-  if db_event_get(hDBEvent, @dbei) = 0 then
+  if my_event_get(hDBEvent, @dbei) = 0 then
   begin
     Result.cbBlob := BlobSize;
     if BlobSize > 0 then
diff --git a/plugins/HistoryPlusPlus/hpp_global.pas b/plugins/HistoryPlusPlus/hpp_global.pas
index 6af8367813..018e233b3f 100644
--- a/plugins/HistoryPlusPlus/hpp_global.pas
+++ b/plugins/HistoryPlusPlus/hpp_global.pas
@@ -293,6 +293,8 @@ procedure OpenUrl(const URLText: String; NewWindow: Boolean);
 
 function HppMessageBox(Handle: THandle; const Text: String; const Caption: String; Flags: Integer): Integer;
 
+function my_event_get(hDbEvent:TMEVENT; dbei:PDBEVENTINFO):int;
+
 function MakeTextXMLedA(const Text: AnsiString): AnsiString;
 function MakeTextXMLedW(const Text: WideString): WideString;
 function FormatCString(const Text: WideString): WideString;
@@ -708,6 +710,15 @@ begin
          or (Pos(RTF_BEGIN_2, Value) = 1);
 end;
 
+function my_event_get(hDbEvent:TMEVENT; dbei:PDBEVENTINFO):int;
+begin
+  Result := db_event_get(hDbEvent, dbei);
+  if Result = 0 then begin
+    if (dbei.flags and DBEF_MSEC) <> 0 then
+        dbei.Timestamp := Trunc(dbei.Timestamp / 1000);
+  end;
+end;
+
 function _WideCharType(WC: WideChar; dwInfoType: Cardinal): Word;
 begin
   Win32Check(GetStringTypeExW(GetThreadLocale, dwInfoType, PWideChar(@WC), 1, Result))
diff --git a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
index 5a57ca9cb4..9a1f4924db 100644
--- a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
+++ b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
@@ -180,7 +180,7 @@ begin
     begin
       ZeroMemory(@Event, SizeOf(Event));
       Event.cbBlob := 0;
-      db_event_get(hDBEvent, @Event);
+      my_event_get(hDBEvent, @Event);
       CurTime := Event.Timestamp;
       if PrevTime = 0 then
       begin