diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h
index 10f572bca..3abd2f972 100644
--- a/src/chat/chat-message/chat-message-p.h
+++ b/src/chat/chat-message/chat-message-p.h
@@ -139,6 +139,7 @@ private:
 	SalOp *salOp = nullptr;
 	SalCustomHeader *salCustomHeaders = nullptr;
 	unsigned char currentSendStep = Step::None;
+	unsigned char currentRecvStep = Step::None;
 	bool applyModifiers = true;
 	FileTransferChatMessageModifier fileTransferChatMessageModifier;
 
diff --git a/src/chat/chat-message/chat-message.cpp b/src/chat/chat-message/chat-message.cpp
index 43af1c22e..abb579b71 100644
--- a/src/chat/chat-message/chat-message.cpp
+++ b/src/chat/chat-message/chat-message.cpp
@@ -450,27 +450,51 @@ LinphoneReason ChatMessagePrivate::receive () {
 	// Start of message modification
 	// ---------------------------------------
 
-	if (internalContent.getContentType() == ContentType::Cpim) {
-		CpimChatMessageModifier ccmm;
-		ccmm.decode(q->getSharedFromThis(), errorCode);
+
+	if ((currentRecvStep &ChatMessagePrivate::Step::Cpim) == ChatMessagePrivate::Step::Cpim) {
+		lInfo() << "Cpim step already done, skipping";
+	} else {
+		if (internalContent.getContentType() == ContentType::Cpim) {
+			CpimChatMessageModifier ccmm;
+			ccmm.decode(q->getSharedFromThis(), errorCode);
+		}
+		currentRecvStep |= ChatMessagePrivate::Step::Cpim;
 	}
 
-	EncryptionChatMessageModifier ecmm;
-	ChatMessageModifier::Result result = ecmm.decode(q->getSharedFromThis(), errorCode);
-	if (result == ChatMessageModifier::Result::Error) {
-		/* Unable to decrypt message */
-		if (chatRoom)
-			chatRoom->getPrivate()->notifyUndecryptableMessageReceived(q->getSharedFromThis());
-		reason = linphone_error_code_to_reason(errorCode);
-		q->sendDeliveryNotification(reason);
-		return reason;
+	if ((currentRecvStep &ChatMessagePrivate::Step::Encryption) == ChatMessagePrivate::Step::Encryption) {
+		lInfo() << "Encryption step already done, skipping";
+	} else {
+		EncryptionChatMessageModifier ecmm;
+		ChatMessageModifier::Result result = ecmm.decode(q->getSharedFromThis(), errorCode);
+		if (result == ChatMessageModifier::Result::Error) {
+			/* Unable to decrypt message */
+			if (chatRoom)
+				chatRoom->getPrivate()->notifyUndecryptableMessageReceived(q->getSharedFromThis());
+			reason = linphone_error_code_to_reason(errorCode);
+			q->sendDeliveryNotification(reason);
+			return reason;
+		} else if (result == ChatMessageModifier::Result::Suspended) {
+			currentRecvStep |= ChatMessagePrivate::Step::Encryption;
+			return LinphoneReasonNone;
+		}
+		currentRecvStep |= ChatMessagePrivate::Step::Encryption;
 	}
 
-	MultipartChatMessageModifier mcmm;
-	mcmm.decode(q->getSharedFromThis(), errorCode);
+	if ((currentRecvStep &ChatMessagePrivate::Step::Multipart) == ChatMessagePrivate::Step::Multipart) {
+		lInfo() << "Multipart step already done, skipping";
+	} else {
+		MultipartChatMessageModifier mcmm;
+		mcmm.decode(q->getSharedFromThis(), errorCode);
+		currentRecvStep |= ChatMessagePrivate::Step::Multipart;
+	}
 
-	// This will check if internal content is FileTransfer and make the appropriate changes
-	fileTransferChatMessageModifier.decode(q->getSharedFromThis(), errorCode);
+	if ((currentRecvStep & ChatMessagePrivate::Step::FileUpload) == ChatMessagePrivate::Step::FileUpload) {
+		lInfo() << "File upload step already done, skipping";
+	} else {
+		// This will check if internal content is FileTransfer and make the appropriate changes
+		fileTransferChatMessageModifier.decode(q->getSharedFromThis(), errorCode);
+		currentRecvStep |= ChatMessagePrivate::Step::FileUpload;
+	}
 
 	if (contents.size() == 0) {
 		// All previous modifiers only altered the internal content, let's fill the content list
diff --git a/src/chat/modifier/encryption-chat-message-modifier.cpp b/src/chat/modifier/encryption-chat-message-modifier.cpp
index 3bb3b28a0..cd9193490 100644
--- a/src/chat/modifier/encryption-chat-message-modifier.cpp
+++ b/src/chat/modifier/encryption-chat-message-modifier.cpp
@@ -93,6 +93,9 @@ ChatMessageModifier::Result EncryptionChatMessageModifier::decode (
 		return ChatMessageModifier::Result::Skipped;
 
 	message->setIsSecured(true);
+	if (retval == 1)
+		return ChatMessageModifier::Result::Suspended;
+		
 	return ChatMessageModifier::Result::Done;
 }