diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 792fbc350..eeebb86f1 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -62,10 +62,17 @@
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/delete_message">
 
+		<LinearLayout
+		android:id="@+id/separator"
+		android:layout_width="100dp"
+		android:layout_height="10dp"
+		android:orientation="horizontal"/>
+
         <LinearLayout
             android:id="@+id/background"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_below="@id/separator"
             android:orientation="horizontal">
 
             <RelativeLayout
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index 94c706c22..807495b45 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -183,6 +183,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 
 	    holder.eventLayout.setVisibility(View.GONE);
 	    holder.bubbleLayout.setVisibility(View.GONE);
+	    holder.separatorLayout.setVisibility(i == 0 ? View.GONE : View.VISIBLE); // Hide separator if first item in list
 	    holder.delete.setVisibility(isEditionEnabled() ? View.VISIBLE : View.GONE);
 	    holder.messageText.setVisibility(View.GONE);
 	    holder.messageImage.setVisibility(View.GONE);
@@ -212,13 +213,13 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 			    EventLog previousEvent = (EventLog)getItem(i-1);
 			    if (previousEvent.getType() == EventLog.Type.ConferenceChatMessage) {
 				    ChatMessage previousMessage = previousEvent.getChatMessage();
-				    /*if (previousMessage.getFromAddress().weakEqual(message.getFromAddress())) {
+				    if (previousMessage.getFromAddress().weakEqual(message.getFromAddress())) {
 					    holder.separatorLayout.setVisibility(View.GONE);
-				    }*/
-			    }/* else {
+				    }
+			    } else {
 			    	// No separator if previous event is not a message
 				    holder.separatorLayout.setVisibility(View.GONE);
-			    }*/
+			    }
 		    }
 
 		    holder.messageId = message.getMessageId();