diff --git a/Makefile b/Makefile
index f5068180c..78f6ce9fa 100644
--- a/Makefile
+++ b/Makefile
@@ -435,7 +435,7 @@ prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h
 $(TOPDIR)/res/raw/rootca.pem:
 	 HTTPS_CA_DIR=$(HTTPS_CA_DIR) $(TOPDIR)/submodules/linphone/scripts/mk-ca-bundle.pl $@
 
-prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem
+prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/res/raw/rootca.pem $(TOPDIR)/submodules/linphone/tester/messages.db
 	rm -rf liblinphone_tester/assets/config_files
 	mkdir -p liblinphone_tester/assets/config_files
 	for file in $^; do \
diff --git a/submodules/externals/build/sqlite/Android.mk b/submodules/externals/build/sqlite/Android.mk
index f163d55eb..09cd26583 100644
--- a/submodules/externals/build/sqlite/Android.mk
+++ b/submodules/externals/build/sqlite/Android.mk
@@ -4,6 +4,11 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 	sqlite3.c
 
+# Android does not provide a way to create temporary files which are needed
+# for transactions... so we work in memory only
+# see http://www.sqlite.org/compile.html#temp_store
+LOCAL_CFLAGS += -DSQLITE_TEMP_STORE=3
+
 LOCAL_MODULE:= liblinsqlite
 
 include $(BUILD_STATIC_LIBRARY)
diff --git a/submodules/linphone b/submodules/linphone
index c53f70e25..c8bd7e100 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit c53f70e256c464fef9dc3eea88583ffdc069fc10
+Subproject commit c8bd7e1007c466d5f244c0e82e8d8e5ebb563c2f