diff --git a/Makefile b/Makefile
index bd6be1c5e..0b9db5d9d 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ BUILD_WEBRTC_AECM=1
 BUILD_FOR_X86=1
 USE_JAVAH=1
 BUILD_TLS=1
-BUILD_SQLITE=0
+BUILD_SQLITE=1
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
diff --git a/res/values/non_localizable_custom.xml b/res/values/non_localizable_custom.xml
index e9436e0a4..2ce6972f9 100644
--- a/res/values/non_localizable_custom.xml
+++ b/res/values/non_localizable_custom.xml
@@ -63,7 +63,7 @@
 	<bool name="disable_chat">false</bool>
 	<bool name="disable_chat__message_notification">false</bool>
 	<bool name="disable_chat_send_file">false</bool>
-	<bool name="use_linphone_chat_storage">false</bool>
+	<bool name="use_linphone_chat_storage">true</bool>
 	
 	<bool name="hash_images_as_name_before_upload">true</bool>