diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index 7a2c37352..068821313 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -767,7 +767,7 @@ void ChatMessagePrivate::processResponseFromPostFile (const belle_http_response_
 				
 				Content fileTransferContent;
 				fileTransferContent.setContentType(ContentType::FileTransfer);
-				fileTransferContent.setBody(getText());
+				fileTransferContent.setBody(internalContent.getBodyAsString());
 				q->addContent(fileTransferContent);
 
 				q->updateState(ChatMessage::State::FileTransferDone);
diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp
index 3d085d61d..cfba88fd7 100644
--- a/src/chat/chat-room/chat-room.cpp
+++ b/src/chat/chat-room/chat-room.cpp
@@ -458,11 +458,6 @@ void ChatRoom::compose () {
 shared_ptr<ChatMessage> ChatRoom::createFileTransferMessage (const LinphoneContent *initialContent) {
 	shared_ptr<ChatMessage> chatMessage = createMessage();
 
-	/*Content content;
-	content.setContentType(ContentType::FileTransfer);
-	content.setBody(linphone_content_get_string_buffer(initialContent));
-	chatMessage->addContent(content);*/
-
 	chatMessage->getPrivate()->setDirection(ChatMessage::Direction::Outgoing);
 	chatMessage->getPrivate()->setFileTransferInformation(linphone_content_copy(initialContent));
 	return chatMessage;