diff --git a/Linphone/GeneratedGit.swift b/Linphone/GeneratedGit.swift
index aa0f7ced3..228e4d8a9 100644
--- a/Linphone/GeneratedGit.swift
+++ b/Linphone/GeneratedGit.swift
@@ -2,6 +2,6 @@ import Foundation
 
 public enum AppGitInfo {
     public static let branch = "master"
-    public static let commit = "3b10fbb7c"
+    public static let commit = "95a7f0987"
     public static let tag = "6.1.0-alpha"
 }
diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
index ab880ca1b..89efb732e 100644
--- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
+++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
@@ -2435,9 +2435,17 @@ class ConversationViewModel: ObservableObject {
 							
 							let indexMessageSelected = self.conversationMessagesSection[0].rows.firstIndex(of: self.selectedMessageToDisplayDetails!)
 							
+							var reactionsTmp: [String] = []
+							if let messageToSendReactionTmp = messageToSendReaction {
+								messageToSendReactionTmp.reactions.forEach({ chatMessageReaction in
+									reactionsTmp.append(chatMessageReaction.body)
+								})
+							}
+							
 							DispatchQueue.main.async {
 								if indexMessageSelected != nil {
 									self.conversationMessagesSection[0].rows[indexMessageSelected!].message.ownReaction = ""
+									self.conversationMessagesSection[0].rows[indexMessageSelected!].message.reactions = reactionsTmp
 								}
 								self.selectedMessageToDisplayDetails = nil
 								self.isShowSelectedMessageToDisplayDetails = false
@@ -2463,9 +2471,17 @@ class ConversationViewModel: ObservableObject {
 						
 						let indexMessageSelected = self.conversationMessagesSection[0].rows.firstIndex(of: self.selectedMessage!)
 						
+						var reactionsTmp: [String] = []
+						if let messageToSendReactionTmp = messageToSendReaction {
+							messageToSendReactionTmp.reactions.forEach({ chatMessageReaction in
+								reactionsTmp.append(chatMessageReaction.body)
+							})
+						}
+						
 						DispatchQueue.main.async {
 							if indexMessageSelected != nil {
 								self.conversationMessagesSection[0].rows[indexMessageSelected!].message.ownReaction = messageToSendReaction?.ownReaction?.body == emoji ? "" : emoji
+								self.conversationMessagesSection[0].rows[indexMessageSelected!].message.reactions = reactionsTmp
 							}
 							self.selectedMessage = nil
 						}