diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d2a5c766a..dd0645646 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -80,6 +80,7 @@
 	<bool name="disable_chat_send_file">false</bool>
 	<string name="temp_photo_name">linphone-android-photo-temp</string>
 	<string name="temp_photo_name_with_date">linphone-android-photo-%s</string>
+	<bool name="lower_space_between_chat_bubbles_if_same_person">false</bool>
 
 	<!-- Contacts -->
 	<bool name="hide_contact_phone_numbers">false</bool>
diff --git a/src/android/org/linphone/chat/ChatEventsAdapter.java b/src/android/org/linphone/chat/ChatEventsAdapter.java
index d9f2f4ca6..b7d97aceb 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -207,7 +207,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
 		    holder.bubbleLayout.setVisibility(View.VISIBLE);
 		    final ChatMessage message = event.getChatMessage();
 
-		    if (i > 0) {
+		    if (i > 0 && mContext.getResources().getBoolean(R.bool.lower_space_between_chat_bubbles_if_same_person)) {
 			    EventLog previousEvent = (EventLog)getItem(i-1);
 			    if (previousEvent.getType() == EventLog.Type.ConferenceChatMessage) {
 				    ChatMessage previousMessage = previousEvent.getChatMessage();