4 files changed, 1 insertions, 10 deletions
diff --git a/src/mir_app/src/MDatabaseReadonly.cpp b/src/mir_app/src/MDatabaseReadonly.cpp
index c5ab94fed6..1de92de019 100644
--- a/src/mir_app/src/MDatabaseReadonly.cpp
+++ b/src/mir_app/src/MDatabaseReadonly.cpp
@@ -146,8 +146,3 @@ MEVENT MDatabaseReadonly::GetEventById(LPCSTR, LPCSTR)
 {
 	return 0;
 }
-
-BOOL MDatabaseReadonly::SetEventId(LPCSTR, MEVENT, LPCSTR)
-{
-	return FALSE;
-}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index c096e56e47..73c6f0edf6 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -597,7 +597,6 @@ Miranda_WaitOnHandleEx @663
 ??0MDatabaseReadonly@@QAE@XZ @684 NONAME
 ??_7MDatabaseReadonly@@6B@ @685 NONAME
 ?GetEventById@MDatabaseReadonly@@UAGIPBD0@Z @686 NONAME
-?SetEventId@MDatabaseReadonly@@UAGHPBDI0@Z @687 NONAME
 ?EditEvent@MDatabaseReadonly@@UAGHIIPBUDBEVENTINFO@@@Z @688 NONAME
 g_hevContactAdded @689 NONAME
 g_hevContactDeleted @690 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index 3cba4b2b3b..9dcb0e0cab 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -597,7 +597,6 @@ Miranda_WaitOnHandleEx @663
 ??0MDatabaseReadonly@@QEAA@XZ @684 NONAME
 ??_7MDatabaseReadonly@@6B@ @685 NONAME
 ?GetEventById@MDatabaseReadonly@@UEAAIPEBD0@Z @686 NONAME
-?SetEventId@MDatabaseReadonly@@UEAAHPEBDI0@Z @687 NONAME
 ?EditEvent@MDatabaseReadonly@@UEAAHIIPEBUDBEVENTINFO@@@Z @688 NONAME
 g_hevContactAdded @689 NONAME
 g_hevContactDeleted @690 NONAME
diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp
index 8eb3f862fc..c4b978a13f 100644
--- a/src/mir_app/src/proto_interface.cpp
+++ b/src/mir_app/src/proto_interface.cpp
@@ -199,11 +199,9 @@ MEVENT PROTO_INTERFACE::RecvMsg(MCONTACT hContact, PROTORECVEVENT *pre)
 	if ((GetCaps(PFLAGNUM_4) & PF4_SERVERMSGID) && pre->szMsgId != nullptr) {
 		MEVENT hDbEvent = db_event_getById(m_szModuleName, pre->szMsgId);
 		if (hDbEvent == 0 || db_event_edit(hContact, hDbEvent, &dbei)) {
+			dbei.szId = pre->szMsgId;
 			hDbEvent = db_event_add(hContact, &dbei);
-			if (hDbEvent)
-				db_event_setId(m_szModuleName, hDbEvent, pre->szMsgId);
 		}
-
 		return hDbEvent;
 	}