diff --git a/src/chat/modifier/cpim-chat-message-modifier.cpp b/src/chat/modifier/cpim-chat-message-modifier.cpp
index 03c35fed0..3f361b9c9 100644
--- a/src/chat/modifier/cpim-chat-message-modifier.cpp
+++ b/src/chat/modifier/cpim-chat-message-modifier.cpp
@@ -35,13 +35,6 @@ LINPHONE_BEGIN_NAMESPACE
 ChatMessageModifier::Result CpimChatMessageModifier::encode (const shared_ptr<ChatMessage> &message, int &errorCode) {
 	Cpim::Message cpimMessage;
 
-	// TODO: Remove this buggy Content-Type header
-	Cpim::GenericHeader cpimContentTypeHeader;
-	cpimContentTypeHeader.setName("Content-Type");
-	cpimContentTypeHeader.setValue(ContentType::Cpim.asString());
-	cpimMessage.addCpimHeader(cpimContentTypeHeader);
-	// TODO: Remove this buggy Content-Type header
-
 	Cpim::FromHeader cpimFromHeader;
 	cpimFromHeader.setValue(cpimAddressAsString(message->getFromAddress()));
 	cpimMessage.addMessageHeader(cpimFromHeader);
@@ -74,14 +67,6 @@ ChatMessageModifier::Result CpimChatMessageModifier::encode (const shared_ptr<Ch
 	const string contentBody = content->getBodyAsString();
 	cpimMessage.setContent(contentBody);
 
-	// TODO: Remove this check because of buggy Content-Type header
-	if (!cpimMessage.isValid()) {
-		lError() << "[CPIM] Message is invalid: " << contentBody;
-		errorCode = 500;
-		return ChatMessageModifier::Result::Error;
-	}
-	// TODO: Remove this check because of buggy Content-Type header
-
 	Content newContent;
 	newContent.setContentType(ContentType::Cpim);
 	newContent.setBody(cpimMessage.asString());