5 files changed, 6 insertions, 6 deletions
diff --git a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
index f1faa55e6c..33fe30105b 100644
--- a/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
+++ b/plugins/HistoryPlusPlus/EmptyHistoryForm.pas
@@ -257,7 +257,7 @@ begin
   SetSafetyMode(False);
   while hDBEvent <> 0 do
   begin
-    prevhDbEvent := db_event_prev(hDBEvent);
+    prevhDbEvent := db_event_prev(hContact,hDBEvent);
     if db_event_delete(hContact,hDBEvent) = 0 then
       hDBEvent := prevhDbEvent
     else
diff --git a/plugins/HistoryPlusPlus/HistoryForm.pas b/plugins/HistoryPlusPlus/HistoryForm.pas
index 3cec81369e..218f404be5 100644
--- a/plugins/HistoryPlusPlus/HistoryForm.pas
+++ b/plugins/HistoryPlusPlus/HistoryForm.pas
@@ -2109,7 +2109,7 @@ begin
     Sessions[idx].TimestampLast := 0;
     Exit;
   end;
-  hDBEvent := db_event_next(hDBEvent);
+  hDBEvent := db_event_next(hContact,hDBEvent);
   if hDBEvent <> 0 then
   begin
     Sessions[idx].hDBEventFirst := hDBEvent;
diff --git a/plugins/HistoryPlusPlus/hpp_bookmarks.pas b/plugins/HistoryPlusPlus/hpp_bookmarks.pas
index 5d0ec98640..942ac135b3 100644
--- a/plugins/HistoryPlusPlus/hpp_bookmarks.pas
+++ b/plugins/HistoryPlusPlus/hpp_bookmarks.pas
@@ -634,7 +634,7 @@ begin
         Result := True;
         break;
       end;
-      hDBEvent := db_event_next(hDBEvent);
+      hDBEvent := db_event_next(Contact.hContact,hDBEvent);
     end;
   end
   else
@@ -651,7 +651,7 @@ begin
         Result := True;
         break;
       end;
-      hDBEvent := db_event_prev(hDBEvent);
+      hDBEvent := db_event_prev(Contact.hContact,hDBEvent);
     end;
   end;
 end;
diff --git a/plugins/HistoryPlusPlus/hpp_searchthread.pas b/plugins/HistoryPlusPlus/hpp_searchthread.pas
index 88637c039b..6d850ddf5e 100644
--- a/plugins/HistoryPlusPlus/hpp_searchthread.pas
+++ b/plugins/HistoryPlusPlus/hpp_searchthread.pas
@@ -428,7 +428,7 @@ begin
   begin
     if SearchEvent(hDBEvent) then
       SendItem(hDBEvent);
-    hDBEvent := db_event_prev(hDBEvent);
+    hDBEvent := db_event_prev(Contact, hDBEvent);
   end;
   SendBatch;
 end;
diff --git a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
index 57535d7004..d86372feaf 100644
--- a/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
+++ b/plugins/HistoryPlusPlus/hpp_sessionsthread.pas
@@ -209,7 +209,7 @@ begin
         Inc(Count);
         PrevTime := CurTime;
       end;
-      hDBEvent := db_event_next(hDBEvent);
+      hDBEvent := db_event_next(FContact, hDBEvent);
     end;
     SendItem(FirstEvent, LastEvent, FirstTimestamp, LastTimestamp, Count);
     SendBatch;