diff --git a/include/linphone/utils/general.h b/include/linphone/utils/general.h
index fea6e3ff0..b11044e92 100644
--- a/include/linphone/utils/general.h
+++ b/include/linphone/utils/general.h
@@ -127,7 +127,7 @@ constexpr T *getPublicHelper (Object *object, const ObjectPrivate *) {
 	friend class CLASS;
 
 #define L_DISABLE_COPY(CLASS) \
-	CLASS(const CLASS &) = delete; \
+	CLASS (const CLASS &) = delete; \
 	CLASS &operator= (const CLASS &) = delete;
 
 #define L_D() decltype(std::declval<decltype(*this)>().getPrivate()) const d = getPrivate();
diff --git a/src/content/content-type.h b/src/content/content-type.h
index ebbbe9e19..c2a1d0ba1 100644
--- a/src/content/content-type.h
+++ b/src/content/content-type.h
@@ -30,7 +30,7 @@ class ContentTypePrivate;
 
 class LINPHONE_PUBLIC ContentType : public ClonableObject {
 public:
-	ContentType (const std::string &contentType = "");
+	explicit ContentType (const std::string &contentType = "");
 	ContentType (const std::string &type, const std::string &subType);
 	ContentType (const std::string &type, const std::string &subType, const std::string &parameter);
 	ContentType (const ContentType &src);
diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp
index e64babbff..405b70552 100644
--- a/src/db/events-db.cpp
+++ b/src/db/events-db.cpp
@@ -305,9 +305,10 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {}
 				{ content }
 			);
 
-			const bool noAppData = false;
-			const string appData = getValueFromLegacyMessage<string>(message, 10, const_cast<bool &>(noAppData));
-			(void)appData;
+			bool noAppData = false;
+			const string appData = getValueFromLegacyMessage<string>(message, 10, noAppData);
+			if (!noAppData)
+				return;
 		}
 
 		tr.commit();
@@ -385,6 +386,21 @@ EventsDb::EventsDb () : AbstractDb(*new EventsDbPrivate) {}
 			"    ON DELETE CASCADE"
 			")";
 
+		*session <<
+			"CREATE TABLE IF NOT EXISTS message_participant ("
+			"  message_event_id INT UNSIGNED NOT NULL,"
+			"  sip_address_id INT UNSIGNED NOT NULL,"
+			"  state TINYINT UNSIGNED NOT NULL,"
+
+			"  PRIMARY KEY (message_event_id, sip_address_id),"
+			"  FOREIGN KEY (message_event_id)"
+			"    REFERENCES message_event(id)"
+			"    ON DELETE CASCADE,"
+			"  FOREIGN KEY (sip_address_id)"
+			"    REFERENCES sip_address(id)"
+			"    ON DELETE CASCADE,"
+			")";
+
 		*session <<
 			"CREATE TABLE IF NOT EXISTS message_content ("
 			"  id" + primaryKeyAutoIncrementStr() + ","