diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index 9d99b6fd8..ed8326745 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -236,7 +236,11 @@ const ContentType &ChatMessagePrivate::getContentType () {
 }
 
 void ChatMessagePrivate::setContentType (const ContentType &contentType) {
-	internalContent.setContentType(contentType);
+	if (contents.size() > 0 && internalContent.getContentType().isEmpty() && internalContent.isEmpty()) {
+		contents.front()->setContentType(contentType);
+	} else {
+		internalContent.setContentType(contentType);
+	}
 }
 
 const string &ChatMessagePrivate::getText () {
@@ -265,7 +269,11 @@ const string &ChatMessagePrivate::getText () {
 }
 
 void ChatMessagePrivate::setText (const string &text) {
-	internalContent.setBody(text);
+	if (contents.size() > 0 && internalContent.getContentType().isEmpty() && internalContent.isEmpty()) {
+		contents.front()->setBody(text);
+	} else {
+		internalContent.setBody(text);
+	}
 }
 
 LinphoneContent *ChatMessagePrivate::getFileTransferInformation () const {