diff --git a/src/chat/chat-message.cpp b/src/chat/chat-message.cpp
index eb7e5bf53..3723533b8 100644
--- a/src/chat/chat-message.cpp
+++ b/src/chat/chat-message.cpp
@@ -996,6 +996,11 @@ LinphoneReason ChatMessagePrivate::receive() {
 	MultipartChatMessageModifier mcmm;
 	mcmm.decode(q->getSharedFromThis(), &errorCode);
 
+	if (contents.size() == 0) {
+		// All previous modifiers only altered the internal content, let's fill the content list
+		contents.push_back(internalContent);
+	}
+
 	// ---------------------------------------
 	// End of message modification
 	// ---------------------------------------
diff --git a/src/chat/modifier/multipart-chat-message-modifier.cpp b/src/chat/modifier/multipart-chat-message-modifier.cpp
index 4390841ee..7d2f5f36b 100644
--- a/src/chat/modifier/multipart-chat-message-modifier.cpp
+++ b/src/chat/modifier/multipart-chat-message-modifier.cpp
@@ -40,9 +40,6 @@ ChatMessageModifier::Result MultipartChatMessageModifier::decode (shared_ptr<Cha
 	if (false) { // Multipart required
 
 		return ChatMessageModifier::Result::Done;
-	} else if (message->getContents().size() == 0) {
-		// All previous modifiers only altered the internal content, let's fill the content list because we're the last modifier to be called
-		message->addContent(message->getInternalContent());
 	}
 	return ChatMessageModifier::Result::Skipped;
 }