diff --git a/README.md b/README.md
index df4f16c35..afd28c46f 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,9 @@ Linphone is a free VoIP and video softphone based on the SIP protocol.
 
 1. Download the Android sdk (API 28.0.0 at max) with platform-tools and tools updated to latest revision, then add both 'tools' and 'platform-tools' folders in your path and the android-sdk folder to ANDROID_HOME environment variable.
 
-2. Download the Android ndk (version 16) from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable.
+2. Download the Android NDK 17 from google and add it to your path (no symlink !!!) and ANDROID_NDK environment variable.
 
-3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.10)_.
+3. Install _yasm_, _nasm_ (For OpenH224 support only), _python_, _pkg_config_ and _cmake(>=3.12)_.
   * On 64 bits linux systems you'll need the _ia32-libs_ package.
   * With the latest Debian (multiarch), you need this:
     * `dpkg --add-architecture i386`
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index d469db883..ba9acf38b 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -81,6 +81,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">true</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 e8f8c8865..94c706c22 100644
--- a/src/android/org/linphone/chat/ChatEventsAdapter.java
+++ b/src/android/org/linphone/chat/ChatEventsAdapter.java
@@ -208,7 +208,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();