diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
index 24dcc5be2..9a17efd3f 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesAdapter.java
@@ -334,9 +334,11 @@ public class ChatMessagesAdapter extends SelectableAdapter<ChatMessageViewHolder
     }
 
     public void addToHistory(EventLog log) {
-        mHistory.add(0, log);
-        notifyItemInserted(0);
-        notifyItemChanged(1); // Update second to last item just in case for grouping purposes
+        if (!mHistory.contains(log)) {
+            mHistory.add(0, log);
+            notifyItemInserted(0);
+            notifyItemChanged(1); // Update second to last item just in case for grouping purposes
+        }
     }
 
     public void addAllToHistory(ArrayList<EventLog> logs) {
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index ec740d668..25fe7256c 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -1213,11 +1213,14 @@ public class ChatMessagesFragment extends Fragment
     public void onNewEvent(@NonNull ChatRoom chatRoom, @NonNull EventLog eventLog) {}
 
     @Override
-    public void onChatMessageSent(ChatRoom cr, EventLog event) {
+    public void onChatMessageSending(ChatRoom cr, EventLog event) {
         ((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
     }
 
+    @Override
+    public void onChatMessageSent(@NonNull ChatRoom chatRoom, @NonNull EventLog eventLog) {}
+
     @Override
     public void onConferenceAddressGeneration(ChatRoom cr) {}