diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 614ce0aba..f92d9a52a 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -357,6 +357,9 @@ public class ChatEventsAdapter extends BaseAdapter implements ChatMessageListene
 
 		    holder.bubbleLayout.setLayoutParams(layoutParams);
 	    } else { // Event is not chat message
+		    if (event.isFullState()) { // Do not display full state events
+			    return view;
+		    }
 		    holder.eventLayout.setVisibility(View.VISIBLE);
 
 		    Log.d("Conference event type is " + event.getType().toString());
diff --git a/submodules/linphone b/submodules/linphone
index 8e05e6a21..a4a221dc0 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 8e05e6a21f0770e4e00fbf316568645bebaf41c0
+Subproject commit a4a221dc0602d8ce170dbd3ffac75b72395a41fc