diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp
index d53df4dbe..7826ced15 100644
--- a/src/c-wrapper/api/c-chat-message.cpp
+++ b/src/c-wrapper/api/c-chat-message.cpp
@@ -138,10 +138,6 @@ void linphone_chat_message_set_outgoing(LinphoneChatMessage *msg) {
 	L_GET_PRIVATE_FROM_C_OBJECT(msg)->setDirection(LinphonePrivate::ChatMessage::Direction::Outgoing);
 }
 
-unsigned int linphone_chat_message_get_storage_id(LinphoneChatMessage *msg) {
-	return L_GET_PRIVATE_FROM_C_OBJECT(msg)->getStorageId();
-}
-
 LinphoneChatMessageState linphone_chat_message_get_state(const LinphoneChatMessage *msg) {
 	return ((LinphoneChatMessageState)L_GET_CPP_PTR_FROM_C_OBJECT(msg)->getState());
 }
@@ -158,10 +154,6 @@ void linphone_chat_message_set_message_id(LinphoneChatMessage *msg, char *id) {
 	L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setImdnMessageId(L_C_TO_STRING(id));
 }
 
-void linphone_chat_message_set_storage_id(LinphoneChatMessage *msg, unsigned int id) {
-	L_GET_PRIVATE_FROM_C_OBJECT(msg)->setStorageId(id);
-}
-
 bool_t linphone_chat_message_is_read(LinphoneChatMessage *msg) {
 	return L_GET_CPP_PTR_FROM_C_OBJECT(msg)->isRead();
 }
diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h
index aecdf91d3..f57f79cfb 100644
--- a/src/chat/chat-message/chat-message-p.h
+++ b/src/chat/chat-message/chat-message-p.h
@@ -73,9 +73,6 @@ public:
 		this->toAddress = toAddress;
 	}
 
-	unsigned int getStorageId() const;
-	void setStorageId(unsigned int id);
-
 	belle_http_request_t *getHttpRequest() const;
 	void setHttpRequest(belle_http_request_t *request);
 
@@ -127,7 +124,6 @@ public:
 
 private:
 	// TODO: Clean attributes.
-	unsigned int storageId = 0;
 	time_t time = ::ms_time(0); // TODO: Change me in all files.
 	std::string id;
 	std::string rttMessage;
diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index aaae7d964..bab4b5db6 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -100,14 +100,6 @@ void ChatMessagePrivate::setState (ChatMessage::State s, bool force) {
 	store();
 }
 
-unsigned int ChatMessagePrivate::getStorageId () const {
-	return storageId;
-}
-
-void ChatMessagePrivate::setStorageId (unsigned int id) {
-	storageId = id;
-}
-
 belle_http_request_t *ChatMessagePrivate::getHttpRequest () const {
 	return fileTransferChatMessageModifier.getHttpRequest();
 }
diff --git a/src/chat/chat-room/chat-room.h b/src/chat/chat-room/chat-room.h
index 4e6bc3d9a..a4d6c126a 100644
--- a/src/chat/chat-room/chat-room.h
+++ b/src/chat/chat-room/chat-room.h
@@ -58,7 +58,7 @@ public:
 
 	virtual CapabilitiesMask getCapabilities () const = 0;
 
-	std::shared_ptr<ChatMessage> getLastMessageInHistory() const;
+	std::shared_ptr<ChatMessage> getLastMessageInHistory () const;
 
 	// TODO: Remove useless functions.
 	void compose ();