diff --git a/coreapi/friendlist.c b/coreapi/friendlist.c
index a317ab1c8..b9a772ebe 100644
--- a/coreapi/friendlist.c
+++ b/coreapi/friendlist.c
@@ -404,9 +404,11 @@ static LinphoneFriendListStatus _linphone_friend_list_add_friend(LinphoneFriendL
 		ms_warning("Friend %s already in list [%s], ignored.", tmp ? tmp : "unknown", list->display_name);
 		if (tmp) ms_free(tmp);
 	} else {
-		return linphone_friend_list_import_friend(list, lf, synchronize);
+		LinphoneFriendListStatus status = linphone_friend_list_import_friend(list, lf, synchronize);
+		linphone_friend_save(lf, lf->lc);
+		return status;
 	}
-	return LinphoneFriendListOK;
+	return LinphoneFriendListInvalidFriend;
 }
 
 LinphoneFriendListStatus linphone_friend_list_add_friend(LinphoneFriendList *list, LinphoneFriend *lf) {
@@ -431,7 +433,6 @@ LinphoneFriendListStatus linphone_friend_list_import_friend(LinphoneFriendList *
 	if (synchronize) {
 		list->dirty_friends_to_update = ms_list_append(list->dirty_friends_to_update, linphone_friend_ref(lf));
 	}
-	linphone_friend_save(lf, lf->lc);
 	return LinphoneFriendListOK;
 }
 
@@ -483,13 +484,13 @@ const MSList * linphone_friend_list_get_friends(const LinphoneFriendList *list)
 }
 
 void linphone_friend_list_update_dirty_friends(LinphoneFriendList *list) {
-	LinphoneCardDavContext *cdc = linphone_carddav_context_new(list);
 	MSList *dirty_friends = list->dirty_friends_to_update;
 
-	if (cdc) {
-		cdc->sync_done_cb = carddav_done;
-		while (dirty_friends) {
+	while (dirty_friends) {
+		LinphoneCardDavContext *cdc = linphone_carddav_context_new(list);
+		if (cdc) {
 			LinphoneFriend *lf = (LinphoneFriend *)dirty_friends->data;
+			cdc->sync_done_cb = carddav_done;
 			if (lf) {
 				if (cdc->friend_list->cbs->sync_state_changed_cb) {
 					cdc->friend_list->cbs->sync_state_changed_cb(cdc->friend_list, LinphoneFriendListSyncStarted, NULL);
@@ -498,8 +499,8 @@ void linphone_friend_list_update_dirty_friends(LinphoneFriendList *list) {
 			}
 			dirty_friends = ms_list_next(dirty_friends);
 		}
-		list->dirty_friends_to_update = ms_list_free_with_data(list->dirty_friends_to_update, (void (*)(void *))linphone_friend_unref);
 	}
+	list->dirty_friends_to_update = ms_list_free_with_data(list->dirty_friends_to_update, (void (*)(void *))linphone_friend_unref);
 }
 
 static void carddav_created(LinphoneCardDavContext *cdc, LinphoneFriend *lf) {
@@ -786,6 +787,7 @@ int linphone_friend_list_import_friends_from_vcard4_file(LinphoneFriendList *lis
 		}
 		vcards = ms_list_next(vcards);
 	}
+	linphone_core_store_friends_list_in_db(list->lc, list);
 	return count;
 }
 
@@ -819,6 +821,7 @@ int linphone_friend_list_import_friends_from_vcard4_buffer(LinphoneFriendList *l
 		}
 		vcards = ms_list_next(vcards);
 	}
+	linphone_core_store_friends_list_in_db(list->lc, list);
 	return count;
 }
 
diff --git a/tester/vcard_tester.c b/tester/vcard_tester.c
index 077dd3037..6d9a42e35 100644
--- a/tester/vcard_tester.c
+++ b/tester/vcard_tester.c
@@ -79,9 +79,6 @@ static void linphone_vcard_import_a_lot_of_friends_test(void) {
 
 	elapsed = (double)(end - start);
 	ms_error("Imported a thousand of vCards from file (only %i friends with SIP address found) in %f seconds", ms_list_size(friends), elapsed / CLOCKS_PER_SEC);
-#ifndef ANDROID
-	BC_ASSERT_TRUE(elapsed < 1500000); // 1.5 seconds
-#endif
 
 	lfl = linphone_core_create_friend_list(manager->lc);
 	infile = fopen(import_filepath, "rb");
@@ -105,9 +102,6 @@ static void linphone_vcard_import_a_lot_of_friends_test(void) {
 
 	elapsed = (double)(end - start);
 	ms_error("Imported a thousand of vCards from buffer (only %i friends with SIP address found) in %f seconds", ms_list_size(friends), elapsed / CLOCKS_PER_SEC);
-#ifndef ANDROID
-	BC_ASSERT_TRUE(elapsed < 1500000); // 1.5 seconds
-#endif
 
 	linphone_friend_list_unref(lfl);
 
@@ -718,7 +712,6 @@ static void carddav_multiple_sync(void) {
 	linphone_core_manager_destroy(manager);
 }
 
-#if 0 // To remove once crash will be fixed
 static void carddav_server_to_client_and_client_to_sever_sync(void) {
 	LinphoneCoreManager *manager = linphone_core_manager_new2("carddav_rc", FALSE);
 	LinphoneFriendList *lfl = linphone_core_create_friend_list(manager->lc);
@@ -746,10 +739,9 @@ static void carddav_server_to_client_and_client_to_sever_sync(void) {
 	ms_free(stats);
 	linphone_friend_unref(lf1);
 	linphone_friend_unref(lf2);
-	linphone_friend_list_unref(lfl);belle_sip_auth_helper_compute_ha1
+	linphone_friend_list_unref(lfl);
 	linphone_core_manager_destroy(manager);
 }
-#endif
 
 #else
 static void dummy_test(void) {
@@ -773,9 +765,7 @@ test_t vcard_tests[] = {
 	{ "CardDAV synchronization 3", carddav_sync_3 },
 	{ "CardDAV synchronization 4", carddav_sync_4 },
 	{ "CardDAV integration", carddav_integration },
-#if 0
 	{ "CardDAV client to server and server to client sync", carddav_server_to_client_and_client_to_sever_sync },
-#endif
 	{ "CardDAV multiple synchronizations", carddav_multiple_sync },
 #else
 	{ "Dummy test", dummy_test }