diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 7083d37dd..52090f148 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -1818,7 +1818,7 @@ static void linphone_core_init(LinphoneCore * lc, const LinphoneCoreVTable *vtab
 		linphone_configuring_terminated(lc, LinphoneConfiguringSkipped, NULL);
 	} // else linphone_core_start will be called after the remote provisioning (see linphone_core_iterate)
 #ifdef SQLITE_STORAGE_ENABLED
-	sqlite3_bctbx_vfs_register(1);
+	sqlite3_bctbx_vfs_register(0);
 #endif
 }
 
diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 60a759b45..bf1883de6 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -42,28 +42,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "sqlite3.h"
 #include <assert.h>
 
-int _linphone_sqlite3_open(const char *db_file, sqlite3 **db) {
-	char* errmsg = NULL;
-	int ret;
-#if defined(ANDROID) || defined(__QNXNTO__)
-	ret = sqlite3_open(db_file, db);
-#elif TARGET_OS_IPHONE
-	/* the secured filesystem of the iPHone doesn't allow writing while the app is in background mode, which is problematic.
-	 * We workaround by asking that the open is made with no protection*/
-	ret = sqlite3_open_v2(db_file, db, SQLITE_OPEN_FILEPROTECTION_NONE|SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE, NULL);
-#elif defined(_WIN32)
-	wchar_t db_file_utf16[MAX_PATH_SIZE];
-	ret = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, db_file, -1, db_file_utf16, MAX_PATH_SIZE);
-	if(ret == 0) db_file_utf16[0] = '\0';
-	ret = sqlite3_open16(db_file_utf16, db);
+static char *utf8_convert(const char *filename){
+	char db_file_utf8[MAX_PATH_SIZE] = "";
+#if defined(_WIN32)
+	wchar_t db_file_utf16[MAX_PATH_SIZE]={0};
+	MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, filename, -1, db_file_utf16, MAX_PATH_SIZE);
+	WideCharToMultiByte(CP_UTF8, 0, db_file_utf16, -1, db_file_utf8, sizeof(db_file_utf8), NULL, NULL);
 #else
 	char db_file_locale[MAX_PATH_SIZE] = {'\0'};
-	char db_file_utf8[MAX_PATH_SIZE] = "";
 	char *inbuf=db_file_locale, *outbuf=db_file_utf8;
 	size_t inbyteleft = MAX_PATH_SIZE, outbyteleft = MAX_PATH_SIZE;
 	iconv_t cb;
 
-	strncpy(db_file_locale, db_file, MAX_PATH_SIZE-1);
+	strncpy(db_file_locale, filename, MAX_PATH_SIZE-1);
 	cb = iconv_open("UTF-8", nl_langinfo(CODESET));
 	if(cb != (iconv_t)-1) {
 		int ret;
@@ -71,8 +62,26 @@ int _linphone_sqlite3_open(const char *db_file, sqlite3 **db) {
 		if(ret == -1) db_file_utf8[0] = '\0';
 		iconv_close(cb);
 	}
-	ret = sqlite3_open(db_file_utf8, db);
 #endif
+	return ms_strdup(db_file_utf8);
+}
+
+
+int _linphone_sqlite3_open(const char *db_file, sqlite3 **db) {
+	char* errmsg = NULL;
+	int ret;
+	int flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE;
+
+#if TARGET_OS_IPHONE
+	/* the secured filesystem of the iPHone doesn't allow writing while the app is in background mode, which is problematic.
+	 * We workaround by asking that the open is made with no protection*/
+	flags |= SQLITE_OPEN_FILEPROTECTION_NONE;
+#endif
+	
+	char *utf8_filename = utf8_convert(db_file);
+	ret = sqlite3_open_v2(utf8_filename, db, flags, LINPHONE_SQLITE3_VFS);
+	ms_free(utf8_filename);
+
 	if (ret != SQLITE_OK) return ret;
 	// Some platforms do not provide a way to create temporary files which are needed
 	// for transactions... so we work in memory only
diff --git a/coreapi/private.h b/coreapi/private.h
index a85259154..4cf2ef61d 100644
--- a/coreapi/private.h
+++ b/coreapi/private.h
@@ -1521,6 +1521,8 @@ int linphone_core_get_default_proxy_config_index(LinphoneCore *lc);
 
 char *linphone_presence_model_to_xml(LinphonePresenceModel *model) ;
 
+#define LINPHONE_SQLITE3_VFS "sqlite3bctbx_vfs"
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/coreapi/sqlite3_bctbx_vfs.c b/coreapi/sqlite3_bctbx_vfs.c
index 9e190106f..ae9d4e869 100644
--- a/coreapi/sqlite3_bctbx_vfs.c
+++ b/coreapi/sqlite3_bctbx_vfs.c
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 #ifdef SQLITE_STORAGE_ENABLED
+#include "private.h"
 
 #include "sqlite3_bctbx_vfs.h"
 #include <sqlite3.h>
@@ -283,7 +284,7 @@ sqlite3_vfs *sqlite3_bctbx_vfs_create(void){
     sizeof(sqlite3_bctbx_file_t),   	/* szOsFile */
     MAXPATHNAME,                  	/* mxPathname */
     0,                            	/* pNext */
-    "sqlite3bctbx_vfs",              /* zName */
+    LINPHONE_SQLITE3_VFS,              /* zName */
     0,                            	/* pAppData */
     sqlite3bctbx_Open,            	/* xOpen */
     0,                   			/* xDelete */
@@ -333,7 +334,7 @@ void sqlite3_bctbx_vfs_register( int makeDefault){
 
 void sqlite3_bctbx_vfs_unregister(void)
 {
-	sqlite3_vfs* pVfs = sqlite3_vfs_find("sqlite3bctbx_vfs");
+	sqlite3_vfs* pVfs = sqlite3_vfs_find(LINPHONE_SQLITE3_VFS);
 	sqlite3_vfs_unregister(pVfs);
 }