diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index bab4b5db6..25f63b6cf 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -327,11 +327,12 @@ LinphoneReason ChatMessagePrivate::receive () {
 	shared_ptr<Core> core = q->getCore();
 	shared_ptr<ChatRoom> chatRoom = q->getChatRoom();
 
+	setState(ChatMessage::State::Delivered);
+
 	// ---------------------------------------
 	// Start of message modification
 	// ---------------------------------------
 
-
 	if ((currentRecvStep &ChatMessagePrivate::Step::Cpim) == ChatMessagePrivate::Step::Cpim) {
 		lInfo() << "Cpim step already done, skipping";
 	} else {
diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp
index 00e99d7d7..090fd3811 100644
--- a/src/chat/chat-room/chat-room.cpp
+++ b/src/chat/chat-room/chat-room.cpp
@@ -183,7 +183,6 @@ LinphoneReason ChatRoomPrivate::messageReceived (SalOp *op, const SalMessage *sa
 	msg->setInternalContent(content);
 
 	msg->getPrivate()->setTime(salMsg->time);
-	msg->getPrivate()->setState(ChatMessage::State::Delivered);
 	msg->setImdnMessageId(op->get_call_id());
 
 	const SalCustomHeader *ch = op->get_recv_custom_header();