diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
index f8465fb3e..42c00bf71 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
@@ -96,6 +96,18 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
             ChatMessage message = event.getChatMessage();
             message.setUserData(holder);
 
+            if (message.isOutgoing() && message.getState() != ChatMessage.State.Displayed) {
+                message.setListener(new ChatMessageListenerStub() {
+                    @Override
+                    public void onMsgStateChanged(ChatMessage message, ChatMessage.State state) {
+                        ChatMessageViewHolder holder = (ChatMessageViewHolder) message.getUserData();
+                        if (holder != null) {
+                            notifyItemChanged(holder.getAdapterPosition());
+                        }
+                    }
+                });
+            }
+
             LinphoneContact contact = null;
             Address remoteSender = message.getFromAddress();
             if (!message.isOutgoing()) {
@@ -108,17 +120,6 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
             }
             holder.bindMessage(message, contact);
             changeBackgroundDependingOnPreviousAndNextEvents(message, holder, position);
-
-            message.setListener(new ChatMessageListenerStub() {
-                @Override
-                public void onMsgStateChanged(ChatMessage message, ChatMessage.State state) {
-                    ChatMessageViewHolder holder = (ChatMessageViewHolder) message.getUserData();
-                    if (holder != null) {
-                        holder.bindMessage(message, null);
-                        changeBackgroundDependingOnPreviousAndNextEvents(message, holder, holder.getAdapterPosition());
-                    }
-                }
-            });
         } else { // Event is not chat message
             Address address = event.getParticipantAddress();
             String displayName = null;
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 1ccc22884..a6099cbd7 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -56,6 +56,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.linphone.LinphoneManager;
+import org.linphone.core.ChatMessageListenerStub;
 import org.linphone.settings.LinphonePreferences;
 import org.linphone.LinphoneService;
 import org.linphone.utils.FileUtils;