diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c
index 5d07c148b..ad4dc533a 100644
--- a/coreapi/callbacks.c
+++ b/coreapi/callbacks.c
@@ -549,9 +549,6 @@ static void message_delivery_update(SalOp *op, SalMessageDeliveryStatus status){
 	if (linphone_chat_message_get_chat_room(chat_msg) != NULL) {
 		linphone_chat_message_update_state(chat_msg, chatStatusSal2Linphone(status));
 	}
-	if (status != SalMessageDeliveryInProgress) { /*only release op if not in progress*/
-		linphone_chat_message_unref(chat_msg);
-	}
 }
 
 static void info_received(SalOp *op, SalBodyHandler *body_handler) {
diff --git a/src/c-wrapper/internal/c-tools.h b/src/c-wrapper/internal/c-tools.h
index 4635cc280..ef183a97d 100644
--- a/src/c-wrapper/internal/c-tools.h
+++ b/src/c-wrapper/internal/c-tools.h
@@ -535,9 +535,8 @@ public:
 	>
 	static inline bctbx_list_t *getResolvedCListFromCppList (const std::list<std::shared_ptr<CppType>> &cppList) {
 		bctbx_list_t *result = nullptr;
-		for (const auto &value : cppList) {
+		for (const auto &value : cppList)
 			result = bctbx_list_append(result, belle_sip_object_ref(getCBackPtr(value)));
-		}
 		return result;
 	}
 
diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index dfae54c1c..d26927c9e 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -491,7 +491,7 @@ void ChatMessagePrivate::send () {
 	// Start of message modification
 	// ---------------------------------------
 
-	if (applyModifiers) { 
+	if (applyModifiers) {
 		// Do not multipart or encapsulate with CPIM in an old ChatRoom to maintain backward compatibility
 		if (q->getChatRoom()->canHandleParticipants()) {
 			if ((currentSendStep &ChatMessagePrivate::Step::Multipart) == ChatMessagePrivate::Step::Multipart) {